system/nvidia-driver: Updated for version 470.63.01.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 38 insertions, 72 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index ac73a1301a..a1637dec87 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for nvidia-driver
 
 # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, US
-# Copyright 2020 Lenard Spencer, Orlando, FL, USA
+# Copyright 2020, 2021 Lenard Spencer, Orlando, FL, USA
 #
 # All rights reserved.
 #
@@ -24,12 +24,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# see changelog.txt
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-460.84}
+VERSION=${VERSION:-470.63.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -44,6 +42,10 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 if [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   TARGET="x86_64"
@@ -55,14 +57,6 @@ else
   exit 1
 fi
 
-if [ "${COMPAT32}" = "yes" ]; then
-    COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
-    MULTI="_multilib"
-else
-    COMP32="--no-install-compat32-libs"
-    MULTI=""
-fi
-
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
@@ -71,10 +65,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 # There are a couple of unresolved issues with nvidia-installer, so we
 # abort if an Nvidia driver is still installed:
 if [ -x /usr/bin/nvidia-installer ]; then
@@ -93,7 +83,7 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
   $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \
   $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
   $PKG/usr/include/GL $PKG/etc/vulkan/{icd.d,implicit_layer.d} $PKG/etc/X11/xorg.conf.d \
-  $PKG/etc/X11/glvnd/egl_vendor.d
+  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/lib/firmware/nvidia $PKG/var/log
 
 if [ "$COMPAT32" = "yes" ]; then
   mkdir -p $PKG/usr/lib/tls
@@ -123,9 +113,6 @@ find -L . \
 
 cd $TMP/nvidia-installer-$VERSION
 
-# First, we must patch for the removed sys/sysctl.h:
-  patch -p1 < $CWD/nvidia-installer-removed-sysctl-h.patch
-
 # Let's try to remove the conflicting files and GPU detection
   patch -p0 < $CWD/skip_conflict-GPU_detect.patch
 
@@ -148,6 +135,14 @@ cd -
 mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
 mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
 
+if [ "${COMPAT32}" = "yes" ]; then
+    COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
+    MULTI="_multilib"
+else
+    COMP32="--no-install-compat32-libs"
+    MULTI=""
+fi
+
 # Install the binary libs using nvidia-installer compiled above
 cd $TMP/$SRCNAM
 ./nvidia-installer -s --no-kernel-module --no-drm --no-unified-memory \
@@ -166,9 +161,16 @@ cd $TMP/$SRCNAM
   --log-file-name=$PKG/var/log/nvidia-installer.log \
   --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \
   --no-nvidia-modprobe \
+  --no-systemd \
   $COMP32
 
-  # Move ICDs to $PKG and cleanup (no switch option in installer?)
+# Starting with the 465 driver, the installer now places a version-specific
+# binary blob in /lib/firmware/nvidia.  For sanity's sake, we will move
+# it into our package:
+mv /lib/firmware/nvidia/$VERSION $PKG/lib/firmware/nvidia
+
+# Move ICDs to $PKG and cleanup (no switch option in installer?)
+# (This is why there should not be a driver already installed)
 mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
 mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
 mv /etc/vulkan/implicit_layer.d/nvidia_layers.json $PKG/etc/vulkan/implicit_layer.d/nvidia_layers.json
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index f4ee4e220d..5b5e90f9e3 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="460.84"
+VERSION="470.63.01"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/460.84/NVIDIA-Linux-x86_64-460.84.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.84.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.84.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.84.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.84.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.84.tar.bz2"
-MD5SUM_x86_64="629d4f2a0d6f593aa4cf9b73983d3c8b \
-               f5dbfa88beb774fcebd49c2a948e751e \
-               2f52011df5f23b32479d4b3357089607 \
-               c0675a205646234f8b481b6442d4a723 \
-               0bc714dec860bbdbe17e31d299fe677f \
-               ecc7aea757a0285a38e5d2138d9287bf"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.63.01/NVIDIA-Linux-x86_64-470.63.01.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.63.01.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.63.01.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.63.01.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.63.01.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.63.01.tar.bz2"
+MD5SUM_x86_64="24ffc518e708addc9728f7f356f56ef7 \
+               9df0010aac5443f0523e271e35ea09ca \
+               59af33b68dfd336d58cd44bd746cd9d9 \
+               41a25fcc1ecd3d07cd731ac5adbe6055 \
+               5ef0d380f8a94019cf2250a6028afad9 \
+               ce95b4773e8e46d7cb8bf481b656fef0"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-driver/nvidia-installer-removed-sysctl-h.patch b/system/nvidia-driver/nvidia-installer-removed-sysctl-h.patch
deleted file mode 100644
index 7b230fcb11..0000000000
--- a/system/nvidia-driver/nvidia-installer-removed-sysctl-h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur nvidia-installer-460.67.orig/kernel.c nvidia-installer-460.67/kernel.c
---- nvidia-installer-460.67.orig/kernel.c	2021-03-10 19:24:00.000000000 -0500
-+++ nvidia-installer-460.67/kernel.c	2021-04-16 17:59:48.828574898 -0400
-@@ -23,7 +23,10 @@
- #include <sys/utsname.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysctl.h>
-+#include <gnu/libc-version.h>
-+#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 30
-+  #include <sys/sysctl.h>
-+#endif
- #include <ctype.h>
- #include <stdlib.h>
- #include <dirent.h>
-@@ -1076,7 +1079,8 @@
-     }
- 
-     if (!loglevel_set) {
--        /*
-+#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 30
-+         /*
-          * Explicitly initialize the value of len, even though it looks like the
-          * syscall should do that, since in practice it doesn't always actually
-          * set the value of the pointed-to length parameter.
-@@ -1090,6 +1094,10 @@
-                 loglevel_set = TRUE;
-             }
-         }
-+#else   /* sys/sysctl.h has been removed from glibc 2.32 and later */
-+        if (!old_level)
-+        loglevel_set = TRUE;
-+#endif
-     }
- 
-     return loglevel_set;
diff --git a/system/nvidia-driver/rc.nvidia-persistenced b/system/nvidia-driver/rc.nvidia-persistenced
index 59bdf18d11..b95480a4e0 100644
--- a/system/nvidia-driver/rc.nvidia-persistenced
+++ b/system/nvidia-driver/rc.nvidia-persistenced
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # NVIDIA Persistence Daemon Init Script
 #
diff --git a/system/nvidia-driver/slack-desc b/system/nvidia-driver/slack-desc
index 165da72937..7b63dee80e 100644
--- a/system/nvidia-driver/slack-desc
+++ b/system/nvidia-driver/slack-desc
@@ -16,4 +16,4 @@ nvidia-driver: See /usr/doc/nvidia-driver-PKGVERSION/README.Slackware
 nvidia-driver: for more information.
 nvidia-driver:
 nvidia-driver: https://www.nvidia.com
-nvidia-driver: @MULTILIB@
+nvidia-driver: