aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/nvidia-driver/README4
-rw-r--r--system/nvidia-driver/changelog.txt1
-rw-r--r--system/nvidia-driver/nvidia-driver.SlackBuild34
-rw-r--r--system/nvidia-driver/nvidia-driver.info50
4 files changed, 54 insertions, 35 deletions
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index f2dbaf6237cf0..e5583b23c50b7 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -4,10 +4,10 @@ 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 now the default. If these cause any
compatibility issues with older GLX sofware, either upgrade your software
-or try:
+or try:
GLVND="no" ./nvidia-driver.SlackBuild
Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index 9160e1fed8916..c69b69642b6a2 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -30,3 +30,4 @@
5.0 20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch
5.1 01-APR-2017 fix nvidia-switch lib names to prevent bad ldconfig symlinks on reboot
5.2 02-JUN-2017 version update LLB, refactor/debug scripts, use nvidia-installer
+5.3 13-OCT-2017 version update LLB, bug fixes, update copyright
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 971a27e04d04f..4a53708305050 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -2,7 +2,6 @@
# 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.
#
@@ -26,12 +25,12 @@
# see changelog.txt
PRGNAM=nvidia-driver
-VERSION=${VERSION:-375.66}
+VERSION=${VERSION:-384.90}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
GLVND=${GLVND:-yes}
-# libglnvd may land in mesa and is Nvidia recomended
+# libglnvd may land in mesa and is Nvidia recommended
set -e
@@ -83,7 +82,7 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
$PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64}
if [ "$COMPAT32" = "yes" ]; then
- mkdir -p $PKG/usr/lib
+ mkdir -p $PKG/usr/lib/tls
fi
# Extract all the sources
@@ -240,6 +239,7 @@ cd $TMP/$SRCNAM
--x-sysconfig-path=$PKG/etc/X11/xorg.conf.d \
--opengl-prefix=$PKG/usr \
--utility-prefix=$PKG/usr \
+ --utility-libdir=lib${LIBDIRSUFFIX} \
--documentation-prefix=$PKG/usr \
--application-profile-path=$PKG/usr/share/nvidia \
--glvnd-egl-config-path=$PKG/etc/X11/glvnd/egl_vendor.d \
@@ -249,6 +249,13 @@ cd $TMP/$SRCNAM
# Clean-up: we really do not need this:
rm -rf /var/lib/nvidia
+# which 32-bit tls? why? why?
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+ install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION
+ cd $PKG/usr/lib
+ ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
+ cd -
+fi
# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files
# so we don't stomp on the overlapping xorg files.
@@ -278,9 +285,10 @@ sed -i "s|$PKG/usr/share/doc/NVIDIA_GLX-1.0|/usr/share/pixmaps|" \
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 conficting files as needed; remove conflicting symlinks created by installer
+# rename wrong/conficting files as needed; remove conflicting symlinks created by installer
cd $PKG/usr/lib$LIBDIRSUFFIX
if [ "$GLVND" = "yes" ]; then
mv libEGL.so.1 libEGL.so.1-nvidia
@@ -311,15 +319,25 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
rm -f libGLESv1_CM.so
rm -f libGLESv2.so
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? this gets fixed in nvidia-switch so ignoring for now.
fi
-#ICDs
-install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
-install -m 644 nvidia_icd.json $PKG/etc/vulkan/icd.d/
+# Move ICDs to $PKG and cleanup (no switch option in installer?)
+mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
+mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
+rm -rf /etc/OpenCL
+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
+# Fix weird bug in nvidia-installer that I can't find
+cd $TMP/nvidia-modprobe-$VERSION
+ install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
+ rm -f /usr/bin/nvidia-modprobe
+cd -
+
cat <<EOF > $PKG/var/log/nvidia/README.txt
Do NOT delete this directory!
nvidia-switch will backup the original X.org libraries here.
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index e189aedb99e98..1089b9d7024cb 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
PRGNAM="nvidia-driver"
-VERSION="375.66"
+VERSION="384.90"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/375.66/NVIDIA-Linux-x86-375.66.run \
- https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.66.tar.bz2"
-MD5SUM="47dddb796fe39497cf6ae374591f6eb9 \
- 1a09312f35b2a9211d6256272f5a5e02 \
- 53c8efb0bb4a18bb05cbddc8845d9aaa \
- f97000abef5f7c7ae27a8f8572558b96 \
- eb29b20b91703323a69d08db1be7237d \
- 5fd9daa01c3d6309ae91083d0f01e8be"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/375.66/NVIDIA-Linux-x86_64-375.66.run \
- https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.66.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.66.tar.bz2"
-MD5SUM_x86_64="9cf2c0a342a088211f25c5d8137097e6 \
- 1a09312f35b2a9211d6256272f5a5e02 \
- 53c8efb0bb4a18bb05cbddc8845d9aaa \
- f97000abef5f7c7ae27a8f8572558b96 \
- eb29b20b91703323a69d08db1be7237d \
- 5fd9daa01c3d6309ae91083d0f01e8be"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/384.90/NVIDIA-Linux-x86-384.90.run \
+ https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-384.90.tar.bz2"
+MD5SUM="9423e4bdef7745c7b57a75c24f853b53 \
+ eccf8f3ef3f77dd69d90ede1d8eb970b \
+ ffb290c363298f9286b2add198338ed1 \
+ a525c7246aa472a88baf9a947112fcdf \
+ 4dbf2f78094564d61f89dae4304f1423 \
+ 5ad21bed26d5c28af7ff06aa179003eb"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/384.90/NVIDIA-Linux-x86_64-384.90.run \
+ https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-384.90.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-384.90.tar.bz2"
+MD5SUM_x86_64="487f9702d76d9eebea5b73b33fe4d602 \
+ eccf8f3ef3f77dd69d90ede1d8eb970b \
+ ffb290c363298f9286b2add198338ed1 \
+ a525c7246aa472a88baf9a947112fcdf \
+ 4dbf2f78094564d61f89dae4304f1423 \
+ 5ad21bed26d5c28af7ff06aa179003eb"
REQUIRES="nvidia-kernel"
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeowulf@gmail.com"
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-21 13:40:53 +0000