make ati-drivers-9.11 compile with 2.6.32 kernel, close bug #294997

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 52 insertions, 10 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 218162461673..9c0476efccb9 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.204 2009/12/02 09:35:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.205 2009/12/15 12:10:33 lxnay Exp $
+
+  15 Dec 2009; Fabio Erculiani <lxnay@gentoo.org> ati-drivers-9.11.ebuild,
+  +files/kernel/2.6.32-9.11-fix_compilation.patch:
+  make ati-drivers-9.11 compile with 2.6.32 kernel, close bug #294997
 
   02 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/8.40.4/ati-drivers-2.6.23.patch,
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index dc60ed86858e..0ee879c6009c 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -3,6 +3,7 @@ AUX ati-drivers-xen.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 S
 AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
 AUX kernel/2.6.31-fglrx_find_task_by_vpid.patch 581 RMD160 2da3e760a41b967f16e92e94d7ac7d5fc841f60e SHA1 a7c9f836b302cc8bd708b0c266a60baea2f5560d SHA256 4e95b588e894cfb89270168cd771c67bf270c805f30481fceebe47aac3f36980
+AUX kernel/2.6.32-9.11-fix_compilation.patch 1434 RMD160 f0b939542db82f0ac51a3abce2085c61f4b10b89 SHA1 9bdb6bb765bd748d898fa0553b97d40923670f48 SHA256 bd2df542c237d0570c3c75c0251514bbf8b67f3ceb40e734916ea53c75c189b7
 AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2eb1754a44134a95475be5f0cb894e24bc SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13
 DIST ati-driver-installer-8-11-x86.x86_64.run 75818703 RMD160 7fdda8fc18f6b19b8ce526c0a136291c873a7907 SHA1 75f9775f3df412617aa2897ef8d75e10c9fc9017 SHA256 d63d1a2d16eff0160d9007b6a1b6323d1b3ff34841afaa36a490c5bd6c813cee
 DIST ati-driver-installer-9-10-x86.x86_64.run 87135724 RMD160 0f0d35adfe21c6956072421a3928a712d6421c5f SHA1 d4188de2c44f2960f7a7ddc3c837206863509062 SHA256 f1964630c5612d1bcee274108f70b8a94880bc627260d58240124242e3ac2531
@@ -12,7 +13,7 @@ DIST ati-driver-installer-9-9-x86.x86_64.run 98115301 RMD160 ab5fca036c3e5b3b492
 EBUILD ati-drivers-8.552-r2.ebuild 15154 RMD160 d41da317a256df7ea94aa8a206748f4e1ec484ca SHA1 90909da4f960af12bbdbe99f3cbf368997a6ed40 SHA256 93f3685069866522dcad08f04d67f3a160d01455d63c1b051a39d6eca676c34e
 EBUILD ati-drivers-8.593.ebuild 15053 RMD160 a3dbfe4c37711b94c32de563565b420688f6fe36 SHA1 fe5d8f8fef80e6c1ab2c86b1e5839ca19fddd36a SHA256 7eeb0a77548c4e21eaa8be827009e1ee9907c8a28977af31267d83ca1b43010e
 EBUILD ati-drivers-9.10.ebuild 18467 RMD160 87f2ec3af5826a837267b4cbd84d46906ee7f3c6 SHA1 fb5c0e1cce988d79da655170c9c28243e2257d06 SHA256 d23b11808c4535977c8398ed64507b7787475dd30b13774c750822272eec5d24
-EBUILD ati-drivers-9.11.ebuild 18457 RMD160 f6836b0e5ed55f77b4c00443424113ac5f20710d SHA1 e3b2508c9c24283cbb1fbb56ca00e79e125b851d SHA256 0d50927f66ab09353e278652e2bac8ae61de329e2f84bb249852a5e3fbe2d13a
+EBUILD ati-drivers-9.11.ebuild 18495 RMD160 3a10d9fef485429a8b59bbd8ce363a7604fbe18b SHA1 58b3da16f7a192af90b13e72bd19408b008df817 SHA256 6e73e11bb159b73f0ef5a6e17a3641f1cc81901ecdf074c8859e4ee01ab1c28a
 EBUILD ati-drivers-9.9-r2.ebuild 18603 RMD160 478de170d9064ac958ceabaf54b5c26a8239a484 SHA1 138aa96fff22f473cb91a84cd317562879976e2c SHA256 2a29c232d71a4b379af7bbd6e58f45fee1e799ad31df388c76775785932db35f
