Updated to version 410.57

4 files changed, 73 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89485d3b1959..80d9081b5f14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,27 @@
 pkgbase = nvidia-full-beta
-	pkgver = 396.54
+	pkgver = 410.57
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom:NVIDIA
 	makedepends = linux-headers
 	options = !strip
-	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/396.54/NVIDIA-Linux-x86_64-396.54-no-compat32.run
+	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/410.57/NVIDIA-Linux-x86_64-410.57.run
 	source = 10-nvidia-drm-outputclass.conf
 	source = 20-nvidia.conf
-	md5sums = 710acf72a2d8dde844dd2638e0782819
-	md5sums = 4f5562ee8f3171769e4638b35396c55d
-	md5sums = 2640eac092c220073f0668a7aaff61f7
+	source = linux-4.16.patch
+	sha256sums = 5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320
+	sha256sums = 3a5f66620501d8dd85085a35c2f9e85a2e0d56a1b565b2df1e9fabc40e643363
+	sha256sums = 444c6cfceac08a52d0873a1f5146fea2eeb44e7952ca1cc08629786b691e92b4
+	sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385
 
 pkgname = nvidia-full-beta
 	pkgdesc = Full NVIDIA driver package for Arch's official 'linux' package (driver, utilities, and libraries) (beta version)
 	install = nvidia-full-beta.install
 	depends = linux
-	depends = nvidia-utils-full-beta>=396.54
+	depends = nvidia-utils-full-beta>=410.57
 	depends = libgl
-	provides = nvidia=396.54
+	provides = nvidia=410.57
 	conflicts = nvidia-96xx
 	conflicts = nvidia-173xx
 	conflicts = nvidia
@@ -34,8 +36,8 @@ pkgname = nvidia-utils-full-beta
 	optdepends = opencl-nvidia-full-beta: OpenCL support
 	optdepends = xorg-server-devel: nvidia-xconfig
 	optdepends = egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.3)
-	provides = nvidia-utils=396.54
-	provides = nvidia-settings=396.54
+	provides = nvidia-utils=410.57
+	provides = nvidia-settings=410.57
 	provides = libglvnd
 	provides = vulkan-driver
 	conflicts = nvidia-utils
@@ -44,7 +46,7 @@ pkgname = nvidia-utils-full-beta
 	backup = etc/X11/xorg.conf.d/20-nvidia.conf
 
 pkgname = nvidia-egl-wayland-full-beta
-	pkgdesc = NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.0.3) for 'nvidia-utils-full-beta'
+	pkgdesc = NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.) for 'nvidia-utils-beta'
 	depends = nvidia-utils-full-beta
 	provides = egl-wayland
 	conflicts = egl-wayland
@@ -52,7 +54,7 @@ pkgname = nvidia-egl-wayland-full-beta
 pkgname = nvidia-libgl-full-beta
 	pkgdesc = NVIDIA driver library symlinks for 'nvidia-utils-full-beta'
 	depends = nvidia-utils-full-beta
-	provides = nvidia-libgl=396.54
+	provides = nvidia-libgl=410.57
 	provides = libgl
 	provides = libegl
 	provides = libgles
@@ -65,7 +67,7 @@ pkgname = opencl-nvidia-full-beta
 	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-full-beta'
 	depends = zlib
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=396.54
+	provides = opencl-nvidia=410.57
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
@@ -76,7 +78,7 @@ pkgname = lib32-nvidia-utils-full-beta
 	depends = nvidia-utils-full-beta
 	depends = lib32-mesa>=17.0.2-1
 	optdepends = lib32-opencl-nvidia-full-beta: OpenCL support
-	provides = lib32-nvidia-utils=396.54
+	provides = lib32-nvidia-utils=410.57
 	provides = lib32-libglvnd
 	provides = lib32-vulkan-driver
 	conflicts = lib32-nvidia-utils
@@ -86,7 +88,7 @@ pkgname = lib32-nvidia-libgl-full-beta
 	pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-full-beta'
 	depends = lib32-nvidia-utils-full-beta
 	depends = nvidia-libgl-full-beta
-	provides = lib32-nvidia-libgl=396.54
+	provides = lib32-nvidia-libgl=410.57
 	provides = lib32-libgl
 	provides = lib32-libegl
 	provides = lib32-libgles
@@ -101,7 +103,7 @@ pkgname = lib32-opencl-nvidia-full-beta
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia=396.54
+	provides = lib32-opencl-nvidia=410.57
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
 
diff --git a/PKGBUILD b/PKGBUILD
index 422dbff9c0f4..524dea6b3292 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Det <nimetonmaili g-mail>
+# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Contributor: Det <nimetonmaili g-mail>
 # Based on nvidia-beta: https://aur.archlinux.org/packages/nvidia-beta/,
 #          nvidia-utils-beta: https://aur.archlinux.org/packages/nvidia-utils-beta/ and
 #          lib32-nvidia-utils-beta: https://aur.archlinux.org/packages/lib32-nvidia-utils-beta/
