Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv332 Modified Files: catalyst-kmod.spec Added Files: rename_debug.patch Log Message: * Tue Apr 03 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 11.11-2 - patch for newer kernels rename_debug.patch: kcl_debug.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- NEW FILE rename_debug.patch --- --- lib/modules/fglrx/build_mod/kcl_debug.h 2011-11-08 15:30:36.000000000 +0000 +++ lib/modules/fglrx/build_mod/kcl_debug.h 2012-04-03 19:46:34.551509851 +0100 @@ -85,8 +85,8 @@ void ATI_API_CALL KCL_DEBUG_OsDump(void) #ifdef ERROR #undef ERROR #endif -#ifdef WARN -#undef WARN +#ifdef KCL_WARN +#undef KCL_WARN #endif #ifdef INFO #undef INFO @@ -122,7 +122,7 @@ typedef enum _LOG_LEVEL_ { SPECIAL = 0, ERROR , - WARN , + KCL_WARN , INFO , INFOEX, TRACE, @@ -163,14 +163,14 @@ static log_map module_log_map[LOG_L_MAX] { {SPECIAL , 'S'}, {ERROR , 'E'}, - {WARN , 'W'}, + {KCL_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(KCL_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX))) static module_map module_type_map[LOG_M_MAX] = { Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/catalyst-kmod.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- catalyst-kmod.spec 3 Apr 2012 17:29:46 -0000 1.43 +++ catalyst-kmod.spec 3 Apr 2012 19:46:47 -0000 1.44 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest +%define buildforkernels current # Tweak to have debuginfo - part 1/2 %if 0%{?fedora} > 7 @@ -13,7 +13,7 @@ Name: catalyst-kmod Version: 11.11 -Release: 1%{?dist}.20 +Release: 2%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -22,6 +22,7 @@ Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{ve... Source11: catalyst-kmodtool-excludekernel-filterfile Patch0: compat_alloc-Makefile.patch +Patch1: rename_debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i686 @@ -67,6 +68,7 @@ pushd fglrxpkg %patch0 -p0 -b.compat_alloc +%patch1 -p0 -b.rename_debug popd for kernel_version in %{?kernel_versions} ; do @@ -97,6 +99,9 @@ %changelog +* Tue Apr 03 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 11.11-2 +- patch for newer kernels + * Tue Apr 03 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 11.11-1.20 - rebuild for updated kernel