aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/nvidia-driver/README12
-rw-r--r--system/nvidia-driver/changelog.txt1
-rw-r--r--system/nvidia-driver/nvidia-driver.SlackBuild174
-rw-r--r--system/nvidia-driver/nvidia-driver.info50
-rw-r--r--system/nvidia-driver/nvidia-switch229
5 files changed, 268 insertions, 198 deletions
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index e44212da199b8..5dccc1074f356 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -4,6 +4,11 @@ of the nvidia-kernel package at SlackBuilds.org.
Installing the 32-bit compatibility libraries is available: if desired, do:
COMPAT32="yes" ./nvidia-driver.SlackBuild
+
+GLVND GLX client libraries are noe the default. If these cause any
+compatibility issues with older GLX sofware, either upgrade your software
+or try:
+ GLNVD="no" ./nvidia-driver.SlackBuild
Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
nvidia-settings. Please refer to the Nvidia documentation and man pages
@@ -43,7 +48,12 @@ manually, since 'nvidia-switch --install' may fail, resulting in xorg
not working. Here are the affected files:
/usr/lib[64]/libGL.so.1.2
- /usr/lib[64]/xorg/modules/extensions/{libglx.so libglx.la}
+ /usr/lib[64]/libGL.la
+ /usr/lib[64]/libGLESv1_CM.so.1.0.0
+ /usr/lib[64]/libGLESv2.so.2.0.0
+ /usr/lib[64]/libEGL.so.1.0.0
+ /usr/lib[64]/xorg/modules/libwfb.so
+ /usr/lib[64]/xorg/modules/extensions/libglx.so
Simply remove the dead nvidia symlinks and rename the saved '-xorg'
appended files.
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index 9bfbd1d96c3ae..2b74340715c3f 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -27,3 +27,4 @@
4.5a 26-MAR-2016 fixed broken symlinks
4.6 24-APR-2016 version update LLB, fix symlinks, added to version if multilib
4.7 31-APR-2016 version update LLB, added nvidia-installer, updated libs/symlinks
+5.0 20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 2040c422e8df0..1e209cd4b3e2f 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-2016 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,12 +26,12 @@
# see changelog.txt
PRGNAM=nvidia-driver
-VERSION=${VERSION:-367.44}
+VERSION=${VERSION:-375.39}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CPROXY=${CPROXY:-yes}
-GLVND=${GLVND:-no} # change at your peril ;-)
-# Note: libglvnd may land in X.org Mesa
+GLVND=${GLVND:-yes}
+# Note: libglvnd may land in X.org Mesa and Nvidia recommended
set -e
@@ -63,12 +63,19 @@ elif [ "$ARCH" = "x86_64" ]; then
# Set 32-bit compatibility flag default
COMPAT32=${COMPAT32:-no}
else
+ COMPAT32=${COMPAT32:-no}
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi
SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
+# Flag package as multilib, if needed
+MULTI=""
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+ MULTI="_multi"
+fi
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -92,49 +99,52 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
- $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/tls \
- $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,pixmaps} \
- $PKG/usr/include/GL $PKG/etc/vulcan/ic.d/
+# Build package directory structure
+mkdir -p $PKG/install $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
+ $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/{tls,vdpau} \
+ $PKG/etc/X11/glvnd/egl_vendor.d \
+ $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,nvidia,pixmaps} \
+ $PKG/usr/include/GL $PKG/etc/vulcan/ic.d $PKG/usr/doc/$PRGNAM-$VERSION
-# Main driver
+# Main X driver and modules
install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
-install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
+install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION
+# We'll move this over but will leave X.org's libwfb alone
+install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION
+
if [ "$GLVND" = "no" ]; then
-# The non-GLVND GLX client libraries are the default
+# The non-GLVND GLX client libraries
install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+ install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
else
-# GLVND libGL libraries for future consideration, conflict with non-GLVND versions
- install -m 755 libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.1.0.0-nvidia
+# GLVND GLX client libraries libraries are the default, conflict with non-GLVND versions
+ install -m 755 libGL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
+ install -m 755 libEGL.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.1-nvidia
fi
-# EGL requires the non-conflicting GLVND libs
-install -m 755 libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
+# Common libs, EGL requires the non-conflicting GLVND libs
+# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
+install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
+install -m 755 libGLESv1_CM.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.1-nvidia
+install -m 755 libGLESv2.so.2 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.2-nvidia
install -m 755 libGLX_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libOpenGL.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libGLdispatch.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
-
-# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
-install -m 755 libEGL.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.1-nvidia
+install -m 755 libGLX.so.0 $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libEGL_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libGLESv1_CM.so.1 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.1-nvidia
-install -m 755 libGLESv2.so.2 $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.2-nvidia
install -m 755 libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libGLESv2_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-
-# common libs
install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
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 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/
install -m 755 libnvidia-eglcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-egl-wayland.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-encode.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-fbc.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-ifr.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
@@ -142,95 +152,92 @@ install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-ptxjitcompiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX
install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
-install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/vdpau
-# For nvidia-settings GUI support
-install -m 755 libnvidia-gtk2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-gtk3.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-
-#ICDs
-install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
-install -m 644 nvidia_icd.json $PKG/etc/vulcan/ic.d/
+# non-conflict symlinks; see also 'nvidia-switch'
+cd $PKG/usr/lib$LIBDIRSUFFIX
+ ln -sf libcuda.so.$VERSION libcuda.so
+ ln -sf libGLX.so.0 libGLX.so
+ ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
+ ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
+ ln -sf libOpenGL.so.0 libOpenGL.so
+ ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
+ ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
+ ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
+ ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+ ln -sf vdpau/libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
+cd -
+cd $PKG/usr/lib$LIBDIRSUFFIX/tls
+ ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+cd -
# Add optional 32-bit support
if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
- mkdir -p $PKG/usr/lib/tls
- install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
-
+ mkdir -p $PKG/usr/lib/{tls,vdpau}
if [ "$GLVND" = "no" ]; then
-# The non-GLVND GLX client libraries are the default
+# The non-GLVND GLX client libraries
install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/
+ install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/
else
-# GLVND libGL libraries for future consideration, conflict with non-GLVND versions
- install -m 755 32/libGL.so.1.0.0 $PKG/usr/lib/libGL.so.1.0.0-nvidia
+# GLVND GLX client libraries libraries are the default, conflict with non-GLVND versions
+ install -m 755 32/libGL.so.1.0.0 $PKG/usr/lib/libGL.so.1.0.0
+ install -m 755 32/libEGL.so.1 $PKG/usr/lib/libEGL.so.1-nvidia
fi
-# EGL requires the non-conflicting GLVND libs
+# Common libs, EGL requires the non-conflicting GLVND libs
+# we'll try leaving these in to get EGL which needs GLVND (see README.txt)
+ install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
+ install -m 755 32/libGLESv1_CM.so.1 $PKG/usr/lib/libGLESv1_CM.so.1-nvidia
+ install -m 755 32/libGLESv2.so.2 $PKG/usr/lib/libGLESv2.so.2-nvidia
install -m 755 32/libGLX_nvidia.so.$VERSION $PKG/usr/lib/
install -m 755 32/libOpenGL.so.0 $PKG/usr/lib/
install -m 755 32/libGLdispatch.so.0 $PKG/usr/lib/
install -m 755 32/libGLX.so.0 $PKG/usr/lib/
-
-
-# we'll try leaving these in to get EGL etc support that needs GLVND (see README.txt)
- install -m 755 32/libEGL.so.1 $PKG/usr/lib/libEGL.so.1-nvidia
install -m 755 32/libEGL_nvidia.so.$VERSION $PKG/usr/lib/
- install -m 755 32/libGLESv1_CM.so.1 $PKG/usr/lib/libGLESv1_CM.so.1-nvidia
- install -m 755 32/libGLESv2.so.2 $PKG/usr/lib/libGLESv2.so.2-nvidia
install -m 755 32/libGLESv1_CM_nvidia.so.$VERSION $PKG/usr/lib/
install -m 755 32/libGLESv2_nvidia.so.$VERSION $PKG/usr/lib/
-# Common libs
install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/
install -m 755 32/libcuda.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/
+ install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-encode.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-fatbinaryloader.so.$VERSION $PKG/usr/lib/
- install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-fbc.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-glsi.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-ifr.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-ptxjitcompiler.so.$VERSION $PKG/usr/lib/
- install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/
- install -m 755 32/libnvidia-tls.so.$VERSION $PKG/usr/lib
+ install -m 755 32/libnvidia-tls.so.$VERSION $PKG/usr/lib/
install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
-fi
-
-# symlinks; see also 'nvidia-switch'
-cd $PKG/usr/lib$LIBDIRSUFFIX
- ln -sf libcuda.so.$VERSION libcuda.so
- ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
- ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
- ln -sf libOpenGL.so.0 libOpenGL.so
- ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
- ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
- ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
- ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-cd -
-cd $PKG/usr/lib$LIBDIRSUFFIX/tls
- ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
-cd -
-
-# symlinks for optional 32-bit support
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+ install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/vdpau/
+
+# non-conflict symlinks for optional 32-bit support; see also 'nvidia-switch'
cd $PKG/usr/lib
ln -sf libcuda.so.$VERSION libcuda.so
- ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
+ ln -sf libGLX.so.0 libGLX.so
ln -sf libGLX_nvidia.so.$VERSION libGLX_nvidia.so.0
+ ln -sf libGLX_nvidia.so.$VERSION libGLX_indirect.so.0
ln -sf libOpenGL.so.0 libOpenGL.so
ln -sf libEGL_nvidia.so.$VERSION libEGL_nvidia.so.0
ln -sf libGLESv1_CM_nvidia.so.$VERSION libGLESv1_CM_nvidia.so.1
ln -sf libGLESv2_nvidia.so.$VERSION libGLESv2_nvidia.so.2
ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
+ ln -sf vdpau/libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
cd -
- cd $PKG/usr/lib$LIBDIRSUFFIX/tls
+ cd $PKG/usr/lib/tls
ln -sf libnvidia-tls.so.$VERSION libnvidia-tls.so
cd -
fi
+#ICDs
+install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
+install -m 644 nvidia_icd.json $PKG/etc/vulcan/ic.d/
+# Shouldn't hurt to have this as well regardless of GLX client libraries used
+install -m 644 10_nvidia.json $PKG/etc/X11/glvnd/egl_vendor.d/
+
# Next come the apps
for i in nvidia-smi nvidia-bug-report.sh nvidia-debugdump; do
install -m 755 $i $PKG/usr/bin/
@@ -284,6 +291,9 @@ cd $TMP/nvidia-settings-$VERSION
install -m 644 doc/_out/Linux_$TARGET/nvidia-settings.1.gz $PKG/usr/man/man1/
install -m 644 doc/nvidia-settings.desktop $PKG/usr/share/applications/
install -m 644 doc/nvidia-settings.png $PKG/usr/share/pixmaps/
+# For nvidia-settings GUI support
+ install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk2.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk2.so.$VERSION
+ install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk3.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk3.so.$VERSION
cd ../
# Compiling nvidia-xconfig from source
@@ -341,6 +351,11 @@ 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
@@ -350,18 +365,15 @@ 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|" \
- $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" \
- $PKG/usr/share/applications/nvidia-settings.desktop
+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|__LIBGL_PATH__|/usr/lib/|" $PKG/usr/lib/libGL.la-nvidia
sed -i "s|/usr/X11R6/lib|/usr/lib/|" $PKG/usr/lib/libGL.la-nvidia
fi
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Basic docs
cd $TMP/$SRCNAM
cp -a LICENSE NVIDIA_Changelog README.txt html $PKG/usr/doc/$PRGNAM-$VERSION
# sample start/stop scripts for nvidia-persistenced
@@ -370,18 +382,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
-# configs, nvidia-settings application profile support (see documention for use).
-mkdir -p $PKG/usr/share/nvidia
+# nvidia-settings application profile support (see documention for use).
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/
-mkdir -p $PKG/install
sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-MULTI=""
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
- MULTI="_multi"
-fi
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index f7c4d8bc510c9..4028acb831dab 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
PRGNAM="nvidia-driver"
-VERSION="367.44"
+VERSION="375.39"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/367.44/NVIDIA-Linux-x86-367.44.run \
- ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-367.44.tar.bz2"
-MD5SUM="93ff8e1fe32939ca4fd6522b93825edc \
- f51a71ff7fcd4d5497ff0845f8cffe3a \
- d770941b0e0cd125edf2efdebbc1f1a0 \
- e30b2ff6481e188fcba57aa123c1584a \
- 2e729b8bf966d0f7239202a3f1ddf2c1 \
- aef95c4f92612770772140a11432c4d3"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/367.44/NVIDIA-Linux-x86_64-367.44.run \
- ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.44.tar.bz2 \
- ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-367.44.tar.bz2"
-MD5SUM_x86_64="d34b42e64b25bf2a8d7b9a157723a3bd \
- f51a71ff7fcd4d5497ff0845f8cffe3a \
- d770941b0e0cd125edf2efdebbc1f1a0 \
- e30b2ff6481e188fcba57aa123c1584a \
- 2e729b8bf966d0f7239202a3f1ddf2c1 \
- aef95c4f92612770772140a11432c4d3"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/375.39/NVIDIA-Linux-x86-375.39.run \
+ ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.39.tar.bz2"
+MD5SUM="9247d5eb9df58bb7755c9060ef5d103d \
+ 1a1b3ecbbd9cf17085548cc5d8fe6cba \
+ f630cbefa0c300d58df7a1d989c7766c \
+ d147dd34877b73000448f5fe8d06371d \
+ ced26b5504b08abaf4e156740021b2bc \
+ 7f41d52c1220feb4d837982a54190d6c"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/375.39/NVIDIA-Linux-x86_64-375.39.run \
+ ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.39.tar.bz2 \
+ ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.39.tar.bz2"
+MD5SUM_x86_64="35b32baba21089dfe5d960ae89d98cde \
+ 1a1b3ecbbd9cf17085548cc5d8fe6cba \
+ f630cbefa0c300d58df7a1d989c7766c \
+ d147dd34877b73000448f5fe8d06371d \
+ ced26b5504b08abaf4e156740021b2bc \
+ 7f41d52c1220feb4d837982a54190d6c"
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 33d3f61d65d60..d28aa95526cae 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2012-2015 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,14 +20,14 @@
# 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.6
+# nvidia-switch utility 3.0
#
# 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 more cleanup; still way too brittle.
-# NOTE: non-GLVND ONLY!!
+
ROOT="${ROOT:-/}"
CWD=$(pwd)
@@ -40,77 +40,104 @@ 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="/usr/share/X11/xorg.conf.d/10-nvidia.conf"
save_GL(){
cd $2
- if [ "$1" = "nvidia" ]; then
- mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
- mv libGL.la libGL.la-xorg
- mv libGL.la-nvidia libGL.la
- ln -sf libGL.so.$NV_VERSION libGL.so.1
- ln -sf libGL.so.$NV_VERSION libGL.so
-
- mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg
- mv libEGL.so.1-nvidia 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 libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0-xorg
- mv libGLESv1_CM.so.1-nvidia libGLESv1_CM.so.1.1.0
- ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so
- ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1
-
- mv libGLESv2.so.2.0.0 libGLESv2.so.2.0.0-xorg
- mv libGLESv2.so.2-nvidia libGLESv2.so.2.0.0
- ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
- ln -sf libGLESv2.so.2.0.0 libGLESv2.so
- fi
+ case "$1" in
+ "nvidia")
+ mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
+ mv libGL.la libGL.la-xorg
+ mv libGL.la-nvidia libGL.la
+ mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg
- if [ "$1" = "xorg" ]; then
- mv libGL.la libGL.la-nvidia
- mv libGL.la-xorg libGL.la
- 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 libEGL.so.1.0.0 libEGL.so.1-nvidia
- 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 libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1-nvidia
- mv libGLESv1_CM.so.1.1.0-xorg libGLESv1_CM.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
-
- mv libGLESv2.so.2.0.0 libGLESv2.so.2-nvidia
- mv libGLESv2.so.2.0.0-xorg libGLESv2.so.2.0.0
- ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
- ln -sf libGLESv2.so.2.0.0 libGLESv2.so
- fi
+ if [ "$GLVND" = "yes" ]; then
+ ln -sf libGL.so.1.0.0 libGL.so.1
+ ln -sf libGL.so.1 libGL.so
+ ln -sf libEGL.so.1-nvidia libEGL.so.1
+ ln -sf libEGL.so.1 libEGL.so
+ else
+ ln -sf libGL.so.$NV_VERSION libGL.so.1
+ ln -sf libGL.so.1 libGL.so
+ ln -sf libEGL.so.$NV_VERSION libEGL.so.1
+ ln -sf libEGL.so.1 libEGL.so
+ fi
+
+ mv libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0-xorg
+ ln -sf libGLESv1_CM.so.1-nvidia libGLESv1_CM.so.1
+ ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so
+ mv libGLESv2.so.2.0.0 libGLESv2.so.2.0.0-xorg
+ ln -sf libGLESv2.so.2-nvidia libGLESv2.so.2
+ ln -sf libGLESv2.so.2 libGLESv2.so
+ ;;
+
+ "xorg")
+ mv libGL.la libGL.la-nvidia
+ mv libGL.la-xorg libGL.la
+ mv libEGL.so.1.0.0-xorg libEGL.so.1.0.0
+ 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
+ ln -sf libEGL.so.1.0.0 libEGL.so.1
+ ln -sf libEGL.so.1.0.0 libEGL.so
+
+ mv libGLESv1_CM.so.1.1.0-xorg libGLESv1_CM.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
+ mv libGLESv2.so.2.0.0-xorg libGLESv2.so.2.0.0
+ ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
+ ln -sf libGLESv2.so.2.0.0 libGLESv2.so
+ ;;
+ *)
+ echo "nothind to do for save_gl?"
+ exit 1
+ ;;
+ esac
cd "$CWD"
}
save_glx(){
cd "$XLIB"
- if [ "$1" = "nvidia" ]; then
- mv libglx.so libglx.so-xorg
- mv libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION
- ln -sf libglx.so.$NV_VERSION libglx.so
- fi
- if [ "$1" = "xorg" ]; then
- mv libglx.so.$NV_VERSION libglx.so.$NV_VERSION-nvidia
- rm -f libglx.so
- mv libglx.so-xorg libglx.so
- fi
-cd "$CWD"
+ case "$1" in
+ "nvidia")
+ if [ -e libglx.so ]; then
+ mv libglx.so libglx.so-xorg
+ fi
+ ln -sf libglx.so.$NV_VERSION libglx.so
+ ;;
+ "xorg")
+ if [ -e libglx.so-xorg ]; then
+ rm -f libglx.so
+ mv libglx.so-xorg libglx.so
+ else
+ rm -f libglx.so
+ fi
+ ;;
+ *)
+ echo "nothind to do for save_glx?"
+ exit 1
+ ;;
+ esac
+ cd "$CWD"
}
-nvidia_ldconfig(){
- /sbin/ldconfig
- #Generate correct symink for that lib
- /sbin/ldconfig -l $1
+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(){
@@ -121,9 +148,14 @@ nvidia_install(){
save_glx "nvidia"
save_GL "nvidia" $LIB
+ save_wfb "nvidia"
# Check for multilib configuration
if [ "$COMPAT32" = "yes" ]; then
- save_GL "nvidia" $LIB32
+ if [ -e $LIB32/libGL.so.$GL_VERSION ]; then
+ save_GL "nvidia" $LIB32
+ else
+ echo "mesa-compat32 is not installed, skipping..."
+ fi
fi
}
@@ -135,19 +167,33 @@ nvidia_remove(){
save_glx "xorg"
save_GL "xorg" $LIB
-
- # Kill dangling symlinks;
- rm -f $LIB/libnvidia*.so.1
- rm -f $LIB/libvdpau_nvidia.so.1
+ save_wfb "xorg"
+# remove dangling sylinks
+ rm -f $LIB/libnvcuvid.so.1
+ rm -f $LIB/libnvidia-cfg.so.1
+ rm -f $LIB/libnvidia-encode.so.1
+ rm -f $LIB/libnvidia-fbc.so.1
+ rm -f $LIB/libnvidia-ifr.so.1
+ rm -f $LIB/libnvidia-ml.so.1
+ rm -f $LIB/libnvidia-opencl.so.1
rm -f $LIB/libcuda.so.1
-
+ rm -f $LIB/libOpenCL.so.1
# Check for multilib configuration
if [ "$COMPAT32" = "yes" ]; then
- save_GL "xorg" $LIB32
-# remove dangling symlinks
- rm -f $LIB32/libnvidia*.so.1
- rm -f $LIB32/libvdpau_nvidia.so.1
+ if [ -e $LIB32/libGL.so.$GL_VERSION-xorg ]; then
+ save_GL "xorg" $LIB32
+ else
+ echo "mesa-compat32 is not installed, skipping..."
+ fi
+# remove dangling sylinks
+ rm -f $LIB32/libnvcuvid.so.1
+ rm -f $LIB32/libnvidia-encode.so.1
+ rm -f $LIB32/libnvidia-fbc.so.1
+ rm -f $LIB32/libnvidia-ifr.so.1
+ rm -f $LIB32/libnvidia-ml.so.1
+ rm -f $LIB32/libnvidia-opencl.so.1
rm -f $LIB32/libcuda.so.1
+ rm -f $LIB32/libOpenCL.so.1
fi
if [ -e $NV_CONF ]; then
@@ -158,11 +204,11 @@ nvidia_remove(){
}
restore(){
-# Attempts to reinstall damaged stock packages if something went wrong.
-# Obviously, you will need to run this after '--remove' and before
+# Attempt to reinstall damaged stock packages if something went wrong.
+# Obviously, you will need to run this after '--remove' and before
# 'removepkg nvidia-driver'.
# User must:
-# 1. remove any dangling symlinks and *-xorg, *-nvidia files in /usr/lib?/,
+# 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
# 3. be running STOCK Slackware-14.2
@@ -177,8 +223,9 @@ fi
PKGPATH="/root/Slackware"
MESA="mesa-11.2.2-$ARCH-1.txz"
MESA32="mesa-compat32-11.2.2-$ARCH-1compat32.txz"
-XORG="xorg-1.18.3-$ARCH-2.txz"
-
+XORG="xorg-server-1.18.3-$ARCH-2.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!"
@@ -201,14 +248,20 @@ usage(){
echo " --help Show this help message"
}
-if [ "$1" = '--install' ]; then
- nvidia_install
-elif [ "$1" = '--remove' ]; then
- nvidia_remove
-elif [ "$1" = '--restore' ]; then
- restore
-elif [ "$1" = '--help' ]; then
- usage
-else
- usage
-fi
+case "$1" in
+ "--install")
+ nvidia_install
+ ;;
+ "--remove")
+ nvidia_remove
+ ;;
+ "--restore")
+ restore
+ ;;
+ "--help")
+ usage
+ ;;
+ *)
+ usage
+ ;;
+esac