system/nvidia-driver: Updated for version 302.17.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

1 files changed, 32 insertions, 30 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index ebc913b722..0a3e1b32e1 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for nvidia-driver
 
 # Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 20011-2012 Edward W. koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,9 +36,11 @@
 # 1.6	27-AUG-2011	version bump, minor edits
 # 1.7	21-OCT-2011	version bump
 # 1.8   24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
+# 1.9   02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
 
 PRGNAM=nvidia-driver
-VERSION=295.33
+VERSION=302.17
+MVERS=302
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +68,7 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   TARGET="x86_64"
- LIBDIRSUFFIX="64"
+  LIBDIRSUFFIX="64"
 # Set 32-bit compatibility flag default
   COMPAT32=${COMPAT32:-no}
 else
@@ -94,17 +97,17 @@ chmod -R u+w,go+r-w,a-s .
 
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
   $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/{tls,vdpau} \
-  $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,pixmaps}
+  $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,pixmaps} \
+  $PKG/usr/include/GL
 
 install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
-install -m 755 libglx.so.$VERSION \
-  $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia
+
+install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia
 install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia
 install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 444 libXvMCNVIDIA.a $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libXvMCNVIDIA.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/vdpau/
 install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/
@@ -115,27 +118,24 @@ install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
 install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
 
-# Optional 32-bit support; NOTE! nvidia-switch does not operate here.
+install -m 644 gl.h $PKG/usr/include/GL/gl.h-nvidia
+install -m 644 glext.h $PKG/usr/include/GL/glext.h-nvidia
+install -m 644 glx.h $PKG/usr/include/GL/glx-nvidia
+install -m 644 glxext.h $PKG/usr/include/GL/glxext.h-nvidia
+
+# Optional 32-bit support
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   mkdir -p $PKG/usr/lib/{tls,vdpau}
 
   install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libGL.la $PKG/usr/lib/
   install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/vdpau/
   install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
   install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
   install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/
   install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
 fi
 
-# Next come the apps
-for i in nvidia-smi nvidia-bug-report.sh; do
-  install -m 755 $i $PKG/usr/bin/
-done
-
-install -m 644 nvidia-smi.1.gz $PKG/usr/man/man1/
-
 # symlinks
 cd $PKG/usr/lib$LIBDIRSUFFIX
   for i in libcuda libnvidia-cfg; do
@@ -152,22 +152,17 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
   ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
 cd -
 
-cd $PKG/usr/lib$LIBDIRSUFFIX/vdpau
-  ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
-  ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so.1
-cd -
-
 cd $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules
-  ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1
+  ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so
 cd -
 
 # symlinks for optional 32-bit support
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   cd $PKG/usr/lib
-    ln -sf libGL.so.$VERSION libGL.so.1
-    ln -sf libGL.so.1 libGL.so
-    ln -sf libcuda.so.$VERSION libcuda.so.1
-    ln -sf libcuda.so.1 libcuda.so
+    ln -sf libGL.so.$VERSION libGL.so.$MVERS
+    ln -sf libGL.so.$MVERS libGL.so
+    ln -sf libcuda.so.$VERSION libcuda.so.$MVERS
+    ln -sf libcuda.so.$MVERS libcuda.so
     ln -sf libOpenCL.so.1.0.0 libOpenCL.so.1.0
     ln -sf libOpenCL.so.1.0 libOpenCL.so.1
     ln -sf libOpenCL.so.1 libOpenCL.so
@@ -175,6 +170,13 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   cd -
 fi
 
+# Next come the apps
+for i in nvidia-smi nvidia-bug-report.sh nvidia-debugdump; do
+  install -m 755 $i $PKG/usr/bin/
+done
+
+install -m 644 nvidia-smi.1.gz $PKG/usr/man/man1/
+
 # Compiling nvidia-installer from source
 cd $TMP/nvidia-installer-$VERSION
   chown -R root:root .
@@ -202,8 +204,8 @@ cd $TMP/nvidia-settings-$VERSION
   CFLAGS="$SLKCFLAGS" \
   make
 
-  install -m 755 _out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/
-  install -m 644 _out/Linux_$TARGET/nvidia-settings.1.gz $PKG/usr/man/man1/
+  install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/
+  install -m 644 doc/_out/Linux_$TARGET/nvidia-settings.1.gz $PKG/usr/man/man1/
   install -m 644 doc/nvidia-settings.desktop $PKG/usr/share/applications/
   install -m 644 doc/nvidia-settings.png $PKG/usr/share/pixmaps/
 cd ../
@@ -220,9 +222,9 @@ cd $TMP/nvidia-xconfig-$VERSION
   install -m 644 _out/Linux_$TARGET/nvidia-xconfig.1.gz $PKG/usr/man/man1/
 cd -
 
-# Self written bash script which I (H.W.) use to switch between nvidia and nv.
-# It is now also used by doinst.sh to switch to the nvidia-driver right
-# after installation.  For 32-bit and pure 64-bit only (EWK).
+# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files
+# so we don't stomp on the overlapping xorg files. 
+# Note: switching "on the fly" no longer supported. 
 install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
 sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
 sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch