Date: Mon, 25 Oct 2021 14:32:08 GMT From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 48fcd1c22641 - main - emulators/wine-devel: Point Vulkan loader at 32-bit Mesa libs Message-ID: <202110251432.19PEW8dx055021@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=48fcd1c22641393f82f4625da8729d280d614714 commit 48fcd1c22641393f82f4625da8729d280d614714 Author: Alex S <iwtcex@gmail.com> AuthorDate: 2021-10-25 11:45:55 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2021-10-25 14:31:53 +0000 emulators/wine-devel: Point Vulkan loader at 32-bit Mesa libs PR: 259211 Approved by: Damjan Jovanovic <damjan.jov@gmail.com> (maintainer) --- emulators/wine-devel/Makefile | 2 +- emulators/wine-devel/files/wine-wow64.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index cc6d1027d0cf..16caa1a462b6 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= wine DISTVERSION= 6.19 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index e24bc30e1b78..a7b1efba17cc 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -24,7 +24,6 @@ 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" ] @@ -33,6 +32,10 @@ do 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110251432.19PEW8dx055021>