packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec, xorg-driver...

[pluto]

Author: pluto                        Date: Sat Jan 21 20:52:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid macro hell (amd WARN enum vs. kernel WARN logging).

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.248 -> 1.249) , xorg-driver-video-fglrx-WARN.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.248 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.249
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.248	Thu Dec 29 13:16:48 2011
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Sat Jan 21 21:52:04 2012
@@ -50,6 +50,7 @@
 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
@@ -216,6 +217,7 @@
 %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}
@@ -455,6 +457,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.249  2012/01/21 20:52:04  pluto
+- avoid macro hell (amd WARN enum vs. kernel WARN logging).
+
 Revision 1.248  2011/12/29 12:16:48  baggins
 - updated to 11.12
 

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-WARN.patch
diff -u /dev/null packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-WARN.patch:1.1
--- /dev/null	Sat Jan 21 21:52:10 2012
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-WARN.patch	Sat Jan 21 21:52:04 2012
@@ -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] =
+ {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.248&r2=1.249&f=u