- avoid macro hell (amd WARN enum vs. kernel WARN logging).

Changed files:
    xorg-driver-video-fglrx-WARN.patch -> 1.1
    xorg-driver-video-fglrx.spec -> 1.249

diff --git a/xorg-driver-video-fglrx-WARN.patch b/xorg-driver-video-fglrx-WARN.patch
new file mode 100644 (file)
index 0000000..fe5ed2f
--- /dev/null
+++ b/xorg-driver-video-fglrx-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] =
+ {

diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 47078b46b82e3eeb364648022b0c6cd4cbab104e..4fb8f28f9c1f501cca315d75a2fbde506ff15df1 100644 (file)
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -49,6 +49,7 @@ Patch2:               %{pname}-x86genericarch.patch
 Patch3:                %{pname}-desktop.patch
 Patch4:                %{pname}-nofinger.patch
 Patch5:                %{pname}-GPL-only.patch
+Patch6:                %{pname}-WARN.patch
 URL:           http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires: rpmbuild(macros) >= 1.379
@@ -215,6 +216,7 @@ cp arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
 
 install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
 cp -r %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}