Updated to version 450.57

4 files changed, 50 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cef1c7f576d..a9a20f71e138 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = nvidia-beta
 	pkgdesc = NVIDIA drivers for Arch's official 'linux' package (beta version)
-	pkgver = 450.51
+	pkgver = 450.57
 	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
 	makedepends = linux-headers
-	depends = linux
-	depends = nvidia-utils-beta>=450.51
-	depends = libglvnd
-	provides = nvidia=450.51
-	provides = nvidia-beta=450.51
+	makedepends = dkms
+	provides = nvidia=450.57
+	provides = nvidia-beta=450.57
 	conflicts = nvidia
 	options = !strip
-	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/450.51/NVIDIA-Linux-x86_64-450.51-no-compat32.run
-	source = 010-nvidia-kernel-5.7.patch
-	sha256sums = 7e08a97f68e9d4b8fbae9811926fdfbff216fa37252aa114425bc1aa85730d22
-	sha256sums = 37cf072fdaee3f9f0c5a8b4d5f2dac722c7b96720fc317bc2da947bde52fb946
+	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/450.57/NVIDIA-Linux-x86_64-450.57-no-compat32.run
+	source = 110-nvidia-change-dkms-conf.patch
+	sha256sums = 8a65da18761a2e6547d681b0d87201a46d822e71a318c89a849767a95fbd1e07
+	sha256sums = 3f0940fa30468d237cda6cab354b4c40c7baacad5bd5aaf31706740f855e35ce
 
 pkgname = nvidia-beta
+	depends = linux
+	depends = nvidia-utils-beta>=450.57
+	depends = libglvnd
 
diff --git a/010-nvidia-kernel-5.7.patch b/010-nvidia-kernel-5.7.patch
deleted file mode 100644
index d7c58e10d7f0..000000000000
--- a/010-nvidia-kernel-5.7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -144,6 +144,7 @@ test_headers() {
-     FILES="$FILES video/nv_internal.h"
-     FILES="$FILES asm/book3s/64/hash-64k.h"
-     FILES="$FILES asm/set_memory.h"
-+    FILES="$FILES asm/pgtable.h"
-     FILES="$FILES asm/prom.h"
-     FILES="$FILES asm/powernv.h"
-     FILES="$FILES asm/tlbflush.h"
-@@ -471,6 +472,9 @@ compile_test() {
-             # It does not exist on all architectures.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #if defined(NV_ASM_PGTABLE_TYPES_H_PRESENT)
-             #include <asm/pgtable_types.h>
diff --git a/110-nvidia-change-dkms-conf.patch b/110-nvidia-change-dkms-conf.patch
new file mode 100644
index 000000000000..c33844d8bf29
--- /dev/null
+++ b/110-nvidia-change-dkms-conf.patch
@@ -0,0 +1,26 @@
+--- a/kernel/dkms.conf
++++ b/kernel/dkms.conf
+@@ -1,12 +1,20 @@
+ PACKAGE_NAME="nvidia"
+-PACKAGE_VERSION="__VERSION_STRING"
++PACKAGE_VERSION="450.57"
+ AUTOINSTALL="yes"
+ 
+ # By default, DKMS will add KERNELRELEASE to the make command line; however,
+ # this will cause the kernel module build to infer that it was invoked via
+ # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
+ # the 'make' command name to suppress this behavior.
+-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
+ 
+ # The list of kernel modules will be generated by nvidia-installer at runtime.
+-__DKMS_MODULES
++BUILT_MODULE_NAME[0]="nvidia"
++DEST_MODULE_LOCATION[0]="/kernel/drivers/video"
++BUILT_MODULE_NAME[1]="nvidia-uvm"
++DEST_MODULE_LOCATION[1]="/kernel/drivers/video"
++BUILT_MODULE_NAME[2]="nvidia-modeset"
++DEST_MODULE_LOCATION[2]="/kernel/drivers/video"
++BUILT_MODULE_NAME[3]="nvidia-drm"
++DEST_MODULE_LOCATION[3]="/kernel/drivers/video"
++
diff --git a/PKGBUILD b/PKGBUILD
index d9ee1c82e45c..7d308a60fdb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,43 @@
 # Contributor: Dan Vratil
 
 pkgname=nvidia-beta
-pkgver=450.51
+pkgver=450.57
 pkgrel=1
 pkgdesc="NVIDIA drivers for Arch's official 'linux' package (beta version)"
 arch=('x86_64')
 url='https://www.nvidia.com/'
 license=('custom')
-depends=('linux' "nvidia-utils-beta>=${pkgver}" 'libglvnd')
-makedepends=('linux-headers')
+makedepends=('linux-headers' 'dkms')
 provides=("nvidia=${pkgver}" "nvidia-beta=${pkgver}")
 conflicts=('nvidia')
 options=('!strip')
 _pkg="NVIDIA-Linux-${CARCH}-${pkgver}-no-compat32"
 source=("http://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run"
-        '010-nvidia-kernel-5.7.patch')
-sha256sums=('7e08a97f68e9d4b8fbae9811926fdfbff216fa37252aa114425bc1aa85730d22'
-            '37cf072fdaee3f9f0c5a8b4d5f2dac722c7b96720fc317bc2da947bde52fb946')
+        '110-nvidia-change-dkms-conf.patch')
+sha256sums=('8a65da18761a2e6547d681b0d87201a46d822e71a318c89a849767a95fbd1e07'
+            '3f0940fa30468d237cda6cab354b4c40c7baacad5bd5aaf31706740f855e35ce')
 
 prepare() {
     # extract the source file
     [ -d "$_pkg" ] && rm -rf "$_pkg"
     printf '%s\n' "  -> Self-Extracting ${_pkg}.run..."
     sh "${_pkg}.run" --extract-only
+    ln -s kernel "${_pkg}/nvidia-${pkgver}"
     
-    patch -d "$_pkg" -Np1 -i "${srcdir}/010-nvidia-kernel-5.7.patch"
+    patch -d "$_pkg" -Np1 -i "${srcdir}/110-nvidia-change-dkms-conf.patch"
 }
 
 build() {
-    printf '%s\n' "  -> Building Nvidia module for kernel $(</usr/src/linux/version)..."
-    make -C "${_pkg}/kernel" SYSSRC='/usr/src/linux' module
+    dkms build --dkmstree "$srcdir" --sourcetree "${srcdir}/${_pkg}" -m "nvidia/${pkgver}" -k "$(</usr/src/linux/version)"
 }
 
 package() {
-    local _extradir
-     _extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules"
+    depends=('linux' "nvidia-utils-beta>=${pkgver}" 'libglvnd')
     
-    install -D -m644 "${_pkg}/kernel/"nvidia{,-drm,-modeset,-uvm}.ko -t "${pkgdir}${_extradir}"
+    local _kernver
+    _kernver="$(</usr/src/linux/version)"
+    
+    install -D -m644 "nvidia/${pkgver}/${_kernver}/${CARCH}/module"/* -t "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
     find "$pkgdir" -name '*.ko' -exec xz -T1 {} +
     printf '%s\n' 'blacklist nouveau' | install -D -m644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
     install -D -m644 "${_pkg}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"