Attachment 214949 Details for Bug 245496 – just an example, did not test this

[patch] just an example, did not test this

ymmv.patch (text/plain), 2.32 KB, created by Alex S on 2020-05-28 03:55:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex S

Created: 2020-05-28 03:55:31 UTC

Size: 2.32 KB

patch

obsolete

>diff --git a/emulators/i386-wine-devel/files/binbounce b/emulators/i386-wine-devel/files/binbounce
>index 6f950fa41556..9a63984b1d8c 100644
>--- a/emulators/i386-wine-devel/files/binbounce
>+++ b/emulators/i386-wine-devel/files/binbounce
>@@ -10,10 +10,10 @@ then
>   export LIBGL_DRIVERS_PATH=$LOCALBASE/lib32/dri
>   if [ `uname -p` = i386 ]
>   then
>-    export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH"
>+    export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL"
>     export LD_LIBRARY_PATH_RPATH=y
>   else
>-    export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":/usr/lib32
>+    export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL":/usr/lib32
>     export LD_32_LIBRARY_PATH_RPATH=y
>   fi
>   export PATH="$LOCALBASE/bin32":"$PATH"
>diff --git a/emulators/i386-wine-devel/files/nvidia.sh b/emulators/i386-wine-devel/files/nvidia.sh
>index a6a832d7c73a..84bcbb6d780d 100644
>--- a/emulators/i386-wine-devel/files/nvidia.sh
>+++ b/emulators/i386-wine-devel/files/nvidia.sh
>@@ -115,12 +115,6 @@ do
>       rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 
>       rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1
>       rm -rf  ${PREFIX}/lib32/.nvidia/
>-      if [ -d ${PREFIX}/lib32/.libGL-new ]
>-      then
>-        ln -s .libGL-new/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
>-      else
>-        ln -s .libGL/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
>-      fi
>       exit 0
>       ;;
>     -n)
>diff --git a/emulators/i386-wine-devel/files/pkg-install b/emulators/i386-wine-devel/files/pkg-install
>index d1199ce5460c..f8594b3ad36f 100644
>--- a/emulators/i386-wine-devel/files/pkg-install
>+++ b/emulators/i386-wine-devel/files/pkg-install
>@@ -3,12 +3,7 @@
> export PREFIX=${PKG_PREFIX:-/usr/local}
> export WINE=$1
> 
>-if [ -d ${PREFIX}/lib32/.libGL-new ]
>-then
>-    LIBGLDIR=.libGL-new
>-else
>-    LIBGLDIR=.libGL
>-fi
>+LIBGLDIR=.libGL
> 
> case "$2" in
>   DEINSTALL)
>@@ -16,7 +11,6 @@ case "$2" in
>     rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri
>     ;;
>   POST-INSTALL)
>-    ln -s ${LIBGLDIR}/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
>     mkdir -p ${PREFIX}/lib32/dri
>     for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so)
>     do

Actions: View | Diff

Attachments on bug 245496: 214949 | 215302 | 215612