system/nvidia-driver: Updated for version 270.41.19.

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

3 files changed, 74 insertions, 27 deletions

diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index ad76586bd5318..8521adb0e7f34 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -2,15 +2,23 @@ This is the proprietary binary video driver from NVidia for the X.Org
 X-server. This package does not include the kernel-module - it is a
 part of the nvidia-kernel package at SlackBuilds.org.
 
+Installing the 32-bit compatibility libraries is available, so pass
+
+SRCSUFFIX="" ./nvidia-driver.SlackBuild
+
+You will need to download the NVIDIA-Linux-x86_64-xxx.yy.zz.run version
+instead of NVIDIA-Linux-x86_64-xxx.yy.zz-no-compat32.run
+
 Since this nvidia-driver conflicts with some files of xorg, it's a bit
 complex to install/uninstall the driver.  However, installation of the
 nvidia-driver package itself backs up the conflicting files and puts the
 nvidia-specific files into place.
 
-Heinz Wiesinger, the author of the build script, has written a script called
-nvidia-switch, which is used to switch between the stock xorg driver and
-the nvidia driver, but it will not edit xorg.conf for you; you have to do
-that manually.  The nvidia-switch script is installed to /usr/sbin.
+Heinz Wiesinger, the original author of the build script, has written a 
+script called nvidia-switch, which is used to switch between the stock 
+xorg driver and the nvidia driver, but it will not edit xorg.conf for you;
+you have to do that manually.  The nvidia-switch script is installed to 
+/usr/sbin.
 
 Usage of nvidia-switch:
   nvidia-switch --xorg    <--> switch to the stock xorg files
@@ -35,4 +43,9 @@ won't work on next startup.  Here are the affected files:
   /usr/lib/libGL.so.1.2
   /usr/lib/xorg/modules/extensions/{libglx.so libglx.la}
 
+or, for Slackware64,
+
+  /usr/lib64/libGL.so.1.2
+  /usr/lib64/xorg/modules/extensions/{libglx.so libglx.la}
+
 This also requires the nvidia-kernel and libvdpau package from SlackBuilds.org.
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index c063fa2340d52..5fc3c921216fb 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -23,9 +23,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Thanks to Robby Workman for suggestions to improve this script.
+#
+# ChangeLog
+# ------------------------------------------------------------------------------
+# 1.0	20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
+# 1.1	10-APR-2011	updated to new version, testing 13.37rc4.6692
+# 1.2   27-MAY-2011	new version, allow multilib option, minor edits
 
 PRGNAM=nvidia-driver
-VERSION=260.19.29
+VERSION=270.41.19
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +61,8 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   TARGET="x86_64"
-  SRCSUFFIX="-no-compat32"
+  SRCSUFFIX=${SCRSUFFIX:--no-compat32}
+# Pass SRCSUFFIX="" if you d/l the pure full package with 32-bit compatibility.
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -104,6 +111,20 @@ install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 
 install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
 
+# Optional 32-bit support; NOTE! nvidia-switch does not operate here.
+if [ "$ARCH" = "x86_64" -a "${SRCSUFFIX}" != "-no-compat32" ]; 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/
@@ -134,6 +155,18 @@ cd $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules
   ln -sf libnvidia-wfb.so.$VERSION libnvidia-wfb.so.1
 cd -
 
+# symlinks for optional 32-bit support
+if [ "${SRCSUFFIX}" != "-no-compat32" ]; then
+  cd $PKG/usr/lib
+    ln -sf libcuda.so.$VERSION libcuda.so.1
+    ln -sf libcuda.so.1 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
+    ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
+  cd -
+fi
+
 # Compiling nvidia-installer from source
 cd $TMP/nvidia-installer-$VERSION
   chown -R root:root .
@@ -179,10 +212,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 use to switch between nvidia and nv.
+# 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.
+# after installation.  For pure 64-bit only (EWK).
 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
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 4f364deb7e175..3d4a882ec4c3c 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,22 +1,24 @@
 PRGNAM="nvidia-driver"
-VERSION="260.19.29"
+VERSION="270.41.19"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/260.19.29/NVIDIA-Linux-x86-260.19.29.run \
-    ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-260.19.29.tar.bz2 \
-    ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-260.19.29.tar.bz2 \
-    ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-260.19.29.tar.bz2"
-MD5SUM="e982a05a85c68130acfe1d48086250e3 \
-    743cdfc95507f19ad71b80dbfe7826e9 \
-    39e66889a185c220ac582b38e05dfb6b \
-    4417c24d1187abec65ed42812f16a505"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/260.19.29/NVIDIA-Linux-x86_64-260.19.29-no-compat32.run \
-    ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-260.19.29.tar.bz2 \
-    ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-260.19.29.tar.bz2 \
-    ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-260.19.29.tar.bz2"
-MD5SUM_x86_64="0583668d86f7318d99def3ed3e1cc4bc \
-    743cdfc95507f19ad71b80dbfe7826e9 \
-    39e66889a185c220ac582b38e05dfb6b \
-    4417c24d1187abec65ed42812f16a505"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/270.41.19/NVIDIA-Linux-x86-270.41.19.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-270.41.19.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-270.41.19.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-270.41.19.tar.bz2"
+MD5SUM="c167e32702f56599bd600add97943312 \
+        023a6cf43efa7a42073f1e69f70c089c \
+        521dcb2f1261c303a915e20ad528b44b \
+        cad8553d213c698b11932197d40c59b4"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19-no-compat32.run \
+                 ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19.run
+                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-270.41.19.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-270.41.19.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-270.41.19.tar.bz2"
+MD5SUM_x86_64="cb518bdd70f356425b8c4a5a48c0ad9c \
+               b84143ecb5c0511c5ef9e53e732d9136
+               023a6cf43efa7a42073f1e69f70c089c \
+               521dcb2f1261c303a915e20ad528b44b \
+               cad8553d213c698b11932197d40c59b4"
 MAINTAINER="Edward Koenig"
 EMAIL="kingbeowulf@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"