Merge changes from lib32-nvidia-utils-beta and update to latest vulkan developer driver 381.26.03

2 files changed, 31 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43aaae5f8193..08d08171451e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = lib32-nvidia-utils-vulkan-developer-beta
-	pkgver = 375.27.15
+	pkgver = 381.26.03
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom:NVIDIA
 	makedepends = nvidia-libgl-vulkan-developer-beta
 	options = !strip
-	source = https://developer.nvidia.com/linux-375271532bit
-	md5sums = 0a2e0a05ed1f5babba47b5d301a4e8fa
+	source = https://developer.nvidia.com/3812603-linux-32bit
+	md5sums = 07d6373f9d2672afacf11be1060bebb6
 
 pkgname = lib32-nvidia-utils-vulkan-developer-beta
 	pkgdesc = NVIDIA driver utilities and libraries (vulkan developer beta version) (32-bit)
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
-	depends = nvidia-utils>=375.27.10
+	depends = nvidia-utils-vulkan-developer-beta
+	depends = lib32-mesa>=17.0.2-1
 	optdepends = lib32-opencl-nvidia-vulkan-developer-beta: OpenCL support
-	provides = lib32-nvidia-utils=375.27.15
+	provides = lib32-nvidia-utils=381.26.03
 	provides = lib32-libglvnd
 	provides = lib32-vulkan-driver
 	conflicts = lib32-nvidia-utils
@@ -23,24 +24,25 @@ pkgname = lib32-nvidia-utils-vulkan-developer-beta
 
 pkgname = lib32-nvidia-libgl-vulkan-developer-beta
 	pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-vulkan-developer-beta'
-	depends = lib32-nvidia-utils>=375.27.10
-	depends = nvidia-libgl>=375.27.10,
-	depends = lib32-mesa
+	depends = lib32-nvidia-utils-vulkan-developer-beta
+	depends = nvidia-libgl-vulkan-developer-beta
+	depends = lib32-libgles
+	provides = lib32-nvidia-libgl=381.26.03
 	provides = lib32-libgl
 	provides = lib32-libegl
 	provides = lib32-libgles
-	provides = lib32-nvidia-libgl
+	conflicts = lib32-nvidia-libgl
 	conflicts = lib32-libgl
 	conflicts = lib32-libegl
 	conflicts = lib32-libgles
-	conflicts = lib32-nvidia-libgl
+	replaces = lib32-nvidia-utils<=381.26.03-1
 
 pkgname = lib32-opencl-nvidia-vulkan-developer-beta
 	pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-vulkan-developer-beta'
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia
+	provides = lib32-opencl-nvidia=381.26.03
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
 
diff --git a/PKGBUILD b/PKGBUILD
index 94b2fd967c35..7867da1e634f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,19 @@
 # Maintainer: whoseos <kristian mailbox.org>
 # Contributors: Det, Ng Oon-Ee, Dan Vratil, Jeremy Sands, Erik Hardesty, josephgbr
 # Based on [aur]'s lib32-nvidia-utils-beta: https://aur.archlinux.org/packages/lib32-nvidia-utils-beta/
-# Base for this PKGBUILD is not the latest AUR package, but the package from 2016-12-14 for nvidia version 375.26
 
 pkgname=('lib32-nvidia-utils-vulkan-developer-beta' 'lib32-nvidia-libgl-vulkan-developer-beta' 'lib32-opencl-nvidia-vulkan-developer-beta')
-pkgver=375.27.15
+pkgver=381.26.03
 pkgrel=1
 arch=('x86_64')
 url="http://www.nvidia.com/"
 makedepends=('nvidia-libgl-vulkan-developer-beta')  # To avoid conflict during installation in the build chroot
 license=('custom:NVIDIA')
 options=('!strip')
-_pkg="linux-375271532bit"
+_pkg="${pkgver//./}-linux-32bit"
 _pkg_dir="NVIDIA-Linux-x86-$pkgver"
