Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18864
Modified Files:
catalyst-kmod.spec
Added Files:
fglrx_kernel_3.4.0.patch
Log Message:
* Wed May 23 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-2
- patch for newer kernels (3.4.0)
fglrx_kernel_3.4.0.patch:
firegl_public.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE fglrx_kernel_3.4.0.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c
+++ lib/modules/fglrx/build_mod/firegl_public.c
@@ -187,6 +187,9 @@
#include <linux/gfp.h>
#include <linux/swap.h>
#include "asm/i387.h"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+#include <asm/fpu-internal.h>
+#endif
#include "firegl_public.h"
#include "kcl_osconfig.h"
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- catalyst-kmod.spec 23 May 2012 06:47:58 -0000 1.51
+++ catalyst-kmod.spec 23 May 2012 09:28:58 -0000 1.52
@@ -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: 12.4
-Release: 1%{?dist}.5
+Release: 2%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -24,6 +24,7 @@
Patch0: compat_alloc-Makefile.patch
Patch1: rename_debug.patch
Patch2: catalyst-kmod-i386.patch
+Patch3: fglrx_kernel_3.4.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i686
@@ -70,6 +71,7 @@
pushd fglrxpkg
%patch0 -p0 -b.compat_alloc
%patch1 -p0 -b.rename_debug
+%patch3 -p0 -b.fglrx_kernel_3.4.0
%ifarch %{ix86}
%patch2 -p0 -b.catalyst-kmod-i386
%endif
@@ -103,6 +105,9 @@
%changelog
+* Wed May 23 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-2
+- patch for newer kernels (3.4.0)
+
* Wed May 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.4-1.5
- Rebuilt for updated kernel