system/nvidia-driver: Updated for version 440.44.

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

4 files changed, 47 insertions, 35 deletions

diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index cbfb71ee50..27a2d6c793 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -8,8 +8,8 @@ use nvidia-legacy390-{driver,kernel}
 Installing the 32-bit compatibility libraries is available: if desired, do:
   COMPAT32="yes" ./nvidia-driver.SlackBuild
   
-If you plan to test this buildscript on current (15.0), to avoid stomping
-on the installed libglvnd, do:
+If you plan to test this buildscript on current (15.0 EXPERIMENTAL), to
+avoid stomping on the installed libglvnd, do:
   CURRENT="yes" ./nvidia-driver.SlackBuild
 
 Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
@@ -23,3 +23,16 @@ you might need to include the following line in your /etc/rc.d/rc.local:
 /usr/bin/nvidia-modprobe -c 0 -u
 ------------->8---------------
 
+Notes:
+1.  You still need to blacklist the opensource nouveau driver. This is
+    easily done by installing xf86-video-nouveau-blacklist-noarch-1.txz
+    in extra/xf86-video-nouveau-blacklist on the distibution DVD.
+2.  If nvidia-driver is already installed, there may be extraneous
+    "unable to find installed file..." messages on the console and log.
+    This is benign and due to the nvidia installer not being very smart.
+3.  If you want to revert back to the open source drivers,
+    'removepkg nvidia-driver' "should" work in most cases. If not, simply
+    reinstall the orginal Mesa and xorg-server packages.
+4.  With the deprecation of nvidia-switch, 'upgradepkg nvidia-driver'
+    "should" work in most cases. If not, follow #3 above and then install
+    the new package.
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index ce4312bf9a..d4dd4318c3 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -45,4 +45,5 @@
 6.5     14-MAY-2019 version update LLB
 6.6     10-AUG-2019 version update LLB, drop non-glvnd libs. This script will NOT work on current
 6.7     11-SEP-2019 version update LLB, fix for pre-Turing GPUs (This script will NOT work on current).
-7.0     28-NOV-2019 version update LLB, add temp glvnd switch for 15.0, remove nvidia-switch
+7.0     28-Sep-2019 version update LLB, add temp glvnd switch for 15.0, remove nvidia-switch
+7.1	15-Dec-2019 version update LLB, fix libs
\ No newline at end of file
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index cb536d4137..21031db704 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -25,7 +25,7 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-440.36}
+VERSION=${VERSION:-440.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -154,26 +154,24 @@ cd $TMP/$SRCNAM
   $COMP32
 
 # Clean-up: we really do not need this:
-rm -rf /var/lib/nvidia
-# If running current (15.0) remove duplicate libglvnd files
+rm -rf /var/log/nvidia
+# If running current (15.0) remove duplicate libglvnd files and symlinks
 if [ "$CURRENT" = "yes" ]; then
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.1.1.0
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.1.7.0
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.1.2.0
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.2.1.0
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLX.so.0.0.0
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLdispatch.so.0.0.0
+    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so{,.1,.1.1.0}
+    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGL.so{,.1,.1.7.0}
+    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so{,.1,.1.2.0}
+    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so{,.2,.2.1.0}
+    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLX.so{,.0}
     rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLdispatch.so.0
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libOpenGl.0.0.0 
+    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libOpenGL.so{,.0} 
     if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-        rm -f $PKG/usr/lib/libEGL.so.1.1.0
-        rm -f $PKG/usr/lib/libGL.so.1.7.0
-        rm -f $PKG/usr/lib/libGLESv1_CM.so.1.2.0
-        rm -f $PKG/usr/lib/libGLESv2.so.2.1.0
-        rm -f $PKG/usr/lib/libGLX.so.0.0.0
-        rm -f $PKG/usr/lib/libGLdispatch.so.0.0.0
-	rm -f $PKG/usr/lib/libGLdispatch.so.0
-        rm -f $PKG/usr/lib/libOpenGl.0.0.0
+        rm -f $PKG/usr/lib/libEGL.so{,.1,.1.1.0}
+        rm -f $PKG/usr/lib/libGL.so{,.1,.1.7.0}
+        rm -f $PKG/usr/lib/libGLESv1_CM.so{,.1,.1.2.0}
+        rm -f $PKG/usr/lib/libGLESv2.so{,.2,.2.1.0}
+        rm -f $PKG/usr/lib/libGLX.so{,.0}
+        rm -f $PKG/usr/lib/libGLdispatch.so.0
+        rm -f $PKG/usr/lib/libOpenGL.so{,.0}
     fi
 fi
 
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 929d009c5d..b09232687d 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="440.36"
+VERSION="440.44"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.36/NVIDIA-Linux-x86_64-440.36.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-440.36.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-440.36.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-440.36.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.36.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-440.36.tar.bz2"
-MD5SUM_x86_64="0a85672111e3eb348838a5919253411b \
-               e024b533882f834f7fbaabbded3a243a \
-               a505045ed590ad38093438263d225c9b \
-               b7a86c33ccc6d82289207d1295630025 \
-               923f6ea80fd6936b349107e2bc2209b6 \
-               aff1463ace949faa29a5ec6f6900d66f"
-REQUIRES="nvidia-kernel"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.44/NVIDIA-Linux-x86_64-440.44.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-440.44.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-440.44.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-440.44.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.44.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-440.44.tar.bz2"
+MD5SUM_x86_64="8b72e9af14e43171405526a308a08796 \
+               f05affe38d9cebd8187e43959be68418 \
+               80735545a9db47a33e6c0f6f21e5a8c8 \
+               b2aa0c6c5fdfe4af2aa75da579ede1ce \
+               fc4a7b3a51f36ecada5dbc98fed02457 \
+               2fb930fec0e76939c13394c43d195abbv"
+REQUIRES="nvidia-kernel "
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"