Update to 340.93-4

5 files changed, 42 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6599a0b6e779..655997f1c9da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = nvidia-340xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 340xx legacy branch.
 	pkgver = 340.93
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.nvidia.com/
 	install = nvidia-340xx-ck.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-ck-headers>=4.1
-	makedepends = linux-ck-headers<4.2
-	depends = linux-ck>=4.1
-	depends = linux-ck<4.2
+	makedepends = linux-ck-headers>=4.3
+	makedepends = linux-ck-headers<4.4
+	depends = linux-ck>=4.3
+	depends = linux-ck<4.4
 	depends = nvidia-340xx-libgl
 	depends = nvidia-340xx-utils=340.93
 	conflicts = nvidia-ck
@@ -64,7 +64,9 @@ pkgbase = nvidia-340xx-ck
 	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
diff --git a/PKGBUILD b/PKGBUILD
index c4efb76702e6..ad5933dd83a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,25 @@
 
 pkgname=nvidia-340xx-ck
 pkgver=340.93
-_extramodules=extramodules-4.1-ck
-pkgrel=3
+_extramodules=extramodules-4.3-ck
+pkgrel=4
 pkgdesc="NVIDIA drivers for linux-ck, 340xx legacy branch."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-ck>=4.1' 'linux-ck<4.2' "nvidia-340xx-libgl" "nvidia-340xx-utils=${pkgver}")
-makedepends=('linux-ck-headers>=4.1' 'linux-ck-headers<4.2')
+depends=('linux-ck>=4.3' 'linux-ck<4.4' "nvidia-340xx-libgl" "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-ck-headers>=4.3' 'linux-ck-headers<4.4')
 conflicts=('nvidia-ck' 'nvidia-304xx-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvidia-96xx-ck' 'nvidia-beta-ck' 'nvidia-ck-atom' 'nvidia-ck-barcelona' 'nvidia-ck-bulldozer' 'nvidia-ck-corex' 'nvidia-ck-core2' 'nvidia-ck-haswell' 'nvidia-ck-broadwell' 'nvidia-ck-ivybridge' 'nvidia-ck-kx' 'nvidia-ck-k10' 'nvidia-ck-nehalem' 'nvidia-ck-p4' 'nvidia-ck-piledriver' 'nvidia-ck-pentm' 'nvidia-ck-sandybridge' 'nvidia-304xx-ck-atom' 'nvidia-304xx-ck-barcelona' 'nvidia-304xx-ck-corex' 'nvidia-304xx-ck-core2' 'nvidia-304xx-ck-haswell' 'nvidia-304xx-ck-broadwell' 'nvidia-304xx-ck-ivybridge' 'nvidia-304xx-ck-kx' 'nvidia-304xx-ck-k10' 'nvidia-304xx-ck-nehalem' 'nvidia-304xx-ck-p4' 'nvidia-304xx-ck-piledriver' 'nvidia-304xx-ck-pentm' 'nvidia-304xx-ck-sandybridge' 'nvidia-340xx-ck-atom' 'nvidia-340xx-ck-barcelona' 'nvidia-340xx-ck-bulldozer' 'nvidia-340xx-ck-core2' 'nvidia-340xx-ck-haswell' 'nvidia-340xx-ck-broadwell' 'nvidia-340xx-ck-ivybridge' 'nvidia-340xx-ck-kx' 'nvidia-340xx-ck-k10' 'nvidia-340xx-ck-nehalem' 'nvidia-340xx-ck-p4' 'nvidia-340xx-ck-piledriver' 'nvidia-340xx-ck-pentm' 'nvidia-340xx-ck-sandybridge')
 #groups=('ck-generic')
 #replaces=()
 license=('custom')
 install=nvidia-340xx-ck.install
 options=(!strip)
-source=("nv-drm.patch")
-#"nvidia-4.0.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")
-sha256sums=('9515310b017ad4134f50e92b39cb437e3d18605d26aead1dda02599d41e6ee26')
+sha256sums=('9515310b017ad4134f50e92b39cb437e3d18605d26aead1dda02599d41e6ee26'
+            '0e11d4d73556e39fffce5b8c14674ede0064cabee058d9fb8f8bd7c3035fca5d')
 sha256sums_i686=('4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612')
 sha256sums_x86_64=('8fb230a7579a15c778ab7c2f160830682919729235beb8ea2b84326528c54843')
 
@@ -31,7 +32,7 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
 		patch -Np0 -i "$srcdir/nv-drm.patch"
-#		patch -Np0 -i "$srcdir/nvidia-4.0.patch"
+		patch -Np1 -i "$srcdir/nvidia-4.3-build.patch"
 }
 
 build() {
diff --git a/nvidia-340xx-ck.install b/nvidia-340xx-ck.install
index c98d933539d7..021bdfc960fa 100644
--- a/nvidia-340xx-ck.install
+++ b/nvidia-340xx-ck.install
@@ -1,15 +1,13 @@
-post_install() {
-    EXTRAMODULES='extramodules-4.1-ck'
+post_upgrade() {
+    EXTRAMODULES='extramodules-4.3-ck'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
 }
 
-post_upgrade() {
-    EXTRAMODULES='extramodules-4.1-ck'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+post_install() {
+	post_upgrade
+	echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-4.1-ck'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+	post_upgrade
 }
diff --git a/nvidia-4.0.patch b/nvidia-4.0.patch
deleted file mode 100644
index 905ebeaf3fde..000000000000
--- a/nvidia-4.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800
-+++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800
-@@ -35,8 +35,13 @@
-     unsigned long cr0 = read_cr0();
-     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
-     wbinvd();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
-+    *cr4 = __read_cr4();
-+    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
-+#else
-     *cr4 = read_cr4();
-     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
-+#endif
-     __flush_tlb();
- }
- 
-@@ -46,7 +46,11 @@
-     wbinvd();
-     __flush_tlb();
-     write_cr0((cr0 & 0x9fffffff));
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
-+    if (cr4 & 0x80) __write_cr4(cr4);
-+#else
-     if (cr4 & 0x80) write_cr4(cr4);
-+#endif
- }
- 
- static int nv_determine_pat_mode(void)
diff --git a/nvidia-4.3-build.patch b/nvidia-4.3-build.patch
new file mode 100644
index 000000000000..0bc539497ebd
--- /dev/null
+++ b/nvidia-4.3-build.patch
@@ -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;
+ }