Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25035 Modified Files: catalyst-kmod.spec sources Added Files: catalyst-kmod-i386.patch rename_debug.patch Log Message: * Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 12.3-1 - Update to Catalyst 12.3 (internal version 8.951) - patch for newer kernels catalyst-kmod-i386.patch: firegl_public.c | 6 ++++++ 1 file changed, 6 insertions(+) --- NEW FILE catalyst-kmod-i386.patch --- diff -purN catalyst-kmod-data-12.2/common/lib/modules/fglrx/build_mod/firegl_public.c catalyst-kmod-data-12.2-fixed/common/lib/modules/fglrx/build_mod/firegl_public.c --- lib/modules/fglrx/build_mod/firegl_public.c.i387 2012-02-29 21:34:52.000000000 +0100 +++ lib/modules/fglrx/build_mod/firegl_public.c 2012-03-13 12:47:23.500889722 +0100 @@ -5799,10 +5799,16 @@ void ATI_API_CALL KCL_fpu_begin(void) #ifdef CONFIG_X86_64 kernel_fpu_begin(); #else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,8) + preempt_disable(); + if (__thread_has_fpu(current)) + __save_init_fpu(current); +#else struct thread_info *cur_task = current_thread_info(); preempt_disable(); if (cur_task->status & TS_USEDFPU) __save_init_fpu(cur_task->task); +#endif else clts(); #endif rename_debug.patch: kcl_debug.c | 2 +- kcl_debug.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE rename_debug.patch --- --- lib/modules/fglrx/build_mod/kcl_debug.h 2012-02-29 22:34:52.000000000 +0200 +++ lib/modules/fglrx/build_mod/kcl_debug.h 2012-03-22 13:56:37.441824720 +0200 @@ -85,8 +85,8 @@ #ifdef ERROR #undef ERROR #endif -#ifdef WARN -#undef WARN +#ifdef KCL_WARN +#undef KCL_WARN #endif #ifdef INFO #undef INFO @@ -122,7 +122,7 @@ { SPECIAL = 0, ERROR , - WARN , + KCL_WARN , INFO , INFOEX, TRACE, @@ -160,7 +160,7 @@ }log_map; -#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))) extern const log_map module_log_map[]; extern const module_map module_type_map[]; --- lib/modules/fglrx/build_mod/kcl_debug.c 2012-02-29 22:34:52.000000000 +0200 +++ lib/modules/fglrx/build_mod/kcl_debug.c 2012-03-22 13:56:21.594823600 +0200 @@ -69,7 +69,7 @@ { {SPECIAL , 'S'}, {ERROR , 'E'}, - {WARN , 'W'}, + {KCL_WARN , 'W'}, {INFO , 'I'}, {INFOEX , 'X'}, {TRACE , 'T'}, Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- catalyst-kmod.spec 30 Mar 2012 09:36:51 -0000 1.37 +++ catalyst-kmod.spec 30 Mar 2012 11:04:15 -0000 1.38 @@ -12,8 +12,8 @@ %endif Name: catalyst-kmod -Version: 12.1 -Release: 1%{?dist}.10 +Version: 12.3 +Release: 1%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -22,6 +22,8 @@ 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 +Patch2: catalyst-kmod-i386.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i686 @@ -67,6 +69,10 @@ pushd fglrxpkg %patch0 -p0 -b.compat_alloc +%patch1 -p0 -b.rename_debug +%ifarch %{ix86} +%patch2 -p0 -b.catalyst-kmod-i386 +%endif popd for kernel_version in %{?kernel_versions} ; do @@ -97,6 +103,10 @@ %changelog +* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 12.3-1 +- Update to Catalyst 12.3 (internal version 8.951) +- patch for newer kernels + * Fri Mar 30 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 12.1-1.10 - rebuild for updated kernel Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 Feb 2012 19:05:51 -0000 1.7 +++ sources 30 Mar 2012 11:04:15 -0000 1.8 @@ -1 +1 @@ -9a2a8f10a14e6eb14664d1db2180c6f8 catalyst-kmod-data-12.1.tar.bz2 +b234bbb76947415916cc76006697ba80 catalyst-kmod-data-12.3.tar.bz2