[packages/xorg-driver-video-nvidia-legacy-340xx] - fix building on linux 3.18.17+ - rel 3

baggins baggins at pld-linux.org
Wed Jul 8 21:35:40 CEST 2015


commit 2c94312c3d9ae9ed2c61330764497c8537c4ac86
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jul 8 21:35:05 2015 +0200

    - fix building on linux 3.18.17+
    - rel 3

 linux-4.0.patch                            | 2 +-
 xorg-driver-video-nvidia-legacy-340xx.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-340xx.spec b/xorg-driver-video-nvidia-legacy-340xx.spec
index 6073a20..81dc958 100644
--- a/xorg-driver-video-nvidia-legacy-340xx.spec
+++ b/xorg-driver-video-nvidia-legacy-340xx.spec
@@ -25,7 +25,7 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	2
+%define		rel	3
 %define		pname	xorg-driver-video-nvidia-legacy-340xx
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
diff --git a/linux-4.0.patch b/linux-4.0.patch
index fcbc23b..ae77d13 100644
--- a/linux-4.0.patch
+++ b/linux-4.0.patch
@@ -4,7 +4,7 @@
  #define NV_SPIN_UNLOCK(lock)      spin_unlock(lock)
  #define NV_SPIN_UNLOCK_WAIT(lock) spin_unlock_wait(lock)
  
-+#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)))
 +#define read_cr4 __read_cr4
 +#define write_cr4 __write_cr4
 +#endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-340xx.git/commitdiff/2c94312c3d9ae9ed2c61330764497c8537c4ac86



More information about the pld-cvs-commit mailing list