From 8509036382592bb1ad35fa674da3ab94e89022a0 Mon Sep 17 00:00:00 2001
From: "Edward W. Koenig" <kingbeowulf@gmail.com>
Date: Mon, 3 Jul 2017 23:36:48 +0700
Subject: system/nvidia-driver: Updated for version 375.66.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/nvidia-driver/README                        |   4 +-
 system/nvidia-driver/changelog.txt                 |   1 +
 system/nvidia-driver/nvidia-driver.SlackBuild      | 331 +++++++++------------
 system/nvidia-driver/nvidia-driver.info            |  50 ++--
 system/nvidia-driver/nvidia-switch                 | 111 +++----
 .../nvidia-driver/skip_conflict-GPU_detect.patch   |  28 ++
 6 files changed, 245 insertions(+), 280 deletions(-)
 create mode 100644 system/nvidia-driver/skip_conflict-GPU_detect.patch

diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index 5dccc1074f356..066a174ec34b7 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -55,5 +55,5 @@ not working. Here are the affected files:
   /usr/lib[64]/xorg/modules/libwfb.so
   /usr/lib[64]/xorg/modules/extensions/libglx.so
 
-Simply remove the dead nvidia symlinks and rename the saved '-xorg'
-appended files.
+Simply remove the dead nvidia symlinks and and reinstall the mesa and
+xorg-server packages. See 'nvidia-switch --help'.
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index d621da47f95b6..9160e1fed8916 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -29,3 +29,4 @@
 4.7	31-APR-2016 version update LLB, added nvidia-installer, updated libs/symlinks
 5.0	20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch
 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
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index bb3688f8a84e3..65d5bc90de4af 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -26,18 +26,18 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-375.39}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-375.66}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CPROXY=${CPROXY:-yes}
+
 GLVND=${GLVND:-yes}
-# Note: libglvnd may land in X.org Mesa and Nvidia recommended
+# libglnvd may land in mesa and is Nvidia recomended
 
 set -e
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,14 +48,16 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   TARGET="x86"
   LIBDIRSUFFIX=""
+  COMPAT32=no
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   TARGET="x86"
   LIBDIRSUFFIX=""
+  COMPAT32=no
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   TARGET="x86_64"
@@ -63,21 +65,28 @@ elif [ "$ARCH" = "x86_64" ]; then
 # Set 32-bit compatibility flag default
   COMPAT32=${COMPAT32:-no}
 else
-  COMPAT32=${COMPAT32:-no}
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  COMPAT32=no
 fi
 
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
-# Flag package as multilib, if needed
-MULTI=""
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-  MULTI="_multi"
+# make a clean package directory tree
+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/usr/share/{applications,nvidia,pixmaps} \
+  $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}
+
+if [ "$COMPAT32" = "yes" ]; then
+  mkdir -p $PKG/usr/lib
 fi
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+# Extract all the sources
 cd $TMP
 rm -rf nvidia-installer-$VERSION
 tar xvf $CWD/nvidia-installer-$VERSION.tar.bz2
@@ -89,7 +98,6 @@ rm -rf nvidia-modprobe-$VERSION.tar.bz2
 tar xvf $CWD/nvidia-modprobe-$VERSION.tar.bz2
 rm -rf nvidia-persistenced-$VERSION.tar.bz2
 tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
-rm -rf $SRCNAM
 sh $CWD/$SRCNAM.run --extract-only
 cd $SRCNAM
 chown -R root:root .
