rpms/catalyst-kmod/devel fglrx_gpl_symbol.patch, NONE, 1.1 catalyst-kmod.spec, 1.25, 1.26

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/catalyst-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20537

Modified Files:
	catalyst-kmod.spec 
Added Files:
	fglrx_gpl_symbol.patch 
Log Message:
* Sat Jul 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:15.7-3
- Hack driver for kernel breakage


fglrx_gpl_symbol.patch:
 firegl_public.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fglrx_gpl_symbol.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c	2013-01-15 22:33:27.000000000 +0100
+++ lib/modules/fglrx/build_mod/firegl_public.c	2014-08-18 20:05:44.327520475 +0200
@@ -250,7 +250,7 @@
 #endif
 
 #ifdef MODULE_LICENSE
-MODULE_LICENSE("Proprietary. (C) 2002 - ATI Technologies, Starnberg, GERMANY");
+MODULE_LICENSE("GPL\0Proprietary. (C) 2002 - ATI Technologies, Starnberg, GERMANY");
 #endif
 #ifdef MODULE_DEVICE_TABLE
 MODULE_DEVICE_TABLE(pci, fglrx_pci_table);


Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/catalyst-kmod.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- catalyst-kmod.spec	24 Jul 2015 09:27:45 -0000	1.25
+++ catalyst-kmod.spec	25 Jul 2015 07:51:19 -0000	1.26
@@ -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
-%global buildforkernels newest
+%global buildforkernels current
 
 # Tweak to have debuginfo - part 1/2
 %if 0%{?fedora} > 7
@@ -14,7 +14,7 @@
 Name:        catalyst-kmod
 Epoch:       1
 Version:     15.7
-Release:     2%{?dist}.2
+Release:     3%{?dist}
 # Taken over by kmodtool
 Summary:     AMD display driver kernel module
 Group:       System Environment/Kernel
@@ -25,6 +25,9 @@
 Patch0:      compat_alloc-Makefile.patch
 Patch1:      kernel_4.0-cr4-strn.patch
 Patch2:      kernel_4.1-remove-IRQF_DISABLED.patch
+# I shouldn't have to do this but the kernel devs are being wankers
+# https://lkml.org/lkml/2015/7/19/233
+Patch3:      fglrx_gpl_symbol.patch
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,6 +76,7 @@
 %patch0 -p0 -b.compat_alloc
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 popd
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -103,6 +107,9 @@
 
 
 %changelog
+* Sat Jul 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:15.7-3
+- Hack driver for kernel breakage
+
 * Fri Jul 24 2015 Nicolas Chauvet <kwizart at gmail.com> - 1:15.7-2.2
 - Rebuilt for kernel