system/nvidia-driver: Updated for version 346.35.

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

1 files changed, 13 insertions, 32 deletions

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 89d51cfa01..247654196a 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-2013 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2015 Edward W. Koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,32 +23,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# ChangeLog
-# ------------------------------------------------------------------------------
-# 1.0	20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-# 1.1	10-APR-2011	updated to new version, testing 13.37rc4.6692
-# 1.2   27-MAY-2011	new version, allow multilib option, minor edits
-# 1.2.1 20-JUNE-2011	minor edits, thanks to Robby and Roberto
-# 1.5	01-JULY-2011	new version, single driver download, add switch to select
-#			pure x86_64 or x86_64 with 32-bit compatibility.
-# 1.6	27-AUG-2011	version bump, minor edits
-# 1.7	21-OCT-2011	version bump
-# 1.8   24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
-# 1.9   02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
-# 2.0	21-AUG-2012	new version (important security fix), missing vdpau-nvidia, dropped *.h
-# 2.1	25-AUG-2012	new version -Long Lived Branch, fixed symlinks (per Das email)
-# 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.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.3   20-NOV-2014	new version (LLB), update libs, fix nvidia-switch
-# 3.4   11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
+# see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-340.65}
+VERSION=${VERSION:-346.35}
 MVERS=340
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -125,8 +103,6 @@ install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensi
 install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia
 install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
 install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.$VERSION-nvidia
-install -m 755 libGLESv1_CM.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libGLESv2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 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/
@@ -141,7 +117,12 @@ install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
 install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
 
-# For 8-series GPU if libwfb.so is missing (ie older X servers).
+# For nvidia-settings GUI support
+install -m 755 libnvidia-gtk2.so.346.35 $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-gtk3.so.346.35 $PKG/usr/lib$LIBDIRSUFFIX/
+
+# 8-series GPU is No longer supported so just drop this
+# in until nvidia decides to remove it (see README.txt).
 install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION-nvidia
 
 # Don't forget separate libvdpau package on SBo.
@@ -157,8 +138,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia
   install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
   install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/libEGL.so.$VERSION-nvidia
-  install -m 755 32/libGLESv1_CM.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libGLESv2.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/
@@ -277,7 +256,7 @@ cd $TMP/nvidia-xconfig-$VERSION
 cd -
 
 # Some new optional "useless" utilities, such as laptop GPU switching
-# nvdia-modprobe needed to create device nodes, see README!
+# nvidia-modprobe needed to create device nodes, see README!
 # FIXME: Needs cleanup at a later date.
 
 # Compiling nvidia-modprobe from source
@@ -338,10 +317,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
 
-# nvidia-settings application profile support (see documention for use).
+# configs, nvidia-settings application profile support (see documention for use).
 mkdir -p $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/
+install -m 755 monitoring.conf $PKG/usr/share/nvidia/
+install -m 755 pci.ids $PKG/usr/share/nvidia/
 
 mkdir -p $PKG/install
 sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc