git: 5c904df2ecdf - main - emulators/wine: Point Vulkan loader at 32-bit Mesa libs

From: Gerald Pfeifer <gerald_at_FreeBSD.org>
Date: Wed, 27 Oct 2021 10:27:22 UTC
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5c904df2ecdfe40bf56ae0fe1b6833958a358905

commit 5c904df2ecdfe40bf56ae0fe1b6833958a358905
Author:     Alex S <iwtcex@gmail.com>
AuthorDate: 2021-10-27 10:26:00 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2021-10-27 10:26:34 +0000

    emulators/wine: Point Vulkan loader at 32-bit Mesa libs
    
    This back ports commit 48fcd1c22641393f82f4625da8729d280d614714 from
    the wine-devel port.
    
    PR:             259211
---
 emulators/wine/Makefile            | 2 +-
 emulators/wine/files/wine-wow64.sh | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0fd470058b09..a9285f91045c 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	6.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine/files/wine-wow64.sh b/emulators/wine/files/wine-wow64.sh
index e24bc30e1b78..a7b1efba17cc 100644
--- a/emulators/wine/files/wine-wow64.sh
+++ b/emulators/wine/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