[Pkg-fglrx-devel] r1411 - in fglrx-legacy-driver/trunk/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2014-09-27 19:42:13 +0000 (Sat, 27 Sep 2014)
New Revision: 1411

Added:
   fglrx-legacy-driver/trunk/debian/patches/09-linux-3.14.patch
Modified:
   fglrx-legacy-driver/trunk/debian/changelog
   fglrx-legacy-driver/trunk/debian/patches/series
Log:
restore compatibility with Linux 3.14

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2014-09-27 19:14:37 UTC (rev 1410)
+++ fglrx-legacy-driver/trunk/debian/changelog	2014-09-27 19:42:13 UTC (rev 1411)
@@ -1,3 +1,10 @@
+fglrx-legacy-driver (8.97.100.7-5) UNRELEASED; urgency=medium
+
+  * Add patch 09-linux-3.14.patch from Eli (based on patches from Krzysztof
+    Kolasa) to restore compatibility with Linux 3.14.  (Closes: #758003)
+
+ -- Andreas Beckmann <anbe at debian.org>  Sat, 27 Sep 2014 21:23:29 +0200
+
 fglrx-legacy-driver (8.97.100.7-4) unstable; urgency=low
 
   * Add patches 07-change-create_proc-to-proc_create-for-kernel-3.10.X and

Added: fglrx-legacy-driver/trunk/debian/patches/09-linux-3.14.patch
===================================================================
--- fglrx-legacy-driver/trunk/debian/patches/09-linux-3.14.patch	                        (rev 0)
+++ fglrx-legacy-driver/trunk/debian/patches/09-linux-3.14.patch	2014-09-27 19:42:13 UTC (rev 1411)
@@ -0,0 +1,38 @@
+Author: Eli <epicadocan at gmail.com>
+Description: add support for Linux 3.14
+ Patch based on commits created by Krzysztof Kolasa
+ from https://github.com/kolasa/fglrx-13.25
+Bug-Debian: https://bugs.debian.org/758003
+
+diff -uprN fglrx-8.97.100.7/firegl_public.h fglrx-8.97.100.7-b/firegl_public.h
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.h	2013-01-15 22:33:27.000000000 +0100
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.h	2014-08-13 09:27:55.000000000 +0200
+@@ -231,8 +231,11 @@ typedef struct {
+  */
+ typedef int             KCL_TYPE_Pid;       /** Process identifier */
+ typedef int             KCL_TYPE_Tgid;      /** Thread Group identifier */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0)
+ typedef int             KCL_TYPE_Uid;       /** User identifier */
+-
++#else
++typedef kuid_t KCL_TYPE_Uid; /** User identifier */
++#endif
+ /** Atomic variables
+  * This type is defined using struct to make sure compiled code will
+  * always refer to the memory containing the atomic variable (prevent
+diff -uprN fglrx-8.97.100.7/kcl_acpi.c fglrx-8.97.100.7-b/kcl_acpi.c
+--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-07-23 17:14:36.000000000 +0200
++++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-08-13 09:27:55.000000000 +0200
+@@ -776,7 +776,11 @@ unsigned int ATI_API_CALL KCL_ACPI_GetHa
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+     #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+-        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
++		#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
++			pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
++		#else
++			pInfo->video_handle = pInfo->pcidev->dev.acpi_node.companion;
++		#endif
+     #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
+     #else 

Modified: fglrx-legacy-driver/trunk/debian/patches/series
===================================================================
--- fglrx-legacy-driver/trunk/debian/patches/series	2014-09-27 19:14:37 UTC (rev 1410)
+++ fglrx-legacy-driver/trunk/debian/patches/series	2014-09-27 19:42:13 UTC (rev 1411)
@@ -6,3 +6,4 @@
 06-stub-for-agpless-kernel.diff
 07-change-create_proc-to-proc_create-for-kernel-3.10.X.patch
 08-add-linux-seq_file.h-for-kernel-3.10.X.patch
+09-linux-3.14.patch