1 files changed, 33 insertions, 8 deletions
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 124b0f4697..951f4a069c 100644..100755
--- 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.59}
+VERSION=${VERSION:-440.64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -154,7 +154,7 @@ cd $TMP/$SRCNAM
   $COMP32
 
 # Clean-up: we really do not need this:
-rm -rf /var/log/nvidia
+rm -rf $PKG/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.1.0}
@@ -173,6 +173,37 @@ if [ "$CURRENT" = "yes" ]; then
         rm -f $PKG/usr/lib/libGLdispatch.so.0
         rm -f $PKG/usr/lib/libOpenGL.so{,.0}
     fi
+# Don't ship .la files:
+    rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+    if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+        rm -f $PKG/usr/lib/*.la
+    fi
+else
+# save libGL.la for 14.2
+    cd $PKG/usr/lib$LIBDIRSUFFIX
+    mv libGL.la libGL.la-nvidia
+    cd -
+    if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+        cd $PKG/usr/lib
+	mv libGL.la libGL.la-nvidia
+        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 ;-)
+    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
+    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
+    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
 fi
 
 # add tls
@@ -262,12 +293,6 @@ cd -
     install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
   cd -
 
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-    rm -f $PKG/usr/lib/*.la
-fi
-
 # These update or correct wrong paths
 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