-source=("https://developer.nvidia.com/linux-375271532bit")
-md5sums=('0a2e0a05ed1f5babba47b5d301a4e8fa')
+source=("https://developer.nvidia.com/${pkgver//./}-linux-32bit")
+md5sums=('07d6373f9d2672afacf11be1060bebb6')
 
 _create_links() {
   # create missing soname links
@@ -44,7 +43,7 @@ package_lib32-opencl-nvidia-vulkan-developer-beta() {
   pkgdesc="NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-vulkan-developer-beta' "
   depends=('lib32-zlib' 'lib32-gcc-libs')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('lib32-opencl-nvidia' 'lib32-opencl-driver')
+  provides=("lib32-opencl-nvidia=$pkgver" 'lib32-opencl-driver')
   conflicts=('lib32-opencl-nvidia')
   cd $_pkg_dir
 
@@ -62,40 +61,30 @@ package_lib32-opencl-nvidia-vulkan-developer-beta() {
 
 package_lib32-nvidia-libgl-vulkan-developer-beta() {
   pkgdesc="NVIDIA driver library symlinks for 'lib32-nvidia-utils-vulkan-developer-beta'"
-  depends=("lib32-nvidia-utils>=375.27.10" "nvidia-libgl>=375.27.10", 'lib32-mesa')
-  provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles' 'lib32-nvidia-libgl')
-  conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles' 'lib32-nvidia-libgl')
+  depends=('lib32-nvidia-utils-vulkan-developer-beta' 'nvidia-libgl-vulkan-developer-beta' 'lib32-libgles')
+  provides=("lib32-nvidia-libgl=$pkgver" 'lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+  conflicts=('lib32-nvidia-libgl' 'lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+  replaces=("lib32-nvidia-utils<=${pkgver}-${pkgrel}")
   cd $_pkg_dir
 
-  # libGL (link)
-  install -d "$pkgdir"/usr/lib32/
-  ln -s /usr/lib32/nvidia/libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so.1.0.0
-  ln -s libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so.1
-  ln -s libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so
+  mkdir -p "${pkgdir}/usr/lib32/"
 
-  # GLX (link)
-  ln -s /usr/lib32/nvidia/libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0
-  ln -s libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.$pkgver
-  ln -s libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so
+  # libGL (link)
+  ln -s /usr/lib32/nvidia/libGL.so.1.0.0 "$pkgdir"/usr/lib32/libGL.so.1
+  ln -s libGL.so.1 "$pkgdir"/usr/lib32/libGL.so
 
   # EGL (link)	
   ln -s /usr/lib32/nvidia/libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so.1
-  ln -s libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so.$pkgver
   ln -s libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so
 
   # OpenGL ES 1 (link)
   ln -s /usr/lib32/nvidia/libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so.1
-  ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so.$pkgver
   ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so
 
   # OpenGL ES 2 (link)
   ln -s /usr/lib32/nvidia/libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so.2
-  ln -s libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so.$pkgver
   ln -s libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so
 
-  # VDPAU (link)
-  ln -s /usr/lib32/vdpau/libvdpau_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libvdpau_nvidia.so
-  
   # License (link)
   install -d "$pkgdir"/usr/share/licenses/
   ln -s nvidia-utils/ "$pkgdir"/usr/share/licenses/lib32-nvidia-libgl
@@ -103,7 +92,7 @@ package_lib32-nvidia-libgl-vulkan-developer-beta() {
 
 package_lib32-nvidia-utils-vulkan-developer-beta() {
   pkgdesc="NVIDIA driver utilities and libraries (vulkan developer beta version) (32-bit)"
-  depends=('lib32-zlib' 'lib32-gcc-libs' "nvidia-utils>=375.27.10")
+  depends=('lib32-zlib' 'lib32-gcc-libs' 'nvidia-utils-vulkan-developer-beta' 'lib32-mesa>=17.0.2-1')
   optdepends=('lib32-opencl-nvidia-vulkan-developer-beta: OpenCL support')
   provides=("lib32-nvidia-utils=$pkgver" 'lib32-libglvnd' 'lib32-vulkan-driver')
   conflicts=('lib32-nvidia-utils' 'lib32-libglvnd')
@@ -116,14 +105,16 @@ package_lib32-nvidia-utils-vulkan-developer-beta() {
   install -Dm755 libOpenGL.so.0 "$pkgdir"/usr/lib32/libOpenGL.so.0
 
   # GLX
-  install -Dm755 libGLX.so.0 "$pkgdir"/usr/lib32/nvidia/libGLX.so.0
+  install -Dm755 libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0
   install -Dm755 libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_nvidia.so.$pkgver
+  # now in lib32-mesa driver
+  #ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_indirect.so.0
 
   # EGL
   install -Dm755 libEGL.so.1 "$pkgdir"/usr/lib32/nvidia/libEGL.so.1
   install -Dm755 libEGL_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libEGL_nvidia.so.$pkgver
   install -Dm755 libnvidia-eglcore.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-eglcore.so.$pkgver
-  install -Dm755 libnvidia-egl-wayland.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-egl-wayland.so.$pkgver
+  install -Dm755 libnvidia-egl-wayland.so.1.0.1 "$pkgdir"/usr/lib32/libnvidia-egl-wayland.so.1.0.1
 
   # OpenGL ES
   install -Dm755 libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/nvidia/libGLESv1_CM.so.1