[Pkg-fglrx-devel] r1466 - in fglrx-driver/trunk/debian: . patches
Patrick Matthäi
pmatthaei at moszumanska.debian.org
Thu May 21 17:41:00 UTC 2015
Author: pmatthaei
Date: 2015-05-21 17:41:00 +0000 (Thu, 21 May 2015)
New Revision: 1466
Added:
fglrx-driver/trunk/debian/patches/01-dkms-arch_compat.patch
fglrx-driver/trunk/debian/patches/02-authatieventsd.sh.patch
fglrx-driver/trunk/debian/patches/03-stub-for-agpless-kernel.patch
fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch
Removed:
fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch
fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch
fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.patch
fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/patches/series
Log:
* Uploading to unstable.
* Rename patches (correct order).
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2015-04-20 01:02:47 UTC (rev 1465)
+++ fglrx-driver/trunk/debian/changelog 2015-05-21 17:41:00 UTC (rev 1466)
@@ -1,4 +1,4 @@
-fglrx-driver (1:14.12-2) UNRELEASED; urgency=medium
+fglrx-driver (1:14.12-2) UNRELEASED; urgency=low
[ Andreas Beckmann ]
* fglrx_3.17rc6-no_hotplug.patch: New patch, add support for Linux >= 3.17.
@@ -7,6 +7,10 @@
[ Michael Gilbert ]
* Remove myself from the uploaders list.
+ [ Patrick Matthäi ]
+ * Uploading to unstable.
+ * Rename patches (correct order).
+
-- Andreas Beckmann <anbe at debian.org> Sat, 24 Jan 2015 19:53:38 +0100
fglrx-driver (1:14.12-1) experimental; urgency=medium
Copied: fglrx-driver/trunk/debian/patches/01-dkms-arch_compat.patch (from rev 1465, fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch)
===================================================================
--- fglrx-driver/trunk/debian/patches/01-dkms-arch_compat.patch (rev 0)
+++ fglrx-driver/trunk/debian/patches/01-dkms-arch_compat.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -0,0 +1,14 @@
+description: set compat_alloc_user_space so that it is compatible with dkms
+author: Patrick Matthäi <pmatthaei at debian.org>
+
+diff -Naur fglrx-driver-11-5.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile fglrx-driver-11-5/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
+--- fglrx-driver-11-5.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2011-05-03 17:19:14.000000000 +0200
++++ fglrx-driver-11-5/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2011-05-11 19:22:41.000000000 +0200
+@@ -68,6 +68,7 @@
+ -DFGL_GART_RESERVED_SLOT \
+ -DFGL_LINUX253P1_VMA_API \
+ -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
++ -DCOMPAT_ALLOC_USER_SPACE=$(shell if grep -q compat_alloc_user_space /lib/modules/$(KERNELRELEASE)/build/Module.symvers ; then echo arch_compat_alloc_user_space ; else echo compat_alloc_user_space ; fi) \
+
+ ifeq ($(KERNELRELEASE),)
+ # on first call from remote location we get into this path
Copied: fglrx-driver/trunk/debian/patches/02-authatieventsd.sh.patch (from rev 1465, fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch)
===================================================================
--- fglrx-driver/trunk/debian/patches/02-authatieventsd.sh.patch (rev 0)
+++ fglrx-driver/trunk/debian/patches/02-authatieventsd.sh.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -0,0 +1,68 @@
+description: compatiblility for authatieventsd.sh on Debian
+author: Patrick Matthäi <pmatthaei at debian.org>
+
+Index: fglrx-driver/common/etc/ati/authatieventsd.sh
+===================================================================
+--- fglrx-driver.orig/common/etc/ati/authatieventsd.sh 2011-07-18 19:32:39.000000000 -0400
++++ fglrx-driver/common/etc/ati/authatieventsd.sh 2011-07-18 20:25:31.000000000 -0400
+@@ -42,6 +42,16 @@
+ return 0
+ fi
+
++ # Check for xauth
++ XAUTH_AUTH_MASK=/var/run/xauth/A$1*
++ XAUTH_AUTH_FILE=`ls -t $XAUTH_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file
++ if [ -n "$XAUTH_AUTH_FILE" ]; then
++ SERVER_AUTH_FILE=$XAUTH_AUTH_FILE
++ DISP_SEARCH_STRING="#ffff#"
++ return 0
++ fi
++
++
+ # Check gdm
+
+ GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth
+@@ -55,12 +65,14 @@
+
+ for XPID in `pidof X`; do
+ TRIAL_XAUTH_FILE=`tr '\0' '\n' < /proc/$XPID/environ | grep -e "^XAUTHORITY=" | cut -d= -f2`
++ if [ -n "$TRIAL_XAUTH_FILE" ]; then
+ TRIAL_XAUTH_KEY=`xauth -f $TRIAL_XAUTH_FILE list | grep "unix$1"`
+ if [ -n "$TRIAL_XAUTH_KEY" ]; then
+ SERVER_AUTH_FILE=$TRIAL_XAUTH_FILE
+ DISP_SEARCH_STRING="unix$1"
+ return 0
+ fi
++ fi
+ done
+
+ # Couldn't find the key
+@@ -83,16 +95,22 @@
+ case "$1" in
+ grant)
+ GetServerAuthFile $2 || exit -1
+- DISP_AUTH_KEY=`xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{ print $3 }'`
+- if [ -n "$DISP_AUTH_KEY" ]; then
+- xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
+- else
+- exit -1
++ xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING || exit -1
++ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
++ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
++ su $user -c "echo "$2 . `xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{print $3}'`" | xauth -f $3 merge -" || exit -1
++ else
++ echo "$2 . `xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{print $3}'`" | xauth -f $3 merge - || exit -1
+ fi
+ ;;
+
+ revoke)
+- xauth -f $3 remove $2 || exit -1
++ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
++ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
++ su $user -c "xauth -f $3 remove $2" || exit -1
++ else
++ xauth -f $3 remove $2 || exit -1
++ fi
+ ;;
+
+ *)
Deleted: fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch 2015-04-20 01:02:47 UTC (rev 1465)
+++ fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -1,14 +0,0 @@
-description: set compat_alloc_user_space so that it is compatible with dkms
-author: Patrick Matthäi <pmatthaei at debian.org>
-
-diff -Naur fglrx-driver-11-5.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile fglrx-driver-11-5/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
---- fglrx-driver-11-5.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2011-05-03 17:19:14.000000000 +0200
-+++ fglrx-driver-11-5/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2011-05-11 19:22:41.000000000 +0200
-@@ -68,6 +68,7 @@
- -DFGL_GART_RESERVED_SLOT \
- -DFGL_LINUX253P1_VMA_API \
- -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
-+ -DCOMPAT_ALLOC_USER_SPACE=$(shell if grep -q compat_alloc_user_space /lib/modules/$(KERNELRELEASE)/build/Module.symvers ; then echo arch_compat_alloc_user_space ; else echo compat_alloc_user_space ; fi) \
-
- ifeq ($(KERNELRELEASE),)
- # on first call from remote location we get into this path
Deleted: fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch 2015-04-20 01:02:47 UTC (rev 1465)
+++ fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -1,68 +0,0 @@
-description: compatiblility for authatieventsd.sh on Debian
-author: Patrick Matthäi <pmatthaei at debian.org>
-
-Index: fglrx-driver/common/etc/ati/authatieventsd.sh
-===================================================================
---- fglrx-driver.orig/common/etc/ati/authatieventsd.sh 2011-07-18 19:32:39.000000000 -0400
-+++ fglrx-driver/common/etc/ati/authatieventsd.sh 2011-07-18 20:25:31.000000000 -0400
-@@ -42,6 +42,16 @@
- return 0
- fi
-
-+ # Check for xauth
-+ XAUTH_AUTH_MASK=/var/run/xauth/A$1*
-+ XAUTH_AUTH_FILE=`ls -t $XAUTH_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file
-+ if [ -n "$XAUTH_AUTH_FILE" ]; then
-+ SERVER_AUTH_FILE=$XAUTH_AUTH_FILE
-+ DISP_SEARCH_STRING="#ffff#"
-+ return 0
-+ fi
-+
-+
- # Check gdm
-
- GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth
-@@ -55,12 +65,14 @@
-
- for XPID in `pidof X`; do
- TRIAL_XAUTH_FILE=`tr '\0' '\n' < /proc/$XPID/environ | grep -e "^XAUTHORITY=" | cut -d= -f2`
-+ if [ -n "$TRIAL_XAUTH_FILE" ]; then
- TRIAL_XAUTH_KEY=`xauth -f $TRIAL_XAUTH_FILE list | grep "unix$1"`
- if [ -n "$TRIAL_XAUTH_KEY" ]; then
- SERVER_AUTH_FILE=$TRIAL_XAUTH_FILE
- DISP_SEARCH_STRING="unix$1"
- return 0
- fi
-+ fi
- done
-
- # Couldn't find the key
-@@ -83,16 +95,22 @@
- case "$1" in
- grant)
- GetServerAuthFile $2 || exit -1
-- DISP_AUTH_KEY=`xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{ print $3 }'`
-- if [ -n "$DISP_AUTH_KEY" ]; then
-- xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
-- else
-- exit -1
-+ xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING || exit -1
-+ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
-+ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
-+ su $user -c "echo "$2 . `xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{print $3}'`" | xauth -f $3 merge -" || exit -1
-+ else
-+ echo "$2 . `xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{print $3}'`" | xauth -f $3 merge - || exit -1
- fi
- ;;
-
- revoke)
-- xauth -f $3 remove $2 || exit -1
-+ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
-+ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
-+ su $user -c "xauth -f $3 remove $2" || exit -1
-+ else
-+ xauth -f $3 remove $2 || exit -1
-+ fi
- ;;
-
- *)
Copied: fglrx-driver/trunk/debian/patches/03-stub-for-agpless-kernel.patch (from rev 1465, fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.patch)
===================================================================
--- fglrx-driver/trunk/debian/patches/03-stub-for-agpless-kernel.patch (rev 0)
+++ fglrx-driver/trunk/debian/patches/03-stub-for-agpless-kernel.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -0,0 +1,20 @@
+Description: Add a stub for kernels built without CONFIG_AGP
+Author: Vasiliy Yeremeyev <vayerx at gmail.com>
+Origin: other, https://bugs.gentoo.org/show_bug.cgi?id=435322#c11
+Forwarded: no
+Last-Update: 2012-11-04
+
+--- fglrx-driver-13.1.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
++++ fglrx-driver-13.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
+@@ -479,6 +479,11 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned
+ return -EINVAL;
+ }
+
++int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
++{
++ return -EINVAL;
++}
++
+ int ATI_API_CALL KCL_AGP_ReadCapsRegisters(KCL_PCI_DevHandle dev, unsigned int *caps)
+ {
+ return -EINVAL;
Copied: fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch (from rev 1465, fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch)
===================================================================
--- fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch (rev 0)
+++ fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -0,0 +1,33 @@
+# Fix building with Linux 3.17.
+
+Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
+===================================================================
+--- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -1093,6 +1093,9 @@ static int fglrx_pci_suspend(struct pci_
+ // directly here to allow suspend/resume without X server start.
+ firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
+ pci_disable_device(pdev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
++ pci_ignore_hotplug(pdev);
++#endif
+ PMSG_EVENT(pdev->dev.power.power_state) = state;
+ }
+ else
+Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+===================================================================
+--- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
++++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+@@ -840,10 +840,12 @@ static acpi_status KCL_ACPI_Slot_No_Hotp
+ if(tdev != NULL)
+ {
+ device = (acpi_device_adr(tdev) >> 16) & 0xffff;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+ if(PCI_SLOT(pdev->devfn) == device)
+ {
+ tdev->flags.no_hotplug = true;
+ }
++#endif
+ }
+ #endif
+ return 0;
Deleted: fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.patch 2015-04-20 01:02:47 UTC (rev 1465)
+++ fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -1,20 +0,0 @@
-Description: Add a stub for kernels built without CONFIG_AGP
-Author: Vasiliy Yeremeyev <vayerx at gmail.com>
-Origin: other, https://bugs.gentoo.org/show_bug.cgi?id=435322#c11
-Forwarded: no
-Last-Update: 2012-11-04
-
---- fglrx-driver-13.1.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
-+++ fglrx-driver-13.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
-@@ -479,6 +479,11 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned
- return -EINVAL;
- }
-
-+int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
-+{
-+ return -EINVAL;
-+}
-+
- int ATI_API_CALL KCL_AGP_ReadCapsRegisters(KCL_PCI_DevHandle dev, unsigned int *caps)
- {
- return -EINVAL;
Deleted: fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch 2015-04-20 01:02:47 UTC (rev 1465)
+++ fglrx-driver/trunk/debian/patches/fglrx_3.17rc6-no_hotplug.patch 2015-05-21 17:41:00 UTC (rev 1466)
@@ -1,31 +0,0 @@
-Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
-===================================================================
---- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1093,6 +1093,9 @@ static int fglrx_pci_suspend(struct pci_
- // directly here to allow suspend/resume without X server start.
- firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
- pci_disable_device(pdev);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-+ pci_ignore_hotplug(pdev);
-+#endif
- PMSG_EVENT(pdev->dev.power.power_state) = state;
- }
- else
-Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-===================================================================
---- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -840,10 +840,12 @@ static acpi_status KCL_ACPI_Slot_No_Hotp
- if(tdev != NULL)
- {
- device = (acpi_device_adr(tdev) >> 16) & 0xffff;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
- if(PCI_SLOT(pdev->devfn) == device)
- {
- tdev->flags.no_hotplug = true;
- }
-+#endif
- }
- #endif
- return 0;
Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series 2015-04-20 01:02:47 UTC (rev 1465)
+++ fglrx-driver/trunk/debian/patches/series 2015-05-21 17:41:00 UTC (rev 1466)
@@ -1,4 +1,4 @@
-02-dkms-arch_compat.patch
-03-authatieventsd.sh.patch
-06-stub-for-agpless-kernel.patch
-fglrx_3.17rc6-no_hotplug.patch
+01-dkms-arch_compat.patch
+02-authatieventsd.sh.patch
+03-stub-for-agpless-kernel.patch
+04-3.17rc6-no_hotplug.patch
More information about the Pkg-fglrx-devel
mailing list