Update

3 files changed, 16 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8923fdbfd54..abbf5ecf1a46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-lqx
 	pkgdesc = NVIDIA drivers for linux-lqx
-	pkgver = 355.11
-	pkgrel = 6
+	pkgver = 358.16
+	pkgrel = 1
 	url = http://www.nvidia.com/
 	install = nvidia-lqx.install
 	arch = i686
@@ -12,16 +12,14 @@ pkgbase = nvidia-lqx
 	depends = linux-lqx>=4.3
 	depends = linux-lqx<4.4
 	depends = nvidia-libgl
-	depends = nvidia-utils=355.11
+	depends = nvidia-utils=358.16
 	conflicts = nvidia-304xx-lqx
 	conflicts = nvidia-340xx-lqx
 	options = !strip
-	source = nvidia-4.3-build.patch
-	md5sums = 1e5f60cf8e77af482345549b9436887a
-	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/355.11/NVIDIA-Linux-x86-355.11.run
-	md5sums_i686 = 16d143ccafe99328a2ca8e5a396fd4bc
-	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/355.11/NVIDIA-Linux-x86_64-355.11-no-compat32.run
-	md5sums_x86_64 = 30133d89690f4683c4e289ec6c0247dc
+	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/358.16/NVIDIA-Linux-x86-358.16.run
+	md5sums_i686 = 5dfe11ca13548ca4813b10f3223d6014
+	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/358.16/NVIDIA-Linux-x86_64-358.16-no-compat32.run
+	md5sums_x86_64 = efb1e649c0e0d62e92774bbf2c124488
 
 pkgname = nvidia-lqx
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f396ae13910..43aa1095f761 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-lqx
-pkgver=355.11
+pkgver=358.16
 _extramodules=extramodules-4.3-lqx
-pkgrel=6
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux-lqx"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -15,12 +15,10 @@ conflicts=('nvidia-304xx-lqx' 'nvidia-340xx-lqx')
 license=('custom')
 install=nvidia-lqx.install
 options=(!strip)
-source=('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=('1e5f60cf8e77af482345549b9436887a')
-md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
-md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
+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_i686=('5dfe11ca13548ca4813b10f3223d6014')
+md5sums_x86_64=('efb1e649c0e0d62e92774bbf2c124488')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -29,7 +27,6 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
-    patch -Np1 -i ${srcdir}/nvidia-4.3-build.patch
    
 }
 
@@ -42,6 +39,9 @@ build() {
 package() {
 	install -Dm644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
 		"${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+        install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \
+                "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"	
+
 
 	if [[ "$CARCH" = "x86_64" ]]; then
 		install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
diff --git a/nvidia-4.3-build.patch b/nvidia-4.3-build.patch
deleted file mode 100644
index 1d13fd8706f4..000000000000
--- a/nvidia-4.3-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/kernel/nvidia/nv-procfs.c
-+++ b/kernel/nvidia/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;
- }