diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-04-29 21:08:28 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-06-29 00:57:50 +0000 |
| commit | 83cf9277fc61e6e9c449df858a6d7b41e39bb08c (patch) | |
| tree | b1d05bc10a38cef432649e29fb17964def2b1c97 /emulators/wine | |
| parent | a3f72bf4c58cf9ae627ea465a996f80d174bad26 (diff) | |
| download | ports-83cf9277fc61e6e9c449df858a6d7b41e39bb08c.tar.gz ports-83cf9277fc61e6e9c449df858a6d7b41e39bb08c.zip | |
emulators/wine: support graphics/mesa-devel for WoW64
WoW64 currently uses i386 packages on amd64 under special PREFIX, so
- Include mesa-devel paths to LIBGL_DRIVERS_PATH override
- Respect libmap.conf(5) in 32-bit packages
To use simply install mesa-devel as regular and WoW64 package e.g.,
$ pkg install mesa-devel
$ /usr/local/share/wine/pkg32.sh install mesa-devel
In case of issues simply remove mesa-devel e.g.,
$ pkg delete mesa-devel
$ /usr/local/share/wine/pkg32.sh delete mesa-devel
PR: 271140
Reviewed by: Alex S
Approved by: maintainer timeout (2 months)
Diffstat (limited to 'emulators/wine')
| -rw-r--r-- | emulators/wine/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine/files/wine-wow64.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index d3a0b2ce41b2..652a179359a4 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine DISTVERSION= 7.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/7.0/ diff --git a/emulators/wine/files/wine-wow64.sh b/emulators/wine/files/wine-wow64.sh index 796f26787c8c..ca324c2d50a2 100644 --- a/emulators/wine/files/wine-wow64.sh +++ b/emulators/wine/files/wine-wow64.sh @@ -32,7 +32,7 @@ then exit 1 fi -export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri" +export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri" export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib" for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib do @@ -42,10 +42,12 @@ do fi done export LD_32_LIBRARY_PATH_RPATH=y +LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null || true) export LD_32_LIBMAP=" libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 $LOCALBASE/lib/libvulkan_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so $LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so +$LD_32_LIBMAP_CONF $LD_32_LIBMAP" if [ -z "$WINE_NO_WOW64" ] |