From ca171dac329f38fac23b94d77e5ca42d9cadfdd0 Mon Sep 17 00:00:00 2001
From: Edward Koenig <kingbeowulf@gmail.com>
Date: Mon, 11 Nov 2013 21:41:53 -0600
Subject: system/nvidia-legacy96-driver: Fixed nvidia-switch utility

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 .../nvidia-legacy96-driver.info                      | 14 +++++++-------
 system/nvidia-legacy96-driver/nvidia-switch          | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'system/nvidia-legacy96-driver')

diff --git a/system/nvidia-legacy96-driver/nvidia-legacy96-driver.info b/system/nvidia-legacy96-driver/nvidia-legacy96-driver.info
index 867378e260d01..005a10cb56b4d 100644
--- a/system/nvidia-legacy96-driver/nvidia-legacy96-driver.info
+++ b/system/nvidia-legacy96-driver/nvidia-legacy96-driver.info
@@ -10,13 +10,13 @@ MD5SUM="21f6eb657e651a83ff4271438122b379\
         c27decb2951a393620bb469757314c19 \
         394956f6d29e642bda2a16ade02d27ad"
 DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.23/NVIDIA-Linux-x86_64-96.43.23-pkg2.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-96.43.20.tar.gz \
-          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-96.43.20.tar.gz \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-96.43.20.tar.gz"
+                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-96.43.20.tar.gz \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-96.43.20.tar.gz \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-96.43.20.tar.gz"
 MD5SUM_x86_64="dd8546e5ae7d10da072306e5f13952b8 \
-        8a5bdb1c455953e8cc4c089f4404f373 \
-        c27decb2951a393620bb469757314c19 \
-        394956f6d29e642bda2a16ade02d27ad"
+               8a5bdb1c455953e8cc4c089f4404f373 \
+               c27decb2951a393620bb469757314c19 \
+               394956f6d29e642bda2a16ade02d27ad"
 REQUIRES="nvidia-legacy96-kernel"
 MAINTAINER="Edward Koenig"
-EMAIL="kinbeowulf@gmail.com"
+EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy96-driver/nvidia-switch b/system/nvidia-legacy96-driver/nvidia-switch
index b700fb2f5d97e..263b77b7462bd 100644
--- a/system/nvidia-legacy96-driver/nvidia-switch
+++ b/system/nvidia-legacy96-driver/nvidia-switch
@@ -20,7 +20,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# nvidia-switch utility 0.8.2
+# nvidia-switch utility 0.8.3
 #
 # A tool to switch between nvidia-binary-driver and stock xorg-driver
 # if both are installed in parallel.
@@ -35,7 +35,7 @@ LIB="${ROOT}usr/lib${LIBSUFFIX}"
 XMOD="${LIB}/xorg/modules"
 XLIB="$XMOD/extensions"
 NV_VERSION='PKGVERSION' # This will be replaced in the build script
-GL_VERSION="1.2"
+GL_VERSION="1.2.0"
 
 remove_link(){
 if [ -L "$1" ]; then
@@ -61,7 +61,7 @@ setup_link(){
   else
     rm -f $2
   fi
-  ln -s "$3" "$2"
+  ln -sf "$3" "$2"
 }
 
 # Move and rename files in /usr/include
@@ -87,7 +87,7 @@ for i in glxext.h glext.h glx.h gl.h; do
       rm -f "$i-$1"
     else
       mv "$i" "$i-$1"
-      ln -s "$i-$THREE" "$i"
+      ln -sf "$i-$THREE" "$i"
     fi
   else
     $CMD "$i-$THREE" "$i"
@@ -131,7 +131,7 @@ libgl_nvidia(){
 if [ -e "$LIB/libGL.so.$GL_VERSION" ]; then
   cd "$LIB"
   mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
-  setup_link "" "libGL.so.1" "libGL.so.$NV_VERSION"
+  setup_link "" "libGL.so.$GL_VERSION" "libGL.so.$NV_VERSION"
   cd "$CWD"
 fi
 }
@@ -145,7 +145,7 @@ else
   if [ -e "$LIB/libGL.so.$GL_VERSION-xorg" ]; then
     cd "$LIB"
     mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
-    ln -s libGL.so.$GL_VERSION libGL.so.1
+    ln -sf libGL.so.$GL_VERSION libGL.so.1
     cd "$CWD"
   fi
 fi
@@ -157,8 +157,8 @@ libglcore_nvidia(){
 if [ -e "$LIB/libGLcore.so.$NV_VERSION-nvidia" ]; then
   cd "$LIB"
   rm -f libGLcore.so.$NV_VERSION libGLcore.so.1
-  ln -s libGLcore.so.$NV_VERSION-nvidia libGLcore.so.$NV_VERSION
-  ln -s libGLcore.so.$NV_VERSION libGLcore.so.1
+  ln -sf libGLcore.so.$NV_VERSION-nvidia libGLcore.so.$NV_VERSION
+  ln -sf libGLcore.so.$NV_VERSION libGLcore.so.1
   cd "$CWD"
 fi
 }
@@ -184,7 +184,7 @@ for i in $(ls libglx.so* | grep -v -); do
     rm -f $i
   fi
 done
-ln -s libglx.so.$NV_VERSION libglx.so
+ln -sf libglx.so.$NV_VERSION libglx.so
 }
 
 libglx_nvidia(){
@@ -462,7 +462,7 @@ xorg(){
      libglx_xorg "xorg"
    fi
 
-   LD_NVIDIA="${LIB}/libGL.so.1.2"
+   LD_NVIDIA="${LIB}/libGL.so.$GL_VERSION"
    nvidia_ldconfig $LD_NVIDIA "xorg"
 }
 
-- 
cgit v1.2.3