Upgpkg: 381.22

4 files changed, 138 insertions, 140 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e11c7a66ca4d..31bec49bd2b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon May  1 07:43:49 UTC 2017
 pkgbase = nvidia-full-beta
-	pkgver = 381.09
-	pkgrel = 2
+	pkgver = 381.22
+	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = i686
 	arch = x86_64
@@ -11,22 +9,20 @@ pkgbase = nvidia-full-beta
 	options = !strip
 	source = 10-nvidia-drm-outputclass.conf
 	source = 20-nvidia.conf
-	source = linux-4.11.patch
 	md5sums = 4f5562ee8f3171769e4638b35396c55d
 	md5sums = 2640eac092c220073f0668a7aaff61f7
-	md5sums = 897d9775dc484ab37934e7b102c5b325
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run
-	md5sums_i686 = aa16257e2ab1c28724479165afc187cc
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/381.09/NVIDIA-Linux-x86_64-381.09-no-compat32.run
-	md5sums_x86_64 = fe66660415e3919681e61bfc4e95cba4
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.22.run
+	md5sums_i686 = 8825cec1640739521689bd80121d1425
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.22-no-compat32.run
+	md5sums_x86_64 = 0e9590d48703c8baa034b6f0f8bbf1e5
 
 pkgname = nvidia-full-beta
 	pkgdesc = Full NVIDIA driver package for Arch's official 'linux' package (driver, utilities, and libraries) (beta version)
 	install = nvidia-full-beta.install
 	depends = linux
-	depends = nvidia-utils-full-beta>=381.09
+	depends = nvidia-utils-full-beta>=381.22
 	depends = libgl
-	provides = nvidia=381.09
+	provides = nvidia=381.22
 	conflicts = nvidia-96xx
 	conflicts = nvidia-173xx
 	conflicts = nvidia
@@ -41,8 +37,8 @@ pkgname = nvidia-utils-full-beta
 	optdepends = opencl-nvidia-full-beta: OpenCL support
 	optdepends = xorg-server-devel: nvidia-xconfig
 	optdepends = egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.1)
-	provides = nvidia-utils=381.09
-	provides = nvidia-settings=381.09
+	provides = nvidia-utils=381.22
+	provides = nvidia-settings=381.22
 	provides = libglvnd
 	provides = vulkan-driver
 	conflicts = nvidia-utils
@@ -59,7 +55,7 @@ pkgname = nvidia-egl-wayland-full-beta
 pkgname = nvidia-libgl-full-beta
 	pkgdesc = NVIDIA driver library symlinks for 'nvidia-utils-full-beta'
 	depends = nvidia-utils-full-beta
-	provides = nvidia-libgl=381.09
+	provides = nvidia-libgl=381.22
 	provides = libgl
 	provides = libegl
 	provides = libgles
@@ -72,7 +68,7 @@ pkgname = opencl-nvidia-full-beta
 	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-full-beta'
 	depends = zlib
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=381.09
+	provides = opencl-nvidia=381.22
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
@@ -83,7 +79,7 @@ pkgname = lib32-nvidia-utils-full-beta
 	depends = nvidia-utils-full-beta
 	depends = lib32-mesa>=17.0.2-1
 	optdepends = lib32-opencl-nvidia-full-beta: OpenCL support
-	provides = lib32-nvidia-utils=381.09
+	provides = lib32-nvidia-utils=381.22
 	provides = lib32-libglvnd
 	provides = lib32-vulkan-driver
 	conflicts = lib32-nvidia-utils
@@ -93,7 +89,7 @@ pkgname = lib32-nvidia-libgl-full-beta
 	pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-full-beta'
 	depends = lib32-nvidia-utils-full-beta
 	depends = nvidia-libgl-full-beta
-	provides = lib32-nvidia-libgl=381.09
+	provides = lib32-nvidia-libgl=381.22
 	provides = lib32-libgl
 	provides = lib32-libegl
 	provides = lib32-libgles
@@ -108,7 +104,7 @@ pkgname = lib32-opencl-nvidia-full-beta
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia=381.09
+	provides = lib32-opencl-nvidia=381.22
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
 
