From cd3b96c20963ffa74d22d3070d1846605679a34c Mon Sep 17 00:00:00 2001 From: "Edward W. Koenig" Date: Thu, 17 Dec 2015 04:35:07 +0700 Subject: [PATCH] system/nvidia-driver: Updated for version 352.63. Signed-off-by: Willy Sudiarto Raharjo --- system/nvidia-driver/changelog.txt | 3 +- system/nvidia-driver/nvidia-driver.SlackBuild | 9 ++-- system/nvidia-driver/nvidia-driver.info | 50 +++++++++---------- system/nvidia-driver/nvidia-switch | 27 ++++++---- 4 files changed, 47 insertions(+), 42 deletions(-) diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt index 24f954e7b3..1583469cbf 100644 --- a/system/nvidia-driver/changelog.txt +++ b/system/nvidia-driver/changelog.txt @@ -21,4 +21,5 @@ 4.0 07-FEB-2015 new long lived branch, version update, bug fixes 4.1 27-APR-2015 version update LLB, fix $VERSION usage 4.2 28-JUL-2015 version update LLB, bug fixes, clean-ups. -4.3 05-SEP-2015 version update LLB \ No newline at end of file +4.3 05-SEP-2015 version update LLB +4.4 13-DEC-2015 version update, X.Org 1.18 support diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index ec50fa8c0c..1040a6760f 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -26,12 +26,14 @@ # see changelog.txt PRGNAM=nvidia-driver -VERSION=${VERSION:-352.41} +VERSION=${VERSION:-352.63} MVERS=340 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CPROXY=${CPROXY:-no} +set -e + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; @@ -66,8 +68,6 @@ fi SRCNAM=NVIDIA-Linux-$TARGET-${VERSION} -set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -116,9 +116,6 @@ install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/ - - -# Watch for conflicts in newer MESA package install -m 755 libGLESv1_CM.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.$VERSION install -m 755 libGLESv2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.$VERSION diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index cb13d6595a..b2b8dcf290 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,30 +1,30 @@ PRGNAM="nvidia-driver" -VERSION="352.41" +VERSION="352.63" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.41/NVIDIA-Linux-x86-352.41.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.41.tar.bz2" -MD5SUM="3f9c9fed035fa845e3f6a1ea5f5732f7 \ - 76902115efedd712b94e8c367ecefb4c \ - 1c816bf20976aaae9b3c3685fc8e9eec \ - d22259e6e3e898d9173bbeeed30c5bec \ - 96ceb2bc7ac4a03edfbf96a642cfda64 \ - bde51cb75eb2595555a147b292fd331a" -DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.41/NVIDIA-Linux-x86_64-352.41.run \ - ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.41.tar.bz2 \ - ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.41.tar.bz2" -MD5SUM_x86_64="d828258194ea4672e3935f96402410c2 \ - 76902115efedd712b94e8c367ecefb4c \ - 1c816bf20976aaae9b3c3685fc8e9eec \ - d22259e6e3e898d9173bbeeed30c5bec \ - 96ceb2bc7ac4a03edfbf96a642cfda64 \ - bde51cb75eb2595555a147b292fd331a" +DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.63/NVIDIA-Linux-x86-352.63.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.63.tar.bz2" +MD5SUM="7882ecda1763504beb10af77a21b21c5 \ + 805ae3c1167a0472dd62bcb036364ab3 \ + 6bb15d188e90dfe99ce0fd0e7bd1c926 \ + 88c1bdd242f1aa34d5b98b1ff12a24f7 \ + daf3b3b4847039d3028a1a2200448277 \ + a52e338d6c50560d4696b4531fe6b2cb" +DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.63/NVIDIA-Linux-x86_64-352.63.run \ + ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.63.tar.bz2 \ + ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.63.tar.bz2" +MD5SUM_x86_64="d4127834036fe24ec7a07999dadf3529 \ + 805ae3c1167a0472dd62bcb036364ab3 \ + 6bb15d188e90dfe99ce0fd0e7bd1c926 \ + 88c1bdd242f1aa34d5b98b1ff12a24f7 \ + daf3b3b4847039d3028a1a2200448277 \ + a52e338d6c50560d4696b4531fe6b2cb" 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 e40d264801..68d9d4acea 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -20,13 +20,13 @@ # 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.3 +# nvidia-switch utility 2.4 # # 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 # need to edit a bunch of other config files. -# TO-DO: needs cleanup; too "wordy" and brittle. +# TO-DO: needs cleanup; too brittle. set -e @@ -46,17 +46,17 @@ NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf" save_GL(){ cd $2 if [ "$1" = "nvidia" ]; then - if [ ! -e libGL.so.$GL_VERSION-xorg ]; then + if [ -e libGL.so.$GL_VERSION ]; then mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg mv libGL.la libGL.la-xorg fi mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION + mv libGL.la-nvidia libGL.la ln -sf libGL.so.$NV_VERSION libGL.so.1 ln -sf libGL.so.$NV_VERSION libGL.so - if [ ! -e libEGL.so.1.0.0-xorg ]; then + if [ -e libEGL.so.1.0.0 ]; then mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg fi - mv libGL.la-nvidia libGL.la mv libEGL.so.$NV_VERSION-nvidia libEGL.so.$NV_VERSION ln -sf libEGL.so.$NV_VERSION libEGL.so.1.0.0 ln -sf libEGL.so.$NV_VERSION libEGL.so.1 @@ -71,8 +71,6 @@ save_GL(){ ln -sf libGL.so.$GL_VERSION libGL.so.1 ln -sf libGL.so.$GL_VERSION libGL.so mv libGL.la-xorg libGL.la - else - echo WARNING: libGL.so is missing. fi mv libEGL.so.$NV_VERSION libEGL.so.$NV_VERSION-nvidia if [ -e libEGL.so.1.0.0-xorg ]; then @@ -137,6 +135,12 @@ nvidia_remove(){ # Check for multilib configuration if [ "$COMPAT32" = "yes" ]; then save_GL "xorg" $LIB32 +# remove dangling symlinks + rm -f $LIB32/libGLESv1_CM.so.1 + rm -f $LIB32/libGLESv2.so.2 + rm -f $LIB32/libnvidia*.so.1 + rm -f $LIB32/libvdpau-nvidia.so.1 + rm -f $LIB32/libcuda.so.1 fi if [ -e $NV_CONF ]; then @@ -146,9 +150,12 @@ nvidia_remove(){ # LD_NVIDIA="${LIB}/libGL.so.$GL_VERSION" # nvidia_ldconfig $LD_NVIDIA # screws up multilub /usr/lib links? -# Kill two dangling libGLES symlinks; check next mesa version for presence. - rm -f /usr/lib64/libGLESv1_CM.so.1 - rm -f /usr/lib64/libGLESv2.so.2 +# Kill two dangling symlinks; check next mesa version for libGLES presence. + rm -f $LIB/libGLESv1_CM.so.1 + rm -f $LIB/libGLESv2.so.2 + rm -f $LIB/libnvidia*.so.1 + rm -f $LIB/libvdpau-nvidia.so.1 + rm -f $LIB/libcuda.so.1 } usage(){