system/nvidia-legacy96-driver: Updated for version 96.43.16.

This commit is contained in:
Heinz Wiesinger 2010-04-07 23:47:29 -05:00 committed by Robby Workman
parent ca20cc8535
commit 3be5d4f283
4 changed files with 31 additions and 41 deletions

View File

@ -2,21 +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 )
/usr/sbin/nvidia-switch --install

View File

@ -2,7 +2,7 @@
# Slackware build script for nvidia-legacy96-driver
# Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=nvidia-legacy96-driver
VERSION=96.43.14
VERSION=96.43.16
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -62,6 +62,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
@ -104,6 +106,22 @@ cd usr/share
cp -a man* $PKG/usr/
cd -
# symlinks
cd $PKG/usr/lib$LIBDIRSUFFIX
ln -sf libnvidia-cfg.so.$VERSION libnvidia-cfg.so.1
ln -sf libnvidia-cfg.so.1 libnvidia-cfg.so
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.
@ -127,8 +145,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}

View File

@ -1,10 +1,10 @@
PRGNAM="nvidia-legacy96-driver"
VERSION="96.43.14"
VERSION="96.43.16"
HOMEPAGE="http://www.nvidia.com"
DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/96.43.14/NVIDIA-Linux-x86-96.43.14-pkg0.run"
DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.14/NVIDIA-Linux-x86_64-96.43.14-pkg0.run"
MD5SUM="4c1524c5f88e684bb1045ca759c11526"
MD5SUM_x86_64="6924d94b07163d7d71b44f53471dfb83"
DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/96.43.16/NVIDIA-Linux-x86-96.43.16-pkg0.run"
MD5SUM="7479b25c747e29af95b9ccf06f43fbf9"
DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.16/NVIDIA-Linux-x86_64-96.43.16-pkg0.run"
MD5SUM_x86_64="73e226d4ee0996b6df4bdf44cc1fc6f5"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"
APPROVED="Erik Hanson"
APPROVED="rworkman"

View File

@ -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"