@@ -99,163 +107,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Build package directory structure
-mkdir -p $PKG/install $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
-  $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/{tls,vdpau} \
-  $PKG/etc/X11/glvnd/egl_vendor.d \
-  $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,nvidia,pixmaps} \
-  $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/usr/doc/$PRGNAM-$VERSION
-
-# Main X driver and modules
-install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
-install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION
-# We'll move this over but will leave X.org's libwfb alone
-install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION
-
-if [ "$GLVND" = "no" ]; then
-# The non-GLVND GLX client libraries
-  install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-  install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-else
-# GLVND GLX client libraries libraries are the default, conflict with non-GLVND versions
-  install -m 755 libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
-  install -m 755 libEGL.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.1-nvidia
-fi
-
-# Common libs, EGL requires the non-conflicting GLVND libs
-# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
-install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-install -m 755 libGLESv1_CM.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.1-nvidia
-install -m 755 libGLESv2.so.2 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.2-nvidia
-install -m 755 libGLX_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libOpenGL.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libGLdispatch.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libEGL_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libGLESv2_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-eglcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-egl-wayland.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-encode.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-fbc.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-ifr.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-ptxjitcompiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX
-install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
-install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/vdpau
-
-# non-conflict symlinks; see also 'nvidia-switch'
-cd $PKG/usr/lib$LIBDIRSUFFIX
-  ln -sf libcuda.so.$VERSION libcuda.so
-  ln -sf libGLX.so.0 libGLX.so
-  ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
-  ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
-  ln -sf libOpenGL.so.0 libOpenGL.so
-  ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
-  ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
-  ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
-  ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-  ln -sf vdpau/libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
-cd -
-cd $PKG/usr/lib$LIBDIRSUFFIX/tls
-  ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-cd -
-
-# Add optional 32-bit support
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-  mkdir -p $PKG/usr/lib/{tls,vdpau}
-  if [ "$GLVND" = "no" ]; then
-# The non-GLVND GLX client libraries 
-    install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/
-    install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/
-  else
-# GLVND GLX client libraries libraries are the default, conflict with non-GLVND versions
-    install -m 755 32/libGL.so.1.0.0 $PKG/usr/lib/libGL.so.1.0.0
-    install -m 755 32/libEGL.so.1 $PKG/usr/lib/libEGL.so.1-nvidia
-  fi
-
-# Common libs, EGL requires the non-conflicting GLVND libs
-# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
-  install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
-  install -m 755 32/libGLESv1_CM.so.1 $PKG/usr/lib/libGLESv1_CM.so.1-nvidia
-  install -m 755 32/libGLESv2.so.2 $PKG/usr/lib/libGLESv2.so.2-nvidia
-  install -m 755 32/libGLX_nvidia.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libOpenGL.so.0 $PKG/usr/lib/
-  install -m 755 32/libGLdispatch.so.0 $PKG/usr/lib/
-  install -m 755 32/libGLX.so.0 $PKG/usr/lib/
-  install -m 755 32/libEGL_nvidia.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libGLESv2_nvidia.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/
-  install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-eglcore.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-encode.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-fbc.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-glsi.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-ifr.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-ptxjitcompiler.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-tls.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
-  install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/vdpau/
-
-# non-conflict symlinks for optional 32-bit support; see also 'nvidia-switch'
-  cd $PKG/usr/lib
-    ln -sf libcuda.so.$VERSION libcuda.so
-    ln -sf libGLX.so.0 libGLX.so
-    ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
-    ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
-    ln -sf libOpenGL.so.0 libOpenGL.so
-    ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
-    ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
-    ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
-    ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-    ln -sf vdpau/libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
-  cd -
-  cd $PKG/usr/lib/tls
-    ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-  cd -
-fi
-
-#ICDs
-install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
-install -m 644 nvidia_icd.json $PKG/etc/vulkan/icd.d
-# Shouldn't hurt to have this as well regardless of GLX client libraries used
-install -m 644 10_nvidia.json $PKG/etc/X11/glvnd/egl_vendor.d/
-
-# Next come the apps
-for i in nvidia-smi nvidia-bug-report.sh nvidia-debugdump; do
-  install -m 755 $i $PKG/usr/bin/
-done
-
-install -m 644 nvidia-smi.1.gz $PKG/usr/man/man1/
-
-# New CUDA MPS server for 64-bit Linux only, and requires a device that supports
-# Unified Virtual Address (UVA) and CUDA 4.0+. See NVIDIA docs.
-if [ "$ARCH" = "x86_64" -a "${CPROXY}" = "yes" ]; then
-   install -m 755 nvidia-cuda-mps-control $PKG/usr/bin/
-   install -m 755 nvidia-cuda-mps-server $PKG/usr/bin/
-   install -m 644 nvidia-cuda-mps-control.1.gz $PKG/usr/man/man1/
-fi
-
+# Compiling the various open source apps instead of using the precompiled binaries
 # Compiling nvidia-installer from source
-# Not really needed for this SBo package...yet!
 cd $TMP/nvidia-installer-$VERSION
+
+# Let's try to remove the conflicting files and GPU detection
+  patch -p1 < $CWD/skip_conflict-GPU_detect.patch
+
   chown -R root:root .
   find -L . \
    \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -267,6 +125,7 @@ cd $TMP/nvidia-installer-$VERSION
 
   install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
   install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
