From nobody Mon Jun 24 07:45:36 2024 X-Original-To: dev-commits-ports-all@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 4W70PX2BNcz5NYrR; Mon, 24 Jun 2024 07:45:36 +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 4W70PX1X0Sz4YjQ; Mon, 24 Jun 2024 07:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719215136; 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=bpc5EAImlX5gFfGjSqGbgzWwUTufXVQn71k6eRLTWF8=; b=ynecefo8eiOPZlONBs2U08IbYl7ji0LTPqLxXRJFpqhO2Gpb5CxSZbsZy9bXGE1zC3QbeS X47+mk6I3ad0W4TJmBWAVX4KTUIoqJRaFoKnipv4vSNnDFIga0XCEHmL5c6wj0iUvkZk11 ++4ZoYkpZ+0j1lrSccTqgyWxWzOUgI1JyE20acw7NcI5zrYxCktUON9glwM3VtqxH24RvO IwlpMov/NTgkjT2L3AEyfPj/vlngKGd/ySoERd3XUKziSrbBZLZsDdxjrvrPd255+haXI1 1FvsyEaupbHJYyE7Re/DDAPKWnOLFPkbIk5OrUr+n/p2nSjKkXt94TA/Xp54KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719215136; a=rsa-sha256; cv=none; b=v0BXYQFoW2Ucky0L+KllBQntQhqQ5VPsdG1/1GVA6rg/qVUbw5C9vr6kAAbFlwFDJMETGQ d/XMs6TDPpeWuOorHAE4rMdYzK8W6+xMPwB6c//8IvvibRsHyAjmV0GGg4ysJLQTAC0w6w 3JHhUw8Fpvwvg2XF2zqdMFhtirkA3UZ4xD7bl8iIWL8DnkiDyScpWLRqudiCQ4gG0r+tX/ 19SiaiWbAiE5n0mbzBESGjDLZ6lbDTBNDx8yL/wZyF/Tbt8Hrctqgwrlg4EYUKTckPtfvK VtMJmsDBz58Dk4BMD8OWYF1TGfhc86u65s/0Q4SPGdFguWRJUCS/LVfKG7dh8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719215136; 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=bpc5EAImlX5gFfGjSqGbgzWwUTufXVQn71k6eRLTWF8=; b=VdhKT3BVROahzkLFu76F8p8xo4rmv9qWadHbxNSFQarINS8oZ4zVWEClq5HTfrMpb9RKkH 0H8ZOLFshScOZzmVYpEPeDZsanwlyo6WV840JOa8OYyjaSd9/aneJal5MfjE88Y59gPqV3 vwcavp0LR/o0T9IXm6oM8+nwQjV8mu6q2QpDieSxv3Ny0R7an1KmZA0ciPODzAGjucACUR X03D+pQ+ZU2TNkaoP1N3AJmm0vGGyCY+/fi4X7l++WSdv5X+a7CQbQzl7ONzUcTO2iYNHc QHU2300VbM/O7keJCe2rYfM88Q+8kDQnkCEmVg9Nsl2YK8ZofNj8EryrvS7oEA== 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 4W70PX0qpfz18ms; Mon, 24 Jun 2024 07:45:36 +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 45O7jajk078371; Mon, 24 Jun 2024 07:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45O7ja73078368; Mon, 24 Jun 2024 07:45:36 GMT (envelope-from git) Date: Mon, 24 Jun 2024 07:45:36 GMT Message-Id: <202406240745.45O7ja73078368@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: 89f7712ef739 - main - emulators/wine-devel: Fix pkg-plist for OSS and i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 89f7712ef739f5658db476c8f93c06a3aac3e7d5 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=89f7712ef739f5658db476c8f93c06a3aac3e7d5 commit 89f7712ef739f5658db476c8f93c06a3aac3e7d5 Author: Gerald Pfeifer AuthorDate: 2024-06-24 07:44:53 +0000 Commit: Gerald Pfeifer CommitDate: 2024-06-24 07:44:54 +0000 emulators/wine-devel: Fix pkg-plist for OSS and i386 With the large update to Wine 9.9 we missed the (non-default) OSS option and its impact on packaging. [1] Similarly, i386 does not feature the WoW64 libraries. [2] PR: 279927 Co-authored-by: scf [2] Reported by: O. Hartmann [1], scf [2] Tested by: Ivan Rozhuk [1], scf --- emulators/wine-devel/pkg-plist | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 192fa6519569..8b072e67c619 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1554,7 +1554,7 @@ lib/wine/%%WINEARCH%%-unix/libwmcodecdspuuid.a lib/wine/%%WINEARCH%%-unix/libwmvcore.a lib/wine/%%WINEARCH%%-unix/libwnaspi32.a %%WINE32%%lib/wine/%%WINEARCH%%-unix/libwow32.a -lib/wine/%%WINEARCH%%-unix/libwow64.a +%%WINE64%%lib/wine/%%WINEARCH%%-unix/libwow64.a lib/wine/%%WINEARCH%%-unix/libws2_32.a lib/wine/%%WINEARCH%%-unix/libwsdapi.a lib/wine/%%WINEARCH%%-unix/libwsnmp32.a @@ -1575,9 +1575,7 @@ lib/wine/%%WINEARCH%%-unix/secur32.so lib/wine/%%WINEARCH%%-unix/win32u.so %%ALSA%%lib/wine/%%WINEARCH%%-unix/winealsa.so lib/wine/%%WINEARCH%%-unix/winebus.so -%%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/winegstreamer.dll.so %%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/winegstreamer.so -%%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.drv.so %%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.so lib/wine/%%WINEARCH%%-unix/wineps.so lib/wine/%%WINEARCH%%-unix/winevulkan.so @@ -2084,7 +2082,7 @@ lib/wine/%%WINEARCH%%-windows/libwldap32.a lib/wine/%%WINEARCH%%-windows/libwmcodecdspuuid.a lib/wine/%%WINEARCH%%-windows/libwmvcore.a lib/wine/%%WINEARCH%%-windows/libwnaspi32.a -lib/wine/%%WINEARCH%%-windows/libwow64.a +%%WINE64%%lib/wine/%%WINEARCH%%-windows/libwow64.a lib/wine/%%WINEARCH%%-windows/libws2_32.a lib/wine/%%WINEARCH%%-windows/libwsdapi.a lib/wine/%%WINEARCH%%-windows/libwsnmp32.a @@ -2535,9 +2533,9 @@ lib/wine/%%WINEARCH%%-windows/wnaspi32.dll lib/wine/%%WINEARCH%%-windows/wofutil.dll lib/wine/%%WINEARCH%%-windows/wordpad.exe %%WINE32%%lib/wine/%%WINEARCH%%-windows/wow32.dll -lib/wine/%%WINEARCH%%-windows/wow64.dll -lib/wine/%%WINEARCH%%-windows/wow64cpu.dll -lib/wine/%%WINEARCH%%-windows/wow64win.dll +%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64.dll +%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64cpu.dll +%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64win.dll lib/wine/%%WINEARCH%%-windows/wpc.dll lib/wine/%%WINEARCH%%-windows/write.exe lib/wine/%%WINEARCH%%-windows/ws2_32.dll