[packages/xorg-driver-video-nvidia-legacy-304xx] - fix building with linux 3.19 - rel 2

baggins baggins at pld-linux.org
Mon Mar 30 21:54:35 CEST 2015


commit f497e443b3870a5854a5aadad5198993865872b3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 30 21:54:17 2015 +0200

    - fix building with linux 3.19
    - rel 2

 linux-3.19.patch                           | 26 ++++++++++++++++++++++++++
 xorg-driver-video-nvidia-legacy-304xx.spec |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec
index e194e01..86a2d50 100644
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -25,7 +25,7 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	1
+%define		rel	2
 %define		mname	nvidia-legacy-304xx
 %define		pname	xorg-driver-video-%{mname}
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
@@ -47,6 +47,7 @@ Source4:	10-nvidia.conf
 Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
+Patch2:		linux-3.19.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}}
@@ -246,6 +247,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{?with_kernel:%{expand:%build_kernel_packages}}
diff --git a/linux-3.19.patch b/linux-3.19.patch
new file mode 100644
index 0000000..a22fc74
--- /dev/null
+++ b/linux-3.19.patch
@@ -0,0 +1,26 @@
+--- NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c~	2014-12-02 04:58:34.000000000 +0100
++++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c	2015-03-30 21:52:46.978945686 +0200
+@@ -2026,7 +2026,11 @@
+     unsigned long i_arg
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
++#else
+     return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++#endif
+ }
+ 
+ long nv_kern_compat_ioctl(
+@@ -2035,7 +2039,11 @@
+     unsigned long i_arg
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
++#else
+     return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++#endif
+ }
+ 
+ /*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-304xx.git/commitdiff/f497e443b3870a5854a5aadad5198993865872b3



More information about the pld-cvs-commit mailing list