4 files changed, 46 insertions, 48 deletions
diff --git a/system/nvidia-driver/doinst.sh b/system/nvidia-driver/doinst.sh
index 5d892d248a992..9ad2ad86009d6 100644
--- a/system/nvidia-driver/doinst.sh
+++ b/system/nvidia-driver/doinst.sh
@@ -2,27 +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 libvdpau_nvidia.so )
-( cd usr/libLIBDIRSUFFIX ; ln -sf libvdpau_nvidia.so.PKGVERSION libvdpau_nvidia.so )
-( 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-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index ab1a3ae556473..549409f2d07ed 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nvidia-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-driver
-VERSION=190.42
+VERSION=195.36.15
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -60,12 +60,18 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 mkdir -p $PKG/usr/{bin,share,lib$LIBDIRSUFFIX,sbin} $PKG/usr/include/GL \
-  $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions}
+  $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} $PKG/etc
+
+cd etc
+  cp -rf OpenCL $PKG/etc/
+cd -
 
 # Start with the libraries
 cd usr/lib
   #Do not copy libvdpau and libvdpau_trace, those are now a separate script
-  rm libvdpau.so.$VERSION libvdpau_trace.so.$VERSION
+  rm libvdpau.so.$VERSION vdpau/libvdpau_trace.so.$VERSION
+  #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
@@ -93,6 +99,7 @@ cd usr/include/GL
 cd -
 
 cp -a usr/include/cuda $PKG/usr/include/cuda
+cp -a usr/include/CL $PKG/usr/include/CL
 
 # Next come the apps
 cp -a nvidia-installer $PKG/usr/bin/
@@ -110,6 +117,31 @@ 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 vdpau/libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
+  ln -sf libXvMCNVIDIA.so.$VERSION libXvMCNVIDIA_dynamic.so.1
+  ln -sf libOpenCL.so.1.0.0 libOpenCL.so.1
+  ln -sf libOpenCL.so.1 libOpenCL.so
+cd -
+
+cd $PKG/usr/lib$LIBDIRSUFFIX/tls
+  ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so.1
+cd -
+
+cd $PKG/usr/lib$LIBDIRSUFFIX/vdpau
+  ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
+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.
@@ -133,8 +165,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-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 23f7d64303a69..d995b2fcfd23d 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-driver"
-VERSION="190.42"
+VERSION="195.36.15"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/190.42/NVIDIA-Linux-x86-190.42-pkg0.run"
-MD5SUM="f94806feee87de756d14fe3e9bcaf05a"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/190.42/NVIDIA-Linux-x86_64-190.42-pkg0.run"
-MD5SUM_x86_64="ae431ff849ec01446e6724f9fcfe3bb4"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/195.36.15/NVIDIA-Linux-x86-195.36.15-pkg0.run"
+MD5SUM="b09b45113585524b08b3b2acfdf4a290"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.15/NVIDIA-Linux-x86_64-195.36.15-pkg0.run"
+MD5SUM_x86_64="82ff23e6d02b9f208c618ec17c60ca29"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="rworkman"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index f4e0ed4948084..b700fb2f5d97e 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-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"