add 2.6.33 kernel support and really close bug 297322

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

6 files changed, 189 insertions, 6 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 63417125c8ec..d59646bd98ea 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.208 2010/02/23 20:55:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.209 2010/02/28 17:31:48 lxnay Exp $
+
+  28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org>
+  +files/ati-drivers-2.6.33.patch, ati-drivers-10.1.ebuild,
+  ati-drivers-10.2.ebuild,
+  +files/ati-drivers-fix_compilation-bug-297322.patch:
+  add 2.6.33 kernel support and really close bug 297322
 
 *ati-drivers-10.2 (23 Feb 2010)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 4fb2678aa31c..4e2f7a4bcc3e 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,4 +1,6 @@
 AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6
+AUX ati-drivers-2.6.33.patch 3888 RMD160 48ebf6ed44a681d0213aeddb15ac9659997971ca SHA1 45feff4385e49dc3ee6f813d8cb9957473e5edef SHA256 88c242d50e9e158b5cdfe8de49abb49deb9f7d4fd4a3e014b9092a5eaa58332c
+AUX ati-drivers-fix_compilation-bug-297322.patch 1114 RMD160 69d27b8e3b45f254d3ed71c47b6b28621868af91 SHA1 d51ca6418e9644035727eb63cbe0494111c9e9b2 SHA256 edbfc56eec848389c3dfdd94362322de41027b9813128d2d4f8e476d1d8581e3
 AUX ati-drivers-xen.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
 AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
@@ -12,12 +14,12 @@ DIST ati-driver-installer-9-10-x86.x86_64.run 87135724 RMD160 0f0d35adfe21c69560
 DIST ati-driver-installer-9-11-x86.x86_64.run 87577817 RMD160 2ab19f685f7bb39f6336e081f9d207f87e0c0700 SHA1 e987c1540f7d0141cfe9145442367d1e88314cc4 SHA256 c7a7beaaa5f0e2b09f21590aaa76b3306411095f1cf56991e20d60d0be117683
 DIST ati-driver-installer-9-3-x86.x86_64.run 84841550 RMD160 76d4aa6ec575403190b8feadce99000b69d64d14 SHA1 ceefdfd2f8ecee4998a4ce4b7b87a45f1851e8d0 SHA256 5efec58f92f2fbb90b0d9a9059eb27c9cfffcea0a4ba64f3c8f24fc5dbf8053e
 DIST ati-driver-installer-9-9-x86.x86_64.run 98115301 RMD160 ab5fca036c3e5b3b4926ed16f24822596441cda6 SHA1 22e2adb9c4fdec4647927acec0410e43cb246a4d SHA256 66be4f4aa377cd22a45596c2e3fb5f1a0fbcdd3db5412478175d777572edc483
-EBUILD ati-drivers-10.1.ebuild 18238 RMD160 5af30753d9a9bc64e54f597482318516194ce554 SHA1 46f39848ae963d9d61e4ff650513b22b946d6b22 SHA256 ec2d959d94f85cc9348f0e92222c38a5cd9c3a66bd5a49a9f808b953dc8e8c44
-EBUILD ati-drivers-10.2.ebuild 18238 RMD160 2a90e25393c0aa681c0defa921697510870d1e5e SHA1 0da0664adb0e7f1effd65f2ecfbbace0a7a718c3 SHA256 a5c687e9ff403901da6f7cce8b6ae0f492a0296de38c3bb8910a027d056d3cfb
+EBUILD ati-drivers-10.1.ebuild 18409 RMD160 faa029fcb5513a974ffcd358c316a9b1f5adcdee SHA1 ad09b3b229e5c8567afc3e8d5f96e5a1d63e651d SHA256 c7c80ac5f5cac72668ac75dca29b3de0a7e2efae0acad548a9c7b78928920ce8
+EBUILD ati-drivers-10.2.ebuild 18409 RMD160 5e74a47b314128ba4c2e5397992607f86764f081 SHA1 e9695670e2a069fcab9fb2afb68a0714db4636ed SHA256 1d0078fa500754acf1502c6b237ef6e3f4c5a8ed716562c0203127078cd6b88d
 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 18465 RMD160 921e8a7b9352b51e429dc13c7dda185028daa938 SHA1 f9a761b857f2ec488ee798ff0fdfc03707199a34 SHA256 9e1f002bd754995363656614314ba360c057553a4b5409b6d89c16da5364d678
 EBUILD ati-drivers-9.11.ebuild 18497 RMD160 a2788516d46415227ecbc0e2087f8c472521b03a SHA1 bffc3035e7585be1638d08780079d68143c3ebde SHA256 68afcef3ca9afd30211f0e1539b209e9b3d4d5a4188c300b3ca6fc52d8ac27c1
 EBUILD ati-drivers-9.9-r2.ebuild 18603 RMD160 478de170d9064ac958ceabaf54b5c26a8239a484 SHA1 138aa96fff22f473cb91a84cd317562879976e2c SHA256 2a29c232d71a4b379af7bbd6e58f45fee1e799ad31df388c76775785932db35f
