summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/nvidia-driver/changelog.txt1
-rw-r--r--system/nvidia-driver/nvidia-driver.SlackBuild9
-rw-r--r--system/nvidia-driver/nvidia-driver.info26
-rw-r--r--system/nvidia-driver/nvidia-switch2
4 files changed, 22 insertions, 16 deletions
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index 6921e21c37..82cc11e137 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -38,3 +38,4 @@
5.8 30-JUL-2018 version update LLB
5.9 06-SEP-2018 version update LLB
6.0 09-N0V-2018 version update LLB, 32-bit CPU support dropped, x86_64 COMPAT32 available.
+6.1 22-Dec-2018 version update LLB, fix libglx symlink
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 9bc12c25ac..8649a1493a 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -25,7 +25,7 @@
# see changelog.txt
PRGNAM=nvidia-driver
-VERSION=${VERSION:-410.73}
+VERSION=${VERSION:-410.78}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -280,6 +280,7 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
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
@@ -288,12 +289,14 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
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
- rm -f xorg/modules/extensions/libglx.so
cd -
if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
@@ -308,7 +311,9 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
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.
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 6359028c03..8482d6d107 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
PRGNAM="nvidia-driver"
-VERSION="410.73"
+VERSION="410.78"
HOMEPAGE="http://www.nvidia.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/410.73/NVIDIA-Linux-x86_64-410.73.run \
- https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-410.73.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-410.73.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-410.73.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.73.tar.bz2 \
- https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-410.73.tar.bz2"
-MD5SUM_x86_64="c472621894ea888344cdd9f7c824be19 \
- 5b856f93abfd6c2bbd8c4e16b39e2897 \
- bb3d859adf8dfdac925b735ce68d5b55 \
- 18d6329049922ea6f15c14eb873a1990 \
- 9f38fbae01edfcdcfa59f5d3f3646680 \
- 4ce917ddf270ee6957f353d88a448aa5"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/410.78/NVIDIA-Linux-x86_64-410.78.run \
+ https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-410.78.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-410.78.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-410.78.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.78.tar.bz2 \
+ https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-410.78.tar.bz2"
+MD5SUM_x86_64="5486d21e82fe16b88f43363981dc09d4 \
+ 0d494c6b273a284f96b7696aac90c602 \
+ 2586f14244bcaa44fcd9b8f6d251f0ab \
+ 49fe18bc49fce67002e3329b672fa59f \
+ 45be7ddf4e1a5a5c8655dac961331374 \
+ f7851eee811367e3f7206a73f5fb18e1"
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 4499b2e5d9..2e2750ce15 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -122,7 +122,7 @@ save_glx(){
if [ -e libglx.so ]; then
mv libglx.so xorg-libglx.so
fi
- ln -sf libglx.so.$NV_VERSION libglx.so
+ ln -sf libglxserver_nvidia.so.$NV_VERSION libglx.so
;;
"xorg")
if [ -e xorg-libglx.so ]; then