diff options
| author |   Matteo Bernardini | 2019-02-23 07:59:47 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2019-02-23 07:59:47 +0100 |
| commit | 1e0504fb667c2e46b7658648e95f6bec2232b005 (patch) | |
| tree | 59f57dadb63234845f17b82010dc7c5fc11e1446 /system/nvidia-driver/nvidia-driver.SlackBuild | |
| parent | 56fec0e2e3a00a31f6b83d66093db60a3bbb19f4 (diff) | |
| download | slackbuilds-7f4a955db596b97f021e5c41d2e9fbcdd5260195.tar.gz | |
20190223.1 global branch merge.current-20190223.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system/nvidia-driver/nvidia-driver.SlackBuild')
| -rw-r--r-- | system/nvidia-driver/nvidia-driver.SlackBuild | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index d334d9315c..f8f5e27c03 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 |