rpms/catalyst-kmod/F-17 fglrx_kernel_3.4.0.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 catalyst-kmod.spec, 1.28, 1.29 sources, 1.5, 1.6

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/catalyst-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21863

Modified Files:
	.cvsignore catalyst-kmod.spec sources 
Added Files:
	fglrx_kernel_3.4.0.patch 
Log Message:
* Sun Jun 24 2012 leigh scott <leigh123linux at googlemail.com> - 12.6-0.1
- Update to Catalyst 12.6 beta (internal version 8.98)


fglrx_kernel_3.4.0.patch:
 firegl_public.c |    7 +++++++
 kcl_ioctl.c     |    4 ++++
 2 files changed, 11 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"
@@ -4181,7 +4184,11 @@ static int kasInitExecutionLevels(unsigned long level_init)
 {
     unsigned int p;
     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+    for_each_possible_cpu(p)
+#else
     for_each_cpu_mask(p, cpu_possible_map)
+#endif
     {
         KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
         preempt_disable();
--- lib/modules/fglrx/build_mod/kcl_ioctl.c
+++ lib/modules/fglrx/build_mod/kcl_ioctl.c
@@ -217,6 +217,10 @@
  *  \param size [in] Number of bytes to allocate
  *  \return Pointer to allocated memory
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+DEFINE_PER_CPU(unsigned long, old_rsp);
+#endif
+
 void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
 {
     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-17/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Nov 2011 22:56:44 -0000	1.6
+++ .cvsignore	24 Jun 2012 13:21:25 -0000	1.7
@@ -1 +1 @@
-catalyst-kmod-data-11.11.tar.bz2
+catalyst-kmod-data-12.6.tar.bz2


Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-17/catalyst-kmod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- catalyst-kmod.spec	21 Jun 2012 08:06:57 -0000	1.28
+++ catalyst-kmod.spec	24 Jun 2012 13:21:25 -0000	1.29
@@ -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
@@ -12,8 +12,8 @@
 %endif
 
 Name:        catalyst-kmod
-Version:     11.11
-Release:     1%{?dist}.15
+Version:     12.6
+Release:     0.1%{?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-%{version}.tar.bz2
 Source11:    catalyst-kmodtool-excludekernel-filterfile
 Patch0:      compat_alloc-Makefile.patch
+Patch1:      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
@@ -67,6 +68,7 @@
 
 pushd fglrxpkg
 %patch0 -p0 -b.compat_alloc
+%patch1 -p0 -b.fglrx_kernel_3.4.0
 popd
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -97,6 +99,9 @@
 
 
 %changelog
+* Sun Jun 24 2012 leigh scott <leigh123linux at googlemail.com> - 12.6-0.1
+- Update to Catalyst 12.6 beta (internal version 8.98)
+
 * Thu Jun 21 2012 Nicolas Chauvet <kwizart at gmail.com> - 11.11-1.15
 - Rebuilt for updated kernel
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-17/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Nov 2011 22:56:44 -0000	1.5
+++ sources	24 Jun 2012 13:21:26 -0000	1.6
@@ -1 +1 @@
-19be5cd21a0ba3921676e4d00adf18eb  catalyst-kmod-data-11.11.tar.bz2
+e4d48e45fef6052326748bce90967d22  catalyst-kmod-data-12.6.tar.bz2