[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/

["Enrico Tagliavini" <enrico.tagliavini@gmail.com>]

commit:     f924d696314376bd0c7cbb2ae091b5b8abbd5c09
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Sat May 26 21:06:04 2012 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Sat May 26 21:06:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f924d696

x11-drivers/ati-drivers: add kernel 3.4 support

This fix bug #413569. This time the change is tested
and it works at lest for the commiter. Commit
443439142344878f77b7076980e94954dd080718 has been reverted

---
 x11-drivers/ati-drivers/ati-drivers-12.4.ebuild    |    5 ++---
 .../files/amd-cpu_possible_map_define.patch        |   13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
index 679290c..34d8e5b 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
@@ -330,9 +330,8 @@ src_prepare() {
 	# and finally backported to kernel 3.2.8.
 	epatch "${FILESDIR}"/amd-drivers-3.2.7.1.patch
 
-	# see https://lkml.org/lkml/2012/4/10/485 3.4.0-rc remove the define of
-	# cpu_possible_map, we add it back temporary util AMD fixes
-	epatch "${FILESDIR}"/amd-cpu_possible_map_define.patch
+	# see http://ati.cchtml.com/show_bug.cgi?id=495
+	epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
 
 	cd "${MODULE_DIR}"
 

diff --git a/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.patch b/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.patch
deleted file mode 100644
index 5b3cb9a..0000000
--- a/x11-drivers/ati-drivers/files/amd-cpu_possible_map_define.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2012-05-01 14:35:33.453055055 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-01 14:36:42.184270842 +0200
-@@ -219,6 +219,10 @@
- #define preempt_enable()
- #endif
- 
-+#ifndef cpu_possible_map
-+#define cpu_possible_map	(*(cpumask_t *)cpu_possible_mask)
-+#endif
-+
- // ============================================================
- /* globals */
-