A new vulkan driver has been released with a lower version number...

4 files changed, 43 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 432af1caf9a7..493d1e97aa9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = nvidia-utils-vulkan-developer-beta
-	pkgver = 381.26.03
+	pkgver = 381.10.10
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = i686
@@ -8,12 +8,14 @@ pkgbase = nvidia-utils-vulkan-developer-beta
 	options = !strip
 	source = 10-nvidia-drm-outputclass.conf
 	source = 20-nvidia.conf
+	source = nvidia_icd.json
 	md5sums = 4f5562ee8f3171769e4638b35396c55d
 	md5sums = 2640eac092c220073f0668a7aaff61f7
-	source_i686 = https://developer.nvidia.com/3812603-linux-32bit
-	md5sums_i686 = 07d6373f9d2672afacf11be1060bebb6
-	source_x86_64 = https://developer.nvidia.com/3812603-linux-64bit
-	md5sums_x86_64 = b41bddbe1a613f3c3a07591a276f3202
+	md5sums = 58cb234fd413dd7f1ccec0d096c6c37c
+	source_i686 = https://developer.nvidia.com/3811010-linux-32bit
+	md5sums_i686 = e218ceb370583186b9dc4e0c09d141ad
+	source_x86_64 = https://developer.nvidia.com/3811010-linux-64bit
+	md5sums_x86_64 = 2d808105048db815994264d3ab117c31
 
 pkgname = nvidia-utils-vulkan-developer-beta
 	pkgdesc = NVIDIA driver utilities and libraries (vulkan developer beta version)
@@ -25,8 +27,8 @@ pkgname = nvidia-utils-vulkan-developer-beta
 	optdepends = opencl-nvidia-vulkan-developer-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.26.03
-	provides = nvidia-settings=381.26.03
+	provides = nvidia-utils=381.10.10
+	provides = nvidia-settings=381.10.10
 	provides = libglvnd
 	provides = vulkan-driver
 	conflicts = nvidia-utils
@@ -43,7 +45,7 @@ pkgname = nvidia-egl-wayland-vulkan-developer-beta
 pkgname = nvidia-libgl-vulkan-developer-beta
 	pkgdesc = NVIDIA driver library symlinks for 'nvidia-utils-vulkan-developer-beta'
 	depends = nvidia-utils-vulkan-developer-beta
-	provides = nvidia-libgl=381.26.03
+	provides = nvidia-libgl=381.10.10
 	provides = libgl
 	provides = libegl
 	provides = libgles
@@ -56,7 +58,7 @@ pkgname = opencl-nvidia-vulkan-developer-beta
 	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-vulkan-developer-beta'
 	depends = zlib
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=381.26.03
+	provides = opencl-nvidia=381.10.10
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
diff --git a/.gitignore b/.gitignore
index 497d003dca85..f8958fd13f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 !20-nvidia.conf
 !nvidia-utils-vulkan-developer-beta.install
 !10-nvidia-drm-outputclass.conf
+!nvidia_icd.json
diff --git a/PKGBUILD b/PKGBUILD
index 3790fa963b1c..674fe8b1aaec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on [aur]'s nvidia-utils-beta: https://aur.archlinux.org/packages/nvidia-utils-beta/
 
 pkgname=('nvidia-utils-vulkan-developer-beta' 'nvidia-egl-wayland-vulkan-developer-beta' 'nvidia-libgl-vulkan-developer-beta' 'opencl-nvidia-vulkan-developer-beta')
-pkgver=381.26.03
+pkgver=381.10.10
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -18,13 +18,15 @@ esac
 
 # Source
 source=('10-nvidia-drm-outputclass.conf'
-        '20-nvidia.conf')
+        '20-nvidia.conf'
+        'nvidia_icd.json')
 source_i686=("https://developer.nvidia.com/${pkgver//./}-linux-32bit")
 source_x86_64=("https://developer.nvidia.com/${pkgver//./}-linux-64bit")
 md5sums=('4f5562ee8f3171769e4638b35396c55d'
-         '2640eac092c220073f0668a7aaff61f7')
-md5sums_i686=('07d6373f9d2672afacf11be1060bebb6')
-md5sums_x86_64=('b41bddbe1a613f3c3a07591a276f3202')
+         '2640eac092c220073f0668a7aaff61f7'
+         '58cb234fd413dd7f1ccec0d096c6c37c')
+md5sums_i686=('e218ceb370583186b9dc4e0c09d141ad')
+md5sums_x86_64=('2d808105048db815994264d3ab117c31')
 
 _create_links() {
   # create missing soname links
@@ -192,8 +194,8 @@ package_nvidia-utils-vulkan-developer-beta() {
   # GPU monitoring and management (1/2)
   install -Dm755 libnvidia-ml.so.$pkgver "$pkgdir"/usr/lib/libnvidia-ml.so.$pkgver
 
-  # Vulkan icd
-  install -Dm644 nvidia_icd.json "$pkgdir"/usr/share/vulkan/icd.d/nvidia_icd.json
+  # Vulkan icd (termporary from package)
+  install -Dm644 "$srcdir"/nvidia_icd.json "$pkgdir"/usr/share/vulkan/icd.d/nvidia_icd.json
 
   # Helper libs for approved partners' GRID remote apps
   install -Dm755 libnvidia-ifr.so.$pkgver "$pkgdir"/usr/lib/libnvidia-ifr.so.$pkgver
diff --git a/nvidia_icd.json b/nvidia_icd.json
new file mode 100644
index 000000000000..388c4c3b0067
--- /dev/null
+++ b/nvidia_icd.json
@@ -0,0 +1,22 @@
+{
+    "file_format_version" : "1.0.0",
+    "ICD": {
+        "library_path": "libGLX_nvidia.so.0",
+        "api_version" : "1.0.49"
+    },
+    "layer": {
+        "name": "VK_LAYER_NV_optimus",
+        "type": "INSTANCE",
+        "library_path": "libGLX_nvidia.so.0",
+        "api_version" : "1.0.49",
+        "implementation_version" : "1",
+        "description" : "NVIDIA Optimus layer",
+        "functions": {
+            "vkGetInstanceProcAddr": "vk_optimusGetInstanceProcAddr",
+            "vkGetDeviceProcAddr": "vk_optimusGetDeviceProcAddr"
+        },
+        "disable_environment": {
+            "DISABLE_LAYER_NV_OPTIMUS_1": ""
+        }
+    }
+}