+
 cd -
 
 # Compiling nvidia-settings from source
@@ -294,7 +153,7 @@ cd $TMP/nvidia-settings-$VERSION
 # For nvidia-settings GUI support
   install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk2.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk2.so.$VERSION
   install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk3.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk3.so.$VERSION
-cd ../
+cd -
 
 # Compiling nvidia-xconfig from source
 cd $TMP/nvidia-xconfig-$VERSION
@@ -312,7 +171,7 @@ cd $TMP/nvidia-xconfig-$VERSION
   install -m 644 _out/Linux_$TARGET/nvidia-xconfig.1.gz $PKG/usr/man/man1/
 cd -
 
-# Some new optional "useless" utilities, such as laptop GPU switching
+# Some optional utilities, such as laptop for possible GPU switching and
 # nvidia-modprobe needed to create device nodes, see README!
 # FIXME: Needs cleanup at a later date.
 
@@ -345,9 +204,54 @@ 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/lib64/xorg/modules \
+  --x-library-path=$PKG/usr/lib64 \
+  --x-sysconfig-path=$PKG/etc/X11/xorg.conf.d \
+  --opengl-prefix=$PKG/usr \
+  --utility-prefix=$PKG/usr \
+  --documentation-prefix=$PKG/usr \
+  --application-profile-path=$PKG/usr/share/nvidia \
+  --glvnd-egl-config-path=$PKG/etc/X11/glvnd/egl_vendor.d \
+  $GLVNDOPT \
+  $COMP32
+
+# Clean-up: we really do not need this:
+rm -rf /var/lib/nvidia
+
 # 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 "on the fly" is no longer supported.
+# Note: switching can be problematic ;-)
 install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
 sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
 sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch
@@ -355,39 +259,84 @@ if [ "$GLVND" = "yes" ]; then
   sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch
 else
   sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch
-fi 
+fi
 if [ ${COMPAT32} = "yes" ]; then
   sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch
 else
   sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch
 fi
 
-# These update placeholders and correct wrong paths
-sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-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
+# These 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
+
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-  sed -i "s|__LIBGL_PATH__|/usr/lib/|" $PKG/usr/lib/libGL.la-nvidia
-  sed -i "s|/usr/X11R6/lib|/usr/lib/|" $PKG/usr/lib/libGL.la-nvidia
+  sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la
+  sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la
 fi
 
-# Basic docs
-cd $TMP/$SRCNAM
-cp -a LICENSE NVIDIA_Changelog README.txt html $PKG/usr/doc/$PRGNAM-$VERSION
-# sample start/stop scripts for nvidia-persistenced
-cp -a nvidia-persistenced-init.tar.bz2 $PKG/usr/doc/$PRGNAM-$VERSION
+# rename 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
+   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
+   rm -f libEGL.so
+   rm -f libGL.so
+   rm -f libGL.so.1
+   rm -f libGLESv1_CM.so
+   rm -f libGLESv2.so
+   rm -f xorg/modules/libwfb.so
+   rm -f xorg/modules/extensions/libglx.so
+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
+         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
+      rm -f libEGL.so
+      rm -f libGL.so
+      rm -f libGL.so.1
+      rm -f libGLESv1_CM.so
+      rm -f libGLESv2.so
+   cd -
+fi
+
+#ICDs
+install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
+install -m 644 nvidia_icd.json $PKG/etc/vulkan/icd.d/
+
+# Remove xorg conf file since we take care of that in nvidia-driver
+rm -rf $PKG/etc/X11/xorg.conf.d
 
