Bump to 367.18

3 files changed, 12 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b0bbdeff593..9f8c130440a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jun  8 11:04:24 UTC 2016
+# Mon Jun 13 14:56:54 UTC 2016
 pkgbase = nvidia-lqx
 	pkgdesc = NVIDIA drivers for linux-lqx
-	pkgver = 364.19
-	pkgrel = 2
+	pkgver = 367.18
+	pkgrel = 1
 	url = http://www.nvidia.com/
 	install = nvidia-lqx.install
 	arch = i686
@@ -14,16 +14,14 @@ pkgbase = nvidia-lqx
 	depends = linux-lqx>=4.6
 	depends = linux-lqx<4.7
 	depends = nvidia-libgl
-	depends = nvidia-utils=364.19
+	depends = nvidia-utils=367.18
 	conflicts = nvidia-304xx-lqx
 	conflicts = nvidia-340xx-lqx
 	options = !strip
-	source = linux-4.6.patch
-	md5sums = 3064bd437b26adac246f301f54f2814c
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/364.19/NVIDIA-Linux-x86-364.19.run
-	md5sums_i686 = 8a4015213c4a8f1c80e9520d04a32a7b
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/364.19/NVIDIA-Linux-x86_64-364.19-no-compat32.run
-	md5sums_x86_64 = ad7a0b1855b3913390fb75b4cc3a26dc
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/367.18/NVIDIA-Linux-x86-367.18.run
+	md5sums_i686 = 9ae023927692dab99f23a006865fa966
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/367.18/NVIDIA-Linux-x86_64-367.18-no-compat32.run
+	md5sums_x86_64 = 0e01ed625c26ad4e4b44a7b139a3e363
 
 pkgname = nvidia-lqx
 
diff --git a/PKGBUILD b/PKGBUILD
index b290d742f10e..ca4eef93dd85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-lqx
-pkgver=364.19
+pkgver=367.18
 _extramodules=extramodules-4.6-lqx
-pkgrel=2
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux-lqx"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -17,10 +17,8 @@ install=nvidia-lqx.install
 options=(!strip)
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-source=('linux-4.6.patch')
-md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
-md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
-md5sums=('3064bd437b26adac246f301f54f2814c')
+md5sums_i686=('9ae023927692dab99f23a006865fa966')
+md5sums_x86_64=('0e01ed625c26ad4e4b44a7b139a3e363')
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
@@ -28,7 +26,6 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
-    patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
 }
 
 build() {
diff --git a/linux-4.6.patch b/linux-4.6.patch
deleted file mode 100644
index 3dde4730532b..000000000000
--- a/linux-4.6.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c

-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c

-@@ -77,7 +77,7 @@

- static struct drm_framebuffer *internal_framebuffer_create

- (

-     struct drm_device *dev,

--    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,

-+    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,

-     uint64_t nvkms_params_ptr,

-     uint64_t nvkms_params_size

- )

-@@ -199,7 +199,7 @@

- struct drm_framebuffer *nvidia_drm_framebuffer_create

- (

-     struct drm_device *dev,

--    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd

-+    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd

- )

- {

-     return internal_framebuffer_create(dev, file, cmd, 0, 0);

---- a/kernel/nvidia-drm/nvidia-drm-fb.h

-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h

-@@ -45,7 +45,7 @@

- struct drm_framebuffer *nvidia_drm_framebuffer_create

- (

-     struct drm_device *dev,

--    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd

-+    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd

- );

- 

- int nvidia_drm_add_nvkms_fb(

---- a/kernel/nvidia-drm/nvidia-drm-linux.c

-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c

-@@ -31,6 +31,7 @@

- 

- #if defined(NV_DRM_AVAILABLE)

- 

-+#include "nv-mm.h"

- #include "nv-pgprot.h"

- 

- MODULE_PARM_DESC(

-@@ -121,8 +122,7 @@

- 

-     down_read(&mm->mmap_sem);

- 

--    pages_pinned = get_user_pages(current, mm,

--                                  address, pages_count, write, force,

-+    pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,

-                                   user_pages, NULL);

-     up_read(&mm->mmap_sem);
\ No newline at end of file