diff options
Diffstat (limited to 'system/nvidia-legacy340-driver')
| -rw-r--r-- | system/nvidia-legacy340-driver/README | 12 | ||||
| -rw-r--r-- | system/nvidia-legacy340-driver/changelog.txt | 3 | ||||
| -rw-r--r-- | system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild | 53 | ||||
| -rw-r--r-- | system/nvidia-legacy340-driver/nvidia-legacy340-driver.info | 46 | ||||
| -rw-r--r-- | system/nvidia-legacy340-driver/nvidia-switch | 23 |
5 files changed, 58 insertions, 79 deletions
diff --git a/system/nvidia-legacy340-driver/README b/system/nvidia-legacy340-driver/README index 1ed005a5f2..28f6b894ef 100644 --- a/system/nvidia-legacy340-driver/README +++ b/system/nvidia-legacy340-driver/README @@ -2,7 +2,7 @@ This is the proprietary binary video driver from NVidia for the X.Org X-server. This package does not include the kernel-module - it is a part of the nvidia-kernel package at SlackBuilds.org. -Installing the 32-bit compatibility libraries is available: if desired, do: +Installing 32-bit compatibility libraries is available. If desired, do: COMPAT32="yes" ./nvidia-driver.SlackBuild Several useful utilities are included: nvidia-xsettings, nvidia-smi, and @@ -21,11 +21,11 @@ complex to install/uninstall the driver. However, installation of the nvidia-driver package itself backs up the conflicting files and puts the nvidia-specific files into place. -Included is a script called nvidia-switch, which is used to switch from the -xorg driver to the nvidia driver, but it will not edit xorg.conf for you; -you have to do that manually. The nvidia-switch script is installed to -/usr/sbin. NOTE: Although nvidia-switch is aware of a COMPAT32 environment, -its use therein is not supported. +Included is a script called nvidia-switch, which is used to switch +from the xorg driver to the nvidia driver, but it will not edit +xorg.conf for you; you have to do that manually. The nvidia-switch +script is installed to /usr/sbin. NOTE: Although nvidia-switch is +aware of a COMPAT32 environment, its use therein is not supported. Usage of nvidia-switch: nvidia-switch --install <--> install the nvidia files and save the diff --git a/system/nvidia-legacy340-driver/changelog.txt b/system/nvidia-legacy340-driver/changelog.txt index fbcf48088b..186143460b 100644 --- a/system/nvidia-legacy340-driver/changelog.txt +++ b/system/nvidia-legacy340-driver/changelog.txt @@ -24,4 +24,5 @@ 4.3 19-MAR-2016 remove nvidia-installer (doesn't compile on 14.2RC1) 5.0 15-FEB-2017 version update, security fixes. 5.1 21-OCT-2017 new version for recent kernels -5.2 11-SEP-2019 version update, patch for kernels 4.4.168+ (thanks to Mats T.) +5.2 11-SEP-2019 version update, patch for kernels 4.4.168+ (thanks to MatsT.) +5.3 18-JAN-2020 version update, last version, X.Org 1.20 support diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild index 48ff1b645a..2c913e30a8 100644 --- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild +++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild @@ -1,36 +1,16 @@ -#!/bin/sh - +#!/bin/bash # Slackware build script for nvidia-driver - -# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # See changelog.txt +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=nvidia-legacy340-driver -VERSION=${VERSION:-340.107} +VERSION=${VERSION:-340.108} MVERS=340 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -CPROXY=${CPROXY:-no} +PKGTYPE=${PKGTYPE:-tgz} +CPROXY=${CPROXY:-yes} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -40,7 +20,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -99,7 +86,6 @@ install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/ 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 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 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ @@ -127,7 +113,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/ 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/libnvcuvid.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/ @@ -205,7 +190,7 @@ cd $TMP/nvidia-settings-$VERSION make cd ../../ - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ make install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/ @@ -257,7 +242,7 @@ cd - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - CFLAGS="$SLKCFLAGS" make + CFLAGS="$SLKCFLAGS -I/usr/include/tirpc -Wl,-ltirpc" make #FIXME: need rc.nvidia-persistenced script install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ @@ -276,8 +261,6 @@ else 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|" \ @@ -302,4 +285,4 @@ 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} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info index 4480043062..6d35057cee 100644 --- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info +++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info @@ -1,26 +1,26 @@ PRGNAM="nvidia-legacy340-driver" -VERSION="340.107" +VERSION="340.108" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.107/NVIDIA-Linux-x86-340.107.run \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.107.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.107.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.107.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.107.tar.bz2" -MD5SUM="9a4b382ef545d836033630224735d5dd \ - 07e397113d0067b09008e24bf66f3d29 \ - 0f4e8fd3b3d569e9db4d6f80ece18e11 \ - 81c3737ba46512694da4ca9a7fa94553 \ - 2713de2cab85fb5b9e75ba2ff86eb8d8" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.107/NVIDIA-Linux-x86_64-340.107.run \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.107.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.107.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.107.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.107.tar.bz2" -MD5SUM_x86_64="ba0fc5de5005679d1db9f5fa2cfabd38 \ - 07e397113d0067b09008e24bf66f3d29 \ - 0f4e8fd3b3d569e9db4d6f80ece18e11 \ - 81c3737ba46512694da4ca9a7fa94553 \ - 2713de2cab85fb5b9e75ba2ff86eb8d8" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.108/NVIDIA-Linux-x86-340.108.run \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.108.tar.bz2" +MD5SUM="ffa278e613337e638fd10de41dae3630 \ + 2f63e63b1c475ed023e3ee31b6ed0116 \ + b76a6500801b96c2296310e17b2e0cdf \ + 86944ff799d5798f407c5051282699b3 \ + da1c2d34014a4aa4e66627ba18364779" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.108.tar.bz2" +MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1 \ + 2f63e63b1c475ed023e3ee31b6ed0116 \ + b76a6500801b96c2296310e17b2e0cdf \ + 86944ff799d5798f407c5051282699b3 \ + da1c2d34014a4aa4e66627ba18364779" REQUIRES="nvidia-legacy340-kernel" -MAINTAINER="unmaintained" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="UNMAINTAINED" +EMAIL="UNMAINTAINED" diff --git a/system/nvidia-legacy340-driver/nvidia-switch b/system/nvidia-legacy340-driver/nvidia-switch index 9226a103bd..fe6c962fb0 100644 --- a/system/nvidia-legacy340-driver/nvidia-switch +++ b/system/nvidia-legacy340-driver/nvidia-switch @@ -40,7 +40,8 @@ LIB32="${ROOT}usr/lib" XMOD="${LIB}/xorg/modules" XLIB="$XMOD/extensions" NV_VERSION='PKGVERSION' # This will be replaced in the build script -GL_VERSION="1.2.0" +GL_VERSION="1.7.0" +EGL_VERSION="1.1.0" NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf" save_GL(){ @@ -48,37 +49,33 @@ save_GL(){ if [ "$1" = "nvidia" ]; then if [ ! -e libGL.so.$GL_VERSION-xorg ]; 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 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 - mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg + if [ ! -e libEGL.so.$EGL_VERSION-xorg ]; then + mv libEGL.so.$EGL_VERSION libEGL.so.$EGL_VERSION-xorg fi - mv libGL.la-nvidia libGL.la mv libEGL.so.$NV_VERSION-nvidia libEGL.so.$NV_VERSION - ln -sf libEGL.so.$NV_VERSION libGEL.so.1.0.0 + ln -sf libEGL.so.$NV_VERSION libEGL.so.$EGL_VERSION ln -sf libEGL.so.$NV_VERSION libEGL.so.1 ln -sf libEGL.so.$NV_VERSION libEGL.so fi if [ "$1" = "xorg" ]; then mv libGL.so.$NV_VERSION libGL.so.$NV_VERSION-nvidia - mv libGL.la libGL.la-nvidia if [ -e libGL.so.$GL_VERSION-xorg ]; then mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION 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 - 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 + if [ -e libEGL.so.$EGL_VERSION-xorg ]; then + mv libEGL.so.$EGL_VERSION-xorg libEGL.so.$EGL_VERSION + ln -sf libEGL.so.$EGL_VERSION libEGL.so.1 + ln -sf libEGL.so.$EGL_VERSION libEGL.so fi fi @@ -111,7 +108,6 @@ save_glx(){ cd "$XLIB" if [ "$1" = "nvidia" ]; then if [ ! -e libglx.so-xorg ]; then - mv libglx.la libglx.la-xorg mv libglx.so libglx.so-xorg fi ln -sf libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION @@ -120,7 +116,6 @@ save_glx(){ rm -f libglx.so.$NV_VERSION rm -f libglx.so mv libglx.so-xorg libglx.so - mv libglx.la-xorg libglx.la fi cd "$CWD" } |