+cat <<EOF > $PKG/var/log/nvidia/README.txt
+Do NOT delete this directory!
+nvidia-switch will backup the original X.org libraries here.
+EOF
+
+cd $TMP/$SRCNAM
+# put docs in the right place
+mv $PKG/usr/share/man/man1/nvidia-* $PKG/usr/man/man1
+rm -rf $PKG/usr/share/man
+mv $PKG/usr/share/doc/NVIDIA_GLX-1.0 $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
+cp -a LICENSE NVIDIA_Changelog README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# nvidia-settings application profile support (see documention for use).
-install -m 755 nvidia-application-profiles-$VERSION-key-documentation $PKG/usr/share/nvidia/
-install -m 755 nvidia-application-profiles-$VERSION-rc $PKG/usr/share/nvidia/
-
 sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Flag install as multlib as needed and build package.
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index b3fcaa1324c1c..e189aedb99e98 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-driver"
-VERSION="375.39"
+VERSION="375.66"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/375.39/NVIDIA-Linux-x86-375.39.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.39.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.39.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.39.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.39.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.39.tar.bz2"
-MD5SUM="9247d5eb9df58bb7755c9060ef5d103d \
-        1a1b3ecbbd9cf17085548cc5d8fe6cba \
-        f630cbefa0c300d58df7a1d989c7766c \
-        d147dd34877b73000448f5fe8d06371d \
-        ced26b5504b08abaf4e156740021b2bc \
-        7f41d52c1220feb4d837982a54190d6c"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/375.39/NVIDIA-Linux-x86_64-375.39.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.39.tar.bz2"
-MD5SUM_x86_64="35b32baba21089dfe5d960ae89d98cde \
-               1a1b3ecbbd9cf17085548cc5d8fe6cba \
-               f630cbefa0c300d58df7a1d989c7766c \
-               d147dd34877b73000448f5fe8d06371d \
-               ced26b5504b08abaf4e156740021b2bc \
-               7f41d52c1220feb4d837982a54190d6c"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/375.66/NVIDIA-Linux-x86-375.66.run \
+          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.66.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.66.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.66.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.66.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.66.tar.bz2"
+MD5SUM="47dddb796fe39497cf6ae374591f6eb9 \
+        1a09312f35b2a9211d6256272f5a5e02 \
+        53c8efb0bb4a18bb05cbddc8845d9aaa \
+        f97000abef5f7c7ae27a8f8572558b96 \
+        eb29b20b91703323a69d08db1be7237d \
+        5fd9daa01c3d6309ae91083d0f01e8be"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/375.66/NVIDIA-Linux-x86_64-375.66.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.66.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.66.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.66.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.66.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.66.tar.bz2"
+MD5SUM_x86_64="9cf2c0a342a088211f25c5d8137097e6 \
+               1a09312f35b2a9211d6256272f5a5e02 \
+               53c8efb0bb4a18bb05cbddc8845d9aaa \
+               f97000abef5f7c7ae27a8f8572558b96 \
+               eb29b20b91703323a69d08db1be7237d \
+               5fd9daa01c3d6309ae91083d0f01e8be"
 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 f92f6837cf336..82eaf53932743 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -20,20 +20,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# nvidia-switch utility 3.0
+# nvidia-switch utility 4.0
 #
 # A tool to install and cleanly remove the nvidia driver without stomping on the xorg files.
 # Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still
 # need to edit a bunch of other config files.
 
-# TO-DO: needs more cleanup; still way too brittle.
-# might be better to move mesa and xorg conflicts to /var/lib/nvidia 
-
+# TO-DO: needs more cleanup, simplify linking using system tools
 
 ROOT="${ROOT:-/}"
 CWD=$(pwd)
-LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
 COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no)
+LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
 INC="${ROOT}usr/include/GL"
 LIB="${ROOT}usr/lib${LIBSUFFIX}"
 LIB32="${ROOT}usr/lib"
@@ -43,56 +41,67 @@ NV_VERSION="PKGVERSION" # This will be replaced in the build script
 GL_VERSION="1.2.0"
 GLVND="GLVNDFLAG" # This will be replaced in the build script (yes | no)
 NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf"
+SAVELIBS="/var/log/nvidia"
 
 save_GL(){
+# backup original mesa and xorg conflicts to /var/lib/nvidia
   cd $2
+  if [ "$2" = "$LIB32" ]; then
+     SAVELIBS="/var/log/nvidia/32"
+  fi
+  if [ "$2" = "$LIB" ]; then
+     SAVELIBS="/var/log/nvidia/64"
+  fi
   case "$1" in
     "nvidia")
-      mv libGL.so.$GL_VERSION xorg-libGL.so.$GL_VERSION
-      mv libGL.la xorg-libGL.la
+
+      mv libGL.so.$GL_VERSION $SAVELIBS/libGL.so.$GL_VERSION
+      mv libGL.la $SAVELIBS/libGL.la
+      mv libEGL.so.1.0.0 $SAVELIBS/libEGL.so.1.0.0
+      mv libGLESv1_CM.so.1.1.0 $SAVELIBS/libGLESv1_CM.so.1.1.0
+      mv libGLESv2.so.2.0.0 $SAVELIBS/libGLESv2.so.2.0.0
       mv libGL.la-nvidia libGL.la