-MISC ChangeLog 62496 RMD160 e5759f655cf7b70facf7e0e33cb52c50b23c0c88 SHA1 ae040bad3675715c9641bc60f98b05d15d9531f3 SHA256 77ac7bdd6201b0218b0dcc2e3b2b122e91cbe715a7df9f4979619be87a2a9b54
+MISC ChangeLog 62743 RMD160 bc4ff35dc417184009d27c0a2bf200c68d2bef7f SHA1 dcff2bf50639898ecfbf6307cdcb0db8f87a5269 SHA256 62dfaf986793065c7e40eb8c4da9132100f5c9e20fc422a8bbc166e4aefba307
 MISC metadata.xml 292 RMD160 b7147d33f577e620cc3619c33e4998d934db4ae3 SHA1 50d77810085e2dd55517ffae1882619b774844e0 SHA256 dca87597dda4c00f1252c7ae492afb80e1e026a4ec2a1ab025a7f6af52cd0429
diff --git a/x11-drivers/ati-drivers/ati-drivers-10.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-10.1.ebuild
index 49cdf2c0914c..dce87b93ee18 100644
--- a/x11-drivers/ati-drivers/ati-drivers-10.1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.1.ebuild,v 1.1 2010/02/13 15:55:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.1.ebuild,v 1.2 2010/02/28 17:31:48 lxnay Exp $
 
 EAPI="2"
 
@@ -226,6 +226,11 @@ src_prepare() {
 		fi
 	fi
 
+	# 2.6.33 kernel support
+	epatch "${FILESDIR}"/ati-drivers-2.6.33.patch
+	# Fix a known compilation error
+	epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
+
 	# These are the userspace utilities that we also have source for.
 	# We rebuild these later.
 	rm \
diff --git a/x11-drivers/ati-drivers/ati-drivers-10.2.ebuild b/x11-drivers/ati-drivers/ati-drivers-10.2.ebuild
index 22ec80481c35..410ec152c39b 100644
--- a/x11-drivers/ati-drivers/ati-drivers-10.2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.2.ebuild,v 1.1 2010/02/23 20:55:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.2.ebuild,v 1.2 2010/02/28 17:31:48 lxnay Exp $
 
 EAPI="2"
 
@@ -226,6 +226,11 @@ src_prepare() {
 		fi
 	fi
 
+	# 2.6.33 kernel support
+	epatch "${FILESDIR}"/ati-drivers-2.6.33.patch
+	# Fix a known compilation error
+	epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
+
 	# These are the userspace utilities that we also have source for.
 	# We rebuild these later.
 	rm \
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch
new file mode 100644
index 000000000000..85f9aff70b30
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch
@@ -0,0 +1,140 @@
+--- work.orig/common/lib/modules/fglrx/build_mod/drmP.h
++++ work/common/lib/modules/fglrx/build_mod/drmP.h
+@@ -42,7 +42,11 @@
+  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
+ #include <asm/current.h>
+ #endif /* __alpha__ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/miscdevice.h>
+--- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ work/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -28,7 +28,11 @@
+ #error Kernel versions older than 2.6.0 are no longer supported by this module.
+ #endif 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ 
+ #if !defined(CONFIG_X86) 
+ #if !defined(CONFIG_X86_PC) 
+@@ -163,8 +167,12 @@
+ 
+ //  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
+ #ifndef UTS_RELEASE 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/utsrelease.h>
++#else
+ #include <linux/utsrelease.h>
+ #endif
++#endif
+ 
+ #if defined(__i386__)
+ #ifndef do_div
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
++++ work/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+@@ -15,7 +15,11 @@
+  ****************************************************************************/
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/acpi.h>
+ 
+ #include "kcl_config.h"
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
++++ work/common/lib/modules/fglrx/build_mod/kcl_agp.c
+@@ -31,7 +31,11 @@
+  */
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/pci.h>
+ #include <linux/agp_backend.h>
+ #include <linux/string.h>
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_io.c
++++ work/common/lib/modules/fglrx/build_mod/kcl_io.c
+@@ -37,7 +37,11 @@
+  */
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/poll.h>
+ #include <linux/signal.h>
+ #include <asm/io.h>
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
++++ work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
+@@ -20,7 +20,11 @@
+ #define KCL_OSCONFIG_H
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ 
+ // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
+ #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_pci.c
++++ work/common/lib/modules/fglrx/build_mod/kcl_pci.c
+@@ -31,7 +31,11 @@
+  */
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/pci.h>
+ 
+ #include "kcl_config.h"
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_str.c
++++ work/common/lib/modules/fglrx/build_mod/kcl_str.c
+@@ -30,7 +30,12 @@
+  *
+  */
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/string.h>
+ #include <linux/module.h>
+ 
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c
++++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c
+@@ -31,7 +31,11 @@
+  */
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/wait.h>
+ #include <linux/highmem.h>
+ #include <linux/sched.h>
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch b/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
new file mode 100644
index 000000000000..e2af915a5d02
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
@@ -0,0 +1,25 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c
++++ 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
+--- common/lib/modules/fglrx/build_mod/firegl_public.h
++++ 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)                        \