- fix building with linux 4.4.x

- rel 3

diff --git a/linux-4.4.patch b/linux-4.4.patch
new file mode 100644 (file)
index 0000000..91078e4
--- /dev/null
+++ b/linux-4.4.patch
@@ -0,0 +1,14 @@
+--- xorg-driver-video-fglrx-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c~   2016-01-25 00:43:16.000000000 +0100
++++ xorg-driver-video-fglrx-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c    2016-01-25 00:45:05.769641394 +0100
+@@ -6504,7 +6504,11 @@
+        if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
+ #else
+       _copy_xregs_to_kernel(&fpu->state.xsave);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)
+       if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
++#else
++      if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP))
++#endif
+ #endif
+       return 1;
+    } else if (static_cpu_has(X86_FEATURE_FXSR)) {

diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 7ae8212f0bcf7fc6b875202deca4ae2daf568204..0d9d3d27c4888c68753af88a5474d99bd5f0882c 100644 (file)
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -31,7 +31,7 @@ exit 1
 %define                betaver         1.0
 #define                rel             0.beta%{betaver}.3
 
-%define                rel             2
+%define                rel             3
 %define                pname           xorg-driver-video-fglrx
 Summary:       Linux Drivers for AMD/ATI graphics accelerators
 Summary(pl.UTF-8):     Sterowniki do akceleratorów graficznych AMD/ATI
@@ -63,6 +63,7 @@ Patch7:               linux-3.18.18.patch
 Patch8:                linux-4.0.patch
 Patch9:                linux-4.1.patch
 Patch10:       linux-4.2.patch
+Patch11:       linux-4.2.patch
 URL:           http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires: rpmbuild(macros) >= 1.701
@@ -233,6 +234,7 @@ EOF
 %patch8 -p2
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
 cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}