system/nvidia-driver: Updated for version 340.58.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 75 insertions, 58 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index d9b40ff5409ef..7605e1029a303 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -43,10 +43,11 @@
 # 2.6   20-OCT-2013	new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
 # 3.0   13-NOV-2013	new version (LLB), update libs
 # 3.1	12-APR-2014	new version (LLB), update libs
-# 3.2a   12-JUL-2014	new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
+# 3.2a  12-JUL-2014	new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
+# 3.3   20-NOV-2014	new version (LLB), update libs, fix nvidia-switch
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-340.24}
+VERSION=${VERSION:-340.58}
 MVERS=340
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -329,10 +330,10 @@ 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
 
-# nvidia-settings application profile support
+# nvidia-settings application profile support (see documention for use).
 mkdir -p $PKG/usr/share/nvidia
-install -m 755 nvidia-application-profiles-340.24-key-documentation $PKG/usr/share/nvidia/
-install -m 755 nvidia-application-profiles-340.24-rc $PKG/usr/share/nvidia/
+install -m 755 nvidia-application-profiles-$VERSION-key-documentation $PKG/usr/share/nvidia/
+install -m 755 nvidia-application-profiles-$VERSION-rc $PKG/usr/share/nvidia/
 
 mkdir -p $PKG/install
 sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 74ae0418326e1..d0f686f5c5ade 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-driver"
-VERSION="340.24"
+VERSION="340.58"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.24/NVIDIA-Linux-x86-340.24.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.24.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.24.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.24.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.24.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.24.tar.bz2"
-MD5SUM="edd4c618265d22ef4d2b28baf070c6ff \
-        ecb8f401c1c37031dc0db505b82775b3 \
-        56591382048891d5032065d21df5c787 \
-        d3da36416fd989e98cc297ec923f3891 \
-        d61b7e0d3f4d6bc13bb528a26617f978 \
-        9b159637bb212e44b0688ade20ba5710"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.24/NVIDIA-Linux-x86_64-340.24.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.24.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.24.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.24.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.24.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.24.tar.bz2"
-MD5SUM_x86_64="84c9a35b20fe34cf6f1160d541673c76 \
-        ecb8f401c1c37031dc0db505b82775b3 \
-        56591382048891d5032065d21df5c787 \
-        d3da36416fd989e98cc297ec923f3891 \
-        d61b7e0d3f4d6bc13bb528a26617f978 \
-        9b159637bb212e44b0688ade20ba5710"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.58/NVIDIA-Linux-x86-340.58.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.58.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.58.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.58.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.58.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.58.tar.bz2"
+MD5SUM="b993f9fc59434140f560e32fd7bd2b3d \
+        a536f4ad74620a629c3aecad68c19f63 \
+        cb0dc0141f4118efa3d8ca2ae867dbaf \
+        848ac5d824d239b36d8188de4e2584b4 \
+        cbe2bf2ebe6267a905ed35d58fbadda3 \
+        30577e2a71ecbd2b30bbb1ab72b4e150"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.58/NVIDIA-Linux-x86_64-340.58.run \
+		 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.58.tar.bz2 \
+		 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.58.tar.bz2 \
+		 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.58.tar.bz2 \
+	 	 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.58.tar.bz2 \
+		 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.58.tar.bz2"
+MD5SUM_x86_64="26ebeb6f4adb507bb3b573d9e0c0e2f9 \
+	       a536f4ad74620a629c3aecad68c19f63 \
+               cb0dc0141f4118efa3d8ca2ae867dbaf \
+               848ac5d824d239b36d8188de4e2584b4 \
+               cbe2bf2ebe6267a905ed35d58fbadda3 \
+               30577e2a71ecbd2b30bbb1ab72b4e150"
 REQUIRES="libvdpau nvidia-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index c861d5a034ffc..07f65f5358318 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -20,13 +20,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# nvidia-switch utility 2.0.2
+# nvidia-switch utility 2.1
 #
 # A tool to install and cleanly remove the nvidia driver without stomping on the xorg files.
 # Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still
