rpms/catalyst-kmod/F-13 compat_alloc-Makefile.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 catalyst-kmod.spec, 1.17, 1.18 sources, 1.6, 1.7

[Stewart Adam]

Author: firewing

Update of /cvs/nonfree/rpms/catalyst-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13572

Modified Files:
	.cvsignore catalyst-kmod.spec sources 
Added Files:
	compat_alloc-Makefile.patch 
Log Message:
* Mon Oct 25 2010 Stewart Adam <s.adam at diffingo.com> - 10.10-1
- Update to Catalyst 10.10 (internal version 8.78.3)


compat_alloc-Makefile.patch:
 Makefile |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE compat_alloc-Makefile.patch ---
--- lib/modules/fglrx/build_mod/2.6.x/Makefile.compat_alloc	2010-10-25 19:14:43.157401050 -0400
+++ lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-10-25 19:14:54.586401063 -0400
@@ -66,6 +66,7 @@
                 -DFGL_GART_RESERVED_SLOT \
                 -DFGL_LINUX253P1_VMA_API \
                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
+                -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space \
 
 ifeq ($(KERNELRELEASE),)
 # on first call from remote location we get into this path


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-13/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Sep 2010 15:47:03 -0000	1.7
+++ .cvsignore	26 Oct 2010 01:38:42 -0000	1.8
@@ -1 +1 @@
-catalyst-kmod-data-10.9.tar.bz2
+catalyst-kmod-data-10.10.tar.bz2


Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-13/catalyst-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- catalyst-kmod.spec	21 Oct 2010 19:43:52 -0000	1.17
+++ catalyst-kmod.spec	26 Oct 2010 01:38:42 -0000	1.18
@@ -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 newest
 
 # Tweak to have debuginfo - part 1/2
 %if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
 %endif
 
 Name:        catalyst-kmod
-Version:     10.9
-Release:     1%{?dist}.2
+Version:     10.10
+Release:     1%{?dist}
 # Taken over by kmodtool
 Summary:     AMD display driver kernel module
 Group:       System Environment/Kernel
@@ -21,6 +21,7 @@
 URL:         http://ati.amd.com/support/drivers/linux/linux-radeon.html
 Source0:     http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{version}.tar.bz2
 Source11:    catalyst-kmodtool-excludekernel-filterfile
+Patch0:      compat_alloc-Makefile.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i686
@@ -64,6 +65,10 @@
 # debuginfo fix
 #sed -i -e 's|strip -g|/bin/true|' fglrxpkg/lib/modules/fglrx/build_mod/make.sh
 
+pushd fglrxpkg
+%patch0 -p0 -b.compat_alloc
+popd
+
 for kernel_version  in %{?kernel_versions} ; do
     cp -a fglrxpkg/  _kmod_build_${kernel_version%%___*}
 done
@@ -92,6 +97,9 @@
 
 
 %changelog
+* Mon Oct 25 2010 Stewart Adam <s.adam at diffingo.com> - 10.10-1
+- Update to Catalyst 10.10 (internal version 8.78.3)
+
 * Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.9-1.2
 - rebuild for new kernel
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Sep 2010 15:47:03 -0000	1.6
+++ sources	26 Oct 2010 01:38:42 -0000	1.7
@@ -1 +1 @@
-3a9ba691f730fd6d3c989d7c9d2702fa  catalyst-kmod-data-10.9.tar.bz2
+9011c560536b1fb4f2db3e118088b290  catalyst-kmod-data-10.10.tar.bz2