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

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

commit:     f9b3e92c2fd7512eecee3f259193912a83e00db1
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Fri Dec 30 15:03:32 2011 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Fri Dec 30 15:03:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f9b3e92c

x11-drivers/ati-drivers: hardened fixups

This commit add a patch needed for hardened to compile
It just rename the WARN enum entry in kcl_debug.h
to avoid a name collision with the kernel WARN macro

Many thanks to Zhang Hongjiu <noctuorare <AT> gmail.com>
for the solution.

---
 ...11.12-r1.ebuild => ati-drivers-11.12-r2.ebuild} |    7 +++-
 .../files/ati-drivers-redefine-WARN.patch          |   39 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild
similarity index 98%
rename from x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
rename to x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild
index a397629..73b44b5 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild
@@ -320,7 +320,12 @@ src_prepare() {
 		|| die "Replacing 'finger' with 'who' failed."
 	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
 	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
+	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die \
+		"Failed to epatch powermode-opt-path-2.patch"
+
+	# fix needed for at least hardened-sources, see bug #392753
+	epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch || die \
+		"Failed to epatch ati-drivers-redefine-WARN.patch"
 
 	cd "${MODULE_DIR}"
 

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
new file mode 100644
index 0000000..fe5ed2f
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
@@ -0,0 +1,39 @@
+--- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig	2011-12-30 14:32:00.271391437 +0100
++++ common/lib/modules/fglrx/build_mod/kcl_debug.h	2011-12-30 15:48:21.647473696 +0100
+@@ -85,8 +85,8 @@
+ #ifdef ERROR
+ #undef ERROR
+ #endif
+-#ifdef WARN
+-#undef WARN
++#ifdef AMD_WARN
++#undef AMD_WARN
+ #endif
+ #ifdef INFO
+ #undef INFO
+@@ -122,7 +122,7 @@
+ {
+     SPECIAL = 0,
+     ERROR  ,
+-    WARN  ,
++    AMD_WARN  ,
+     INFO ,
+     INFOEX,
+     TRACE,
+@@ -163,14 +163,14 @@
+ {
+     {SPECIAL        ,   'S'},
+     {ERROR          ,   'E'},
+-    {WARN           ,   'W'},
++    {AMD_WARN       ,   'W'},
+     {INFO           ,   'I'},
+     {INFOEX         ,   'X'},
+     {TRACE          ,   'T'},
+     {PERFORMANCE    ,   'P'},
+     {DUMP           ,   'D'},
+ };
+-#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
++#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
+ #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
+ static module_map module_type_map[LOG_M_MAX] =
+ {