From ae34289e60884e2a377973de71ccb0e6b9d486bd Mon Sep 17 00:00:00 2001 From: "Edward W. Koenig" Date: Mon, 9 Feb 2015 20:21:34 +0700 Subject: [PATCH] system/nvidia-driver: Updated for version 346.35. Signed-off-by: Willy Sudiarto Raharjo --- system/nvidia-driver/changelog.txt | 21 ++++++++ system/nvidia-driver/doinst.sh | 1 - system/nvidia-driver/nvidia-driver.SlackBuild | 45 +++++------------ system/nvidia-driver/nvidia-driver.info | 50 +++++++++---------- system/nvidia-driver/nvidia-switch | 29 +---------- 5 files changed, 61 insertions(+), 85 deletions(-) create mode 100644 system/nvidia-driver/changelog.txt diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt new file mode 100644 index 0000000000..3618dc8431 --- /dev/null +++ b/system/nvidia-driver/changelog.txt @@ -0,0 +1,21 @@ +1.0 20-MAR-2011 New Maintainer: Edward W. Koenig +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-JUN-2011 minor edits, thanks to Robby and Roberto +1.5 01-JUL-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 +4.0 07-FEB-2015 new long lived branch, version update, bug fixes diff --git a/system/nvidia-driver/doinst.sh b/system/nvidia-driver/doinst.sh index 9ad2ad8600..13f101c5be 100644 --- a/system/nvidia-driver/doinst.sh +++ b/system/nvidia-driver/doinst.sh @@ -3,4 +3,3 @@ if [ -x /usr/bin/update-desktop-database ]; then fi /usr/sbin/nvidia-switch --install - 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 -# 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 diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index 8c04868c87..d0c7f08e6b 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,30 +1,30 @@ PRGNAM="nvidia-driver" -VERSION="340.65" +VERSION="346.35" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.65/NVIDIA-Linux-x86-340.65.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.65.tar.bz2" -MD5SUM="4aa6039b8543312b41a924bb87b0b2db \ - 7ac54ac301116588ac0b47a4927ebecb \ - a8057e9055daaa5ad39c444945321010 \ - 8a65ade7f7aca6b3caf442307c398261 \ - 6417b357f4f4d33aec3ea8e6ce71cc41 \ - 01bd1cba409ebfb16e447e329552b35c" -DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.65/NVIDIA-Linux-x86_64-340.65.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.65.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.65.tar.bz2" -MD5SUM_x86_64="eff73ec116ce451d76ba2a7a343f89b9 \ - 7ac54ac301116588ac0b47a4927ebecb \ - a8057e9055daaa5ad39c444945321010 \ - 8a65ade7f7aca6b3caf442307c398261 \ - 6417b357f4f4d33aec3ea8e6ce71cc41 \ - 01bd1cba409ebfb16e447e329552b35c" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/346.35/NVIDIA-Linux-x86-346.35.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-346.35.tar.bz2" +MD5SUM="d2b8f7f90ef5037f03f94519f9809511 \ + e4db7439570c6873db2fa1fc5035ab42 \ + 1b686c2dfe19ce113fd6e1da5fdd8ea9 \ + 115b299805dd8e49fbe0c0e8e3ae51b5 \ + 443894714195e60cf674ace2df78bc3e \ + 94343ace75c246ece7c6f28736950154" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/346.35/NVIDIA-Linux-x86_64-346.35.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-346.35.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-346.35.tar.bz2" +MD5SUM_x86_64="f225dd17a6b325ba6aa98c6035c62d78 \ + e4db7439570c6873db2fa1fc5035ab42 \ + 1b686c2dfe19ce113fd6e1da5fdd8ea9 \ + 115b299805dd8e49fbe0c0e8e3ae51b5 \ + 443894714195e60cf674ace2df78bc3e \ + 94343ace75c246ece7c6f28736950154" 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 43ab255b57..0d559c28b5 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -1,6 +1,6 @@ #!/bin/sh -# 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 @@ -20,7 +20,7 @@ # 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.2 +# nvidia-switch utility 2.3 # # 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 @@ -79,35 +79,12 @@ save_GL(){ mv libEGL.so.1.0.0-xorg libEGL.so.1.0.0 ln -sf libEGL.so.1.0.0 libEGL.so.1 ln -sf libEGL.so.1.0.0 libEGL.so - mv libEGL.la-xorg libEGL.la fi fi cd "$CWD" } -save_wfb(){ - cd "$XMOD" - if [ "$1" = "nvidia" ]; then - mv libnvidia-wfb.so.$NV_VERSION-nvidia libnvidia-wfb.so.$NV_VERSION - ln -sf libnvidia-wfb.so.$NV_VERSION libnvidia-wfb.so.1 - if [ ! -e libwfb.so ]; then - mv libwfb.so libwfb.so-xorg - ln -sf libnvidia-wfb.so.$NV_VERSION libwfb.so - fi - elif [ "$1" = "xorg" ]; then - mv libnvidia-wfb.so.$NV_VERSION libnvidia-wfb.so.$NV_VERSION-nvidia - rm -f libnvidia-wfb.so.1 - if [ -L libwfb.so ]; then - rm -f libwfb.so - if [ -e libwfb.so-xorg ]; then - mv libwfb.so-xorg libwfb.so - fi - fi - fi - cd "$CWD" -} - save_glx(){ cd "$XLIB" if [ "$1" = "nvidia" ]; then @@ -139,7 +116,6 @@ nvidia_install(){ echo "Otherwise, this may lead to improperly working drivers." save_GL "nvidia" $LIB - save_wfb "nvidia" save_glx "nvidia" # Check for multilib configuration if [ "$COMPAT32" = "yes" ]; then @@ -157,7 +133,6 @@ nvidia_remove(){ echo "Otherwise, this may lead to improperly working drivers." save_GL "xorg" $LIB - save_wfb "xorg" save_glx "xorg" # Check for multilib configuration if [ "$COMPAT32" = "yes" ]; then