diff --git a/.SRCINFOb b/.SRCINFOb
new file mode 100644
index 000000000000..2f4ed2fde850
--- /dev/null
+++ b/.SRCINFOb
@@ -0,0 +1,114 @@
+# Generated by mksrcinfo v8
+# Mon May  1 07:43:49 UTC 2017
+pkgbase = nvidia-full-beta
+	pkgver = 381.22
+	pkgrel = 1
+	url = http://www.nvidia.com/
+	arch = i686
+	arch = x86_64
+	license = custom:NVIDIA
+	makedepends = linux-headers
+	options = !strip
+	source = 10-nvidia-drm-outputclass.conf
+	source = 20-nvidia.conf
+	source = linux-4.11.patch
+	md5sums = 4f5562ee8f3171769e4638b35396c55d
+	md5sums = 2640eac092c220073f0668a7aaff61f7
+	md5sums = 897d9775dc484ab37934e7b102c5b325
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.09.run
+	md5sums_i686 = 8825cec1640739521689bd80121d1425
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.09-no-compat32.run
+	md5sums_x86_64 = 0e9590d48703c8baa034b6f0f8bbf1e5
+
+pkgname = nvidia-full-beta
+	pkgdesc = Full NVIDIA driver package for Arch's official 'linux' package (driver, utilities, and libraries) (beta version)
+	install = nvidia-full-beta.install
+	depends = linux
+	depends = nvidia-utils-full-beta>=381.22
+	depends = libgl
+	provides = nvidia=381.22
+	conflicts = nvidia-96xx
+	conflicts = nvidia-173xx
+	conflicts = nvidia
+
+pkgname = nvidia-utils-full-beta
+	pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta'
+	install = nvidia-utils-full-beta.install
+	depends = xorg-server
+	depends = mesa>=17.0.2-2
+	optdepends = gtk2: nvidia-settings (GTK+ v2)
+	optdepends = gtk3: nvidia-settings (GTK+ v3)
+	optdepends = opencl-nvidia-full-beta: OpenCL support
+	optdepends = xorg-server-devel: nvidia-xconfig
+	optdepends = egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.1)
+	provides = nvidia-utils=381.22
+	provides = nvidia-settings=381.22
+	provides = libglvnd
+	provides = vulkan-driver
+	conflicts = nvidia-utils
+	conflicts = nvidia-settings
+	conflicts = libglvnd
+	backup = etc/X11/xorg.conf.d/20-nvidia.conf
+
+pkgname = nvidia-egl-wayland-full-beta
+	pkgdesc = NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.0.1) for 'nvidia-utils-full-beta'
+	depends = nvidia-utils-full-beta
+	provides = egl-wayland
+	conflicts = egl-wayland
+
+pkgname = nvidia-libgl-full-beta
+	pkgdesc = NVIDIA driver library symlinks for 'nvidia-utils-full-beta'
+	depends = nvidia-utils-full-beta
+	provides = nvidia-libgl=381.22
+	provides = libgl
+	provides = libegl
+	provides = libgles
+	conflicts = nvidia-libgl
+	conflicts = libgl
+	conflicts = libegl
+	conflicts = libgles
+
+pkgname = opencl-nvidia-full-beta
+	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-full-beta'
+	depends = zlib
+	optdepends = opencl-headers: headers necessary for OpenCL development
+	provides = opencl-nvidia=381.22
+	provides = opencl-driver
+	conflicts = opencl-nvidia
+
+pkgname = lib32-nvidia-utils-full-beta
+	pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta' (32-bit)
+	depends = lib32-zlib
+	depends = lib32-gcc-libs
+	depends = nvidia-utils-full-beta
+	depends = lib32-mesa>=17.0.2-1
+	optdepends = lib32-opencl-nvidia-full-beta: OpenCL support
+	provides = lib32-nvidia-utils=381.22
+	provides = lib32-libglvnd
+	provides = lib32-vulkan-driver
+	conflicts = lib32-nvidia-utils
+	conflicts = lib32-libglvnd
+
+pkgname = lib32-nvidia-libgl-full-beta
+	pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-full-beta'
+	depends = lib32-nvidia-utils-full-beta
+	depends = nvidia-libgl-full-beta
+	provides = lib32-nvidia-libgl=381.22
+	provides = lib32-libgl
+	provides = lib32-libegl
+	provides = lib32-libgles
+	conflicts = lib32-nvidia-libgl
+	conflicts = lib32-libgl
+	conflicts = lib32-libegl
+	conflicts = lib32-libgles
+	replaces = lib32-nvidia-utils<=313.26-1
+
+pkgname = lib32-opencl-nvidia-full-beta
+	pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-full-beta'
+	depends = lib32-zlib
+	depends = lib32-gcc-libs
+	optdepends = opencl-headers: headers necessary for OpenCL development
+	provides = lib32-opencl-nvidia=381.22
+	provides = lib32-opencl-driver
+	conflicts = lib32-opencl-nvidia
+
diff --git a/PKGBUILD b/PKGBUILD
index 529053cb6565..08c6fbbd72d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 _lib32=0
 
 pkgname=('nvidia-full-beta' 'nvidia-utils-full-beta' 'nvidia-egl-wayland-full-beta' 'nvidia-libgl-full-beta' 'opencl-nvidia-full-beta')
