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

[Andreas Beckmann]

Author: anbe
Date: 2014-04-30 11:27:50 +0000 (Wed, 30 Apr 2014)
New Revision: 1375

Added:
   fglrx-driver/trunk/debian/patches/linux3.14.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
add support for Linux 3.14

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-04-29 08:15:52 UTC (rev 1374)
+++ fglrx-driver/trunk/debian/changelog	2014-04-30 11:27:50 UTC (rev 1375)
@@ -1,5 +1,6 @@
 fglrx-driver (1:14.4-2) UNRELEASED; urgency=medium
 
+  * linux3.14.patch: New patch, add support for Linux 3.14.  (Closes: #746162)
   * Drop Breaks: make (= 3.82-1), fixed in make/experimental.
 
  -- Andreas Beckmann <anbe at debian.org>  Tue, 29 Apr 2014 10:12:10 +0200
@@ -7,7 +8,6 @@
 fglrx-driver (1:14.4-1) unstable; urgency=medium
 
   * New upstream release 14.4 (2014-04-25) (14.10.1006).
-    - Kernel 3.14 support  (Closes: #746162)
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 28 Apr 2014 22:15:24 +0200
 

Added: fglrx-driver/trunk/debian/patches/linux3.14.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/linux3.14.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/linux3.14.patch	2014-04-30 11:27:50 UTC (rev 1375)
@@ -0,0 +1,23 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -1779,17 +1779,14 @@
+  */
+ KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
+ {
+-#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
++#if defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS) \
++	|| LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+     return __kuid_val(current_euid());
+-#else 
+-
+-#ifdef current_euid
++#elif defined(current_euid)
+     return current_euid();
+ #else
+     return current->euid;
+ #endif
+-
+-#endif
+ }
+ 
+ /** /brief Delay execution for the specified number of microseconds

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2014-04-29 08:15:52 UTC (rev 1374)
+++ fglrx-driver/trunk/debian/patches/series	2014-04-30 11:27:50 UTC (rev 1375)
@@ -1,3 +1,4 @@
 02-dkms-arch_compat.patch
 03-authatieventsd.sh.patch
 06-stub-for-agpless-kernel.patch
+linux3.14.patch