From owner-dev-commits-ports-branches@freebsd.org Sun Jul 25 06:33:38 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EE7EA653C14; Sun, 25 Jul 2021 06:33:38 +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 4GXYD25sckz3CMD; Sun, 25 Jul 2021 06:33:38 +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 A6F6B1EDAD; Sun, 25 Jul 2021 06:33:38 +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 16P6XcxH009950; Sun, 25 Jul 2021 06:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16P6XcWw009949; Sun, 25 Jul 2021 06:33:38 GMT (envelope-from git) Date: Sun, 25 Jul 2021 06:33:38 GMT Message-Id: <202107250633.16P6XcWw009949@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kevin Bowling Subject: git: 59ceb0a8cc22 - 2021Q3 - emulators/wine-proton: Vulkan 32-bit Mesa fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 59ceb0a8cc2211a24ee077faf77ae58da06ffc51 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2021 06:33:39 -0000 The branch 2021Q3 has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=59ceb0a8cc2211a24ee077faf77ae58da06ffc51 commit 59ceb0a8cc2211a24ee077faf77ae58da06ffc51 Author: Alex S AuthorDate: 2021-07-25 06:29:47 +0000 Commit: Kevin Bowling CommitDate: 2021-07-25 06:33:29 +0000 emulators/wine-proton: Vulkan 32-bit Mesa fixes Point Vulkan loader at 32-bit Mesa libs PR: 257399 (cherry picked from commit 3247683ba02a707dc767c472520e8e165d848e90) --- 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" "$@"