system/nvidia-driver: Updated for version 319.32.

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

3 files changed, 21 insertions, 29 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index e2722b49c1..6232c28480 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 2011-2013 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2013 Edward W. Koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -40,9 +40,10 @@
 # 2.2	22-NOV-2012	new version -Long Lived Branch. Updates: libs, apps
 # 2.3	15-FEB-2013	new version -Long Lived Branch.
 # 2.4	19-MAY-2013	new version -Long Lived Branch.
+# 2.5	06-JUL-2013	new version -Long Lived Branch.
 
 PRGNAM=nvidia-driver
-VERSION=319.17
+VERSION=319.32
 MVERS=319
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -243,7 +244,7 @@ cd -
 # Some new optional "useless" utilities. FIXME: Needs cleanup at a later date.
 if [ "${OPTAPPS}" = "yes" ]; then
 
-# Compiling nvidia-xconfig from source
+# Compiling nvidia-modprobe from source
   cd $TMP/nvidia-modprobe-$VERSION
     chown -R root:root .
     chmod -R u+w,go+r-w,a-s .
@@ -291,6 +292,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $TMP/$SRCNAM
 
 cp -a LICENSE NVIDIA_Changelog README.txt html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a nvidia-persistenced-init.tar.bz2 $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 67ceba3c31..19e9292dff 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="319.17"
+VERSION="319.32"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/319.17/NVIDIA-Linux-x86-319.17.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-319.17.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-319.17.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-319.17.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-319.17.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-319.17.tar.bz2"
-MD5SUM="993eee683aea53b7965a853ccde3d740 \
-        eb2d16d7d0cd4b3a96e0cd5f5023983c \
-        01ab515aab9a695b63e716477e54ffc0 \
-        ad1bf30d3eb65ee1a147e723fbe7e6ca \
-        f42533abc718058ed3470f37b03890f8 \
-        8491e9e9093cda28fa55e43c2466f344"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/319.17/NVIDIA-Linux-x86_64-319.17.run \
-                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-319.17.tar.bz2 \
-	         ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-319.17.tar.bz2 \
-	         ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-319.17.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-319.17.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-319.17.tar.bz2"
-MD5SUM_x86_64="13b3afaa8981ae62526f9dc9e9464ce4 \
-               eb2d16d7d0cd4b3a96e0cd5f5023983c \
-               01ab515aab9a695b63e716477e54ffc0 \
-               ad1bf30d3eb65ee1a147e723fbe7e6ca \
-               f42533abc718058ed3470f37b03890f8 \
-               8491e9e9093cda28fa55e43c2466f344"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/319.32/NVIDIA-Linux-x86-319.32.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-319.32.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-319.32.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-319.32.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-319.32.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-319.32.tar.bz2"
+MD5SUM="978339ff37c3207f3a39d3952721dcdb \
+        0c912f69ee42fd398970676a5d5b1b4c \
+        fec790ab79825d78a20ef3fc8c9ac9ed \
+        ac2bd2f0820adc29b2c70d6748aaf95a \
+        e79e4cae77ceaa8da8dbcaf6b3c9eb39 \
+        ac5041ab0337c5ee509cc159cab55d5b"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/319.32/NVIDIA-Linux-x86_64-319.32.run"
+MD5SUM_x86_64="608767a3e1bee8a030f31cdc9251182e"
 REQUIRES="libvdpau nvidia-kernel"
 MAINTAINER="Edward Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index 3495777a48..8369e993f0 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -55,7 +55,7 @@ save_GL(){
 # Check for multilib configuration 
     if [ "$COMPAT32" = "yes"  ]; then
       cd $LIB32
-      if [ -f libGL.so.$GL_VERSION ]; then
+      if [ ! -e libGL.so.$GL_VERSION-xorg ]; then
         mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
       fi
         ln -sf libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION