From nobody Wed Oct 27 10:27:22 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0945B182D3E4; Wed, 27 Oct 2021 10:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfPyL6k09z4gx4; Wed, 27 Oct 2021 10:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7A3F674D; Wed, 27 Oct 2021 10:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RARMSI084329; Wed, 27 Oct 2021 10:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RARMgU084328; Wed, 27 Oct 2021 10:27:22 GMT (envelope-from git) Date: Wed, 27 Oct 2021 10:27:22 GMT Message-Id: <202110271027.19RARMgU084328@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 5c904df2ecdf - main - emulators/wine: Point Vulkan loader at 32-bit Mesa libs List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c904df2ecdfe40bf56ae0fe1b6833958a358905 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c904df2ecdfe40bf56ae0fe1b6833958a358905 commit 5c904df2ecdfe40bf56ae0fe1b6833958a358905 Author: Alex S AuthorDate: 2021-10-27 10:26:00 +0000 Commit: Gerald Pfeifer 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