system/nvidia-driver: Updated for version 195.36.15.

1 files changed, 38 insertions, 7 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index ab1a3ae556..549409f2d0 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}