system/nvidia-driver: Updated for version 390.48.

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

4 files changed, 70 insertions, 65 deletions

diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index a0bf4f367c0e7..4a0518e58d8ce 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -1,24 +1,24 @@
-1.0		20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1		10-APR-2011	updated to new version, testing 13.37rc4.6692
-1.2		27-MAY-2011	new version, allow multilib option, minor edits
-1.2.1	20-JUN-2011	minor edits, thanks to Robby and Roberto
-1.5		01-JUL-2011	new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6		27-AUG-2011	version bump, minor edits
-1.7		21-OCT-2011	version bump
-1.8		24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
-1.9		02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
-2.0		21-AUG-2012	new version (important security fix), missing vdpau-nvidia, dropped *.h
-2.1		25-AUG-2012	new version -Long Lived Branch, fixed symlinks (per Das email)
-2.2		22-NOV-2012	new version -Long Lived Branch. Updates: libs, apps
-2.3		15-FEB-2013	new version -Long Lived Branch.
-2.4		19-MAY-2013	new version -Long Lived Branch.
-2.6		20-OCT-2013	new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
-3.0		13-NOV-2013	new version (LLB), update libs
-3.1		12-APR-2014	new version (LLB), update libs
-3.2a	12-JUL-2014	new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
-3.3		20-NOV-2014	new version (LLB), update libs, fix nvidia-switch
-3.4		11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
-4.0		07-FEB-2015 new long lived branch, version update, bug fixes
+1.0     20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
+1.1     10-APR-2011 updated to new version, testing 13.37rc4.6692
+1.2     27-MAY-2011 new version, allow multilib option, minor edits
+1.2.1   20-JUN-2011 minor edits, thanks to Robby and Roberto
+1.5     01-JUL-2011 new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
+1.6     27-AUG-2011 version bump, minor edits
+1.7     21-OCT-2011 version bump
+1.8     24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W.
+1.9     02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only
+2.0     21-AUG-2012 new version (important security fix), missing vdpau-nvidia, dropped *.h
+2.1     25-AUG-2012 new version -Long Lived Branch, fixed symlinks (per Das email)
+2.2     22-NOV-2012 new version -Long Lived Branch. Updates: libs, apps
+2.3     15-FEB-2013 new version -Long Lived Branch.
+2.4     19-MAY-2013 new version -Long Lived Branch.
+2.6     20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
+3.0     13-NOV-2013 new version (LLB), update libs
+3.1     12-APR-2014 new version (LLB), update libs
+3.2a	12-JUL-2014 new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
+3.3     20-NOV-2014 new version (LLB), update libs, fix nvidia-switch
+3.4     11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
+4.0     07-FEB-2015 new long lived branch, version update, bug fixes
 4.1     27-APR-2015 version update LLB, fix $VERSION usage
 4.2     28-JUL-2015 version update LLB, bug fixes, clean-ups.
 4.3     05-SEP-2015 version update LLB
@@ -32,5 +32,5 @@
 5.2	02-JUN-2017 version update LLB, refactor/debug scripts, use nvidia-installer
 5.3	13-OCT-2017 version update LLB, bug fixes, update copyright
 5.4     18-FEB-2018 version update LLB, updates, bug fix (thanks Leo)
-5.5	25-MAR-2018 versiom update LLB
-
+5.5	25-MAR-2018 version update LLB
+5.6     23-APR-2018 version update LLB, update symlinks, fix changelog formatting
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 2c28ac69e6bec..2698fa6a12932 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:-390.42}
+VERSION=${VERSION:-390.48}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -152,9 +152,9 @@ fi
 
 # Install the binary libs using nvidia-installer compiled above
 cd $TMP/$SRCNAM
-./nvidia-installer -s --no-kernel-module -z -n -b \
-  --no-rpms --no-distro-scripts --no-kernel-module-source \
-  --no-x-check --force-libglx-indirect \
+./nvidia-installer -s --no-kernel-module --no-drm --no-unified-memory \
+  -z -n -b --no-rpms --no-distro-scripts \
+  --no-kernel-module-source --no-x-check --force-libglx-indirect \
   --x-prefix=$PKG/usr \
   --x-module-path=$PKG/usr/lib${LIBDIRSUFFIX}/xorg/modules \
   --x-library-path=$PKG/usr/lib${LIBDIRSUFFIX} \
@@ -293,11 +293,11 @@ fi
 # rename wrong/conficting files as needed; remove conflicting symlinks created by installer
 cd $PKG/usr/lib$LIBDIRSUFFIX
    if [ "$GLVND" = "yes" ]; then
-      mv libEGL.so.1 libEGL.so.1-nvidia
+      mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
    fi
    mv libGL.la libGL.la-nvidia
-   mv libGLESv1_CM.so.1 libGLESv1_CM.so.1-nvidia
-   mv libGLESv2.so.2 libGLESv2.so.2-nvidia
+   mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
+   mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
    rm -f libEGL.so
    rm -f libGL.so
    rm -f libGL.so.1
