commit 767f905d454bfbe504a7b3774cbaec5a6eceb345
Author: Jan Rękorajski <[email protected]>
Date: Tue Aug 2 07:40:01 2016 +0200
- fix building with linux 4.7
- rel 3
linux-4.7.patch | 22 ++++++++++++++++++++++
xorg-driver-video-fglrx.spec | 4 +++-
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 84dde3b..70f632d 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -32,7 +32,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
@@ -67,6 +67,7 @@ Patch10: linux-4.3.patch
Patch11: linux-4.4.patch
Patch12: linux-4.5.patch
Patch13: linux-4.6.patch
+Patch14: linux-4.7.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
@@ -238,6 +239,7 @@ EOF
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
diff --git a/linux-4.7.patch b/linux-4.7.patch
new file mode 100644
index 0000000..2d5593b
--- /dev/null
+++ b/linux-4.7.patch
@@ -0,0 +1,22 @@
+---
xorg-driver-video-fglrx-15.12/common/lib/modules/fglrx/build_mod/firegl_public.h~
2015-12-18 19:47:41.000000000 +0100
++++
xorg-driver-video-fglrx-15.12/common/lib/modules/fglrx/build_mod/firegl_public.h
2016-08-02 07:38:26.487200932 +0200
+@@ -647,11 +647,19 @@
+ #endif
+
+ #ifndef cpu_has_pat
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ #define cpu_has_pat test_bit(X86_FEATURE_PAT, (void *)
&boot_cpu_data.x86_capability)
++#else
++#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)
++#endif
+ #endif
+
+ #ifndef cpu_has_pge
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ #define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability)
++#else
++#define cpu_has_pge boot_cpu_has(X86_FEATURE_PGE)
++#endif
+ #endif
+
+ /* 2.6.29 defines pgprot_writecombine as a macro which resolves to a
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/767f905d454bfbe504a7b3774cbaec5a6eceb345
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
