[arch-commits] Commit in nvidia-340xx/trunk (3 files)

[Tobias Powalowski]

    Date: Wednesday, November 4, 2015 @ 16:08:11
  Author: tpowa
Revision: 250102

upgpkg: nvidia-340xx 340.93-5

rebuild against 4.3 series

Added:
  nvidia-340xx/trunk/nvidia-4.3-build.patch
Modified:
  nvidia-340xx/trunk/PKGBUILD
  nvidia-340xx/trunk/nvidia-340xx.install

------------------------+
 PKGBUILD               |   15 +++++++++------
 nvidia-340xx.install   |    2 +-
 nvidia-4.3-build.patch |   20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-04 14:46:39 UTC (rev 250101)
+++ PKGBUILD	2015-11-04 15:08:11 UTC (rev 250102)
@@ -5,18 +5,20 @@
 pkgbase=nvidia-340xx
 pkgname=(nvidia-340xx nvidia-340xx-dkms)
 pkgver=340.93
-_extramodules=extramodules-4.2-ARCH
-pkgrel=4
+_extramodules=extramodules-4.3-ARCH
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
 conflicts=('nvidia')
 license=('custom')
 options=(!strip)
-source=(nv-drm.patch)
+source=(nv-drm.patch
+        nvidia-4.3-build.patch)
 source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('79671a27131da619a33eb02ed0c2c031')
+md5sums=('79671a27131da619a33eb02ed0c2c031'
+         'e400a8c538afd490726941d8c69b2c2d')
 md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437')
 md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
 
@@ -28,6 +30,7 @@
     cd "${_pkg}"
     # patches here
     patch -p0 -i ../nv-drm.patch
+    patch -Np1 -i ../nvidia-4.3-build.patch
 }
 
 build() {
@@ -41,7 +44,7 @@
 
 package_nvidia-340xx() {
     pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-    depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}")
+    depends=('linux>=4.3' 'linux<4.4' 'libgl' "nvidia-340xx-utils=${pkgver}")
     conflict+=('nvidia-340xx-dkms')
     install=nvidia-340xx.install
 

Modified: nvidia-340xx.install
===================================================================
--- nvidia-340xx.install	2015-11-04 14:46:39 UTC (rev 250101)
+++ nvidia-340xx.install	2015-11-04 15:08:11 UTC (rev 250102)
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.2-ARCH'
+    EXTRAMODULES='extramodules-4.3-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }

Added: nvidia-4.3-build.patch
===================================================================
--- nvidia-4.3-build.patch	                        (rev 0)
+++ nvidia-4.3-build.patch	2015-11-04 15:08:11 UTC (rev 250102)
@@ -0,0 +1,20 @@
+--- a/kernel/nv-procfs.c
++++ b/kernel/nv-procfs.c
+@@ -360,7 +360,8 @@ nv_procfs_read_registry(
+     registry_keys = ((nvl != NULL) ?
+             nvl->registry_keys : nv_registry_keys);
+ 
+-    return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++    seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++    return 0;
+ }
+ 
+ static ssize_t
+@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
+     void *v
+ )
+ {
+-    return seq_puts(s, s->private);
++    seq_puts(s, s->private);
++    return 0;
+ }