@@ -8,7 +9,7 @@
 _lib32=0
 
 pkgname=('nvidia-full-beta' 'nvidia-utils-full-beta' 'nvidia-egl-wayland-full-beta' 'nvidia-libgl-full-beta' 'opencl-nvidia-full-beta')
-pkgver=396.54
+pkgver=410.57
 pkgrel=1
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -27,23 +28,25 @@ fi
 source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/$_pkg.run"
         '10-nvidia-drm-outputclass.conf'
         '20-nvidia.conf')
-md5sums=('710acf72a2d8dde844dd2638e0782819'
-         '4f5562ee8f3171769e4638b35396c55d'
-         '2640eac092c220073f0668a7aaff61f7')
-[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums[0]='195afa93d400bdbb9361ede6cef95143'
+sha256sums=('1ad40d83ec712843c1b5593949abefc9093399fb26a418ae9a571fbd1d9b228e'
+            '3a5f66620501d8dd85085a35c2f9e85a2e0d56a1b565b2df1e9fabc40e643363'
+            '444c6cfceac08a52d0873a1f5146fea2eeb44e7952ca1cc08629786b691e92b4')
+[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && sha256sums[0]='5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320'
 
 _extramodules=extramodules-ARCH
 
-# Patch
-#source+=('linux-4.11.patch')
-#md5sums+=('cc8941b6898d9daa0fb67371f57a56b6')
+# Patches
+## restore phys_to_dma support
+## https://bugs.archlinux.org/task/58074
+source+=('linux-4.16.patch')
+sha256sums+=('622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
 
 # Auto-add *.patch files from $startdir to source=()
 for _patch in $(find "$startdir" -maxdepth 1 -name '*.patch' -printf "%f\n"); do
   # Don't duplicate already listed ones
   if [[ ! " ${source[@]} " =~ " $_patch " ]]; then  # https://stackoverflow.com/a/15394738/1821548
     source+=("$_patch")
-    md5sums+=('SKIP')
+    sha256sums+=('SKIP')
   fi
 done
 
@@ -150,14 +153,17 @@ package_nvidia-libgl-full-beta() {
 }
 
 package_nvidia-egl-wayland-full-beta() {
-  pkgdesc="NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.0.3) for 'nvidia-utils-full-beta'"
+  local _eglver='1.1.0'
+  
+  pkgdesc="NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.${_eglver}) for 'nvidia-utils-beta'"
   depends=('nvidia-utils-full-beta')
   provides=('egl-wayland')
   conflicts=('egl-wayland')
   cd $_pkg
 
-  install -Dm755 libnvidia-egl-wayland.so.1.0.3 "$pkgdir"/usr/lib/libnvidia-egl-wayland.so.1.0.3
-  ln -s libnvidia-egl-wayland.so.1.0.3 "$pkgdir"/usr/lib/libnvidia-egl-wayland.so.1
+  install -D -m755 "libnvidia-egl-wayland.so.${_eglver}" -t "$pkgdir"/usr/lib
+  ln -s "libnvidia-egl-wayland.so.${_eglver}" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so"
+  ln -s "libnvidia-egl-wayland.so.${_eglver}" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.1"
 }
 
 package_nvidia-utils-full-beta() {
@@ -178,9 +184,9 @@ package_nvidia-utils-full-beta() {
   install -Dm755 nvidia_drv.so "$pkgdir"/usr/lib/xorg/modules/drivers/nvidia_drv.so
 
   # GLX extension for X
-  install -Dm755 libglx.so.$pkgver "$pkgdir"/usr/lib/nvidia/xorg/libglx.so.$pkgver
-  ln -s libglx.so.$pkgver "$pkgdir"/usr/lib/nvidia/xorg/libglx.so.1   # X doesn't find glx otherwise
-  ln -s libglx.so.$pkgver "$pkgdir"/usr/lib/nvidia/xorg/libglx.so     # X doesn't find glx otherwise
+  install -D -m755 "libglxserver_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib/nvidia/xorg"
+  ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1"  # X doesn't find glx otherwise
+  ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so"    # X doesn't find glx otherwise
 
   # libGL & OpenGL
   install -Dm755 libGL.so.1.7.0 "$pkgdir"/usr/lib/nvidia/libGL.so.1.7.0
diff --git a/linux-4.16.patch b/linux-4.16.patch
new file mode 100644
index 000000000000..67172815ff69
--- /dev/null
+++ b/linux-4.16.patch
@@ -0,0 +1,33 @@
+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();
+             }"
diff --git a/nvidia-full-beta.install b/nvidia-full-beta.install
index ca513095a043..80c7263ec640 100644
--- a/nvidia-full-beta.install
+++ b/nvidia-full-beta.install
@@ -1,6 +1,6 @@
 _depmod() {
     # This gets auto-updated during build
-    _extramodules='extramodules-4.11-ARCH'
+    _extramodules='extramodules-ARCH'
 
     # Update module dependencies
     depmod $(cat /usr/lib/modules/$_extramodules/version)