[packages/xorg-driver-video-nvidia-legacy-340xx] - fix building also for other kernel lines - rel 4

baggins baggins at pld-linux.org
Mon Apr 6 00:05:05 CEST 2020


commit 1ad679c0eeca0fadd0d117d47d9375a9314094aa
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 6 00:02:17 2020 +0200

    - fix building also for other kernel lines
    - rel 4

 kernel-5.6.patch                           | 6 +++++-
 xorg-driver-video-nvidia-legacy-340xx.spec | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-340xx.spec b/xorg-driver-video-nvidia-legacy-340xx.spec
index 3deb780..a81049c 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	3
+%define		rel	4
 %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/kernel-5.6.patch b/kernel-5.6.patch
index eb34358..c549a00 100644
--- a/kernel-5.6.patch
+++ b/kernel-5.6.patch
@@ -331,15 +331,19 @@ diff --git a/kernel/nv-time.h b/kernel/nv-time.h
 index a34ceb2..780f8bc 100644
 --- a/kernel/nv-time.h
 +++ b/kernel/nv-time.h
-@@ -28,7 +28,12 @@
+@@ -28,7 +28,16 @@
  #include <linux/ktime.h>
  #endif
  
 -static inline void nv_gettimeofday(struct timeval *tv)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
++#define nv_timeval timeval
++#else
 +struct nv_timeval {
 +    __kernel_long_t      tv_sec;
 +    __kernel_suseconds_t tv_usec;
 +};
++#endif
 +
 +static inline void nv_gettimeofday(struct nv_timeval *tv)
  {
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list