Updated to version 435.17

3 files changed, 30 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8da3e2941d12..2fed2efd16ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-full-beta-all
 	pkgdesc = Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version)
-	pkgver = 430.40
+	pkgver = 435.17
 	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
@@ -8,24 +8,22 @@ pkgbase = nvidia-full-beta-all
 	makedepends = linux
 	makedepends = linux-headers
 	options = !strip
-	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/430.40/NVIDIA-Linux-x86_64-430.40.run
+	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/435.17/NVIDIA-Linux-x86_64-435.17.run
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-utils-full-beta-all.sysusers
 	source = FS62142.patch
-	source = nvidia-utils-full-beta-all-change-vulkan-driver-path.patch
 	source = nvidia-settings-full-beta-all-change-desktop-paths.patch
-	sha256sums = f700899f48ba711b7e1598014e8db9a93537d7baa3d6a64067ed08578387dfd7
+	sha256sums = a71cecb5b8f0af35ed9a2d4023652a0537271457ef570c5f21dccd5067d9e9a6
 	sha256sums = 089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182
 	sha256sums = d8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167
 	sha256sums = c961006882afb691410c017c239e2c2ef61badb88f15735d37112b513ef0a99d
-	sha256sums = 57e2393228b09b85d91b9d095b85899178f6fd4b456cbb7ea39093d07e7c7ca7
 	sha256sums = 633bf69c39b8f35d0e64062eb0365c9427c2191583f2daa20b14e51772e8423a
 
 pkgname = nvidia-full-beta-all
-	depends = nvidia-utils-full-beta-all>=430.40
+	depends = nvidia-utils-full-beta-all>=435.17
 	depends = libglvnd
-	provides = nvidia=430.40
-	provides = nvidia-beta=430.40
+	provides = nvidia=435.17
+	provides = nvidia-beta=435.17
 	conflicts = nvidia
 
 pkgname = nvidia-utils-full-beta-all
@@ -37,11 +35,11 @@ pkgname = nvidia-utils-full-beta-all
 	optdepends = nvidia-settings-full-beta-all: for the configuration tool
 	optdepends = xorg-server-devel: for nvidia-xconfig
 	optdepends = opencl-nvidia-full-beta-all: for OpenCL support
-	provides = nvidia-utils=430.40
+	provides = nvidia-utils=435.17
 	provides = vulkan-driver
 	provides = opengl-driver
-	provides = nvidia-libgl=430.40
-	provides = nvidia-libgl-beta=430.40
+	provides = nvidia-libgl=435.17
+	provides = nvidia-libgl-beta=435.17
 	conflicts = nvidia-utils
 	conflicts = nvidia-libgl
 	replaces = nvidia-libgl
@@ -49,18 +47,18 @@ pkgname = nvidia-utils-full-beta-all
 pkgname = opencl-nvidia-full-beta-all
 	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-full-beta-all'
 	depends = zlib
-	depends = nvidia-utils-full-beta-all>=430.40
+	depends = nvidia-utils-full-beta-all>=435.17
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=430.40
+	provides = opencl-nvidia=435.17
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
 pkgname = nvidia-settings-full-beta-all
 	pkgdesc = Tool for configuring the NVIDIA graphics driver for 'nvidia-full-beta-all'
-	depends = nvidia-utils-full-beta-all>=430.40
+	depends = nvidia-utils-full-beta-all>=435.17
 	depends = gtk3
-	provides = nvidia-settings=430.40
-	provides = nvidia-settings=430.40
+	provides = nvidia-settings=435.17
+	provides = nvidia-settings=435.17
 	conflicts = nvidia-settings
 
 pkgname = lib32-nvidia-utils-full-beta-all
@@ -68,13 +66,13 @@ pkgname = lib32-nvidia-utils-full-beta-all
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	depends = lib32-libglvnd
-	depends = nvidia-utils-full-beta-all>=430.40
+	depends = nvidia-utils-full-beta-all>=435.17
 	optdepends = lib32-opencl-nvidia-full-beta-all: for OpenCL support
-	provides = lib32-nvidia-utils=430.40
+	provides = lib32-nvidia-utils=435.17
 	provides = lib32-vulkan-driver
 	provides = lib32-opengl-driver
-	provides = lib32-nvidia-libgl=430.40
-	provides = lib32-nvidia-libgl-beta=430.40
+	provides = lib32-nvidia-libgl=435.17
+	provides = lib32-nvidia-libgl-beta=435.17
 	conflicts = lib32-nvidia-utils
 	conflicts = lib32-nvidia-libgl
 	replaces = lib32-nvidia-libgl
