Update to 340.96-1

4 files changed, 11 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 655997f1c9da..5c6c5a77fa4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-340xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 340xx legacy branch.
-	pkgver = 340.93
-	pkgrel = 4
+	pkgver = 340.96
+	pkgrel = 1
 	url = http://www.nvidia.com/
 	install = nvidia-340xx-ck.install
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = nvidia-340xx-ck
 	depends = linux-ck>=4.3
 	depends = linux-ck<4.4
 	depends = nvidia-340xx-libgl
-	depends = nvidia-340xx-utils=340.93
+	depends = nvidia-340xx-utils=340.96
 	conflicts = nvidia-ck
 	conflicts = nvidia-304xx-ck
 	conflicts = nvidia-275xx-ck
@@ -63,14 +63,10 @@ pkgbase = nvidia-340xx-ck
 	conflicts = nvidia-340xx-ck-pentm
 	conflicts = nvidia-340xx-ck-sandybridge
 	options = !strip
-	source = nv-drm.patch
-	source = nvidia-4.3-build.patch
-	sha256sums = 9515310b017ad4134f50e92b39cb437e3d18605d26aead1dda02599d41e6ee26
-	sha256sums = 0e11d4d73556e39fffce5b8c14674ede0064cabee058d9fb8f8bd7c3035fca5d
-	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.93/NVIDIA-Linux-x86-340.93.run
-	sha256sums_i686 = 4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612
-	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.93/NVIDIA-Linux-x86_64-340.93-no-compat32.run
-	sha256sums_x86_64 = 8fb230a7579a15c778ab7c2f160830682919729235beb8ea2b84326528c54843
+	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run
+	sha256sums_i686 = c40e2778cd1ab036a76e1896fe2f77c4aa7baa215dbbdb11a2f4c5f05e1a478e
+	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96-no-compat32.run
+	sha256sums_x86_64 = 280f9db2aea52cab42e141f0393604c7a6d43e7f65d3e60c2319c2674ecc14c4
 
 pkgname = nvidia-340xx-ck
 
diff --git a/PKGBUILD b/PKGBUILD
index ad5933dd83a6..eacd90a7ef02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-340xx-ck
-pkgver=340.93
+pkgver=340.96
 _extramodules=extramodules-4.3-ck
-pkgrel=4
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux-ck, 340xx legacy branch."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -16,14 +16,10 @@ conflicts=('nvidia-ck' 'nvidia-304xx-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvid
 license=('custom')
 install=nvidia-340xx-ck.install
 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")
-sha256sums=('9515310b017ad4134f50e92b39cb437e3d18605d26aead1dda02599d41e6ee26'
-            '0e11d4d73556e39fffce5b8c14674ede0064cabee058d9fb8f8bd7c3035fca5d')
-sha256sums_i686=('4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612')
-sha256sums_x86_64=('8fb230a7579a15c778ab7c2f160830682919729235beb8ea2b84326528c54843')
+sha256sums_i686=('c40e2778cd1ab036a76e1896fe2f77c4aa7baa215dbbdb11a2f4c5f05e1a478e')
+sha256sums_x86_64=('280f9db2aea52cab42e141f0393604c7a6d43e7f65d3e60c2319c2674ecc14c4')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -31,8 +27,6 @@ sha256sums_x86_64=('8fb230a7579a15c778ab7c2f160830682919729235beb8ea2b84326528c5
 prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
-		patch -Np0 -i "$srcdir/nv-drm.patch"
-		patch -Np1 -i "$srcdir/nvidia-4.3-build.patch"
 }
 
 build() {
diff --git a/nv-drm.patch b/nv-drm.patch
deleted file mode 100644
index 820463d378c2..000000000000
--- a/nv-drm.patch
+++ /dev/null
@@ -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",

diff --git a/nvidia-4.3-build.patch b/nvidia-4.3-build.patch
deleted file mode 100644
index 0bc539497ebd..000000000000
--- a/nvidia-4.3-build.patch
+++ /dev/null
@@ -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;
- }