Bump to 340.93

3 files changed, 14 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5da713f6735b..943ad6b9215f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-340xx-lqx
 	pkgdesc = NVIDIA drivers for linux-lqx, 340xx legacy branch
-	pkgver = 340.76
-	pkgrel = 9
+	pkgver = 340.93
+	pkgrel = 4
 	url = http://www.nvidia.com/
 	install = nvidia-340xx-lqx.install
 	arch = i686
@@ -12,18 +12,16 @@ pkgbase = nvidia-340xx-lqx
 	depends = linux-lqx>=4.2
 	depends = linux-lqx<4.3
 	depends = nvidia-340xx-libgl
-	depends = nvidia-340xx-utils=340.76
+	depends = nvidia-340xx-utils=340.93
 	conflicts = nvidia-lqx
 	conflicts = nvidia-304xx-lqx
 	options = !strip
 	source = nv-drm.patch
-	source = nvidia-4.0.patch
 	md5sums = 2365f1405f0c7bbb8f8cd7ebd5e4e301
-	md5sums = f42bdf589f52d4e6c38baa5bef15eef8
-	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run
-	md5sums_i686 = 8064c0a0998c3e7ee3c98ac1832b8194
-	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76-no-compat32.run
-	md5sums_x86_64 = 440df290e213280d6e20d4d4be6f8b4c
+	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.93/NVIDIA-Linux-x86-340.93.run
+	md5sums_i686 = 4a7edf6838a80c77a57fb6f6ec7f0437
+	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.93/NVIDIA-Linux-x86_64-340.93-no-compat32.run
+	md5sums_x86_64 = cb80e3f1cb6f2fb6e6eab35fad0884e4
 
 pkgname = nvidia-340xx-lqx
 
diff --git a/PKGBUILD b/PKGBUILD
index 783013ef3d95..20c8114fb750 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-340xx-lqx
-pkgver=340.76
+pkgver=340.93
 _extramodules=extramodules-4.2-lqx
-pkgrel=9
+pkgrel=4
 pkgdesc="NVIDIA drivers for linux-lqx, 340xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -15,16 +15,12 @@ conflicts=('nvidia-lqx' 'nvidia-304xx-lqx')
 license=('custom')
 install=${pkgname}.install
 options=(!strip)
-source=("nv-drm.patch"
-        "nvidia-4.0.patch")
+source=("nv-drm.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=('2365f1405f0c7bbb8f8cd7ebd5e4e301'
-         'f42bdf589f52d4e6c38baa5bef15eef8')
-md5sums_i686=('8064c0a0998c3e7ee3c98ac1832b8194')
-md5sums_x86_64=('440df290e213280d6e20d4d4be6f8b4c')
-
-
+md5sums=('2365f1405f0c7bbb8f8cd7ebd5e4e301')
+md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437')
+md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -32,8 +28,7 @@ md5sums_x86_64=('440df290e213280d6e20d4d4be6f8b4c')
 prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
-    patch -Np0 -i "$srcdir/nv-drm.patch"
-    patch -Np0 -i "$srcdir/nvidia-4.0.patch"   
+    patch -Np0 -i "$srcdir/nv-drm.patch" 
 }
 
 build() {
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)