Update dependencies. Add fix for FS62142. General improvements.

1 files changed, 26 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d4889aa8f01c..0164a3b7ae40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,55 @@
 # Maintainer : Daniel Bermond < gmail-com: danielbermond >
 # Contributor: Det <nimetonmaili g-mail>
 # Contributor: Ng Oon-Ee
-# Based on nvidia-beta: https://aur.archlinux.org/packages/nvidia-beta/
 
 pkgname=nvidia-beta-all
 pkgver=430.14
-pkgrel=1
-pkgdesc='NVIDIA drivers for all kernels on the system (beta)'
+pkgrel=2
+pkgdesc='NVIDIA drivers for all kernels on the system (beta version)'
 arch=('x86_64')
 url='https://www.nvidia.com/'
-license=('custom:NVIDIA')
-depends=("nvidia-utils-beta>=${pkgver}" 'libgl')
-makedepends=('linux-headers')
+license=('custom')
+depends=("nvidia-utils-beta>=${pkgver}" 'libglvnd')
+makedepends=('linux' 'linux-headers')
 provides=("nvidia=${pkgver}" "nvidia-beta=${pkgver}")
 conflicts=('nvidia')
 options=('!strip')
 _pkg="NVIDIA-Linux-${CARCH}-${pkgver}-no-compat32"
-source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run")
-sha256sums=('0f583a277b1731cb8327510b75dba9cf7adf5c781247e4f48bcc9f358253278f')
+source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run"
+        'FS62142.patch')
+sha256sums=('0f583a277b1731cb8327510b75dba9cf7adf5c781247e4f48bcc9f358253278f'
+            'c961006882afb691410c017c239e2c2ef61badb88f15735d37112b513ef0a99d')
 
 prepare() {
-    local _kernel
-    
     # extract the source file
     [ -d "$_pkg" ] && rm -rf "$_pkg"
     printf '%s\n' "  -> Self-Extracting ${_pkg}.run..."
     sh "${_pkg}.run" --extract-only
-    
-    cd "$_pkg"
+    cd "${_pkg}"
     
     # create a build directory for each installed kernel
-    for _kernel in $(cat /usr/lib/modules/extramodules-*/version)
+    local _kernel
+    local _kernels
+    _kernels=($(find /usr/lib/modules/extramodules-*/version -exec cat {} +))
+    for _kernel in "${_kernels[@]}"
     do
         cp -a kernel "kernel-${_kernel}"
+        printf '%s\n' "  -> Applying patch(es) for kernel ${_kernel}..."
+        cd "kernel-${_kernel}"
         
-        #printf '%s\n' "  -> Applying patch(es) for kernel ${_kernel}..."
-        #cd "kernel-${_kernel}"
-        
-        # apply patches(es) here:
-        #patch -Np2 -i "${srcdir}/<patch>"
+        # fix https://bugs.archlinux.org/task/62142
+        patch -Np2 -i "${srcdir}/FS62142.patch"
         
-        #cd ..
+        cd ..
     done
 }
 
 build() {
     local _kernel
+    local _kernels
+    _kernels=($(find /usr/lib/modules/extramodules-*/version -exec cat {} +))
     
-    for _kernel in $(cat /usr/lib/modules/extramodules-*/version)
+    for _kernel in "${_kernels[@]}"
     do
         cd "${srcdir}/${_pkg}/kernel-${_kernel}"
         
@@ -58,15 +60,17 @@ build() {
 
 package() {
     local _dir
+    local _kerndir
     local _kernel
+    _kerndir=($(find /usr/lib/modules -maxdepth 1 -type d -name 'extramodules-*'))
     
-    for _dir in $(find /usr/lib/modules -maxdepth 1 -type d -name 'extramodules-*')
+    for _dir in "${_kerndir[@]}"
     do
         _kernel="$(cat "${_dir}/version")"
         
         install -D -m644 "${_pkg}/kernel-${_kernel}/"nvidia{,-drm,-modeset,-uvm}.ko -t "${pkgdir}/${_dir}"
         
-        gzip -n "${pkgdir}/${_dir}/"*.ko
+        find "$pkgdir" -name '*.ko' -exec gzip -n {} +
     done
     
     printf '%s\n' 'blacklist nouveau' | install -D -m644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"