From 58138e58b616963259656dc6620dbed5ff34ea5e Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 16 Mar 2019 09:12:52 +0100 Subject: 20190316.1 global branch merge. Signed-off-by: Matteo Bernardini --- system/nvidia-driver/nvidia-driver.SlackBuild | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'system/nvidia-driver/nvidia-driver.SlackBuild') diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 168d845f42..c555834a3b 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -249,6 +249,9 @@ cd - install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ cd - +# Remove $PKG/usr/lib{,$LIBDIRSUFFIX}/libGL.la files +rm -f $PKG/usr/lib{,$LIBDIRSUFFIX}/libGL.la + # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files # so we don't stomp on the overlapping xorg files. # Note: switching can be problematic ;-) @@ -267,25 +270,16 @@ else 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 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 @@ -304,7 +298,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then 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 -- cgit v1.2.3