fix bug #317927

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 0edb5319e839e43fe8ea6a5797acd06a8f0dd7da..a27f14a39b3cedbc31d323bcb64c0ae17cf3d45f 100644 (file)
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # 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.213 2010/04/29 23:47:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.214 2010/05/21 08:59:31 lu_zero Exp $
+
+  21 May 2010; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-2.6.34.patch, ati-drivers-10.4.ebuild:
+  Make it work with linux-2.6.34, patch from archlinux as stated in bug
+  #317927 thanks to Nawwar Kabbani <nawwar@nawwar.net> for reporting
 
 *ati-drivers-10.4 (29 Apr 2010)
 

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 8844f9606f3e68720926e7153706912d82c5d23f..28e2edbb1e544b82f57be0b00b9f585239d334e0 100644 (file)
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,5 +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-2.6.34.patch 358 RMD160 7fa8e781aa3850e70aef0d707a7fb4c50317a3e0 SHA1 2b4c104a76ec3af649cfb734b49e447159a536f7 SHA256 b6da2f0ad829a14b7e50d4ff2bab493ce45a2f4493bc558e28122c4fe7d4032c
 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
@@ -20,12 +21,12 @@ DIST fglrx-installer_8.721.orig.tar.gz 60351683 RMD160 5a0b35ee842baaf95a569ee33
 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-10.3.ebuild 18615 RMD160 7f3d21f454dd839ddddd74959fc2045fb789708b SHA1 ee11c3871705d16b4702fd5e1bcde5ecd0a2eb6a SHA256 7d81e8d92d3c23280ddcb53a888a5b7d961a3c67809f478619c67fda554a9fa0
-EBUILD ati-drivers-10.4.ebuild 18634 RMD160 4719181c0ed64f48dc1d24dedd2fdb291947f3b1 SHA1 ed14b0d86378d1db3b98272566c165402f6fe070 SHA256 ee12223d9875c1aabe8c2dcf5a83ee37e727be91e6a6fac28f2afb2f126d2ace
+EBUILD ati-drivers-10.4.ebuild 18681 RMD160 9087854b39f688e418941096b019381e04322f16 SHA1 f841e1f6cf1fbfce05b750971cb62a3fb8cae60a SHA256 434f1b8c5ce77717a1be241baf732f5f98a36b4c829bda5b1f3b9fe9c4ab25ec
 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-8.721.ebuild 18623 RMD160 dc247b60febbad51ff86843657d3dec8a7b8f59f SHA1 ced0992fee51a7e0f84350d6d5b44df42c5c3ce3 SHA256 d5007606b4be98f41cedde862d8ec7d56c5ba9b1bf19784596e75c2b0454f6b1
 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 63528 RMD160 2d98c1e0804078048618552175f427b07287154b SHA1 063fd30c838299eeae7fb858686f3f3b58ffb017 SHA256 fbcf0f7522babd0a62509bc66a1b0523d6c16f5f6f97944aa3196efc739b25a8
+MISC ChangeLog 63779 RMD160 c05e2ecbb9d438aecf3ebff7e95bae89568dd4f8 SHA1 ecb9ae97acee1197e6185aa3a30ec0eea23dfa96 SHA256 792bc700e042a6d8c5756f1990cedfb6393a70e5881d8c4eb81fc3bdd94739d5
 MISC metadata.xml 406 RMD160 4350052ec01b1d9697733e9d2a745a1c5d0662cd SHA1 595532748b12106a7d2fc8cf360fdb8bfb1bbe3a SHA256 3967bf8a649d675ca070ce281343d1a7f6dc524661658bcee50b35b55157e814

diff --git a/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild
index a183f96024ce236b3035b6ddba8874c8f8727323..e281aea3866c4609e5677984858a43fedd4c6e45 100644 (file)
--- a/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-10.4.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.4.ebuild,v 1.1 2010/04/29 23:47:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.4.ebuild,v 1.2 2010/05/21 08:59:31 lu_zero Exp $
 
 EAPI="2"
 
@@ -233,6 +233,7 @@ src_prepare() {
 
        # 2.6.33 kernel support
        epatch "${FILESDIR}"/ati-drivers-2.6.33.patch
+       epatch "${FILESDIR}"/ati-drivers-2.6.34.patch
        # Fix a known compilation error
        epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
 

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch
new file mode 100644 (file)
index 0000000..1993d13
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.34.patch
@@ -0,0 +1,10 @@
+--- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c    2010-04-13 20:02:46.494496561 +0200
++++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-04-13 19:52:00.054563389 +0200
+@@ -39,6 +39,7 @@
+ #include <linux/wait.h>
+ #include <linux/highmem.h>
+ #include <linux/sched.h>
++#include <linux/slab.h>
+
+ #include "kcl_config.h"
+ #include "kcl_wait.h"