system/nvidia-driver: Updated for version 367.44.

Added nvidia-installer, updated libs/symlinks

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

1 files changed, 94 insertions, 67 deletions

diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index a657f5a52c..33d3f61d65 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -20,15 +20,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# nvidia-switch utility 2.5
+# nvidia-switch utility 2.6
 #
 # 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 cleanup; too brittle.
-
-set -e
+# TO-DO: needs more cleanup; still way too brittle.
+# NOTE: non-GLVND ONLY!!
 
 ROOT="${ROOT:-/}"
 CWD=$(pwd)
@@ -39,66 +38,56 @@ LIB="${ROOT}usr/lib${LIBSUFFIX}"
 LIB32="${ROOT}usr/lib"
 XMOD="${LIB}/xorg/modules"
 XLIB="$XMOD/extensions"
-NV_VERSION='PKGVERSION' # This will be replaced in the build script
+NV_VERSION="PKGVERSION" # This will be replaced in the build script
 GL_VERSION="1.2.0"
 NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf"
 
 save_GL(){
   cd $2
   if [ "$1" = "nvidia" ]; then
-    if [ -e libGL.so.$GL_VERSION ]; then
-       mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
-       mv libGL.la libGL.la-xorg 
-    fi
+    mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
+    mv libGL.la libGL.la-xorg 
     mv libGL.la-nvidia libGL.la
     ln -sf libGL.so.$NV_VERSION libGL.so.1
     ln -sf libGL.so.$NV_VERSION libGL.so
-    if [ -e libEGL.so.1.0.0 ]; then
-       mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg
-    fi
-    mv libEGL.so.1-nvidia libEGL.so.$NV_VERSION
-    ln -sf libEGL.so.$NV_VERSION libEGL.so.1
-    ln -sf libEGL.so.1 libEGL.so
-    if [ -e libGLESv1_CM.so.1.1.0 ]; then
-       mv libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0-xorg
-    fi
-    mv libGLESv1_CM.so.1-nvidia libGLESv1_CM.so.$NV_VERSION
-    ln -sf libGLESv1_CM.so.$NV_VERSION libGLESv1_CM.so.1
-    ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so
-    if [ -e libGLESv2.so.2.0.0 ]; then
-       mv libGLESv2.so.2.0.0 libGLESv2.so.2.0.0-xorg
-    fi
-    mv libGLESv2.so.2-nvidia libGLESv2.so.$NV_VERSION
-    ln -sf libGLESv2.so.$NV_VERSION libGLESv2.so.2
-    ln -sf libGLESv2.so.2 libGLESv2.so
+
+    mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg
+    mv libEGL.so.1-nvidia libEGL.so.1.0.0
+    ln -sf libEGL.so.1.0.0 libEGL.so.1
+    ln -sf libEGL.so.1.0.0 libEGL.so
+
+    mv libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0-xorg
+    mv libGLESv1_CM.so.1-nvidia libGLESv1_CM.so.1.1.0
+    ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so
+    ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1
+
+    mv libGLESv2.so.2.0.0 libGLESv2.so.2.0.0-xorg
+    mv libGLESv2.so.2-nvidia libGLESv2.so.2.0.0
+    ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
+    ln -sf libGLESv2.so.2.0.0 libGLESv2.so
   fi
 
   if [ "$1" = "xorg" ]; then
      mv libGL.la libGL.la-nvidia
-     if [ -e libGL.so.$GL_VERSION-xorg ]; then
-        mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
-        ln -sf libGL.so.$GL_VERSION libGL.so.1
-        ln -sf libGL.so.$GL_VERSION libGL.so
-        mv libGL.la-xorg libGL.la
-     fi
-     mv libEGL.so.$NV_VERSION libEGL.so.1-nvidia
-     if [ -e libEGL.so.1.0.0-xorg ]; then
-         mv libEGL.so.1.0.0-xorg libEGL.so.1.0.0
-         ln -sf libEGL.so.1.0.0 libEGL.so.1
-         ln -sf libEGL.so.1.0.0 libEGL.so
-     fi
-     mv libGLESv2.so.$NV_VERSION libGLESv2.so.2-nvidia
-     if [ -e libGLESv2.so.2.0.0-xorg ]; then
-       mv libGLESv2.so.2.0.0-xorg libGLESv2.so.2.0.0
-       ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
-       ln -sf libGLESv2.so.2.0.0 libGLESv2.so
-     fi
-     mv libGLESv1_CM.so.$NV_VERSION libGLESv1_CM.so.1-nvidia
-     if [ -e libGLESv1_CM.so.1.1.0-xorg ]; then
-        mv libGLESv1_CM.so.1.1.0-xorg 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
-     fi 
+     mv libGL.la-xorg libGL.la
+     mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
+     ln -sf libGL.so.$GL_VERSION libGL.so.1
+     ln -sf libGL.so.$GL_VERSION libGL.so
+
+     mv libEGL.so.1.0.0 libEGL.so.1-nvidia
+     mv libEGL.so.1.0.0-xorg libEGL.so.1.0.0
+     ln -sf libEGL.so.1.0.0 libEGL.so.1
+     ln -sf libEGL.so.1.0.0 libEGL.so
+
+     mv libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1-nvidia
+     mv libGLESv1_CM.so.1.1.0-xorg 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 libGLESv2.so.2.0.0 libGLESv2.so.2-nvidia
+     mv libGLESv2.so.2.0.0-xorg libGLESv2.so.2.0.0
+     ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
+     ln -sf libGLESv2.so.2.0.0 libGLESv2.so
   fi
   cd "$CWD"
 }
