From nobody Thu Jun 29 00:59:14 2023 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 4Qs0TH0yymz4kv4b; Thu, 29 Jun 2023 00:59:15 +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 4Qs0TH0XfGz3kVq; Thu, 29 Jun 2023 00:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688000355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+GJW2DyWTDAmMnnZbGQ0bVs36XbDz8hs308qQWNqo4=; b=oGtuJCFvZvWDV2W9J32Qwwd9hjcEI2bs1pUcCHAKUKPeTNMKHuYOIiEDow0RbMCy+IcAP0 vPmP4NkVLFU9lpn/PxlDxLuzaGuRpIkTJA3Z2r7mDOhSXUWbgSR32qsP0sMkdkNUTdA+sU LtJGr9SKbZJhrbi/UUjAe2WfrBR3C30DVLXShNFUtfhNSdcpljV6rfeAqbbX6bgjnkNHPu iRQ26sV5HOPNIYV3l/KoNLobGAT9RvKmWjrYlTZ+lPtSa/1Drdq9obJyx45wVUjXGl53Pb 3WlLVjO41IPD+pvcWnKKu/ExbRN8OA2PBEgXE6PJYuLecTrEwcnh1loMn4BC4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688000355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+GJW2DyWTDAmMnnZbGQ0bVs36XbDz8hs308qQWNqo4=; b=E1CGpQJriclSyqrXL53eqSD2M/L99B8Sy3pnZdPl70m0QOthi/9VcpwOQ+4jrFOhFiCg5b RmXIiOKZZqi9KEzytH90V2UZjwWgWcpMDpcKdCUYccJQTlv0yLy+7buRaBK+/d7Kk7685V pBEJ6u57U1Md592NG/SPXcIipJkqPlhUeu6HyNY9yn2kSvCLLUELa4nMvDMTlQYI9yts68 MGrlZhF2lexXmZ+xy3JIur/86fJzXUwzBKuHQ6tb8nXmvtZL26jXV0LP0+QQ01Zf29P8mr jUsVh4e0iJ7t6g1tP02Yer1VOZlZB6NvzidrlCUpSWwgS4tCugxnDltGVT1tGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688000355; a=rsa-sha256; cv=none; b=Zcibub8kws/QjaoWcS2h5JmuIWsjsJUXGz3xxOCjh5G79b3VUovKdjnF9bUFSUL9jm3yTo pbgDj019R2y0QVppqKaUX43gp0CasOL5Ye43V0p93GrFkDa1oK4btWh8iCHsjUZZn32eX7 9rGBHGbQHLvBYGCwprYyTP7AyuSFVuYfvbTzPb/FCaoC0D6Wbxu3Y9ySnjVdEskOEerTnT Ab/WBNUBxDtnf/q+Nruoh8iirs6TIlL5T6z7CEf+JN1jxP8p3KQOPj+zBIm2W0p/IRIfam g3w5Ib5uTM+T3LvaTsLbOgDRRj3LacansXKnoTFL+WWB69YshjfUikaFNVfK1Q== 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 4Qs0TG6l5kzvrt; Thu, 29 Jun 2023 00:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T0xEMq045729; Thu, 29 Jun 2023 00:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T0xE1V045728; Thu, 29 Jun 2023 00:59:14 GMT (envelope-from git) Date: Thu, 29 Jun 2023 00:59:14 GMT Message-Id: <202306290059.35T0xE1V045728@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 83cf9277fc61 - main - emulators/wine: support graphics/mesa-devel for WoW64 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83cf9277fc61e6e9c449df858a6d7b41e39bb08c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=83cf9277fc61e6e9c449df858a6d7b41e39bb08c commit 83cf9277fc61e6e9c449df858a6d7b41e39bb08c Author: Jan Beich AuthorDate: 2023-04-29 21:08:28 +0000 Commit: Jan Beich CommitDate: 2023-06-29 00:57:50 +0000 emulators/wine: support graphics/mesa-devel for WoW64 WoW64 currently uses i386 packages on amd64 under special PREFIX, so - Include mesa-devel paths to LIBGL_DRIVERS_PATH override - Respect libmap.conf(5) in 32-bit packages To use simply install mesa-devel as regular and WoW64 package e.g., $ pkg install mesa-devel $ /usr/local/share/wine/pkg32.sh install mesa-devel In case of issues simply remove mesa-devel e.g., $ pkg delete mesa-devel $ /usr/local/share/wine/pkg32.sh delete mesa-devel PR: 271140 Reviewed by: Alex S Approved by: maintainer timeout (2 months) --- emulators/wine-devel/Makefile | 2 +- emulators/wine-devel/files/wine-wow64.sh | 4 +++- emulators/wine-proton/Makefile | 2 +- emulators/wine-proton/files/wine-wow64.sh | 4 +++- emulators/wine/Makefile | 2 +- emulators/wine/files/wine-wow64.sh | 4 +++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 2e546496f9a6..5a4537341928 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine DISTVERSION= 7.22 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/7.x/ diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index 796f26787c8c..ca324c2d50a2 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -32,7 +32,7 @@ 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 LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$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 @@ -42,10 +42,12 @@ do fi done export LD_32_LIBRARY_PATH_RPATH=y +LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null || true) export LD_32_LIBMAP=" libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 $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_CONF $LD_32_LIBMAP" if [ -z "$WINE_NO_WOW64" ] diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile index 24b84e87797d..8004d3e137fb 100644 --- a/emulators/wine-proton/Makefile +++ b/emulators/wine-proton/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine-proton DISTVERSION= 7.0-5 -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 d3fa16776c5f..91bd4a6f0115 100644 --- a/emulators/wine-proton/files/wine-wow64.sh +++ b/emulators/wine-proton/files/wine-wow64.sh @@ -32,7 +32,7 @@ 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 LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$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 @@ -42,10 +42,12 @@ do fi done export LD_32_LIBRARY_PATH_RPATH=y +LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null || true) export LD_32_LIBMAP=" libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 $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_CONF $LD_32_LIBMAP" if [ -z "$WINE_NO_WOW64" ] diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index d3a0b2ce41b2..652a179359a4 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine DISTVERSION= 7.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/7.0/ diff --git a/emulators/wine/files/wine-wow64.sh b/emulators/wine/files/wine-wow64.sh index 796f26787c8c..ca324c2d50a2 100644 --- a/emulators/wine/files/wine-wow64.sh +++ b/emulators/wine/files/wine-wow64.sh @@ -32,7 +32,7 @@ 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 LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$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 @@ -42,10 +42,12 @@ do fi done export LD_32_LIBRARY_PATH_RPATH=y +LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null || true) export LD_32_LIBMAP=" libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 $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_CONF $LD_32_LIBMAP" if [ -z "$WINE_NO_WOW64" ]