diff options
Diffstat (limited to 'system/nvidia-legacy173-driver')
4 files changed, 33 insertions, 45 deletions
diff --git a/system/nvidia-legacy173-driver/doinst.sh b/system/nvidia-legacy173-driver/doinst.sh index bc93bf2c12f6..9ad2ad86009d 100644 --- a/system/nvidia-legacy173-driver/doinst.sh +++ b/system/nvidia-legacy173-driver/doinst.sh @@ -2,25 +2,5 @@ if [ -x /usr/bin/update-desktop-database ]; then ./usr/bin/update-desktop-database -q usr/share/applications fi -if ! [ -e usr/libLIBDIRSUFFIX/xorg/modules/libwfb.so ]; then - ( cd usr/libLIBDIRSUFFIX/xorg/modules ; ln -s libnvidia-wfb.so.1 libwfb.so ) -fi - -( cd usr/libLIBDIRSUFFIX/tls ; rm -rf libnvidia-tls.so.1 ) -( cd usr/libLIBDIRSUFFIX/tls ; ln -sf libnvidia-tls.so.PKGVERSION libnvidia-tls.so.1 ) -( cd usr/libLIBDIRSUFFIX/xorg/modules ; rm -rf libnvidia-wfb.so.1 ) -( cd usr/libLIBDIRSUFFIX/xorg/modules ; ln -sf libnvidia-wfb.so.PKGVERSION libnvidia-wfb.so.1 ) -( cd usr/libLIBDIRSUFFIX ; rm -rf libnvidia-cfg.so.1 ) -( cd usr/libLIBDIRSUFFIX ; ln -sf libnvidia-cfg.so.PKGVERSION libnvidia-cfg.so.1 ) -( cd usr/libLIBDIRSUFFIX ; rm -rf libnvidia-tls.so.1 ) -( cd usr/libLIBDIRSUFFIX ; ln -sf libnvidia-tls.so.PKGVERSION libnvidia-tls.so.1 ) -( cd usr/libLIBDIRSUFFIX ; rm -rf libXvMCNVIDIA_dynamic.so.1 ) -( cd usr/libLIBDIRSUFFIX ; ln -sf libXvMCNVIDIA.so.PKGVERSION libXvMCNVIDIA_dynamic.so.1 ) -( cd usr/libLIBDIRSUFFIX ; rm -rf libnvidia-cfg.so ) -( cd usr/libLIBDIRSUFFIX ; ln -sf libnvidia-cfg.so.1 libnvidia-cfg.so ) -( cd usr/libLIBDIRSUFFIX ; rm -rf libcuda.so.1 ) -( cd usr/libLIBDIRSUFFIX ; ln -sf libcuda.so.PKGVERSION libcuda.so.1 ) -( cd usr/libLIBDIRSUFFIX ; rm -rf libcuda.so ) -( cd usr/libLIBDIRSUFFIX ; ln -sf libcuda.so.1 libcuda.so ) - /usr/sbin/nvidia-switch --install + diff --git a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild index fa7722ee38ae..5e4da9777456 100644 --- a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild +++ b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nvidia-legacy173-driver -# Copyright 2007-2009 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2007-2010 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # Thanks to Robby Workman for suggestions to improve this script. PRGNAM=nvidia-legacy173-driver -VERSION=173.14.22 +VERSION=173.14.25 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,6 +64,8 @@ mkdir -p $PKG/usr/{bin,share,lib$LIBDIRSUFFIX,sbin} $PKG/usr/include/GL \ # Start with the libraries cd usr/lib + #remove duplicate libnvidia-tls + rm libnvidia-tls.so.$VERSION cp -a * $PKG/usr/lib$LIBDIRSUFFIX #Rename those files which would overwrite xorg's original files for i in libGL.so.$VERSION libGLcore.so.$VERSION; do @@ -108,6 +110,24 @@ cd usr/share cp -a man* $PKG/usr/ cd - +# symlinks +cd $PKG/usr/lib$LIBDIRSUFFIX + for i in libnvidia-cfg libcuda; do + ln -s $i.so.$VERSION $i.so.1 + ln -s $i.so.1 $i.so + done + ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.1 + ln -sf libXvMCNVIDIA.so.$VERSION libXvMCNVIDIA_dynamic.so.1 +cd - + +cd $PKG/usr/lib$LIBDIRSUFFIX/tls + ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so.1 +cd - + +cd $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules + ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1 +cd - + # Self written bash script which I use to switch between nvidia and nv. # It is now also used by doinst.sh to switch to the nvidia-driver right # after installation. @@ -131,8 +151,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc -sed "s/PKGVERSION/$VERSION/g" $CWD/doinst.sh > $PKG/install/doinst.sh -sed -i "s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g" $PKG/install/doinst.sh +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info index c2b0a30f6b4c..3fccc160612b 100644 --- a/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info +++ b/system/nvidia-legacy173-driver/nvidia-legacy173-driver.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-legacy173-driver" -VERSION="173.14.22" +VERSION="173.14.25" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/173.14.22/NVIDIA-Linux-x86-173.14.22-pkg0.run" -DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.22/NVIDIA-Linux-x86_64-173.14.22-pkg0.run" -MD5SUM="6bbf9a164cd3f8b84774c6bdca758a14" -MD5SUM_x86_64="148d68a518348330fd8047266552776c" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/173.14.25/NVIDIA-Linux-x86-173.14.25-pkg0.run" +MD5SUM="397bac51f760505ea57e863c1db9c572" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.25/NVIDIA-Linux-x86_64-173.14.25-pkg0.run" +MD5SUM_x86_64="a61b6c1627984f93af73eb446a8beb5e" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="Erik Hanson" +APPROVED="rworkman" diff --git a/system/nvidia-legacy173-driver/nvidia-switch b/system/nvidia-legacy173-driver/nvidia-switch index f4e0ed494808..b700fb2f5d97 100644 --- a/system/nvidia-legacy173-driver/nvidia-switch +++ b/system/nvidia-legacy173-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.1 +# nvidia-switch utility 0.8.2 # # A tool to switch between nvidia-binary-driver and stock xorg-driver # if both are installed in parallel. @@ -236,15 +236,6 @@ fi cd $CWD } -libwfb_nvidia(){ -#Recreate the link removed by --xorg -if ! [ -e "$XMOD/libwfb.so" ]; then - cd $XMOD - ln -s libnvidia-wfb.so.1 libwfb.so - cd $CWD -fi -} - nvidia_ldconfig(){ /sbin/ldconfig #Generate correct symink for that lib @@ -360,7 +351,7 @@ check_glx(){ } check_wfb(){ - for i in libwfb.so libwfb.la libnvidia-wfb.so.1 libnvidia-wfb.so.$NV_VERSION; do + for i in libnvidia-wfb.so.1 libnvidia-wfb.so.$NV_VERSION; do if [ "$i" = "libnvidia-wfb.so.1" ]; then check $XMOD $i "link" else @@ -443,7 +434,6 @@ nvidia(){ libglcore_nvidia libs "nvidia" libglx_nvidia - libwfb_nvidia LD_NVIDIA="${LIB}/libGL.so.$NV_VERSION-nvidia" nvidia_ldconfig $LD_NVIDIA @@ -471,7 +461,6 @@ xorg(){ else libglx_xorg "xorg" fi - remove_link "$XMOD/libwfb.so" LD_NVIDIA="${LIB}/libGL.so.1.2" nvidia_ldconfig $LD_NVIDIA "xorg" |