@@ -106,17 +95,14 @@ save_GL(){
 save_glx(){
   cd "$XLIB"
   if [ "$1" = "nvidia" ]; then
-	if [ ! -e libglx.so-xorg ]; then
-	    mv libglx.la libglx.la-xorg
-	    mv libglx.so libglx.so-xorg
-	fi
-	ln -sf libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION
+	mv libglx.so libglx.so-xorg
+	mv libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION
 	ln -sf libglx.so.$NV_VERSION libglx.so
-  elif [ "$1" = "xorg" ]; then
-	rm -f libglx.so.$NV_VERSION
+  fi
+  if [ "$1" = "xorg" ]; then
+	mv libglx.so.$NV_VERSION libglx.so.$NV_VERSION-nvidia
 	rm -f libglx.so
 	mv libglx.so-xorg libglx.so
-	mv libglx.la-xorg libglx.la
   fi
 cd "$CWD"
 }
@@ -133,8 +119,8 @@ nvidia_install(){
   echo "and in /etc/X11/xorg.conf.d."
   echo "Otherwise, this may lead to improperly working drivers."
 
-  save_GL "nvidia" $LIB
   save_glx "nvidia"
+  save_GL "nvidia" $LIB
 # Check for multilib configuration
   if [ "$COMPAT32" = "yes" ]; then
     save_GL "nvidia" $LIB32
@@ -143,18 +129,18 @@ nvidia_install(){
 
 nvidia_remove(){
   echo $'Returning to stock xorg files!\n'
-  echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf"
-  echo "and in /etc/X11/xorg.conf.d."
+  echo "Make sure the nvidia driver is DISABLED in /usr/share/X11/xorg.conf.d"
+  echo "/etc/X11/xorg.conf and in /etc/X11/xorg.conf.d."
   echo "Otherwise, this may lead to improperly working drivers."
 
-  save_GL "xorg" $LIB
   save_glx "xorg"
-  
-  # Kill dangling symlinks; check next mesa version for libGLES presence.
+  save_GL "xorg" $LIB
+
+  # Kill dangling symlinks; 
   rm -f $LIB/libnvidia*.so.1
   rm -f $LIB/libvdpau_nvidia.so.1
   rm -f $LIB/libcuda.so.1
-  
+
 # Check for multilib configuration
   if [ "$COMPAT32" = "yes" ]; then
     save_GL "xorg" $LIB32
@@ -165,14 +151,53 @@ nvidia_remove(){
   fi
 
   if [ -e $NV_CONF ]; then
-	rm -f $NV_CONF
+    echo "removing $NV_CONF: you will need to provide your own"
+    echo "or reinstall nvidia-driver."
+    rm -f $NV_CONF
   fi
 }
 
+restore(){
+# Attempts to reinstall damaged stock packages if something went wrong. 
+# Obviously, you will need to run this after '--remove' and before 
+# 'removepkg nvidia-driver'.
+# 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 ;-)
+
+if [ "$LIBSUFFIX" = "64" ]; then
+  ARCH="x86_64"
+else
+  ARCH="x86"
+fi
+
+PKGPATH="/root/Slackware"
+MESA="mesa-11.2.2-$ARCH-1.txz"
+MESA32="mesa-compat32-11.2.2-$ARCH-1compat32.txz"
+XORG="xorg-1.18.3-$ARCH-2.txz"
+
+if [ -d $PKGPATH ]; then
+  if [ `find $PKGPATH -prune -empty -type d` ]; then
+    echo "Your $PKGPATH is empty!"
+  else
+    upgradepkg --reinstall $MESA $XORG
+    if [ "COMPAT32" = "yes" ]; then
+      upgradepkg --reinstall $MESA32
+    fi
+  fi
+else
+  echo "Please create $PKGPATH containing the appropriate packages"
+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"
 }
 
@@ -180,6 +205,8 @@ if [ "$1" = '--install' ]; then
   nvidia_install
 elif [ "$1" = '--remove' ]; then
   nvidia_remove
+elif [ "$1" = '--restore' ]; then
+  restore
 elif [ "$1" = '--help' ]; then
   usage
 else