system/nvidia-driver: Updated for version 375.39.

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

1 files changed, 90 insertions, 84 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 2040c422e8..1e209cd4b3 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 2012-2016 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,12 +26,12 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-367.44}
+VERSION=${VERSION:-375.39}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CPROXY=${CPROXY:-yes}
-GLVND=${GLVND:-no} # change at your peril ;-)
-# Note: libglvnd may land in X.org Mesa 
+GLVND=${GLVND:-yes}
+# Note: libglvnd may land in X.org Mesa and Nvidia recommended 
 
 set -e
 
@@ -63,12 +63,19 @@ elif [ "$ARCH" = "x86_64" ]; then
 # Set 32-bit compatibility flag default
   COMPAT32=${COMPAT32:-no}
 else
+  COMPAT32=${COMPAT32:-no}
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
+# Flag package as multilib, if needed
+MULTI=""
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+  MULTI="_multi"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -92,49 +99,52 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
-  $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/tls \
-  $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,pixmaps} \
-  $PKG/usr/include/GL $PKG/etc/vulcan/ic.d/
+# Build package directory structure
+mkdir -p $PKG/install $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
+  $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/{tls,vdpau} \
+  $PKG/etc/X11/glvnd/egl_vendor.d \
+  $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,nvidia,pixmaps} \
+  $PKG/usr/include/GL $PKG/etc/vulcan/ic.d $PKG/usr/doc/$PRGNAM-$VERSION
 
-# Main driver
+# Main X driver and modules
 install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
-install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
+install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION
+# We'll move this over but will leave X.org's libwfb alone
+install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION
+
 if [ "$GLVND" = "no" ]; then
-# The non-GLVND GLX client libraries are the default
+# The non-GLVND GLX client libraries 
   install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+  install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 else
-# GLVND libGL libraries for future consideration, conflict with non-GLVND versions
-  install -m 755 libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.1.0.0-nvidia
+# GLVND GLX client libraries libraries are the default, conflict with non-GLVND versions
+  install -m 755 libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
+  install -m 755 libEGL.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.1-nvidia
 fi
 
-# EGL requires the non-conflicting GLVND libs
-install -m 755 libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
+# Common libs, EGL requires the non-conflicting GLVND libs
+# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
+install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
+install -m 755 libGLESv1_CM.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.1-nvidia
+install -m 755 libGLESv2.so.2 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.2-nvidia
 install -m 755 libGLX_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libOpenGL.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libGLdispatch.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
-
-# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
-install -m 755 libEGL.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.1-nvidia
+install -m 755 libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libEGL_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libGLESv1_CM.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.1-nvidia
-install -m 755 libGLESv2.so.2 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.2-nvidia
 install -m 755 libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libGLESv2_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-
-# common libs
 install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia
 install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-eglcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-egl-wayland.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-encode.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-fbc.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-ifr.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
@@ -142,95 +152,92 @@ install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-ptxjitcompiler.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/
-install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/vdpau
 
-# For nvidia-settings GUI support
-install -m 755 libnvidia-gtk2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-gtk3.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-
-#ICDs
-install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
-install -m 644 nvidia_icd.json $PKG/etc/vulcan/ic.d/
+# non-conflict symlinks; see also 'nvidia-switch'
+cd $PKG/usr/lib$LIBDIRSUFFIX
+  ln -sf libcuda.so.$VERSION libcuda.so
+  ln -sf libGLX.so.0 libGLX.so
+  ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
+  ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
+  ln -sf libOpenGL.so.0 libOpenGL.so
+  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
+  ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+  ln -sf vdpau/libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
+cd -
+cd $PKG/usr/lib$LIBDIRSUFFIX/tls
+  ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+cd -
 
 # 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
-
+  mkdir -p $PKG/usr/lib/{tls,vdpau}
   if [ "$GLVND" = "no" ]; then
-# The non-GLVND GLX client libraries are the default
+# The non-GLVND GLX client libraries 
     install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/
+    install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/
   else
-# GLVND libGL libraries for future consideration, conflict with non-GLVND versions
-    install -m 755 32/libGL.so.1.0.0 $PKG/usr/lib/libGL.so.1.0.0-nvidia
+# GLVND GLX client libraries libraries are the default, conflict with non-GLVND versions
+    install -m 755 32/libGL.so.1.0.0 $PKG/usr/lib/libGL.so.1.0.0
+    install -m 755 32/libEGL.so.1 $PKG/usr/lib/libEGL.so.1-nvidia
   fi
 
