system/nvidia-driver: Updated for version 525.89.02.

Signed-off-by: bedlam <dave@slackbuilds.org>

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

3 files changed, 37 insertions, 28 deletions

diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index 7a8fee3aa272..fa0ac7efca37 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -5,6 +5,9 @@ part of the nvidia-kernel package at SlackBuilds.org.
 NOTE: 64-bit x86_64 support ONLY for Slackware64. For x86 32-bit
 support, use nvidia-legacy390-{driver,kernel}
 
+The Wine libraries are now installed by default.  To disable, pass
+  WINE="no" to the script.
+
 Installing the 32-bit compatibility libraries is available:
 if desired, do:
 
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 751aca832710..f04289184941 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, 2021, 2022 Lenard Spencer, Orlando, FL, USA
+# Copyright 2020-2023 Lenard Spencer, Orlando, FL, USA
 #
 # All rights reserved.
 #
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-525.85.05}
+VERSION=${VERSION:-525.89.02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -80,9 +80,8 @@ rm -rf $PKG
 rm -rf $TMP/$SRCNAM
 mkdir -p $TMP $PKG $OUTPUT $PKG/install
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
-  $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \
+  $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1} \
   $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/lib/firmware/nvidia $PKG/var/log
 
 if [ "$COMPAT32" = "yes" ]; then
@@ -113,6 +112,11 @@ find -L . \
 
 cd $TMP/nvidia-installer-$VERSION
 
+# Install various files in $PKG instead of the root filesystem:
+  sed -i "s|/etc/vulkan|$PKG/etc/vulkan|" files.c
+  sed -i "s|/lib/firmware/nvidia|$PKG/lib/firmware/nvidia|" files.c
+  sed -i "s|\"/etc\"|\"$PKG/etc\"|" nvidia-installer.h
+
   chown -R root:root .
   find -L . \
    \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -158,27 +162,29 @@ 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-install-libglvnd \
+  --no-wine-files \
   --no-systemd \
   --no-peermem \
   $COMP32
 
-# 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
-
+# If we are using Wine, then:
+if [ "${WINE:-yes}" != "no" ]; then
+  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+  install -m 755 _nvngx.dll $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+  install -m 755 nvngx.dll $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+fi
 # libOpenCL.so is now included in 15.0 (in ocl-icd),
 # so we don't need this one.
 rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so*
 if [ "${COMPAT32}" = "yes" ]; then
     rm -f $PKG/usr/lib/libOpenCL.so*
 fi
+# remove a pair of folders installed and used by nvidia-installer but
+# no longer needed (caused the "failed to remove some directories"
+# warning message):
+rm -rf /{usr,var}/lib/nvidia || true
+
 # Mitigate a bug in nvidia-installer that misplaces a symlink
 # (Thanks to marco70 on LQ for catching this:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}/gbm
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 7087102ecb51..cd726273a936 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="525.85.05"
+VERSION="525.89.02"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/525.85.05/NVIDIA-Linux-x86_64-525.85.05.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.85.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.85.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.85.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.85.05.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.85.05.tar.bz2"
-MD5SUM_x86_64="2f04852ec14043363c2500e194edc4b6 \
-               2887aef9b4440600bcd95001a5bb2f93 \
-               eb9a1850f1ccaac0d89afb0aba28cdb0 \
-               04b0ed5ae0dafb2c85159c2da1e9271a \
-               fc231ab04340b3787f00b75572b43b6a \
-               f4af3d0d5a0aaab581a669b0d70868ab"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/525.89.02/NVIDIA-Linux-x86_64-525.89.02.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.89.02.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.89.02.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.89.02.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.89.02.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.89.02.tar.bz2"
+MD5SUM_x86_64="2cd1ed226595db34f9390d0a85f370ff \
+               2f78842451d628dbf9eecb3b241ec107 \
+               cc24dfd9994ff28d7a33598587f523cb \
+               9773208ffdd34cce32a9708433463720 \
+               3013533e08a16d52beb3535e6d0ccc5d \
+               056f5a0e35063d257aa0e6dba974de57"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"