[arch-commits] Commit in nvidia-304xx/trunk (PKGBUILD nvidia-3.19.patch)

[Felix Yan]

    Date: Monday, February 9, 2015 @ 08:45:00
  Author: fyan
Revision: 231178

upgpkg: nvidia-304xx 304.125-10

rebuild for linux 3.19

Added:
  nvidia-304xx/trunk/nvidia-3.19.patch
Modified:
  nvidia-304xx/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   13 +++++++------
 nvidia-3.19.patch |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-09 06:34:49 UTC (rev 231177)
+++ PKGBUILD	2015-02-09 07:45:00 UTC (rev 231178)
@@ -4,13 +4,13 @@
 
 pkgname=nvidia-304xx
 pkgver=304.125
-_extramodules=extramodules-3.18-ARCH
-pkgrel=9
+_extramodules=extramodules-3.19-ARCH
+pkgrel=10
 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.18' 'linux<3.19' 'nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
+depends=('linux>=3.19' 'linux<3.20' 'nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-headers>=3.19' 'linux-headers<3.20')
 conflicts=('nvidia')
 license=('custom')
 install=nvidia.install
@@ -28,8 +28,8 @@
     md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0')
 fi
 
-source+=('nv-drm.patch')
-md5sums+=('79671a27131da619a33eb02ed0c2c031')
+source+=('nv-drm.patch' 'nvidia-3.19.patch')
+md5sums+=('79671a27131da619a33eb02ed0c2c031' 'd14e651d20054d18e0360c157ae60ae4')
 
 prepare() {
     cd "${srcdir}"
@@ -37,6 +37,7 @@
     cd "${_pkg}"
     # patches here
     patch -p0 -i "$srcdir/nv-drm.patch"
+    patch -p1 -i "$srcdir/nvidia-3.19.patch"
 }
 
 build() {

Added: nvidia-3.19.patch
===================================================================
--- nvidia-3.19.patch	                        (rev 0)
+++ nvidia-3.19.patch	2015-02-09 07:45:00 UTC (rev 231178)
@@ -0,0 +1,21 @@
+diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c
+--- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c	2014-12-02 04:58:34.000000000 +0100
++++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c	2014-12-21 17:50:33.420697348 +0100
+@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl(
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ long nv_kern_compat_ioctl(
+@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl(
+     unsigned long i_arg
+ )
+ {
+-    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+ 
+ /*