sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

emulators/wine: support graphics/mesa-devel for WoW64

Browse source 
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)
This commit is contained in:
Jan Beich 2023-04-29 21:08:28 +00:00
parent a3f72bf4c5
commit 83cf9277fc
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emulators/wine-devel/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= wine PORTNAME= wine
DISTVERSION= 7.22 DISTVERSION= 7.22
PORTREVISION= 1 PORTREVISION= 2
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= https://dl.winehq.org/wine/source/7.x/ MASTER_SITES= https://dl.winehq.org/wine/source/7.x/

4
emulators/wine-devel/files/wine-wow64.sh
View file

@ -32,7 +32,7 @@ then
exit 1 exit 1
fi 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" 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 for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
do do
@ -42,10 +42,12 @@ do
fi fi
done done
export LD_32_LIBRARY_PATH_RPATH=y 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=" export LD_32_LIBMAP="
libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 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_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so
$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so $LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so
$LD_32_LIBMAP_CONF
$LD_32_LIBMAP" $LD_32_LIBMAP"
if [ -z "$WINE_NO_WOW64" ] if [ -z "$WINE_NO_WOW64" ]

2
emulators/wine-proton/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= wine-proton PORTNAME= wine-proton
DISTVERSION= 7.0-5 DISTVERSION= 7.0-5
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= emulators CATEGORIES= emulators
MAINTAINER= iwtcex@gmail.com MAINTAINER= iwtcex@gmail.com

4
emulators/wine-proton/files/wine-wow64.sh
View file

@ -32,7 +32,7 @@ then
exit 1 exit 1
fi 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" 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 for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
do do
@ -42,10 +42,12 @@ do
fi fi
done done
export LD_32_LIBRARY_PATH_RPATH=y 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=" export LD_32_LIBMAP="
libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 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_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so
$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so $LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so
$LD_32_LIBMAP_CONF
$LD_32_LIBMAP" $LD_32_LIBMAP"
if [ -z "$WINE_NO_WOW64" ] if [ -z "$WINE_NO_WOW64" ]

2
emulators/wine/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= wine PORTNAME= wine
DISTVERSION= 7.0.2 DISTVERSION= 7.0.2
PORTREVISION= 1 PORTREVISION= 2
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= https://dl.winehq.org/wine/source/7.0/ MASTER_SITES= https://dl.winehq.org/wine/source/7.0/

4
emulators/wine/files/wine-wow64.sh
View file

@ -32,7 +32,7 @@ then
exit 1 exit 1
fi 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" 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 for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
do do
@ -42,10 +42,12 @@ do
fi fi
done done
export LD_32_LIBRARY_PATH_RPATH=y 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=" export LD_32_LIBMAP="
libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 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_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so
$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so $LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so
$LD_32_LIBMAP_CONF
$LD_32_LIBMAP" $LD_32_LIBMAP"
if [ -z "$WINE_NO_WOW64" ] if [ -z "$WINE_NO_WOW64" ]