@@ -83,9 +81,9 @@ pkgname = lib32-opencl-nvidia-full-beta-all
 	pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-full-beta-all'
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
-	depends = lib32-nvidia-utils-full-beta-all>=430.40
+	depends = lib32-nvidia-utils-full-beta-all>=435.17
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia=430.40
+	provides = lib32-opencl-nvidia=435.17
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
 
diff --git a/PKGBUILD b/PKGBUILD
index d555184c2b1f..8245739b354a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('nvidia-full-beta-all'
          'nvidia-settings-full-beta-all'
          'lib32-nvidia-utils-full-beta-all'
          'lib32-opencl-nvidia-full-beta-all')
-pkgver=430.40
+pkgver=435.17
 pkgrel=1
 pkgdesc='Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version)'
 arch=('x86_64')
@@ -21,13 +21,11 @@ source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}
         'nvidia-drm-outputclass.conf'
         'nvidia-utils-full-beta-all.sysusers'
         'FS62142.patch'
-        'nvidia-utils-full-beta-all-change-vulkan-driver-path.patch'
         'nvidia-settings-full-beta-all-change-desktop-paths.patch')
-sha256sums=('f700899f48ba711b7e1598014e8db9a93537d7baa3d6a64067ed08578387dfd7'
+sha256sums=('a71cecb5b8f0af35ed9a2d4023652a0537271457ef570c5f21dccd5067d9e9a6'
             '089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182'
             'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167'
             'c961006882afb691410c017c239e2c2ef61badb88f15735d37112b513ef0a99d'
-            '57e2393228b09b85d91b9d095b85899178f6fd4b456cbb7ea39093d07e7c7ca7'
             '633bf69c39b8f35d0e64062eb0365c9427c2191583f2daa20b14e51772e8423a')
 
 # create soname links
@@ -52,7 +50,6 @@ prepare() {
     cd "${_pkg}"
     bsdtar -xf nvidia-persistenced-init.tar.bz2
     
-    patch -Np1 -i "${srcdir}/nvidia-utils-full-beta-all-change-vulkan-driver-path.patch"
     patch -Np1 -i "${srcdir}/nvidia-settings-full-beta-all-change-desktop-paths.patch"
     
     # create a build directory for each installed kernel
@@ -193,7 +190,7 @@ package_nvidia-utils-full-beta-all() {
     install -D -m755 "libnvidia-glvkspirv.so.${pkgver}" -t "${pkgdir}/usr/lib"
     
     # Vulkan ICD
-    install -D -m644 "nvidia_icd.json.template" "${pkgdir}/usr/share/vulkan/icd.d/nvidia_icd.json"
+    install -D -m644 nvidia_icd.json -t "${pkgdir}/usr/share/vulkan/icd.d"
     
     # VDPAU
     install -D -m755 "libvdpau_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib/vdpau"
@@ -259,6 +256,13 @@ package_nvidia-utils-full-beta-all() {
     cp -a html "${pkgdir}/usr/share/doc/${pkgname}/"
     #ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
     
+    # new power management support
+    install -D -m644 nvidia-suspend.service   -t "${pkgdir}/usr/lib/systemd/system"
+    install -D -m644 nvidia-hibernate.service -t "${pkgdir}/usr/lib/systemd/system"
+    install -D -m644 nvidia-resume.service    -t "${pkgdir}/usr/lib/systemd/system"
+    install -D -m755 nvidia                   -t "${pkgdir}/usr/lib/systemd/system-sleep"
+    install -D -m755 nvidia-sleep.sh          -t "${pkgdir}/usr/bin"
+    
     # distro specific files must be installed in /usr/share/X11/xorg.conf.d
     install -D -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf"
     
diff --git a/nvidia-utils-full-beta-all-change-vulkan-driver-path.patch b/nvidia-utils-full-beta-all-change-vulkan-driver-path.patch
deleted file mode 100644
index 1e7a45be536f..000000000000
--- a/nvidia-utils-full-beta-all-change-vulkan-driver-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp a/nvidia_icd.json.template b/nvidia_icd.json.template
---- a/nvidia_icd.json.template	2019-05-08 00:55:21.000000000 +0000
-+++ b/nvidia_icd.json.template	2019-06-08 15:56:37.000000000 +0000
-@@ -1,7 +1,7 @@
- {
-     "file_format_version" : "1.0.0",
-     "ICD": {
--        "library_path": "__NV_VK_ICD__",
-+        "library_path": "libGLX_nvidia.so.0",
-         "api_version" : "1.1.99"
-     }
- }