system/nvidia-driver: Updated for version 525.116.04.

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

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

3 files changed, 17 insertions, 23 deletions

diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index b680205a6138..2d3869bed037 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -23,7 +23,7 @@ man pages for details and usage.
 For CUDA/OpenCL to work after reboot, and for utilites such as
 nvidia-smi, you might need to include the following line in your
 /etc/rc.d/rc.local:
-(This is required if you plan on running nvidia-persistenced)
+(This is REQUIRED if you plan on running nvidia-persistenced)
 
     # Create missing nvidia device nodes after reboot
     /usr/bin/nvidia-modprobe -c 0 -u
@@ -33,12 +33,6 @@ Notes:
     This is easily done by installing xf86-video-nouveau-blacklist in
     extra/xf86-video-nouveau-blacklist on the distibution DVD.
 
-2.  The nvidia-installer has been patched so it is now NO LONGER
-    NECESSARY to remove the old driver before running this script.
-
-3.  With Slackware 15.0, nvidia-switch has been dropped once and for
-    all as there are no longer any conflicts.
-
 CAUTION!  Please DO NOT USE this script for Slackware(64) versions 14.2
 or older as it WILL corrupt the mesa and xorg installations.
 Please use the scripts from those repos instead.
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 84e57ed92ec1..fd7352bbd050 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-525.116.03}
+VERSION=${VERSION:-525.116.04}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -72,7 +72,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
 fi
 
 if [ "${PERSISTENCED:-no}" = "yes" ]; then
-  if [ `getent group nvidia > /dev/null` -o `getent passwd nvidia > /dev/null` ]; then
+  if [ "`getent group nvidia > /dev/null`" -o "`getent passwd nvidia > /dev/null`" ]; then
     echo "User and/or group nvidia do not exist!"
     echo "Please create user and group nvidia and rerun this script."
     exit 1
@@ -147,7 +147,6 @@ mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
 
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
     COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
-    mkdir -p $PKG/usr/lib
 else
     if [ ! "$ARCH" = "x86_64" ]; then
         COMP32=""
@@ -317,6 +316,7 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then
 # install rc.nvidia-perstistenced:
   mkdir -p $PKG/etc/rc.d $PKG/var/run/nvidia-persistenced
   install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
+  sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
   chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
 fi
 
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 1c229fab7577..9f83820af64b 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="525.116.03"
+VERSION="525.116.04"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/525.116.03/NVIDIA-Linux-x86_64-525.116.03.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.116.03.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.116.03.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.116.03.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.116.03.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.116.03.tar.bz2"
-MD5SUM_x86_64="5a941ba275fa02560f91f5f1292b0302 \
-               6ae928754bd555561ae2b693889e8b58 \
-               de41610fce1dea7ccb9553c22849c8ef \
-               ec4e5c7ec1cb8190e0940e59931bf554 \
-               00b9ff03e3b20818d4dda047de01a51f \
-               a1582c05d148f257b402b879dcc78e55"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/525.116.04/NVIDIA-Linux-x86_64-525.116.04.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.116.04.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.116.04.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.116.04.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.116.04.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.116.04.tar.bz2"
+MD5SUM_x86_64="416818dcdf3c923b851e88a759bd0e00 \
+               5c041126284c13be7e7809bfc270affb \
+               18aa1ad8f0b1965d576fbe2d78ba27a8 \
+               a20d7de86e9504e32902bc8f96d08255 \
+               5a9cefc9d1551bae1c003d021f8c2f51 \
+               618c182c355725a23c4e1598d78fb2aa"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"