Date: Sun, 25 Jul 2021 06:31:20 GMT From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3247683ba02a - main - emulators/wine-proton: Vulkan 32-bit Mesa fixes Message-ID: <202107250631.16P6VK8P006371@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=3247683ba02a707dc767c472520e8e165d848e90 commit 3247683ba02a707dc767c472520e8e165d848e90 Author: Alex S <iwtcex@gmail.com> AuthorDate: 2021-07-25 06:29:47 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2021-07-25 06:29:47 +0000 emulators/wine-proton: Vulkan 32-bit Mesa fixes Point Vulkan loader at 32-bit Mesa libs PR: 257399 --- emulators/wine-proton/Makefile | 2 +- emulators/wine-proton/files/wine-wow64.sh | 31 +++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile index 40a9bfa8b42c..9937ff5e8491 100644 --- a/emulators/wine-proton/Makefile +++ b/emulators/wine-proton/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine-proton DISTVERSION= 6.3-2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MAINTAINER= iwtcex@gmail.com diff --git a/emulators/wine-proton/files/wine-wow64.sh b/emulators/wine-proton/files/wine-wow64.sh index 9efb09fc3d3b..e5b414ea2d93 100644 --- a/emulators/wine-proton/files/wine-wow64.sh +++ b/emulators/wine-proton/files/wine-wow64.sh @@ -5,16 +5,6 @@ LOCALBASE="${PREFIX%/*}" I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" -export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$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:$I386_ROOT/$LOCALBASE/llvm10/lib:$I386_ROOT/$LOCALBASE/llvm11/lib" -export LD_32_LIBRARY_PATH_RPATH=y - -if [ -z "$WINE_NO_WOW64" ] -then - export PATH="${TARGET%/*}:${PATH}" - export WINESERVER="${TARGET}server" -fi - if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ] then printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine" @@ -31,4 +21,25 @@ 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 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 + if [ -d "$d" ] + then + export LD_32_LIBRARY_PATH="$LD_32_LIBRARY_PATH:$d" + fi +done +export LD_32_LIBRARY_PATH_RPATH=y +export LD_32_LIBMAP=" +$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" + +if [ -z "$WINE_NO_WOW64" ] +then + export PATH="${TARGET%/*}:${PATH}" + export WINESERVER="${TARGET}server" +fi + exec "$I386_ROOT/$PREFIX/bin/wine" "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107250631.16P6VK8P006371>