[packages/xorg-driver-video-fglrx] - fix building on 3.18.17+ - rel 2

[baggins]

commit 9a3ff5efc0438a5dd4c8e5ff8e15bffdbb0c1507
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jul 8 21:20:24 2015 +0200

    - fix building on 3.18.17+
    - rel 2

 linux-4.0.patch              | 8 ++++----
 xorg-driver-video-fglrx.spec | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 5d3ccb6..2194860 100644
--- 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		1
+%define		rel		2
 %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
diff --git a/linux-4.0.patch b/linux-4.0.patch
index f645595..ae410d1 100644
--- a/linux-4.0.patch
+++ b/linux-4.0.patch
@@ -5,7 +5,7 @@ diff -ur xorg-driver-video-fglrx-14.12.orig/fglrx-14.501.1003/common/lib/modules
  
      if (cpu_has_pge)
      {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,17)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)))
 +        cr4 = __read_cr4();
 +        __write_cr4(cr4 & ~X86_CR4_PGE);
 +#else
@@ -19,7 +19,7 @@ diff -ur xorg-driver-video-fglrx-14.12.orig/fglrx-14.501.1003/common/lib/modules
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,17)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)))
 +        __write_cr4(cr4);
 +#else
          write_cr4(cr4);
@@ -31,7 +31,7 @@ diff -ur xorg-driver-video-fglrx-14.12.orig/fglrx-14.501.1003/common/lib/modules
  
      if (cpu_has_pge)
      {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,17)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)))
 +        cr4 = __read_cr4();
 +        __write_cr4(cr4 & ~X86_CR4_PGE);
 +#else
@@ -45,7 +45,7 @@ diff -ur xorg-driver-video-fglrx-14.12.orig/fglrx-14.501.1003/common/lib/modules
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,17)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)))
 +        __write_cr4(cr4);
 +#else
          write_cr4(cr4);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/9a3ff5efc0438a5dd4c8e5ff8e15bffdbb0c1507