summaryrefslogtreecommitdiffstats
path: root/system/nvidia-legacy96-driver/nvidia-switch
diff options
context:
space:
mode:
author Edward Koenig2013-11-12 04:41:53 +0100
committer Robby Workman2013-11-12 08:25:01 +0100
commitca171dac329f38fac23b94d77e5ca42d9cadfdd0 (patch)
tree683b503865b7dc09ad422a75edbfcdad9e4b27d0 /system/nvidia-legacy96-driver/nvidia-switch
parentc6a1476bf976a1296ccd7880662fabdd9da8f305 (diff)
downloadslackbuilds-ca171dac329f38fac23b94d77e5ca42d9cadfdd0.tar.gz
system/nvidia-legacy96-driver: Fixed nvidia-switch utility
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/nvidia-legacy96-driver/nvidia-switch')
-rw-r--r--system/nvidia-legacy96-driver/nvidia-switch20
1 files changed, 10 insertions, 10 deletions
diff --git a/system/nvidia-legacy96-driver/nvidia-switch b/system/nvidia-legacy96-driver/nvidia-switch
index b700fb2f5d..263b77b746 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"
}