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

[Tobias Powalowski]

    Date: Wednesday, November 4, 2015 @ 16:12:51
  Author: tpowa
Revision: 250104

upgpkg: nvidia-304xx 304.128-5

rebuild against 4.3 series

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-04 15:08:26 UTC (rev 250103)
+++ PKGBUILD	2015-11-04 15:12:51 UTC (rev 250104)
@@ -5,20 +5,22 @@
 pkgbase=nvidia-304xx
 pkgname=(nvidia-304xx nvidia-304xx-dkms)
 pkgver=304.128
-_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-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
 conflicts=('nvidia')
 license=('custom')
 options=(!strip)
 source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
         "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-        'nv-drm.patch')
+        'nv-drm.patch'
+        'nvidia-4.3-build.patch')
 sha512sums=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90'
             'fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2'
-            'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f')
+            'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f'
+            'fe2db48834d73babc715aef394be9181256805b7bb3df34d1ca226bcb5cb19b36ba95c5df532438b08c1f83ab6921991ef44d04f672c177895f9b009219a1fb3')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -29,6 +31,7 @@
     cd "${_pkg}"
     # patches here
     patch -p0 -i "$srcdir/nv-drm.patch"
+    patch -Np1 -i "$srcdir/nvidia-4.3-build.patch"
 }
 
 build() {
@@ -39,7 +42,7 @@
 
 package_nvidia-304xx() {
     pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
-    depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-304xx-utils=${pkgver}")
+    depends=('linux>=4.3' 'linux<4.4' 'libgl' "nvidia-304xx-utils=${pkgver}")
 	conflicts+=('nvidia-304xx-dkms')
     install=nvidia-304xx.install
 

Modified: nvidia-304xx.install
===================================================================
--- nvidia-304xx.install	2015-11-04 15:08:26 UTC (rev 250103)
+++ nvidia-304xx.install	2015-11-04 15:12:51 UTC (rev 250104)
@@ -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:12:51 UTC (rev 250104)
@@ -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;
+ }