diff options
| author |   Matteo Bernardini | 2018-06-02 09:12:05 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2018-06-09 08:36:13 +0200 |
| commit | dc75a597ba887dcac0ec8a7f7ac7cf85e6f8aa0d (patch) | |
| tree | f390239a5219db8bcf4e053a79c593f4992939a5 | |
| parent | 81c344443219574587ae3d6bccb8f19c1bd346af (diff) | |
| download | old.slackbuilds-nvidia-driver.tar.gz | |
system/nvidia-driver: Remove the libGL.la references.nvidia-driver
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | system/nvidia-driver/nvidia-driver.SlackBuild | 13 | ||||
| -rw-r--r-- | system/nvidia-driver/nvidia-switch | 4 |
2 files changed, 3 insertions, 14 deletions
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index d96fb10087..fd59a52657 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -260,6 +260,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 ;-) @@ -278,24 +281,15 @@ 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 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 @@ -312,7 +306,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 diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch index 4499b2e5d9..026b6a169c 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -58,11 +58,9 @@ save_GL(){ "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-nvidia libGL.la if [ "$GLVND" = "yes" ]; then ln -sf libGL.so.1.7.0 libGL.so.1 @@ -86,9 +84,7 @@ save_GL(){ ;; "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 |