Updated to version 515.43.04

3 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a50af6fb52f9..ee2eacd17b85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = nvidia-beta
 	pkgdesc = NVIDIA drivers for Arch's official 'linux' package (beta version)
-	pkgver = 510.68.02
+	pkgver = 515.43.04
 	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
 	makedepends = linux-headers
 	makedepends = dkms
-	provides = nvidia=510.68.02
-	provides = nvidia-beta=510.68.02
+	provides = nvidia=515.43.04
+	provides = nvidia-beta=515.43.04
 	provides = NVIDIA-MODULE
 	conflicts = nvidia
 	options = !strip
-	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/510.68.02/NVIDIA-Linux-x86_64-510.68.02-no-compat32.run
+	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/515.43.04/NVIDIA-Linux-x86_64-515.43.04-no-compat32.run
 	source = 110-nvidia-change-dkms-conf.patch
-	sha256sums = 570570b42a982ee91f05e89672e6dccf9739336a94f411cd33208536c8122917
-	sha256sums = 1580a25f57c6722e1736abe595b2f35f5b02f4ba3e9fdf04978bf7524c2af8b1
+	sha256sums = 2a7010cbdfd0fbbbfbd81b2a95b8624fb3c8e3c2d37d9fdeed96f06e7ff1443e
+	sha256sums = 925553c2491d3726bce65f9d0b5be62b006c824cc2fc0398c710150453128056
 
 pkgname = nvidia-beta
 	depends = linux
-	depends = nvidia-utils-beta>=510.68.02
+	depends = nvidia-utils-beta=515.43.04
 	depends = libglvnd
diff --git a/110-nvidia-change-dkms-conf.patch b/110-nvidia-change-dkms-conf.patch
index 04cf141b6856..d16f2f4fb941 100644
--- a/110-nvidia-change-dkms-conf.patch
+++ b/110-nvidia-change-dkms-conf.patch
@@ -1,17 +1,17 @@
 --- a/kernel/dkms.conf
 +++ b/kernel/dkms.conf
-@@ -1,12 +1,22 @@
+@@ -1,12 +1,21 @@
  PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_VERSION="510.68.02"
++PACKAGE_VERSION="515.43.04"
  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"
+-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
++MAKE[0]="'make' -j"$(nproc)" NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
  
  # The list of kernel modules will be generated by nvidia-installer at runtime.
 -__DKMS_MODULES
@@ -25,4 +25,3 @@
 +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"
 +BUILT_MODULE_NAME[4]="nvidia-peermem"
 +DEST_MODULE_LOCATION[4]="/kernel/drivers/video"
-+
diff --git a/PKGBUILD b/PKGBUILD
index df0fb43ee426..d78346e705bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Dan Vratil
 
 pkgname=nvidia-beta
-pkgver=510.68.02
+pkgver=515.43.04
 pkgrel=1
 pkgdesc="NVIDIA drivers for Arch's official 'linux' package (beta version)"
 arch=('x86_64')
@@ -17,8 +17,8 @@ options=('!strip')
 _pkg="NVIDIA-Linux-${CARCH}-${pkgver}-no-compat32"
 source=("http://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run"
         '110-nvidia-change-dkms-conf.patch')
-sha256sums=('570570b42a982ee91f05e89672e6dccf9739336a94f411cd33208536c8122917'
-            '1580a25f57c6722e1736abe595b2f35f5b02f4ba3e9fdf04978bf7524c2af8b1')
+sha256sums=('2a7010cbdfd0fbbbfbd81b2a95b8624fb3c8e3c2d37d9fdeed96f06e7ff1443e'
+            '925553c2491d3726bce65f9d0b5be62b006c824cc2fc0398c710150453128056')
 
 prepare() {
     # extract the source file
@@ -35,13 +35,12 @@ build() {
 }
 
 package() {
-    depends=('linux' "nvidia-utils-beta>=${pkgver}" 'libglvnd')
+    depends=('linux' "nvidia-utils-beta=${pkgver}" 'libglvnd')
     
     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 {} +
-    install -D -m644 <(printf '%s\n' 'blacklist nouveau') "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
     install -D -m644 "${_pkg}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    find "$pkgdir" -name '*.ko' -exec xz -T1 {} +
 }