-# need to edit a bunch of other config files
+# need to edit a bunch of other config files.
 
-# TO-DO: Bounds/error checking, add more COMPAT32?
+# TO-DO: Bounds/error checking
 
 set -e
 
@@ -51,30 +51,14 @@ save_GL(){
     fi
     ln -sf libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION
     ln -sf libGL.so.$NV_VERSION libGL.so.1
-    ln -sf libGL.so.1 libGL.so
-# Check for multilib configuration
-    if [ "$COMPAT32" = "yes" ]; then
-      cd $LIB32
-      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
-        ln -sf libGL.so.$NV_VERSION libGL.so.1
-        ln -sf libGL.so.1 libGL.so
-    fi
-  elif [ "$1" = "xorg" ]; then
+    ln -sf libGL.so.$NV_VERSION libGL.so
+  fi
+  
+  if [ "$1" = "xorg" ]; then
     mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
     ln -sf libGL.so.$GL_VERSION libGL.so.1
-    ln -sf libGL.so.1 libGL.so
+    ln -sf libGL.so.$GL_VERSION libGL.so
     rm -f libGL.so.$NV_VERSION
-# Check for multilib and reverse any "damage"
-    if [ "$COMPAT32" = "yes" ]; then
-      cd $LIB32
-      mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
-      ln -sf libGL.so.$GL_VERSION libGL.so.1
-      ln -sf libGL.so.1 libGL.so
-      rm -f libGL.so.$NV_VERSION
-    fi
   fi
   cd "$CWD"
 }
@@ -97,7 +81,7 @@ save_wfb(){
                 mv libwfb.so-xorg libwfb.so
             fi
         fi
-  fi 
+  fi
   cd "$CWD"
 }
 
@@ -119,6 +103,28 @@ save_glx(){
 cd "$CWD"
 }
 
+multilib(){
+# rejigger multilib paths/links
+	cd $LIB32
+	case "$1" in
+		"nvidia")
+			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
+			ln -sf libGL.so.$NV_VERSION libGL.so.1
+			ln -sf libGL.so.$NV_VERSION libGL.so
+	;;
+		"xorg")
+			mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
+			ln -sf libGL.so.$GL_VERSION libGL.so.1
+			ln -sf libGL.so.$GL_VERSION libGL.so
+			rm -f libGL.so.$NV_VERSION
+	;;
+	esac
+	cd "$CWD"
+}
+
 nvidia_ldconfig(){
    /sbin/ldconfig
    #Generate correct symink for that lib
@@ -134,10 +140,15 @@ nvidia_install(){
   save_GL "nvidia"
   save_wfb "nvidia"
   save_glx "nvidia"
+# Check for multilib configuration
+  if [ "$COMPAT32" = "yes" ]; then
+    multilib "nvidia"
+  fi
 
-
-  LD_NVIDIA="${LIB}/libGL.so.$NV_VERSION-nvidia"
+  LD_NVIDIA="${LIB}/libGL.so.$NV_VERSION"
   nvidia_ldconfig $LD_NVIDIA
+  WFB-NVIDIA="${XMOD}/libnvidia_wfb.so.$NV_VERSION"
+  nvidia_ldconfig $WFB_NVIDIA
 }
 
 nvidia_remove(){
@@ -149,7 +160,10 @@ nvidia_remove(){
   save_GL "xorg"
   save_wfb "xorg"
   save_glx "xorg"
-
+# Check for multilib configuration
+  if [ "$COMPAT32" = "yes" ]; then
+    multilib "xorg"
+  fi
 
   if [ -e $NV_CONF ]; then
 	rm -f $NV_CONF
@@ -157,6 +171,8 @@ nvidia_remove(){
 
   LD_NVIDIA="${LIB}/libGL.so.$GL_VERSION"
   nvidia_ldconfig $LD_NVIDIA
+  WFB-NVIDIA="${XMOD}/libwfb.so"
+  nvidia_ldconfig $WFB_NVIDIA
 }
 
 usage(){