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

[Felix Yan]

    Date: Tuesday, November 17, 2015 @ 13:09:07
  Author: fyan
Revision: 251117

upgpkg: nvidia-340xx 340.96-1

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

------------------------+
 PKGBUILD               |   14 ++++----------
 nv-drm.patch           |   27 ---------------------------
 nvidia-4.3-build.patch |   20 --------------------
 3 files changed, 4 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-17 12:01:39 UTC (rev 251116)
+++ PKGBUILD	2015-11-17 12:09:07 UTC (rev 251117)
@@ -4,9 +4,9 @@
 
 pkgbase=nvidia-340xx
 pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.93
+pkgver=340.96
 _extramodules=extramodules-4.3-ARCH
-pkgrel=5
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
@@ -13,14 +13,10 @@
 conflicts=('nvidia')
 license=('custom')
 options=(!strip)
-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'
-         'e400a8c538afd490726941d8c69b2c2d')
-md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437')
-md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
+md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
+md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -29,8 +25,6 @@
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
-    patch -p0 -i ../nv-drm.patch
-    patch -Np1 -i ../nvidia-4.3-build.patch
 }
 
 build() {

Deleted: nv-drm.patch
===================================================================
--- nv-drm.patch	2015-11-17 12:01:39 UTC (rev 251116)
+++ nv-drm.patch	2015-11-17 12:09:07 UTC (rev 251117)
@@ -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:01:39 UTC (rev 251116)
+++ nvidia-4.3-build.patch	2015-11-17 12:09:07 UTC (rev 251117)
@@ -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;
- }