-      mv libEGL.so.1.0.0 xorg-libEGL.so.1.0.0
 
       if [ "$GLVND" = "yes" ]; then
         ln -sf libGL.so.1.0.0 libGL.so.1
-        ln -sf libGL.so.1 libGL.so
+	ln -sf libGL.so.1.0.0 libGL.so
         ln -sf libEGL.so.1-nvidia libEGL.so.1
-        ln -sf libEGL.so.1 libEGL.so
+	ln -sf libEGL.so.1-nvidia libEGL.so
       else
         ln -sf libGL.so.$NV_VERSION libGL.so.1
-        ln -sf libGL.so.1 libGL.so
+        ln -sf libGL.so.$NV_VERSION libGL.so
         ln -sf libEGL.so.$NV_VERSION libEGL.so.1
-        ln -sf libEGL.so.1 libEGL.so
+        ln -sf libEGL.so.$NV_VERSION libEGL.so
       fi
 
-      mv libGLESv1_CM.so.1.1.0 xorg-libGLESv1_CM.so.1.1.0
       ln -sf libGLESv1_CM.so.1-nvidia libGLESv1_CM.so.1
-      ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so
-      mv libGLESv2.so.2.0.0 xorg-libGLESv2.so.2.0.0
+      ln -sf libGLESv1_CM.so.1-nvidia libGLESv1_CM.so
+
       ln -sf libGLESv2.so.2-nvidia libGLESv2.so.2
-      ln -sf libGLESv2.so.2 libGLESv2.so
+      ln -sf libGLESv2.so.2-nvidia libGLESv2.so
     ;;
 
     "xorg")
        mv libGL.la libGL.la-nvidia
-       mv xorg-libGL.la libGL.la
-       mv xorg-libEGL.so.1.0.0 libEGL.so.1.0.0
-       mv xorg-libGL.so.$GL_VERSION libGL.so.$GL_VERSION
+       mv $SAVELIBS/libGL.so.$GL_VERSION libGL.so.$GL_VERSION
+       mv $SAVELIBS/libGL.la libGL.la
+       mv $SAVELIBS/libEGL.so.1.0.0 libEGL.so.1.0.0
+       mv $SAVELIBS/libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0
+       mv $SAVELIBS/libGLESv2.so.2.0.0 libGLESv2.so.2.0.0
 
        ln -sf libGL.so.$GL_VERSION libGL.so.1
        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
 
-       mv xorg-libGLESv1_CM.so.1.1.0 libGLESv1_CM.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
-       mv xorg-libGLESv2.so.2.0.0 libGLESv2.so.2.0.0
        ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
        ln -sf libGLESv2.so.2.0.0 libGLESv2.so
   ;;
+
   *)
-        echo "nothind to do for save_gl?"
+        echo "nothing to do for save_gl?"
         exit 1
   ;;
   esac
@@ -117,7 +126,7 @@ save_glx(){
         fi
       ;;
         *)
-          echo "nothind to do for save_glx?"
+          echo "nothing to do for save_glx?"
           exit 1
       ;;
   esac
@@ -152,11 +161,7 @@ nvidia_install(){
   save_wfb "nvidia"
 # Check for multilib configuration
   if [ "$COMPAT32" = "yes" ]; then
-    if [ -e $LIB32/libGL.so.$GL_VERSION ]; then
-      save_GL "nvidia" $LIB32
-    else
-      echo "mesa-compat32 is not installed, skipping..."
-    fi
+    save_GL "nvidia" $LIB32
   fi
 }
 
