commit a55fbbd72f3aae6ddaf040450826f05b0ada1bb0 Author: Matt Housh <jaeger@crux.nu> Date: Wed Jul 4 11:00:36 2007 -0500 gl-select: updated for new nvidia versioning scheme diff --git a/gl-select/.md5sum b/gl-select/.md5sum index 93bdc94..b03ad70 100644 --- a/gl-select/.md5sum +++ b/gl-select/.md5sum @@ -1 +1 @@ -5c4b854798dd52a6047268d03582851f gl-select +42663ce2ed4c073376eacf4d39d6dc4d gl-select diff --git a/gl-select/gl-select b/gl-select/gl-select index 9ba0607..966ee61 100755 --- a/gl-select/gl-select +++ b/gl-select/gl-select @@ -8,6 +8,9 @@ ##### CHANGELOG ############################################################## # +# Jul 4, 2007 - version 1.1.3 +# updated nvidia section for new nvidia versioning scheme +# # Apr 10, 2007 - version 1.1.2 # removed extra libGL.a cp in the ati section # @@ -97,7 +100,7 @@ case "$1" in checkInstalled nvidia # get the .so version number - NV_VER="`pkginfo -i | grep "^nvidia " | awk '{ print $2 }' | cut -d- -f2`" + NV_VER="`pkginfo -i | grep "^nvidia " | awk '{ print $2 }' | cut -d- -f1`" # check for the existence of libglx_so and libGL_so_1_2 # if none, move the xorg stuff out of the way for nvidia's @@ -106,19 +109,19 @@ case "$1" in then echo -n "libglx " mv /usr/lib/xorg/modules/extensions/libglx{.so,_so} - ln -s libglx.so.1.0.$NV_VER \ + ln -s libglx.so.$NV_VER \ /usr/lib/xorg/modules/extensions/libglx.so echo -n "libGLcore " mv /usr/lib/xorg/modules/extensions/libGLcore{.so,_so} - ln -s /usr/lib/libGLcore.so.1.0.$NV_VER \ + ln -s /usr/lib/libGLcore.so.$NV_VER \ /usr/lib/xorg/modules/extensions/libGLcore.so echo -n "libGL " mv /usr/lib/libGL{.so.1.2,_so_1_2} rm /usr/lib/libGL.so{,.1} # nvidia's library versioning prevents ldconfig from creating # libGL.so and libGLcore.so - ln -sf libGL.so.1.0.$NV_VER /usr/lib/libGL.so - ln -sf libGLcore.so.1.0.$NV_VER /usr/lib/libGLcore.so + ln -sf libGL.so.$NV_VER /usr/lib/libGL.so + ln -sf libGLcore.so.$NV_VER /usr/lib/libGLcore.so else infoRevert exit 1