system/nvidia-driver: Updated for version 390.25.

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

4 files changed, 108 insertions, 110 deletions

diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index c69b69642b6a..980cfdd20285 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -31,3 +31,4 @@
 5.1     01-APR-2017 fix nvidia-switch lib names to prevent bad ldconfig symlinks on reboot
 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)
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 4a5370830505..9b797b578f7e 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:-384.90}
+VERSION=${VERSION:-390.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,9 +77,9 @@ 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/usr/share/{applications,nvidia,pixmaps} \
+  $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
   $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/etc/X11/xorg.conf.d \
-  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64}
+  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64} \
 
 if [ "$COMPAT32" = "yes" ]; then
   mkdir -p $PKG/usr/lib/tls
@@ -111,7 +111,7 @@ find -L . \
 cd $TMP/nvidia-installer-$VERSION
 
 # Let's try to remove the conflicting files and GPU detection
-  patch -p1 < $CWD/skip_conflict-GPU_detect.patch
+  patch -p0 < $CWD/skip_conflict-GPU_detect.patch
 
   chown -R root:root .
   find -L . \
@@ -127,7 +127,63 @@ cd $TMP/nvidia-installer-$VERSION
 
 cd -
 
-# Compiling nvidia-settings from source
+# Now we need to copy the newly patched and compiled nvidia-installer
+# to the driver source tree for use
+mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
+mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
+
+# Configure options
+if [ "$GLVND" = "yes" ]; then
+  GLVNDOPT="--install-libglvnd --glvnd-glx-client --glvnd-egl-client"
+else
+  GLVNDOPT="--no-install-libglvnd --no-glvnd-glx-client --no-glvnd-egl-client"
+fi
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+    COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
+    MULTI="_multi"
+else
+    if [ ! "$ARCH" = "x86_64" ]; then
+        COMP32=""
+    else
+        COMP32="--no-install-compat32-libs"
+	MULTI=""
+    fi
+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 \
+  --x-prefix=$PKG/usr \
+  --x-module-path=$PKG/usr/lib${LIBDIRSUFFIX}/xorg/modules \
+  --x-library-path=$PKG/usr/lib${LIBDIRSUFFIX} \
+  --x-sysconfig-path=$PKG/etc/X11/xorg.conf.d \
+  --opengl-prefix=$PKG/usr \
+  --utility-prefix=$PKG/usr \
+  --utility-libdir=lib${LIBDIRSUFFIX} \
+  --documentation-prefix=$PKG/usr \
+  --application-profile-path=$PKG/usr/share/nvidia \
+  --glvnd-egl-config-path=$PKG/etc/X11/glvnd/egl_vendor.d \
+  --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 \
+  $GLVNDOPT \
+  $COMP32
+
+# Clean-up: we really do not need this:
+rm -rf /var/lib/nvidia
+# which 32-bit tls? why? why?
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+      install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION
+      cd $PKG/usr/lib
+          ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
+      cd -
+fi
+
+# Compile utilites from source, replacing the precompiled versions
+#
+# Compiling nvidia-settings
 cd $TMP/nvidia-settings-$VERSION
   chown -R root:root .
   find -L . \
@@ -154,7 +210,7 @@ cd $TMP/nvidia-settings-$VERSION
   install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk3.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk3.so.$VERSION
 cd -
 
-# Compiling nvidia-xconfig from source
+# Compiling nvidia-xconfig
 cd $TMP/nvidia-xconfig-$VERSION
   chown -R root:root .
   find -L . \
@@ -174,7 +230,7 @@ cd -
 # nvidia-modprobe needed to create device nodes, see README!
 # FIXME: Needs cleanup at a later date.
 
-# Compiling nvidia-modprobe from source
+# Compiling nvidia-modprobe
   cd $TMP/nvidia-modprobe-$VERSION
     chown -R root:root .
     find -L . \
@@ -188,7 +244,8 @@ cd -
     install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
     install -m 644 _out/Linux_$TARGET/nvidia-modprobe.1.gz $PKG/usr/man/man1/
   cd -
