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

[Felix Yan]

    Date: Tuesday, November 17, 2015 @ 13:22:48
  Author: fyan
Revision: 251121

upgpkg: nvidia-304xx 304.131-1

Modified:
  nvidia-304xx/trunk/PKGBUILD
Deleted:
  nvidia-304xx/trunk/nv-drm.patch
  nvidia-304xx/trunk/nvidia-4.3-build.patch

------------------------+
 PKGBUILD               |   18 ++++++------------
 nv-drm.patch           |   27 ---------------------------
 nvidia-4.3-build.patch |   20 --------------------
 3 files changed, 6 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-17 12:15:21 UTC (rev 251120)
+++ PKGBUILD	2015-11-17 12:22:48 UTC (rev 251121)
@@ -4,23 +4,19 @@
 
 pkgbase=nvidia-304xx
 pkgname=(nvidia-304xx nvidia-304xx-dkms)
-pkgver=304.128
+pkgver=304.131
 _extramodules=extramodules-4.3-ARCH
-pkgrel=5
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
 conflicts=('nvidia')
 license=('custom')
-options=(!strip)
+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'
-        'nvidia-4.3-build.patch')
-sha512sums=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90'
-            'fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2'
-            'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f'
-            'fe2db48834d73babc715aef394be9181256805b7bb3df34d1ca226bcb5cb19b36ba95c5df532438b08c1f83ab6921991ef44d04f672c177895f9b009219a1fb3')
+        "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+sha512sums=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e'
+            '07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -30,8 +26,6 @@
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
-    patch -p0 -i "$srcdir/nv-drm.patch"
-    patch -Np1 -i "$srcdir/nvidia-4.3-build.patch"
 }
 
 build() {

Deleted: nv-drm.patch
===================================================================
--- nv-drm.patch	2015-11-17 12:15:21 UTC (rev 251120)
+++ nv-drm.patch	2015-11-17 12:22:48 UTC (rev 251121)
@@ -1,27 +0,0 @@
---- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
-+++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
-@@ -18,6 +18,11 @@
-
- #include <drm/drmP.h>
-
-+/* 3.18-rc0+ */
-+#ifndef drm_gem_object
-+#include <drm/drm_gem.h>
-+#endif
-+
- extern nv_linux_state_t *nv_linux_devices;
-
- struct nv_gem_object {
-diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
-index ecc982a..60d7aae 100644
---- kernel/nv-drm.c~
-+++ kernel/nv-drm.c
-@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
-     .gem_prime_vmap = nv_gem_prime_vmap,
-     .gem_prime_vunmap = nv_gem_prime_vunmap,
-
-+    .set_busid = drm_pci_set_busid,
-+
-     .name = "nvidia-drm",
-     .desc = "NVIDIA DRM driver",
-     .date = "20130102",

Deleted: nvidia-4.3-build.patch
===================================================================
--- nvidia-4.3-build.patch	2015-11-17 12:15:21 UTC (rev 251120)
+++ nvidia-4.3-build.patch	2015-11-17 12:22:48 UTC (rev 251121)
@@ -1,20 +0,0 @@
---- 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;
- }