-# EGL requires the non-conflicting GLVND libs
+# Common libs, EGL requires the non-conflicting GLVND libs
+# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
+  install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
+  install -m 755 32/libGLESv1_CM.so.1 $PKG/usr/lib/libGLESv1_CM.so.1-nvidia
+  install -m 755 32/libGLESv2.so.2 $PKG/usr/lib/libGLESv2.so.2-nvidia
   install -m 755 32/libGLX_nvidia.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libOpenGL.so.0 $PKG/usr/lib/
   install -m 755 32/libGLdispatch.so.0 $PKG/usr/lib/
   install -m 755 32/libGLX.so.0 $PKG/usr/lib/
-
-
-# we'll try leaving these in to get EGL etc support that needs GLVND (see README.txt)
-  install -m 755 32/libEGL.so.1 $PKG/usr/lib/libEGL.so.1-nvidia
   install -m 755 32/libEGL_nvidia.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libGLESv1_CM.so.1 $PKG/usr/lib/libGLESv1_CM.so.1-nvidia
-  install -m 755 32/libGLESv2.so.2 $PKG/usr/lib/libGLESv2.so.2-nvidia
   install -m 755 32/libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libGLESv2_nvidia.so.$VERSION $PKG/usr/lib/
-# Common libs
   install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/
   install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-eglcore.so.$VERSION $PKG/usr/lib/
+  install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-encode.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-fbc.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-glsi.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-ifr.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-ptxjitcompiler.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-tls.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/
-fi
-
-# symlinks; see also 'nvidia-switch'
-cd $PKG/usr/lib$LIBDIRSUFFIX
-  ln -sf libcuda.so.$VERSION libcuda.so
-  ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
-  ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
-  ln -sf libOpenGL.so.0 libOpenGL.so
-  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
-  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
+  install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/vdpau/
+  
+# non-conflict symlinks for optional 32-bit support; see also 'nvidia-switch'  
   cd $PKG/usr/lib
     ln -sf libcuda.so.$VERSION libcuda.so
-    ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
+    ln -sf libGLX.so.0 libGLX.so
     ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
+    ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
     ln -sf libOpenGL.so.0 libOpenGL.so
     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
     ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+    ln -sf vdpau/libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
   cd -
-    cd $PKG/usr/lib$LIBDIRSUFFIX/tls
+  cd $PKG/usr/lib/tls
     ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
   cd -
 fi
 
+#ICDs
+install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
+install -m 644 nvidia_icd.json $PKG/etc/vulcan/ic.d/
+# Shouldn't hurt to have this as well regardless of GLX client libraries used
+install -m 644 10_nvidia.json $PKG/etc/X11/glvnd/egl_vendor.d/
+
 # Next come the apps
 for i in nvidia-smi nvidia-bug-report.sh nvidia-debugdump; do
   install -m 755 $i $PKG/usr/bin/
@@ -284,6 +291,9 @@ cd $TMP/nvidia-settings-$VERSION
   install -m 644 doc/_out/Linux_$TARGET/nvidia-settings.1.gz $PKG/usr/man/man1/
   install -m 644 doc/nvidia-settings.desktop $PKG/usr/share/applications/
   install -m 644 doc/nvidia-settings.png $PKG/usr/share/pixmaps/
+# For nvidia-settings GUI support
+  install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk2.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk2.so.$VERSION
+  install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk3.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk3.so.$VERSION
 cd ../
 
 # Compiling nvidia-xconfig from source
@@ -341,6 +351,11 @@ cd -
 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
+if [ "$GLVND" = "yes" ]; then
+  sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch
+else
+  sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch
+fi 
 if [ ${COMPAT32} = "yes" ]; then
   sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch
 else
@@ -350,18 +365,15 @@ fi
 # These update placeholders and correct wrong paths
 sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
 sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-sed -i "s|__UTILS_PATH__|/usr/bin|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings|" $PKG/usr/share/applications/nvidia-settings.desktop
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   sed -i "s|__LIBGL_PATH__|/usr/lib/|" $PKG/usr/lib/libGL.la-nvidia
   sed -i "s|/usr/X11R6/lib|/usr/lib/|" $PKG/usr/lib/libGL.la-nvidia
 fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Basic docs
 cd $TMP/$SRCNAM
 cp -a LICENSE NVIDIA_Changelog README.txt html $PKG/usr/doc/$PRGNAM-$VERSION
 # sample start/stop scripts for nvidia-persistenced
@@ -370,18 +382,12 @@ 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
 
-# configs, nvidia-settings application profile support (see documention for use).
-mkdir -p $PKG/usr/share/nvidia
+# nvidia-settings application profile support (see documention for use).
 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
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-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}