system/nvidia-driver: Updated for version 310.19.

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

1 files changed, 43 insertions, 28 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index d46c4f12a0..21be42b368 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -3,7 +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
+# Copyright 2011-2012 Edward W. koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,16 +35,16 @@
 # 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
-# 1.9a  21-AUG-2012	fix for libvdpau (per post on mail list)  --rworkman
-# 1.9b  10-SEP-2012     fix glx.h missing extension (per email, list and LQ)
-# 1.9c	25-SEP-2012	fix symlinks (thanks to Das via email)
+# 2.0	21-AUG-2012	new version (important security fix), missing vdpau-nvidia, dropped *.h
+# 2.1	25-AUG-2012	new version -Long Lived Branch, fixed symlinks (per Das email)
+# 2.2	22-NOV-2012	new version -Long Lived Branch. Updates: libs, apps
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-302.17}
-BUILD=${BUILD:-4}
+VERSION=310.19
+MVERS=310
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-MVERS=$(printf $VERSION | cut -d. -f1)
+CPROXY=${CPROXY:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -102,42 +102,47 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
   $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,pixmaps} \
   $PKG/usr/include/GL
 
+# Get all the libs to the right place
 install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
-
+install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 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 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/libnvidia-wfb.so.$VERSION-nvidia
-install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-encode.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
+install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
+
+# For 8-series GPU if libwfb.so is missing (ie older X servers).
+install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION-nvidia
+
+# Don't forget separate libvdpau package on SBo.
 install -m 755 libvdpau_nvidia.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/
 
-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.h-nvidia
-install -m 644 glxext.h $PKG/usr/include/GL/glxext.h-nvidia
 
-# Optional 32-bit support
+# Add optional 32-bit support
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   mkdir -p $PKG/usr/lib/{tls,vdpau}
 
+  install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libGL.la $PKG/usr/lib/
+  install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
+  install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
+  install -m 755 32/libnvidia-encode.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
+  install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
   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/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
 fi
 
 # symlinks
@@ -146,13 +151,12 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
     ln -s $i.so.$VERSION $i.so.1
     ln -s $i.so.1 $i.so
   done
-  ln -sf libXvMCNVIDIA.so.$VERSION libXvMCNVIDIA_dynamic.so.1
-  ln -sf libXvMCNVIDIA.so.$VERSION libXvMCNVIDIA_dynamic.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
   ln -sf libnvcuvid.so.$VERSION libnvcuvid.so.1
-  ln -sf libnvcuvid.so.$VERSION libnvcuvid.so
+  ln -sf libnvcuvid.so.1 libnvcuvid.so
+  ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
   ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
 cd -
 
@@ -166,6 +170,9 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
     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
+    ln -sf libnvcuvid.so.$VERSION libnvcuvid.so.1
+    ln -sf libnvcuvid.so.1 libnvcuvid.so
+    ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
     ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
   cd -
 fi
@@ -177,6 +184,14 @@ done
 
 install -m 644 nvidia-smi.1.gz $PKG/usr/man/man1/
 
+# New CUDA proxy server for 64-bit Linux only, and requires a device that supports
+# Unified Virtual Address (UVA) and CUDA 4.0+.
+if [ "$ARCH" = "x86_64" -a "${CPROXY}" = "yes" ]; then
+   install -m 755 nvidia-cuda-proxy-control $PKG/usr/bin/
+   install -m 755 nvidia-cuda-proxy-server $PKG/usr/bin/
+   install -m 644 nvidia-cuda-proxy-control.1.gz $PKG/usr/man/man1/
+fi
+
 # Compiling nvidia-installer from source
 cd $TMP/nvidia-installer-$VERSION
   chown -R root:root .
@@ -224,7 +239,7 @@ cd -
 
 # 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. 
+# Note: switching "on the fly" is 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