-# Compiling nvidia-persistenced from source
+
+# Compiling nvidia-persistenced
   cd $TMP/nvidia-persistenced-$VERSION
     chown -R root:root .
     find -L . \
@@ -203,60 +260,6 @@ cd -
     install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
   cd -
 
-# Now we need to copy these newly compiled binaries to the driver source tree
-# since we can't stop the installer from installing the precompiled ones. The installer
-# will then "reinstall" the proper set to the package tree!
-mv -f $PKG/usr/bin/nvidia-* $TMP/$SRCNAM
-mv -f $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk2.so.$VERSION $TMP/$SRCNAM
-mv -f $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk3.so.$VERSION $TMP/$SRCNAM
-
-# Configure options
-if [ "$GLVND" = "yes" ]; then
-  GLVNDOPT="--install-libglvnd --glvnd-glx-client --glvnd-egl-client"
-else
-  GLVNDOPT="--no-install-libglvnd --no-glvnd-glx-client --no-glvnd-egl-client"
-fi
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-    COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
-    MULTI="_multi"
-else
-    if [ ! "$ARCH" = "x86_64" ]; then
-        COMP32=""
-    else
-        COMP32="--no-install-compat32-libs"
-	MULTI=""
-    fi
-fi
-
-# Install the binary libs using nvidia-installer compiled above
-cd $TMP/$SRCNAM
-./nvidia-installer -s -N --no-kernel-module -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} \
-  --x-sysconfig-path=$PKG/etc/X11/xorg.conf.d \
-  --opengl-prefix=$PKG/usr \
-  --utility-prefix=$PKG/usr \
-  --utility-libdir=lib${LIBDIRSUFFIX} \
-  --documentation-prefix=$PKG/usr \
-  --application-profile-path=$PKG/usr/share/nvidia \
-  --glvnd-egl-config-path=$PKG/etc/X11/glvnd/egl_vendor.d \
-  --log-file-name=$PKG/var/log/nvidia-installer.log \
-  $GLVNDOPT \
-  $COMP32
-
-# Clean-up: we really do not need this:
-rm -rf /var/lib/nvidia
-# which 32-bit tls? why? why?
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-      install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION
-      cd $PKG/usr/lib
-          ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
-      cd -
-fi
-
 # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files
 # so we don't stomp on the overlapping xorg files.
 # Note: switching can be problematic ;-)
@@ -274,13 +277,12 @@ else
   sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch
 fi
 
-# These correct wrong paths
+# These add or correct wrong paths
 sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
 sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
-sed -i "s|$PKG/usr/bin|/usr/bin|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|$PKG/usr/share/doc/NVIDIA_GLX-1.0|/usr/share/pixmaps|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
 
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la
@@ -332,12 +334,6 @@ rm -rf /etc/vulkan
 # Remove xorg conf file since we take care of that in nvidia-driver
 rm -rf $PKG/etc/X11/xorg.conf.d
 
