system/nvidia-driver: Updated for version 361.42.

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

1 files changed, 20 insertions, 15 deletions

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}