-MISC ChangeLog 61755 RMD160 8182a540ad3a550d7ad4993ad0ad4181ae910ab3 SHA1 3c8b5d1a8e2dafd51ffc718cc9b6410783a6bf0b SHA256 d5a2fcd4a203441642e3516f312b0633482da3d01c2704c0e5adcad541ec94fc
+MISC ChangeLog 61948 RMD160 71a4c89d9b1128d3925749662f1f3c6b8644e4ed SHA1 3f8a06adbb2d2c0ed07aa4c60ed3bf341269f46a SHA256 adedd632afac86e989c4163bbc735c1f08db8813ace6ea736e47319d5e1281f3
 MISC metadata.xml 292 RMD160 b7147d33f577e620cc3619c33e4998d934db4ae3 SHA1 50d77810085e2dd55517ffae1882619b774844e0 SHA256 dca87597dda4c00f1252c7ae492afb80e1e026a4ec2a1ab025a7f6af52cd0429
diff --git a/x11-drivers/ati-drivers/ati-drivers-9.11.ebuild b/x11-drivers/ati-drivers/ati-drivers-9.11.ebuild
index 12e27acffd66..5a75d8cf78e5 100644
--- a/x11-drivers/ati-drivers/ati-drivers-9.11.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.11.ebuild,v 1.1 2009/11/19 19:09:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.11.ebuild,v 1.2 2009/12/15 12:10:33 lxnay Exp $
 
 EAPI="2"
 
@@ -101,12 +101,6 @@ _check_kernel_config() {
 		die "CONFIG_PREEMT_RCU enabled"
 	fi
 
-	# kernel hook checking up latest allowed version
-	if kernel_is ge 2 6 32; then
-		eerror "Kernels newer then 2.6.31 are not supported by this driver"
-		die "Downgrade your kernel"
-	fi
-
 	if ! linux_chkconfig_present MTRR; then
 		ewarn "You don't have MTRR support enabled in the kernel."
 		ewarn "Direct rendering will not work."
@@ -223,6 +217,12 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/ati-drivers-xen.patch
 
+	# Upstream will support 2.6.32 Linux kernel from next version
+	# so this (and patch in FILESDIR) will be removed afterwards
+	if kernel_is ge 2 6 32; then
+		epatch "${FILESDIR}"/kernel/2.6.32-${PV}-fix_compilation.patch
+	fi
+
 	# All kernel options for prepare are ment to be in here
 	if use modules; then
 		# version patches
diff --git a/x11-drivers/ati-drivers/files/kernel/2.6.32-9.11-fix_compilation.patch b/x11-drivers/ati-drivers/files/kernel/2.6.32-9.11-fix_compilation.patch
new file mode 100644
index 000000000000..38519d76c343
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/kernel/2.6.32-9.11-fix_compilation.patch
@@ -0,0 +1,37 @@
+--- work/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -1441,7 +1441,9 @@
+ todo !!!
+ #endif
+ 
+-unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
++void __cmpxchg_wrong_size(void) {}
++
++unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
+          unsigned long new, int size)
+ {
+ #ifndef __HAVE_ARCH_CMPXCHG
+--- work/common/lib/modules/fglrx/build_mod/firegl_public.h
++++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.h
+@@ -441,7 +441,8 @@
+ extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
+ extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
+ 
+-extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
++extern void __cmpxchg_wrong_size(void);
++extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
+                       unsigned long new, int size);
+ 
+ #define __ke_cmpxchg(ptr,o,n)                        \
+--- work/common/lib/modules/fglrx/build_mod/kcl_io.c
++++ work.new/common/lib/modules/fglrx/build_mod/kcl_io.c
+@@ -37,8 +37,9 @@
+  */
+ 
+ #include <linux/version.h>
+ #include <linux/autoconf.h>
+ #include <linux/poll.h>
++#include <linux/signal.h>
+ #include <asm/io.h>
+ 
+ #include "kcl_config.h"