-# Fix weird bug in nvidia-installer that I can't find
-cd $TMP/nvidia-modprobe-$VERSION
-  install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
-  rm -f /usr/bin/nvidia-modprobe
-cd -
-
 cat <<EOF > $PKG/var/log/nvidia/README.txt
 Do NOT delete this directory!
 nvidia-switch will backup the original X.org libraries here.
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 1089b9d7024c..7b2b2a6b04a5 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-driver"
-VERSION="384.90"
+VERSION="390.25"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/384.90/NVIDIA-Linux-x86-384.90.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-384.90.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-384.90.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-384.90.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-384.90.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-384.90.tar.bz2"
-MD5SUM="9423e4bdef7745c7b57a75c24f853b53 \
-        eccf8f3ef3f77dd69d90ede1d8eb970b \
-        ffb290c363298f9286b2add198338ed1 \
-        a525c7246aa472a88baf9a947112fcdf \
-        4dbf2f78094564d61f89dae4304f1423 \
-        5ad21bed26d5c28af7ff06aa179003eb"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/384.90/NVIDIA-Linux-x86_64-384.90.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-384.90.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-384.90.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-384.90.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-384.90.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-384.90.tar.bz2"
-MD5SUM_x86_64="487f9702d76d9eebea5b73b33fe4d602 \
-               eccf8f3ef3f77dd69d90ede1d8eb970b \
-               ffb290c363298f9286b2add198338ed1 \
-               a525c7246aa472a88baf9a947112fcdf \
-               4dbf2f78094564d61f89dae4304f1423 \
-               5ad21bed26d5c28af7ff06aa179003eb"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.25/NVIDIA-Linux-x86-390.25.run \
+          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.25.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.25.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.25.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.25.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.25.tar.bz2"
+MD5SUM="024170d6dc8bc83e405c7a73327ec8fb \
+        84a626651e4b5e646ca5bc021f7dbad8 \
+        8df73c47280432fcbe7e92e5b04c9104 \
+        06071dd378ac08e2c2385408fe2313be \
+        b9cae3f1435797ade62eb3fc20fcc8af \
+        e00cb97e8f683f567c9994bfbdc655a6"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.25/NVIDIA-Linux-x86_64-390.25.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.25.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.25.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.25.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.25.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.25.tar.bz2"
+MD5SUM_x86_64="24e514b160490dbbd86b5aefd17e9e6a \
+               84a626651e4b5e646ca5bc021f7dbad8 \
+               8df73c47280432fcbe7e92e5b04c9104 \
+               06071dd378ac08e2c2385408fe2313be \
+               b9cae3f1435797ade62eb3fc20fcc8af \
+               e00cb97e8f683f567c9994bfbdc655a6"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-driver/skip_conflict-GPU_detect.patch b/system/nvidia-driver/skip_conflict-GPU_detect.patch
index b98a12ccbbc1..2b979cbf463c 100644
--- a/system/nvidia-driver/skip_conflict-GPU_detect.patch
+++ b/system/nvidia-driver/skip_conflict-GPU_detect.patch
@@ -1,6 +1,6 @@
-diff -uaN nvidia-installer-375.66/command-list.c nvidia-installer-375.66.new/command-list.c
---- nvidia-installer-375.66/command-list.c	2017-05-01 16:41:24.000000000 -0700
-+++ nvidia-installer-375.66.new/command-list.c	2017-07-01 18:15:25.087868229 -0700
+diff -uaN command-list.c command-list.c.new                 
+--- command-list.c	2018-01-24 20:59:24.000000000 -0800
++++ command-list.c.new	2018-02-18 00:51:13.218202297 -0800
 @@ -903,6 +903,8 @@
      // Allocate enough space for the whole file list, plus two extra files and
      // a NULL at the end.
@@ -10,19 +10,20 @@ diff -uaN nvidia-installer-375.66/command-list.c nvidia-installer-375.66.new/com
  
      for (i = 0; i < p->num_entries; i++) {
          PackageEntry *entry = &p->entries[i];
-Common subdirectories: nvidia-installer-375.66/common-utils and nvidia-installer-375.66.new/common-utils
-diff -uaN nvidia-installer-375.66/misc.c nvidia-installer-375.66.new/misc.c
---- nvidia-installer-375.66/misc.c	2017-05-01 16:41:24.000000000 -0700
-+++ nvidia-installer-375.66.new/misc.c	2017-07-01 18:19:22.310846284 -0700
-@@ -2290,7 +2290,10 @@
+	 
+diff -uaN misc.c misc.c.new      
+--- misc.c	2018-02-18 00:52:42.822203145 -0800
++++ misc.c.new	2018-02-18 00:53:28.926203581 -0800
+@@ -2289,7 +2289,10 @@
                   "For further details, please see the appendix SUPPORTED "
                   "NVIDIA GRAPHICS CHIPS in the README available on the Linux "
                   "driver download page at www.nvidia.com.", p->version);
 -        return FALSE;
-+  /*        return FALSE;
-++ * We're just going to keep the message but skip the result
-++ * so we can run this in a VM.
-++ */
++/*        return FALSE;
++ * We're just going to keep the message but skip the result
++ * so we can run this in a VM.
++ */
      }
  
      if (!found_vga_device)
+