summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2019-08-18 13:56:10 +0200
committer Matteo Bernardini2019-08-18 13:56:10 +0200
commitf10f465c825de326a8e29a1695160fb24e43cba1 (patch)
tree196f4c4d2e899d850e797ae63c08d01376edf4b9
parentd04189e642ca17186cb9b2b5899fa9c12aceb782 (diff)
downloadslackbuilds-nvidia-legacy390-driver.tar.gz
system/nvidia-legacy390-driver: Remove any libGL.la reference.nvidia-legacy390-driver
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild10
-rw-r--r--system/nvidia-legacy390-driver/nvidia-switch4
2 files changed, 0 insertions, 14 deletions
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index 643487be48..4f98017ca9 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -278,24 +278,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 +303,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-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch
index 7d97f3304b..f9874cea37 100644
--- a/system/nvidia-legacy390-driver/nvidia-switch
+++ b/system/nvidia-legacy390-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