[packages/xorg-driver-video-nvidia-legacy-340xx] - fix building with kernel 5.4 - rel 5

[baggins]

commit 30985d0f0fae5cba781088a77336a9bcc05e39ee
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 1 19:17:20 2019 +0100

    - fix building with kernel 5.4
    - rel 5

 kernel-5.4.patch                           | 24 ++++++++++++++++++++++++
 xorg-driver-video-nvidia-legacy-340xx.spec |  8 +++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-340xx.spec b/xorg-driver-video-nvidia-legacy-340xx.spec
index 91fe92b..2081278 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	4
+%define		rel	5
 %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
@@ -51,6 +51,7 @@ Patch2:		linux-4.0.patch
 Patch3:		kernel-4.4.169.patch
 Patch4:		kernel-5.0.patch
 Patch5:		kernel-5.3.patch
+Patch6:		kernel-5.4.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -232,8 +233,8 @@ cd kernel\
 #EOF\
 #mv nv-kernel.o{,.bin}\
 #build_kernel_modules -m nvidia\
-%{__make} SYSSRC=%{_kernelsrcdir} clean\
-%{__make} SYSSRC=%{_kernelsrcdir} module\
+%{__make} SYSSRC=%{_kernelsrcdir} M=`pwd` clean\
+%{__make} SYSSRC=%{_kernelsrcdir} M=`pwd` module\
 cd ..\
 %install_kernel_modules -D installed -m kernel/nvidia -d misc\
 %{nil}
@@ -256,6 +257,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
diff --git a/kernel-5.4.patch b/kernel-5.4.patch
new file mode 100644
index 0000000..3810b4a
--- /dev/null
+++ b/kernel-5.4.patch
@@ -0,0 +1,24 @@
+--- NVIDIA-Linux-x86-340.107/kernel/nv-drm.c~	2019-12-01 19:14:03.000000000 +0100
++++ NVIDIA-Linux-x86-340.107/kernel/nv-drm.c	2019-12-01 19:15:23.503016305 +0100
+@@ -149,7 +149,11 @@
+ #if defined(DRIVER_LEGACY)
+     .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+     .driver_features = DRIVER_GEM | DRIVER_PRIME,
++#else
++    .driver_features = DRIVER_GEM,
++#endif
+ #endif
+     .load = nv_drm_load,
+     .unload = nv_drm_unload,
+@@ -161,7 +165,9 @@
+     .gem_free_object = nv_gem_free,
+ 
+     .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+     .gem_prime_export = drm_gem_prime_export,
++#endif
+     .gem_prime_get_sg_table = nv_gem_prime_get_sg_table,
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
================================================================

---- gitweb:

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