Updated to version 430.09

3 files changed, 23 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62dc8959716a..f687326ec150 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,24 @@
 pkgbase = nvidia-full-beta-all
 	pkgdesc = Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version)
-	pkgver = 418.56
+	pkgver = 430.09
 	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom:NVIDIA
 	makedepends = linux-headers
 	options = !strip
-	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/418.56/NVIDIA-Linux-x86_64-418.56.run
+	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/430.09/NVIDIA-Linux-x86_64-430.09.run
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-utils-full-beta-all.sysusers
-	source = linux-4.16.patch
-	sha256sums = c45500db69ff66b55612904d3c5d2beabf52f29799367f1fcf81d6f28e48e7b1
+	sha256sums = 2565e5f0b0da5f16f1675f67bb05e2fa397d581d8ed9acb23248282f2954a94c
 	sha256sums = 089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182
 	sha256sums = d8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167
-	sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385
 
 pkgname = nvidia-full-beta-all
-	depends = nvidia-utils-full-beta-all>=418.56
+	depends = nvidia-utils-full-beta-all>=430.09
 	depends = libgl
-	provides = nvidia=418.56
-	provides = nvidia-beta=418.56
+	provides = nvidia=430.09
+	provides = nvidia-beta=430.09
 	conflicts = nvidia
 
 pkgname = nvidia-utils-full-beta-all
@@ -33,8 +31,8 @@ pkgname = nvidia-utils-full-beta-all
 	optdepends = opencl-nvidia-full-beta-all: OpenCL support
 	optdepends = xorg-server-devel: nvidia-xconfig
 	optdepends = egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.1.2)
-	provides = nvidia-utils=418.56
-	provides = nvidia-settings=418.56
+	provides = nvidia-utils=430.09
+	provides = nvidia-settings=430.09
 	provides = libglvnd
 	provides = vulkan-driver
 	conflicts = nvidia-utils
@@ -50,7 +48,7 @@ pkgname = nvidia-egl-wayland-full-beta-all
 pkgname = nvidia-libgl-full-beta-all
 	pkgdesc = NVIDIA driver library symlinks for 'nvidia-utils-full-beta-all'
 	depends = nvidia-utils-full-beta-all
-	provides = nvidia-libgl=418.56
+	provides = nvidia-libgl=430.09
 	provides = libgl
 	provides = libegl
 	provides = libgles
@@ -63,7 +61,7 @@ pkgname = opencl-nvidia-full-beta-all
 	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-full-beta-all'
 	depends = zlib
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=418.56
+	provides = opencl-nvidia=430.09
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
@@ -74,7 +72,7 @@ pkgname = lib32-nvidia-utils-full-beta-all
 	depends = nvidia-utils-full-beta-all
 	depends = lib32-mesa>=17.0.2-1
 	optdepends = lib32-opencl-nvidia-full-beta-all: OpenCL support
-	provides = lib32-nvidia-utils=418.56
+	provides = lib32-nvidia-utils=430.09
 	provides = lib32-libglvnd
 	provides = lib32-vulkan-driver
 	conflicts = lib32-nvidia-utils
@@ -84,7 +82,7 @@ pkgname = lib32-nvidia-libgl-full-beta-all
 	pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-full-beta-all'
 	depends = lib32-nvidia-utils-full-beta-all
 	depends = nvidia-libgl-full-beta-all
-	provides = lib32-nvidia-libgl=418.56
+	provides = lib32-nvidia-libgl=430.09
 	provides = lib32-libgl
 	provides = lib32-libegl
 	provides = lib32-libgles
@@ -99,7 +97,7 @@ pkgname = lib32-opencl-nvidia-full-beta-all
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia=418.56
+	provides = lib32-opencl-nvidia=430.09
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
 
diff --git a/PKGBUILD b/PKGBUILD
index c323b80df597..8b286d4c890d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _lib32=0
 
 pkgbase=nvidia-full-beta-all
 pkgname=('nvidia-full-beta-all' 'nvidia-utils-full-beta-all' 'nvidia-egl-wayland-full-beta-all' 'nvidia-libgl-full-beta-all' 'opencl-nvidia-full-beta-all')
-pkgver=418.56
+pkgver=430.09
 pkgrel=1
 pkgdesc='Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version)'
 arch=('x86_64')
@@ -30,13 +30,11 @@ fi
 # source
 source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run"
         'nvidia-drm-outputclass.conf'
-        'nvidia-utils-full-beta-all.sysusers'
-        'linux-4.16.patch')
-sha256sums=('5e5cfcc6a392ceee156d3a55fc1c1cdebd5831b371163c6028fe409cefbf9d43'
+        'nvidia-utils-full-beta-all.sysusers')
+sha256sums=('247e127fcf1f1902193104f22ca69e1974f834b3c4502a0eba42312b8d6c88b9'
             '089d6dc247c9091b320c418b0d91ae6adda65e170934d178cdd4e9bd0785b182'
-            'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167'
-            '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
-[ "$_pkg" = "NVIDIA-Linux-${CARCH}-${pkgver}" ] && sha256sums[0]='c45500db69ff66b55612904d3c5d2beabf52f29799367f1fcf81d6f28e48e7b1'
+            'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167')
+[ "$_pkg" = "NVIDIA-Linux-${CARCH}-${pkgver}" ] && sha256sums[0]='2565e5f0b0da5f16f1675f67bb05e2fa397d581d8ed9acb23248282f2954a94c'
 
 _eglver=1.1.2
 
@@ -75,14 +73,13 @@ prepare() {
     do
         cp -a kernel "kernel-${_kernel}"
         
-        printf '%s\n' "  -> Applying patch(es) for kernel ${_kernel}..."
-        cd "kernel-${_kernel}"
+        #printf '%s\n' "  -> Applying patch(es) for kernel ${_kernel}..."
+        #cd "kernel-${_kernel}"
         
-        # restore phys_to_dma support
-        # https://bugs.archlinux.org/task/58074
-        patch -Np2 -i "${srcdir}/linux-4.16.patch"
+        # apply patches(es) here:
+        #patch -Np2 -i "${srcdir}/<patch>"
         
-        cd ..
+        #cd ..
     done
 }
 
diff --git a/linux-4.16.patch b/linux-4.16.patch
deleted file mode 100644
index 67172815ff69..000000000000
--- a/linux-4.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 10fc418..22ef968 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
- 
- #if defined(NV_VM_INSERT_PAGE_PRESENT)
- #include <linux/pagemap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- #include <linux/dma-mapping.h>
-+#else
-+#include <linux/dma-direct.h>
-+#endif
- #endif
- 
- #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b23dbb4..42dc576 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1906,7 +1906,12 @@ compile_test() {
-             # Determine if the phys_to_dma function is present.
-             #
-             CODE="
-+            #include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
-             #include <linux/dma-mapping.h>
-+#else
-+            #include <linux/dma-direct.h>
-+#endif
-             void conftest_phys_to_dma(void) {
-                 phys_to_dma();
-             }"