-pkgver=381.09
-pkgrel=2
+pkgver=381.22
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom:NVIDIA')
@@ -27,16 +27,16 @@ fi
 
 # Source
 source=('10-nvidia-drm-outputclass.conf'
-        '20-nvidia.conf'
-        'linux-4.11.patch')
+        '20-nvidia.conf')
+#        'linux-4.11.patch')
 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/$_pkg.run")
 md5sums=('4f5562ee8f3171769e4638b35396c55d'
-         '2640eac092c220073f0668a7aaff61f7'
-         '897d9775dc484ab37934e7b102c5b325')
-md5sums_i686=('aa16257e2ab1c28724479165afc187cc')
-md5sums_x86_64=('fe66660415e3919681e61bfc4e95cba4')
-[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('0a306b62fbf080943fd0559e12a7ddeb')
+         '2640eac092c220073f0668a7aaff61f7')
+#         '897d9775dc484ab37934e7b102c5b325')
+md5sums_i686=('8825cec1640739521689bd80121d1425')
+md5sums_x86_64=('0e9590d48703c8baa034b6f0f8bbf1e5')
+[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('1b74150e84fd99cc1207a51b9327112c')
 
 # Auto-detect patches (e.g. linux-4.1.patch)
 for _patch in $(find "$startdir" -maxdepth 1 -name '*.patch' -printf "%f\n"); do
diff --git a/linux-4.11.patch b/linux-4.11.patch
deleted file mode 100644
index 5951face36ed..000000000000
--- a/linux-4.11.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ur NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-drv.c
---- NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-drv.c	2017-03-31 03:42:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-drv.c	2017-04-06 23:53:14.273356795 +0200
-@@ -48,6 +48,8 @@
- #include <drm/drm_auth.h>
- #endif
- 
-+#include <linux/version.h>
-+
- static struct nvidia_drm_device *dev_list = NULL;
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -398,7 +400,11 @@
-     return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- static int nvidia_drm_unload(struct drm_device *dev)
-+#else
-+static void nvidia_drm_unload(struct drm_device *dev)
-+#endif
- {
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-     struct NvKmsKapiDevice *pDevice = NULL;
-@@ -412,7 +418,11 @@
- 
-     if (!nvidia_drm_modeset_enabled(dev))
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-         return 0;
-+#else
-+        return;
-+#endif
-     }
- 
-     mutex_lock(&nv_dev->lock);
-@@ -445,7 +455,11 @@
- 
- #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-     return 0;
-+#else
-+    return;
-+#endif
- }
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -542,7 +556,6 @@
-                                             void *data,
-                                             struct drm_file *file_priv)
- {
--    struct nvidia_drm_device *nv_dev = dev->dev_private;
-     struct drm_nvidia_get_client_capability_params *params = data;
- 
-     switch (params->capability)
-diff -ur NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-gem.c NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-gem.c
---- NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-gem.c	2017-03-31 03:42:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-gem.c	2017-04-06 23:54:19.624353181 +0200
-@@ -31,6 +31,8 @@
- 
- #include "nv-mm.h"
- 
-+#include <linux/version.h>
-+
- static struct nvidia_drm_gem_object *nvidia_drm_gem_new
- (
-     struct drm_file *file_priv,
-@@ -511,11 +513,19 @@
-  * Note that nvidia_drm_vma_fault() can be called for different or same
-  * ranges of the same drm_gem_object simultaneously.
-  */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- static int nvidia_drm_vma_fault(struct vm_area_struct *vma,
-                                 struct vm_fault *vmf)
-+#else
-+static int nvidia_drm_vma_fault(struct vm_fault *vmf)
-+#endif
- {
-     unsigned long address = nv_page_fault_va(vmf);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-     struct drm_gem_object *gem = vma->vm_private_data;
-+#else
-+    struct drm_gem_object *gem = vmf->vma->vm_private_data;
-+#endif
-     struct nvidia_drm_gem_object *nv_gem =
-                     DRM_GEM_OBJECT_TO_NV_GEM_OBJECT(gem);
-     unsigned long page_offset, pfn;
-@@ -526,7 +536,11 @@
- 
-     page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-     ret = vm_insert_pfn(vma, address, pfn + page_offset);
-+#else
-+    ret = vm_insert_pfn(vmf->vma, address, pfn + page_offset);
-+#endif
- 
-     switch (ret) {
-         case 0:
-diff -ur NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-linux.c NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-linux.c
---- NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-linux.c	2017-03-31 03:42:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-linux.c	2017-04-06 23:53:14.273356795 +0200
-@@ -185,7 +185,7 @@
- module_exit(nv_linux_drm_exit);
- 
- #if defined(MODULE_LICENSE)
--  MODULE_LICENSE("MIT");
-+  MODULE_LICENSE("Dual MIT/GPL");
- #endif
- #if defined(MODULE_INFO)
-   MODULE_INFO(supported, "external");