Updated to version 440.59

2 files changed, 25 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec1a2746f45a..758509cf5aaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,27 @@
 pkgbase = nvidia-full-beta-all
 	pkgdesc = Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version)
-	pkgver = 440.44
-	pkgrel = 2
+	pkgver = 440.59
+	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
 	makedepends = linux
 	makedepends = linux-headers
 	options = !strip
-	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/440.44/NVIDIA-Linux-x86_64-440.44.run
+	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/440.59/NVIDIA-Linux-x86_64-440.59.run
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-utils-full-beta-all.sysusers
-	source = 010-nvidia-prime-kernel-5.4.patch::https://gitlab.com/snippets/1929174/raw
-	source = 020-nvidia-kernel-5.5.patch::https://gitlab.com/snippets/1923197/raw
 	source = 110-nvidia-settings-full-beta-all-change-desktop-paths.patch
-	sha256sums = ad427df2b619e6150291f9e03938dc8253769a59e900178c7f07d12d6ec2fc14
+	sha256sums = 61cb1a6c1017087d431c8cec4fc0450030d469cb825a4cac7d1a5142b8c14f98
 	sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d
 	sha256sums = d8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167
-	sha256sums = bedd55074771222bad8391c66b7022a266c135ff51d478710f7dda8708c3e9aa
-	sha256sums = 7dcd609e85720cb812d7b41320d845931d8ea3e8529c700231372e0da66e5804
 	sha256sums = 633bf69c39b8f35d0e64062eb0365c9427c2191583f2daa20b14e51772e8423a
 
 pkgname = nvidia-full-beta-all
-	depends = nvidia-utils-full-beta-all>=440.44
+	depends = nvidia-utils-full-beta-all>=440.59
 	depends = libglvnd
-	provides = nvidia=440.44
-	provides = nvidia-beta=440.44
+	provides = nvidia=440.59
+	provides = nvidia-beta=440.59
 	conflicts = nvidia
 
 pkgname = nvidia-utils-full-beta-all
@@ -37,11 +33,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=440.44
+	provides = nvidia-utils=440.59
 	provides = vulkan-driver
 	provides = opengl-driver
-	provides = nvidia-libgl=440.44
-	provides = nvidia-libgl-beta=440.44
+	provides = nvidia-libgl=440.59
+	provides = nvidia-libgl-beta=440.59
 	conflicts = nvidia-utils
 	conflicts = nvidia-libgl
 	replaces = nvidia-libgl
@@ -49,18 +45,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>=440.44
+	depends = nvidia-utils-full-beta-all>=440.59
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=440.44
+	provides = opencl-nvidia=440.59
 	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>=440.44
+	depends = nvidia-utils-full-beta-all>=440.59
 	depends = gtk3
-	provides = nvidia-settings=440.44
-	provides = nvidia-settings=440.44
+	provides = nvidia-settings=440.59
+	provides = nvidia-settings=440.59
 	conflicts = nvidia-settings
 
 pkgname = lib32-nvidia-utils-full-beta-all
@@ -68,13 +64,13 @@ pkgname = lib32-nvidia-utils-full-beta-all
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	depends = lib32-libglvnd
-	depends = nvidia-utils-full-beta-all>=440.44
+	depends = nvidia-utils-full-beta-all>=440.59
 	optdepends = lib32-opencl-nvidia-full-beta-all: for OpenCL support
-	provides = lib32-nvidia-utils=440.44
+	provides = lib32-nvidia-utils=440.59
 	provides = lib32-vulkan-driver
 	provides = lib32-opengl-driver
-	provides = lib32-nvidia-libgl=440.44
-	provides = lib32-nvidia-libgl-beta=440.44
+	provides = lib32-nvidia-libgl=440.59
+	provides = lib32-nvidia-libgl-beta=440.59
 	conflicts = lib32-nvidia-utils
 	conflicts = lib32-nvidia-libgl
 	replaces = lib32-nvidia-libgl
@@ -83,9 +79,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>=440.44
+	depends = lib32-nvidia-utils-full-beta-all>=440.59
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia=440.44
+	provides = lib32-opencl-nvidia=440.59
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
 
diff --git a/PKGBUILD b/PKGBUILD
index 9351b2ddae2a..85439d019177 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=('nvidia-full-beta-all'
          'nvidia-settings-full-beta-all'
          'lib32-nvidia-utils-full-beta-all'
          'lib32-opencl-nvidia-full-beta-all')
-pkgver=440.44
-pkgrel=2
+pkgver=440.59
+pkgrel=1
 pkgdesc='Full NVIDIA driver package for all kernels on the system (drivers, utilities and libraries) (beta version)'
 arch=('x86_64')
 url='https://www.nvidia.com/'
@@ -20,14 +20,10 @@ _pkg="NVIDIA-Linux-${CARCH}-${pkgver}"
 source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run"
         'nvidia-drm-outputclass.conf'
         'nvidia-utils-full-beta-all.sysusers'
-        '010-nvidia-prime-kernel-5.4.patch::https://gitlab.com/snippets/1929174/raw'
-        '020-nvidia-kernel-5.5.patch::https://gitlab.com/snippets/1923197/raw'
         '110-nvidia-settings-full-beta-all-change-desktop-paths.patch')
-sha256sums=('ad427df2b619e6150291f9e03938dc8253769a59e900178c7f07d12d6ec2fc14'
+sha256sums=('61cb1a6c1017087d431c8cec4fc0450030d469cb825a4cac7d1a5142b8c14f98'
             'be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d'
             'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167'
-            'bedd55074771222bad8391c66b7022a266c135ff51d478710f7dda8708c3e9aa'
-            '7dcd609e85720cb812d7b41320d845931d8ea3e8529c700231372e0da66e5804'
             '633bf69c39b8f35d0e64062eb0365c9427c2191583f2daa20b14e51772e8423a')
 
 # create soname links
@@ -56,27 +52,10 @@ prepare() {
     # create a build directory for each installed kernel
     local _kernel
     local -a _kernels
-    local _majver
     mapfile -t _kernels < <(find /usr/lib/modules/*/build/version -exec cat {} +)
     for _kernel in "${_kernels[@]}"
     do
-        _majver="$(printf "$_kernel" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')"
-        cp -a kernel-orig kernel
-        
-        # current patches are for 5.4 and later only
-        if [ "$(vercmp "$_majver" '5.4')" -ge '0' ]
-        then
-            printf '%s\n' "  -> Applying patch(es) for kernel ${_kernel}..."
-            patch -Np1 -i "${srcdir}/010-nvidia-prime-kernel-5.4.patch"
-            
-            if [ "$(vercmp "$_majver" '5.5')" -ge '0' ]
-            then
-                patch -Np1 -i "${srcdir}/020-nvidia-kernel-5.5.patch"
-            fi
-        fi
-        
-        mv kernel "kernel-${_kernel}"
-        cp -a .manifest ".manifest-${_kernel}"
+        cp -a kernel-orig "kernel-${_kernel}"
     done
     
     patch -Np1 -i "${srcdir}/110-nvidia-settings-full-beta-all-change-desktop-paths.patch"
@@ -90,7 +69,6 @@ build() {
     for _kernel in "${_kernels[@]}"
     do
         cd "${srcdir}/${_pkg}/kernel-${_kernel}"
-        
         printf '%s\n' "  -> Building Nvidia module for ${_kernel}..."
         make SYSSRC="/usr/lib/modules/${_kernel}/build" module
     done