system/nvidia-driver: Updated for version 361.42.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 42 insertions, 36 deletions

diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index cc559ef475..a467f3ee13 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -25,3 +25,4 @@
 4.4     13-DEC-2015 version update, X.Org 1.18 support
 4.5     12-MAR-2016 version update LLB, symlink fixes, drop nvidia-installer, get ready for 14.2
 4.5a    26-MAR-2016 fixed broken symlinks
+4.6     24-APR-2016 version update LLB, fix symlinks, added to version if multilib
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 5e48acc664..c0c6d4271a 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -26,10 +26,10 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-361.28}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-361.42}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CPROXY=${CPROXY:-no}
+CPROXY=${CPROXY:-yes}
 #GLVND=${GLVND:-no} # possibly switch needed?
 
 set -e
@@ -104,6 +104,7 @@ install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
 # non-GLVND GLX client libraries are the default
 install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX
 install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
 #
 # we'll try leaving these in to get EGL etc support that needs GLVND (see README.txt)
@@ -146,16 +147,16 @@ install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
 # Add optional 32-bit support
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   mkdir -p $PKG/usr/lib/tls
-
   install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
 
-  ## GLVND libGL libraries for future consideration, conflict with non-GLVND versions
+## GLVND libGL libraries for future consideration, conflict with non-GLVND versions
 #install -m 755 32/libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.1.0.0-nvidia
 #install -m 755 32/libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
 #
 # non-GLVND GLX client libraries are the default
   install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
+  install -m 755 32/libnvidia-tls.so.$VERSION $PKG/usr/lib/
   install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
 #
 # we'll try leaving these in to get EGL etc support that needs GLVND (see README.txt)
@@ -206,11 +207,11 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
   ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
   ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
   ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
-cd -
-cd $PKG/usr/lib$LIBDIRSUFFIX/tls
- ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-cd -
-ln -sf /usr/lib$LIBDIRSUFFIX/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-tls.so
+  ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+  cd -
+   cd $PKG/usr/lib$LIBDIRSUFFIX/tls
+   ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+  cd -
 
 # symlinks for optional 32-bit support
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
@@ -229,11 +230,11 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
     ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
     ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
     ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
-  cd -
-  cd $PKG/usr/lib$LIBDIRSUFFIX/tls
     ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-  cd -
-  ln -sf /usr/lib$LIBDIRSUFFIX/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-tls.so
+    cd -
+      cd $PKG/usr/lib$LIBDIRSUFFIX/tls
+      ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+    cd -
 fi
 
 # Next come the apps
@@ -365,4 +366,8 @@ sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+MULTI=""
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+  MULTI="_multi"
+fi
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 3fe8123ad4..cefa1a0f5e 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,26 +1,26 @@
 PRGNAM="nvidia-driver"
-VERSION="361.28"
+VERSION="361.42"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run \
-          ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-361.28.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-361.28.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-361.28.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-361.28.tar.bz2"
-MD5SUM="d4fc7fcf1204a46f15733d7cc2711ad2 \
-        ded9f1d6bfc7cf7884f5bec41f2c1428 \
-        7fffeeddbabe37ecf8186254f2f76c14 \
-        70c379092e068e3da1192e41e8018360 \
-        6fbae00939910f3019958876acd59017"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/361.28/NVIDIA-Linux-x86_64-361.28.run \
-                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-361.28.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-361.28.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-361.28.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-361.28.tar.bz2"
-MD5SUM_x86_64="16a583d074a83c1a3ef926e9c59d4349 \
-        ded9f1d6bfc7cf7884f5bec41f2c1428 \
-        7fffeeddbabe37ecf8186254f2f76c14 \
-        70c379092e068e3da1192e41e8018360 \
-        6fbae00939910f3019958876acd59017"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/361.42/NVIDIA-Linux-x86-361.42.run \
+          ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-361.42.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-361.42.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-361.42.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-361.42.tar.bz2"
+MD5SUM="7b2c6f74ebbaccd53dcc89d7166b0680 \
+        34fc0ef5e0ad8978ed3c5373ee576f7e \
+        1b0014952965f20c91c3e20b26d42288 \
+        3addf5d411653c92e23a20299d709314 \
+        476c1afca4da620fb8d02d1c0005c0db"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/361.42/NVIDIA-Linux-x86_64-361.42.run \
+                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-361.42.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-361.42.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-361.42.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-361.42.tar.bz2"
+MD5SUM_x86_64="dc05f2f89f320fe935768e906f8b010b \
+               34fc0ef5e0ad8978ed3c5373ee576f7e \
+               1b0014952965f20c91c3e20b26d42288 \
+               3addf5d411653c92e23a20299d709314 \
+               476c1afca4da620fb8d02d1c0005c0db"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"