@@ -169,32 +174,10 @@ nvidia_remove(){
   save_glx "xorg"
   save_GL "xorg" $LIB
   save_wfb "xorg"
-# remove dangling sylinks
-  rm -f $LIB/libnvcuvid.so.1
-  rm -f $LIB/libnvidia-cfg.so.1
-  rm -f $LIB/libnvidia-encode.so.1
-  rm -f $LIB/libnvidia-fbc.so.1
-  rm -f $LIB/libnvidia-ifr.so.1
-  rm -f $LIB/libnvidia-ml.so.1
-  rm -f $LIB/libnvidia-opencl.so.1
-  rm -f $LIB/libcuda.so.1
-  rm -f $LIB/libOpenCL.so.1
+
 # Check for multilib configuration
   if [ "$COMPAT32" = "yes" ]; then
-    if [ -e $LIB32/xorg-libGL.so.$GL_VERSION ]; then
-      save_GL "xorg" $LIB32
-    else
-      echo "mesa-compat32 is not installed, skipping..."
-    fi
-# remove dangling sylinks
-    rm -f $LIB32/libnvcuvid.so.1
-    rm -f $LIB32/libnvidia-encode.so.1
-    rm -f $LIB32/libnvidia-fbc.so.1
-    rm -f $LIB32/libnvidia-ifr.so.1
-    rm -f $LIB32/libnvidia-ml.so.1
-    rm -f $LIB32/libnvidia-opencl.so.1
-    rm -f $LIB32/libcuda.so.1
-    rm -f $LIB32/libOpenCL.so.1
+    save_GL "xorg" $LIB32
   fi
 
   if [ -e $NV_CONF ]; then
@@ -211,9 +194,9 @@ restore(){
 # User must:
 # 1. remove any dangling symlinks and xorg-*, *-nvidia files in /usr/lib*/,
 #    and any other housekeeping tasks.
-# 2. copy stock Slackware packages to /root/Slackware
-# 3. be running STOCK Slackware-14.2
-# 4. realize that COMPAT32 is not supported ;-)
+# 2. copy stock Slackware packages to /root/Slackware or provide an alternate location
+# 3. be running Slackware-14.2, not current
+# 4. realize that COMPAT32 is not stable ;-)
 
 if [ "$LIBSUFFIX" = "64" ]; then
   ARCH="x86_64"
@@ -221,7 +204,7 @@ else
   ARCH="x86"
 fi
 
-PKGPATH="/root/Slackware"
+PKGPATH=${PKGPATH:-/root/Slackware}
 MESA="mesa-11.2.2-$ARCH-1.txz"
 MESA32="mesa-compat32-11.2.2-$ARCH-1compat32.txz"
 XORG="xorg-server-1.18.3-$ARCH-2.txz"
@@ -231,9 +214,9 @@ if [ -d $PKGPATH ]; then
   if [ `find $PKGPATH -prune -empty -type d` ]; then
     echo "Your $PKGPATH is empty!"
   else
-    upgradepkg --reinstall $MESA $XORG
+    upgradepkg --reinstall --install-new $MESA $XORG
     if [ "COMPAT32" = "yes" ]; then
-      upgradepkg --reinstall $MESA32
+      upgradepkg --reinstall --install-new $MESA32
     fi
   fi
 else
@@ -243,10 +226,14 @@ fi
 
 usage(){
   echo "Usage:"
-  echo " --install		Set up nvidia driver files (only during pkg install)"
-  echo " --remove		Return to stock xorg files and remove all symlinks"
-  echo " --restore		Reinstall stock Mesa and xorg-server [EXPERIMENTAL]"
-  echo " --help			Show this help message"
+  echo " --install    Set up nvidia driver files"
+  echo " --remove     Return to stock xorg files and restore all symlinks"
+  echo " --restore    Reinstall stock Mesa and xorg-server [EXPERIMENTAL]"
+  echo "              mesa-11.2.2, org-server-1.18.3, and optionally"
+  echo "              mesa-compat32-11.2.2 are expected in /root/Slackware"
+  echo "              Use 'PKGPATH="<location>" nvidia-switch --restore'"
+  echo "              to override."
+  echo " --help	      Show this help message"
 }
 
 case "$1" in
diff --git a/system/nvidia-driver/skip_conflict-GPU_detect.patch b/system/nvidia-driver/skip_conflict-GPU_detect.patch
new file mode 100644
index 0000000000000..b98a12ccbbc13
--- /dev/null
+++ b/system/nvidia-driver/skip_conflict-GPU_detect.patch
@@ -0,0 +1,28 @@
+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
+@@ -903,6 +903,8 @@
+     // Allocate enough space for the whole file list, plus two extra files and
+     // a NULL at the end.
+     cfList = nvalloc((p->num_entries + 3) * sizeof(ConflictingFileInfo));
++/* let's just return an empty list!  */
++    return cfList;
+ 
+     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 @@
+                  "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.
+++ */
+     }
+ 
+     if (!found_vga_device)
-- 
cgit v1.2.3