Upgpkg: 396.18

2 files changed, 25 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce3ef38e7aab..4d5317760cb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = nvidia-full-beta
-	pkgver = 390.48
-	pkgrel = 2
+	pkgver = 396.18
+	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom:NVIDIA
 	makedepends = linux-headers
 	options = !strip
-	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/390.48/NVIDIA-Linux-x86_64-390.48-no-compat32.run
+	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/396.18/NVIDIA-Linux-x86_64-396.18-no-compat32.run
 	source = 10-nvidia-drm-outputclass.conf
 	source = 20-nvidia.conf
-	md5sums = 8ed67fc67710b6cfd9c9273054e2117a
+	md5sums = d7d841c8e017e84a4f39619527855bbb
 	md5sums = 4f5562ee8f3171769e4638b35396c55d
 	md5sums = 2640eac092c220073f0668a7aaff61f7
 
@@ -17,9 +17,9 @@ 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>=390.48
+	depends = nvidia-utils-full-beta>=396.18
 	depends = libgl
-	provides = nvidia=390.48
+	provides = nvidia=396.18
 	conflicts = nvidia-96xx
 	conflicts = nvidia-173xx
 	conflicts = nvidia
@@ -33,9 +33,9 @@ pkgname = nvidia-utils-full-beta
 	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.2)
-	provides = nvidia-utils=390.48
-	provides = nvidia-settings=390.48
+	optdepends = egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.3)
+	provides = nvidia-utils=396.18
+	provides = nvidia-settings=396.18
 	provides = libglvnd
 	provides = vulkan-driver
 	conflicts = nvidia-utils
@@ -44,7 +44,7 @@ pkgname = nvidia-utils-full-beta
 	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.2) for 'nvidia-utils-full-beta'
+	pkgdesc = NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.0.3) for 'nvidia-utils-full-beta'
 	depends = nvidia-utils-full-beta
 	provides = egl-wayland
 	conflicts = egl-wayland
@@ -52,7 +52,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=390.48
+	provides = nvidia-libgl=396.18
 	provides = libgl
 	provides = libegl
 	provides = libgles
@@ -65,7 +65,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=390.48
+	provides = opencl-nvidia=396.18
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
@@ -76,7 +76,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=390.48
+	provides = lib32-nvidia-utils=396.18
 	provides = lib32-libglvnd
 	provides = lib32-vulkan-driver
 	conflicts = lib32-nvidia-utils
@@ -86,7 +86,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=390.48
+	provides = lib32-nvidia-libgl=396.18
 	provides = lib32-libgl
 	provides = lib32-libegl
 	provides = lib32-libgles
@@ -101,7 +101,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=390.48
+	provides = lib32-opencl-nvidia=396.18
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
 
diff --git a/PKGBUILD b/PKGBUILD
index d61a04f68400..24fe6245672d 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=390.48
-pkgrel=2
+pkgver=396.18
+pkgrel=1
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom:NVIDIA')
@@ -27,10 +27,10 @@ fi
 source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/$_pkg.run"
         '10-nvidia-drm-outputclass.conf'
         '20-nvidia.conf')
-md5sums=('8ed67fc67710b6cfd9c9273054e2117a'
+md5sums=('d7d841c8e017e84a4f39619527855bbb'
          '4f5562ee8f3171769e4638b35396c55d'
          '2640eac092c220073f0668a7aaff61f7')
-[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums[0]='3f7eafdb17a991b52cdfceb33e82ab75'
+[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums[0]='e9188de3573a435f78c5577f87c93a0e'
 
 # Patch
 #source+=('linux-4.11.patch')
@@ -148,14 +148,14 @@ package_nvidia-libgl-full-beta() {
 }
 
 package_nvidia-egl-wayland-full-beta() {
-  pkgdesc="NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.0.2) for 'nvidia-utils-full-beta'"
+  pkgdesc="NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.0.3) for 'nvidia-utils-full-beta'"
   depends=('nvidia-utils-full-beta')
   provides=('egl-wayland')
   conflicts=('egl-wayland')
   cd $_pkg
 
-  install -Dm755 libnvidia-egl-wayland.so.1.0.2 "$pkgdir"/usr/lib/libnvidia-egl-wayland.so.1.0.2
-  ln -s libnvidia-egl-wayland.so.1.0.2 "$pkgdir"/usr/lib/libnvidia-egl-wayland.so.1
+  install -Dm755 libnvidia-egl-wayland.so.1.0.3 "$pkgdir"/usr/lib/libnvidia-egl-wayland.so.1.0.3
+  ln -s libnvidia-egl-wayland.so.1.0.3 "$pkgdir"/usr/lib/libnvidia-egl-wayland.so.1
 }
 
 package_nvidia-utils-full-beta() {
@@ -165,7 +165,7 @@ package_nvidia-utils-full-beta() {
               'gtk3: nvidia-settings (GTK+ v3)'
               'opencl-nvidia-full-beta: OpenCL support'
               'xorg-server-devel: nvidia-xconfig'
-              'egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.2)')
+              'egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.3)')
   provides=("nvidia-utils=$pkgver" "nvidia-settings=$pkgver" 'libglvnd' 'vulkan-driver')
   conflicts=('nvidia-utils' 'nvidia-settings' 'libglvnd')
   backup=('etc/X11/xorg.conf.d/20-nvidia.conf')
@@ -185,6 +185,7 @@ package_nvidia-utils-full-beta() {
   install -Dm755 libGLdispatch.so.0 "$pkgdir"/usr/lib/libGLdispatch.so.0
   install -Dm755 libnvidia-glcore.so.$pkgver "$pkgdir"/usr/lib/libnvidia-glcore.so.$pkgver
   install -Dm755 libOpenGL.so.0 "$pkgdir"/usr/lib/libOpenGL.so.0
+  install -Dm755 libnvidia-glvkspirv.so.$pkgver "$pkgdir"/usr/lib/libnvidia-glvkspirv.so.$pkgver
 
   # GLX
   install -Dm755 libGLX.so.0 "$pkgdir"/usr/lib/libGLX.so.0
@@ -425,6 +426,7 @@ package_lib32-nvidia-utils-full-beta() {
   install -Dm755 32/libGLdispatch.so.0 "$pkgdir"/usr/lib32/libGLdispatch.so.0
   install -Dm755 32/libnvidia-glcore.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-glcore.so.$pkgver
   install -Dm755 32/libOpenGL.so.0 "$pkgdir"/usr/lib32/libOpenGL.so.0
+  install -Dm755 32/libnvidia-glvkspirv.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-glvkspirv.so.$pkgver
 
   # GLX
   install -Dm755 32/libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0