@@ -310,11 +310,11 @@ cd -
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
    cd $PKG/usr/lib
          if [ "$GLVND" = "yes" ]; then
-            mv libEGL.so.1 libEGL.so.1-nvidia
+            mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
          fi
       mv libGL.la libGL.la-nvidia
-      mv libGLESv1_CM.so.1 libGLESv1_CM.so.1-nvidia
-      mv libGLESv2.so.2 libGLESv2.so.2-nvidia
+      mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
+      mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
       rm -f libEGL.so
       rm -f libGL.so
       rm -f libGL.so.1
@@ -322,7 +322,7 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
       rm -f libGLESv2.so
    cd -
 # FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1 symlink to $PKG/usr/lib64/libGL.so.1
-# appears? this gets fixed in nvidia-switch so ignoring for now.
+# appears? Who would do this, so ignoring for now.
 fi
 
 # Move ICDs to $PKG and cleanup (no switch option in installer?)
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index ee6219dc5cfff..4a3461531841e 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-driver"
-VERSION="390.42"
+VERSION="390.48"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.42/NVIDIA-Linux-x86-390.42.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.42.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.42.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.42.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.42.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.42.tar.bz2"
-MD5SUM="453c6fb7f892eb53bf32011fc0da770d \
-        d64b0eadeea046ccca388541d06875fd \
-        dc72ae7663b458537e3d9ab72d7b9b42 \
-        2ccc6b99452713008c08f6de52a467c0 \
-        a706f62e3964de631f802c92817d0669 \
-        c3c2df775880b8e7930358bfad234e0d"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.42/NVIDIA-Linux-x86_64-390.42.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.42.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.42.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.42.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.42.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.42.tar.bz2"
-MD5SUM_x86_64="41456a83e39bf0088c30247cd1536559 \
-               d64b0eadeea046ccca388541d06875fd \
-               dc72ae7663b458537e3d9ab72d7b9b42 \
-               2ccc6b99452713008c08f6de52a467c0 \
-               a706f62e3964de631f802c92817d0669 \
-               c3c2df775880b8e7930358bfad234e0d"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.48/NVIDIA-Linux-x86-390.48.run \
+          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.48.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.48.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.48.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.48.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.48.tar.bz2"
+MD5SUM="754bbdc3eb6f3873cca49ae807964c0e \
+        1deac74587be7547bff9165f78d7d13b \
+        679d42da4a7fff5a581ad99ecacf1b2b \
+        aeff8bc7cfe2560735b44ccc19cdf827 \
+        93285c91db5b2843d01cc64dadba7b7c \
+        3d269de321e048c4852f926e19a6f0ce"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.48/NVIDIA-Linux-x86_64-390.48.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.48.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.48.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.48.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.48.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.48.tar.bz2"
+MD5SUM_x86_64="3f7eafdb17a991b52cdfceb33e82ab75 \
+               1deac74587be7547bff9165f78d7d13b \
+               679d42da4a7fff5a581ad99ecacf1b2b \
+               aeff8bc7cfe2560735b44ccc19cdf827 \
+               93285c91db5b2843d01cc64dadba7b7c \
+               3d269de321e048c4852f926e19a6f0ce"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index ed6f5c36e912b..4499b2e5d98ae 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -67,8 +67,8 @@ save_GL(){
       if [ "$GLVND" = "yes" ]; then
         ln -sf libGL.so.1.7.0 libGL.so.1
 	ln -sf libGL.so.1.7.0 libGL.so
-        ln -sf libEGL.so.1-nvidia libEGL.so.1
-	ln -sf libEGL.so.1-nvidia libEGL.so
+        ln -sf libEGL.so.1.1.0-nvidia libEGL.so.1.1.0
+	ln -sf libEGL.so.1.1.0-nvidia libEGL.so
       else
         ln -sf libGL.so.$NV_VERSION libGL.so.1
         ln -sf libGL.so.$NV_VERSION libGL.so
@@ -76,11 +76,13 @@ save_GL(){
         ln -sf libEGL.so.$NV_VERSION libEGL.so
       fi
 
-      ln -sf libGLESv1_CM.so.1-nvidia libGLESv1_CM.so.1
-      ln -sf libGLESv1_CM.so.1-nvidia libGLESv1_CM.so
+      ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1.2.0
+      ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1
+      ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so
 
-      ln -sf libGLESv2.so.2-nvidia libGLESv2.so.2
-      ln -sf libGLESv2.so.2-nvidia libGLESv2.so
+      ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2.1.0
+      ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2
+      ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so
     ;;
 
     "xorg")
@@ -95,11 +97,14 @@ save_GL(){
        ln -sf libGL.so.$GL_VERSION libGL.so
        ln -sf libEGL.so.1.0.0 libEGL.so.1
        ln -sf libEGL.so.1.0.0 libEGL.so
+       rm -f libEGL.so.1.1.0
 
        ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1
        ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so
        ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
        ln -sf libGLESv2.so.2.0.0 libGLESv2.so
+       rm -f libGLESv1_CM.so.1.2.0
+       rm -f libGLESv2.so.2.1.0
   ;;
 
   *)