diff options
| -rw-r--r-- | system/nvidia-driver/changelog.txt | 1 | ||||
| -rw-r--r-- | system/nvidia-driver/nvidia-driver.SlackBuild | 82 | ||||
| -rw-r--r-- | system/nvidia-driver/nvidia-driver.info | 26 | ||||
| -rw-r--r-- | system/nvidia-driver/nvidia-switch | 160 |
4 files changed, 45 insertions, 224 deletions
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt index 29e8220b43..154d0675f4 100644 --- a/system/nvidia-driver/changelog.txt +++ b/system/nvidia-driver/changelog.txt @@ -43,3 +43,4 @@ 6.3 26-FEB-2019 version update LLB 6.4 20-APR-2019 version update LLB 6.5 14-MAY-2019 version update LLB +6.6 10-AUG-2019 version update LLB, drop non-glvnd libs. This script will NOT work on current diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index c86736ded8..e52adae023 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -25,12 +25,13 @@ # see changelog.txt PRGNAM=nvidia-driver -VERSION=${VERSION:-430.14} +VERSION=${VERSION:-430.40} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -GLVND=${GLVND:-yes} -# libglnvd may land in mesa and is Nvidia recommended +GLVND=yes +# libglnvd landed in mesa and is Nvidia recommended; no longer optional +# future will remove set -e @@ -68,7 +69,7 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \ $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \ $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \ $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/etc/X11/xorg.conf.d \ - $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64} \ + $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64} if [ "$COMPAT32" = "yes" ]; then mkdir -p $PKG/usr/lib/tls @@ -170,6 +171,17 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then cd - fi +# Only one conflicting lib +cd $PKG/usr/lib$LIBDIRSUFFIX +mv libGL.la libGL.la-nvidia +cd - + +if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then + cd $PKG/usr/lib + mv libGL.la libGL.la-nvidia + cd - +fi + # Compile utilites from source, replacing the precompiled versions # # Compiling nvidia-settings @@ -255,68 +267,23 @@ 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 sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch fi -# These add or correct wrong paths -sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la +# These update or correct wrong paths +sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $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 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la - sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la - sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la -fi - -# rename wrong/conficting files as needed; remove conflicting symlinks created by installer -# since nvidia-switch tracks them. -cd $PKG/usr/lib$LIBDIRSUFFIX - if [ "$GLVND" = "yes" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi - mv libGL.la libGL.la-nvidia - mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia - mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia - rm -f libEGL.so - rm -f libEGL.so.1 - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGLESv1_CM.so - rm -f libGLESv1_CM.so.1 - rm -f libGLESv2.so - rm -f libGLESv2.so.1 - rm -f xorg/modules/libwfb.so -cd - - -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - cd $PKG/usr/lib - if [ "$GLVND" = "yes" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi - mv libGL.la libGL.la-nvidia - mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia - mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia - rm -f libEGL.so - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGLESv1_CM.so - rm -f libGLESv1_CM.so.1 - rm -f libGLESv2.so - rm -f libGLESv2.so.1 - cd - -# FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1 symlink to $PKG/usr/lib64/libGL.so.1 -# appears? Who would do this, so ignoring for now. + sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la-nvidia + sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la-nvidia fi # Move ICDs to $PKG and cleanup (no switch option in installer?) @@ -328,11 +295,6 @@ rm -rf /etc/vulkan # Remove xorg conf file since we take care of that in nvidia-driver rm -rf $PKG/etc/X11/xorg.conf.d -cat <<EOF > $PKG/var/log/nvidia/README.txt -Do NOT delete this directory! -nvidia-switch will backup the original X.org libraries here. -EOF - cd $TMP/$SRCNAM # put docs in the right place mv $PKG/usr/share/man/man1/nvidia-* $PKG/usr/man/man1 diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index eaab57e827..f15643c08d 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,20 +1,20 @@ PRGNAM="nvidia-driver" -VERSION="430.14" +VERSION="430.40" HOMEPAGE="http://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/430.14/NVIDIA-Linux-x86_64-430.14.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-430.14.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-430.14.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-430.14.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.14.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-430.14.tar.bz2" -MD5SUM_x86_64="7c0ac1a2e608d4fb79d2f29f1073897f \ - b023e5224c99981a570e6195c9eae08b \ - 153de667b62f463f8793c76c2b57f649 \ - c0feab5f14ff368255d37ed9656800a3 \ - e283991662b5ca9e4b76b976552d62cc \ - fb26f51140fbc6adb06a85cdbfe2397c" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/430.40/NVIDIA-Linux-x86_64-430.40.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-430.40.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-430.40.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-430.40.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.40.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-430.40.tar.bz2" +MD5SUM_x86_64="3a1d7e988d5cb03669aa93ec3fea74ba \ + b158b20ec20bb5d0983527adeee4de7d \ + f636a5b4576236e1ac1fe8b2a02bff08 \ + 8c210fc8c1ba4121c3cb0655eacdfc8f \ + f6f6bf439e00842cfca0e655ff6a0cc9 \ + e5b87b625ca41eb9ec7d180399c8d877" REQUIRES="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 7c827cca66..ce35b06e8e 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -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 4.0 +# nvidia-switch utility 4.5 # # 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 @@ -39,72 +39,21 @@ XMOD="${LIB}/xorg/modules" XLIB="$XMOD/extensions" NV_VERSION="PKGVERSION" # This will be replaced in the build script GL_VERSION="1.2.0" -GLVND="GLVNDFLAG" # This will be replaced in the build script (yes | no) -NV_CONF="${ROOT}usr/share/X11/xorg.conf.d/10-nvidia.conf" -SAVELIBS="${ROOT}var/log/nvidia" +GLVND="yes" # This will be replaced in the build script (yes | no) + save_GL(){ # backup original mesa and xorg conflicts to /var/log/nvidia cd $2 - # Need to make sure save path is reset incase of multilib - SAVELIBS="${ROOT}var/log/nvidia" - if [ "$2" = "$LIB32" ]; then - SAVELIBS="${SAVELIBS}/32" - elif [ "$2" = "$LIB" ]; then - SAVELIBS="${SAVELIBS}/64" - fi - case "$1" in "nvidia") - - mv libGL.so.$GL_VERSION $SAVELIBS/libGL.so.$GL_VERSION - mv libGL.la $SAVELIBS/libGL.la - mv libEGL.so.1.0.0 $SAVELIBS/libEGL.so.1.0.0 - mv libGLESv1_CM.so.1.1.0 $SAVELIBS/libGLESv1_CM.so.1.1.0 - mv libGLESv2.so.2.0.0 $SAVELIBS/libGLESv2.so.2.0.0 + mv libGL.la libGL.la-xorg mv libGL.la-nvidia libGL.la - - if [ "$GLVND" = "yes" ]; then - ln -sf libGL.so.1.7.0 libGL.so.1 - ln -sf libGL.so.1.7.0 libGL.so - ln -sf libEGL.so.1.1.0-nvidia libEGL.so.1.1.0 - ln -sf libEGL.so.1.1.0-nvidia libEGL.so - else - ln -sf libGL.so.$NV_VERSION libGL.so.1 - ln -sf libGL.so.$NV_VERSION libGL.so - ln -sf libEGL.so.$NV_VERSION libEGL.so.1 - ln -sf libEGL.so.$NV_VERSION libEGL.so - fi - - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1.2.0 - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1 - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so - - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2.1.0 - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2 - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so ;; "xorg") mv libGL.la libGL.la-nvidia - mv $SAVELIBS/libGL.so.$GL_VERSION libGL.so.$GL_VERSION - mv $SAVELIBS/libGL.la libGL.la - mv $SAVELIBS/libEGL.so.1.0.0 libEGL.so.1.0.0 - mv $SAVELIBS/libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0 - mv $SAVELIBS/libGLESv2.so.2.0.0 libGLESv2.so.2.0.0 - - ln -sf libGL.so.$GL_VERSION libGL.so.1 - ln -sf libGL.so.$GL_VERSION libGL.so - ln -sf libEGL.so.1.0.0 libEGL.so.1 - ln -sf libEGL.so.1.0.0 libEGL.so - rm -f libEGL.so.1.1.0 - - ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1 - ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so - ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2 - ln -sf libGLESv2.so.2.0.0 libGLESv2.so - rm -f libGLESv1_CM.so.1.2.0 - rm -f libGLESv2.so.2.1.0 + mv libGL.la-xorg libGL.la ;; *) @@ -115,48 +64,6 @@ save_GL(){ cd "$CWD" } -save_glx(){ - cd "$XLIB" - case "$1" in - "nvidia") - if [ -e libglx.so ]; then - mv libglx.so xorg-libglx.so - fi - ln -sf libglxserver_nvidia.so.$NV_VERSION libglx.so - ;; - "xorg") - if [ -e xorg-libglx.so ]; then - rm -f libglx.so - mv xorg-libglx.so libglx.so - else - rm -f libglx.so - fi - ;; - *) - echo "nothing to do for save_glx?" - exit 1 - ;; - esac - cd "$CWD" -} - -save_wfb(){ - cd "$XMOD" - if [ -e libwfb.so ]; then - echo "Using existing Xorg libwfb..." - else - if [ "$1" = "nvidia" ]; then - ln -sf libwfb.so.$NV_VERSION libwfb.so.1 - ln -sf libwfb.so.1 libwfb.so - fi - if [ "$1" = "xorg" ]; then - rm -f libwfb.so - rm -f libwfb.so.1 - fi - fi - cd "$CWD" -} - nvidia_install(){ if [ ! -d $SAVELIBS ]; then echo "Creating missing $SAVELIB ..." @@ -167,9 +74,8 @@ nvidia_install(){ echo "and in /etc/X11/xorg.conf.d." echo "Otherwise, this may lead to improperly working drivers." - save_glx "nvidia" save_GL "nvidia" $LIB - save_wfb "nvidia" + # Check for multilib configuration if [ "$COMPAT32" = "yes" ]; then save_GL "nvidia" $LIB32 @@ -182,81 +88,33 @@ nvidia_remove(){ echo "/etc/X11/xorg.conf and in /etc/X11/xorg.conf.d." echo "Otherwise, this may lead to improperly working drivers." - save_glx "xorg" save_GL "xorg" $LIB - save_wfb "xorg" - # Check for multilib configuration if [ "$COMPAT32" = "yes" ]; then save_GL "xorg" $LIB32 fi if [ -e $NV_CONF ]; then - echo "removing $NV_CONF: you will need to provide your own" - echo "or reinstall nvidia-driver." - rm -f $NV_CONF + echo "You will need to remove/save $NV_CONF from nvidia-driver to use" + echo "any open source drivers." fi } -restore(){ -# Attempt to reinstall damaged stock packages if something went wrong. -# Obviously, you will need to run this after '--remove' and after -# 'removepkg nvidia-driver'. -# User must: -# 1. remove any dangling symlinks and xorg-*, *-nvidia files in /usr/lib*/, -# and any other housekeeping tasks. -# 2. copy stock Slackware packages to /root/Slackware or provide an alternate location -# 3. be running Slackware-14.2, not current -# 4. realize that COMPAT32 is not stable ;-) - -if [ "$LIBSUFFIX" = "64" ]; then - ARCH="x86_64" -else - ARCH="x86" -fi - -PKGPATH=${PKGPATH:-/root/Slackware} -MESA="mesa-11.2.2-$ARCH-1.txz" -MESA32="mesa-compat32-11.2.2-$ARCH-1compat32.txz" -XORG="xorg-server-1.18.3-$ARCH-5.txz" -# Note: The above is for stock 14.2; modify as needed for /patches or -# multilib updates -if [ -d $PKGPATH ]; then - if [ `find $PKGPATH -prune -empty -type d` ]; then - echo "Your $PKGPATH is empty!" - else - upgradepkg --reinstall --install-new $MESA $XORG - if [ "COMPAT32" = "yes" ]; then - upgradepkg --reinstall --install-new $MESA32 - fi - fi -else - echo "Please create $PKGPATH containing the appropriate packages" -fi -} - usage(){ echo "Usage:" echo " --install Set up nvidia driver files" echo " --remove Return to stock xorg files and restore all symlinks" - echo " --restore Reinstall stock Mesa and xorg-server [EXPERIMENTAL]" - echo " mesa-11.2.2, org-server-1.18.3, and optionally" - echo " mesa-compat32-11.2.2 are expected in /root/Slackware" - echo " Use 'PKGPATH=\"<location>\" nvidia-switch --restore'" - echo " to override." echo " --help Show this help message" } case "$1" in "--install") nvidia_install + ;; "--remove") nvidia_remove ;; - "--restore") - restore - ;; "--help") usage ;; |