Upkg

- New upstream release
- Add patch to fix builds with kernel 5.7.x

3 files changed, 39 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff8d376bbcd7..f69f7c12d3b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 # Generated by mksrcinfo v8
-# Mon May 18 21:10:36 UTC 2020
+# Sat Jun 20 21:19:28 UTC 2020
 pkgbase = nvidia-pf
 	pkgdesc = NVIDIA drivers for linux-pf.
 	pkgver = 440.82
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom
-	makedepends = linux-pf-headers>=5.6
-	makedepends = linux-pf-headers<5.7
-	depends = linux-pf>=5.6
-	depends = linux-pf<5.7
+	makedepends = linux-pf-headers>=5.7
+	makedepends = linux-pf-headers<5.8
+	depends = linux-pf>=5.7
+	depends = linux-pf<5.8
 	depends = nvidia-utils=440.82
 	provides = NVIDIA-MODULE
 	conflicts = nvidia-96xx
@@ -25,7 +25,9 @@ pkgbase = nvidia-pf
 	conflicts = nvidia-pf-k7
 	options = !strip
 	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/440.82/NVIDIA-Linux-x86_64-440.82-no-compat32.run
+	source = nvidia-kernel-5.7.patch
 	md5sums = abc45d506515bde8f9efad90bf54f796
+	md5sums = 8b0b4fd32275a4745d55ea391f23a43e
 
 pkgname = nvidia-pf
 
diff --git a/PKGBUILD b/PKGBUILD
index 69ba16d694ec..5bb40cdde4b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
      
 pkgname=nvidia-pf
 pkgver=440.82
-pkgrel=4
-_goodkver=5.6
-_badkver=5.7
+pkgrel=5
+_goodkver=5.7
+_badkver=5.8
 _modver=${_goodkver}-pf
 _extramodules=extramodules-$_modver
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -22,8 +22,10 @@ conflicts=( 'nvidia-96xx' 'nvidia-173xx' 'nvidia-pf-core2' 'nvidia-pf-k8'
 provides=('NVIDIA-MODULE')
 license=('custom')
 options=(!strip)
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('abc45d506515bde8f9efad90bf54f796')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+       'nvidia-kernel-5.7.patch')
+md5sums=('abc45d506515bde8f9efad90bf54f796'
+         '8b0b4fd32275a4745d55ea391f23a43e')
 
 
 
@@ -36,6 +38,8 @@ prepare()
   sh "${_pkg}.run" --extract-only
   cd "${_pkg}"
   # patches here
+  pwd
+  patch -Np1 -i "${srcdir}/nvidia-kernel-5.7.patch"
 }
 
 build() {
diff --git a/nvidia-kernel-5.7.patch b/nvidia-kernel-5.7.patch
new file mode 100644
index 000000000000..a6821b5b22c8
--- /dev/null
+++ b/nvidia-kernel-5.7.patch
@@ -0,0 +1,22 @@
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 8f807a1..af29636 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -143,6 +143,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"
+@@ -466,6 +467,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)
+             #include <asm/set_memory.h>
+             #else