diverse kleinere Anpassungen an die neuen Driver versionen

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5244 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2010-01-27 11:54:55 +00:00
parent 8484438634
commit f20ccc6837

View File

@ -79,10 +79,10 @@ SRCPATH=XServ/Driver
premk() { premk() {
if [ ${MK64BIT} == "true" ]; then if [ ${MK64BIT} == "true" ]; then
/bin/bash -e $LFSSOURCE/$SRCPATH/NVIDIA-Linux-x86_64-*.run -x --target $MAKEDIR/nvidia-driver /bin/bash -e $LFSSOURCE/$SRCPATH/NVIDIA-Linux-x86_64-*.run -x --target $MAKEDIR/nvidia-driver
DSTPKGNAME=`\ls $LFSSOURCE/$SRCPATH/NVIDIA-Linux*.run|sed -e "s/-x86_64-//"|sed -e "s/\.run$//"` DSTPKGNAME=`\ls $LFSSOURCE/$SRCPATH/NVIDIA-Linux-x86_64*.run|sed -e "s/-x86_64-//"|sed -e "s/\.run$//"`
else else
/bin/bash -e $LFSSOURCE/$SRCPATH/NVIDIA-Linux-x86-*.run -x --target $MAKEDIR/nvidia-driver /bin/bash -e $LFSSOURCE/$SRCPATH/NVIDIA-Linux-x86-*.run -x --target $MAKEDIR/nvidia-driver
DSTPKGNAME=`\ls $LFSSOURCE/$SRCPATH/NVIDIA-Linux*.run|sed -e "s/-x86-//"|sed -e "s/\.run$//"` DSTPKGNAME=`\ls $LFSSOURCE/$SRCPATH/NVIDIA-Linux-x86-*.run|sed -e "s/-x86-//"|sed -e "s/\.run$//"`
fi fi
cd $MAKEDIR/nvidia-driver cd $MAKEDIR/nvidia-driver
} }
@ -109,29 +109,42 @@ mk() {
cd usr/include cd usr/include
ln -s ../X11R7/include/cuda . ln -s ../X11R7/include/cuda .
ln -s ../X11R7/include/GL . ln -s ../X11R7/include/GL .
ln -s ../X11R7/include/vdpau .
cd - cd -
tar -C usr/$LIBDIR -cf - .|tar -C usr/X11R7/$LIBDIR -xvf - tar -C usr/$LIBDIR -cf - .|tar -C usr/X11R7/$LIBDIR -xvf -
rm -r usr/$LIBDIR/* rm -r usr/$LIBDIR/*
find . -type f -exec sed -i "s/X11R6/X11R7/g" {} \;
cd usr/X11R7/$LIBDIR/tls cd usr/X11R7/$LIBDIR/tls
ln -s libnvidia-tls.so.* libnvidia-tls.so.1 ln -s libnvidia-tls.so.* libnvidia-tls.so.1
cd - cd -
cd usr/X11R7/$LIBDIR/vdpau
ln -sf libvdpau_nvidia.so.* libvdpau_nvidia.so.1
ln -sf libvdpau_nvidia.so.1 libvdpau_nvidia.so
ln -sf libvdpau_trace.so.* libvdpau_trace.so.1
ln -sf libvdpau_trace.so.l libvdpau_trace.so
cd -
cd usr/X11R7/$LIBDIR cd usr/X11R7/$LIBDIR
ln -s libcuda.so.* libcuda.so.1 ln -sf libcuda.so.* libcuda.so.1
ln -s libcuda.so.1 libcuda.so ln -sf libcuda.so.1 libcuda.so
ln -s libGLcore.so.* libGLcore.so.1 ln -sf libGLcore.so.* libGLcore.so.1
ln -s libGL.so.* libGL.so.1 ln -sf libGLcore.so.1 libGLcore.so
ln -s libGL.so.1 libGL.so ln -sf libGL.so.* libGL.so.1
ln -s libnvidia-tls.so.* libnvidia-tls.so.1 ln -sf libGL.so.1 libGL.so
ln -s libnvidia-cfg.so.* libnvidia-cfg.so.1 ln -sf libnvidia-cfg.so.* libnvidia-cfg.so.1
ln -s libnvidia-cfg.so.1 libnvidia-cfg.so ln -sf libnvidia-cfg.so.1 libnvidia-cfg.so
ln -s libXvMCNVIDIA.so.* libXvMCNVIDIA_dynamic.so.1 ln -sf libnvidia-tls.so.* libnvidia-tls.so.1
ln -sf libnvidia-tls.so.1 libnvidia-tls.so
ln -sf libvdpau.so.* libvdpau.so.1
ln -sf libvdpau.so.1 libvdpau.so
ln -sf libXvMCNVIDIA.so.* libXvMCNVIDIA_dynamic.so.1
ln -sf libXvMCNVIDIA.so.1 libXvMCNVIDIA_dynamic.so
cd - cd -
mkdir usr/X11R7/$LIBDIR/xorg mkdir usr/X11R7/$LIBDIR/xorg
mv usr/X11R7/$LIBDIR/modules usr/X11R7/$LIBDIR/xorg mv usr/X11R7/$LIBDIR/modules usr/X11R7/$LIBDIR/xorg
cd usr/X11R7/$LIBDIR/xorg/modules cd usr/X11R7/$LIBDIR/xorg/modules
ln -s libnvidia-wfb.so.* libwfb.so.1 #ln -s libnvidia-wfb.so.* libwfb.so.1
ln -s libwfb.so.1 libwfb.so
ln -s libnvidia-wfb.so.* libnvidia-wfb.so.1 ln -s libnvidia-wfb.so.* libnvidia-wfb.so.1
ln -s libnvidia-wfb.so.1 libnvidia-wfb.so
cd - cd -
cd usr/X11R7/$LIBDIR/xorg/modules/extensions cd usr/X11R7/$LIBDIR/xorg/modules/extensions
ln -s libglx.so.* libglx.so ln -s libglx.so.* libglx.so
@ -146,15 +159,23 @@ mk() {
cd usr/X11R7/lib/tls cd usr/X11R7/lib/tls
ln -s libnvidia-tls.so.* libnvidia-tls.so.1 ln -s libnvidia-tls.so.* libnvidia-tls.so.1
cd - cd -
cd usr/X11R7/lib/vdpau
ln -sf libvdpau_nvidia.so.* libvdpau_nvidia.so.1
ln -sf libvdpau_nvidia.so.1 libvdpau_nvidia.so
ln -sf libvdpau_trace.so.* libvdpau_trace.so.1
ln -sf libvdpau_trace.so.l libvdpau_trace.so
cd -
cd usr/X11R7/lib cd usr/X11R7/lib
ln -s libcuda.so.* libcuda.so.1 ln -sf libcuda.so.* libcuda.so.1
ln -s libcuda.so.1 libcuda.so ln -sf libcuda.so.1 libcuda.so
ln -s libGLcore.so.* libGLcore.so.1 ln -sf libGLcore.so.* libGLcore.so.1
ln -s libGL.so.* libGL.so.1 ln -sf libGLcore.so.1 libGLcore.so
ln -s libGL.so.1 libGL.so ln -sf libGL.so.* libGL.so.1
ln -s libnvidia-tls.so.* libnvidia-tls.so.1 ln -sf libGL.so.1 libGL.so
ln -s libnvidia-cfg.so.* libnvidia-cfg.so.1 ln -sf libnvidia-tls.so.* libnvidia-tls.so.1
ln -s libnvidia-cfg.so.1 libnvidia-cfg.so ln -sf libnvidia-tls.so.1 libnvidia-tls.so
ln -sf libvdpau.so.* libvdpau.so.1
ln -sf libvdpau.so.1 libvdpau.so
cd - cd -
fi fi
mv .manifest usr/share/doc/nvidia mv .manifest usr/share/doc/nvidia