From owner-dev-commits-ports-main@freebsd.org Tue Aug 10 07:43:49 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 6CB6A663D5F; Tue, 10 Aug 2021 07:43:49 +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 4GkQ1d2TJmz3QhF; Tue, 10 Aug 2021 07:43:49 +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 3DA3317D98; Tue, 10 Aug 2021 07:43:49 +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 17A7hnDZ023015; Tue, 10 Aug 2021 07:43:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17A7hnsk023014; Tue, 10 Aug 2021 07:43:49 GMT (envelope-from git) Date: Tue, 10 Aug 2021 07:43:49 GMT Message-Id: <202108100743.17A7hnsk023014@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: 3f3a0267078b - main - emulators/wine: XAudio2 no longer depends on OpenAL 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: 3f3a0267078b3438d5453b5a4bf230cf282ca0e0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2021 07:43:49 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f3a0267078b3438d5453b5a4bf230cf282ca0e0 commit 3f3a0267078b3438d5453b5a4bf230cf282ca0e0 Author: Gerald Pfeifer AuthorDate: 2021-08-10 07:43:27 +0000 Commit: Gerald Pfeifer CommitDate: 2021-08-10 07:43:27 +0000 emulators/wine: XAudio2 no longer depends on OpenAL Since upstream commit 3e390b1aafff47df63376a8ca4293c515d74f4ba on 2019-02-20 XAudio2 uses FAudio (which already is an unconditional dependency) and no longer depends on OpenAL, so adjust the packing list accordingly. [1] We did not detect this via regular testing due to false negatives in Mk/Scripts/check-stagedir.sh in the presence of %%OPTION%%s in pkg-plist. [2] PR: 257651 [1], 220950 [2] Submitted by: Alex S [1] --- emulators/wine/Makefile | 2 +- emulators/wine/pkg-plist | 92 ++++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 47b932bbdc79..4addc6fe331a 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -2,7 +2,7 @@ PORTNAME= wine DISTVERSION= 6.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index df1e5ce4d141..722dc3d61f0a 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -2484,14 +2484,14 @@ lib/wine/fakedlls/wuapi.dll lib/wine/fakedlls/wuaueng.dll lib/wine/fakedlls/wuauserv.exe lib/wine/fakedlls/wusa.exe -%%OPENAL%%lib/wine/fakedlls/x3daudio1_0.dll -%%OPENAL%%lib/wine/fakedlls/x3daudio1_1.dll -%%OPENAL%%lib/wine/fakedlls/x3daudio1_2.dll -%%OPENAL%%lib/wine/fakedlls/x3daudio1_3.dll -%%OPENAL%%lib/wine/fakedlls/x3daudio1_4.dll -%%OPENAL%%lib/wine/fakedlls/x3daudio1_5.dll -%%OPENAL%%lib/wine/fakedlls/x3daudio1_6.dll -%%OPENAL%%lib/wine/fakedlls/x3daudio1_7.dll +lib/wine/fakedlls/x3daudio1_0.dll +lib/wine/fakedlls/x3daudio1_1.dll +lib/wine/fakedlls/x3daudio1_2.dll +lib/wine/fakedlls/x3daudio1_3.dll +lib/wine/fakedlls/x3daudio1_4.dll +lib/wine/fakedlls/x3daudio1_5.dll +lib/wine/fakedlls/x3daudio1_6.dll +lib/wine/fakedlls/x3daudio1_7.dll lib/wine/fakedlls/xactengine3_0.dll lib/wine/fakedlls/xactengine3_1.dll lib/wine/fakedlls/xactengine3_2.dll @@ -2500,21 +2500,21 @@ lib/wine/fakedlls/xactengine3_4.dll lib/wine/fakedlls/xactengine3_5.dll lib/wine/fakedlls/xactengine3_6.dll lib/wine/fakedlls/xactengine3_7.dll -%%OPENAL%%lib/wine/fakedlls/xapofx1_1.dll -%%OPENAL%%lib/wine/fakedlls/xapofx1_2.dll -%%OPENAL%%lib/wine/fakedlls/xapofx1_3.dll -%%OPENAL%%lib/wine/fakedlls/xapofx1_4.dll -%%OPENAL%%lib/wine/fakedlls/xapofx1_5.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_0.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_1.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_2.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_3.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_4.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_5.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_6.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_7.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_8.dll -%%OPENAL%%lib/wine/fakedlls/xaudio2_9.dll +lib/wine/fakedlls/xapofx1_1.dll +lib/wine/fakedlls/xapofx1_2.dll +lib/wine/fakedlls/xapofx1_3.dll +lib/wine/fakedlls/xapofx1_4.dll +lib/wine/fakedlls/xapofx1_5.dll +lib/wine/fakedlls/xaudio2_0.dll +lib/wine/fakedlls/xaudio2_1.dll +lib/wine/fakedlls/xaudio2_2.dll +lib/wine/fakedlls/xaudio2_3.dll +lib/wine/fakedlls/xaudio2_4.dll +lib/wine/fakedlls/xaudio2_5.dll +lib/wine/fakedlls/xaudio2_6.dll +lib/wine/fakedlls/xaudio2_7.dll +lib/wine/fakedlls/xaudio2_8.dll +lib/wine/fakedlls/xaudio2_9.dll lib/wine/fakedlls/xcopy.exe lib/wine/fakedlls/xinput1_1.dll lib/wine/fakedlls/xinput1_2.dll @@ -3223,14 +3223,14 @@ lib/wine/wuapi.dll.so lib/wine/wuaueng.dll.so lib/wine/wuauserv.exe.so lib/wine/wusa.exe.so -%%OPENAL%%lib/wine/x3daudio1_0.dll.so -%%OPENAL%%lib/wine/x3daudio1_1.dll.so -%%OPENAL%%lib/wine/x3daudio1_2.dll.so -%%OPENAL%%lib/wine/x3daudio1_3.dll.so -%%OPENAL%%lib/wine/x3daudio1_4.dll.so -%%OPENAL%%lib/wine/x3daudio1_5.dll.so -%%OPENAL%%lib/wine/x3daudio1_6.dll.so -%%OPENAL%%lib/wine/x3daudio1_7.dll.so +lib/wine/x3daudio1_0.dll.so +lib/wine/x3daudio1_1.dll.so +lib/wine/x3daudio1_2.dll.so +lib/wine/x3daudio1_3.dll.so +lib/wine/x3daudio1_4.dll.so +lib/wine/x3daudio1_5.dll.so +lib/wine/x3daudio1_6.dll.so +lib/wine/x3daudio1_7.dll.so lib/wine/xactengine3_0.dll.so lib/wine/xactengine3_1.dll.so lib/wine/xactengine3_2.dll.so @@ -3239,21 +3239,21 @@ lib/wine/xactengine3_4.dll.so lib/wine/xactengine3_5.dll.so lib/wine/xactengine3_6.dll.so lib/wine/xactengine3_7.dll.so -%%OPENAL%%lib/wine/xapofx1_1.dll.so -%%OPENAL%%lib/wine/xapofx1_2.dll.so -%%OPENAL%%lib/wine/xapofx1_3.dll.so -%%OPENAL%%lib/wine/xapofx1_4.dll.so -%%OPENAL%%lib/wine/xapofx1_5.dll.so -%%OPENAL%%lib/wine/xaudio2_0.dll.so -%%OPENAL%%lib/wine/xaudio2_1.dll.so -%%OPENAL%%lib/wine/xaudio2_2.dll.so -%%OPENAL%%lib/wine/xaudio2_3.dll.so -%%OPENAL%%lib/wine/xaudio2_4.dll.so -%%OPENAL%%lib/wine/xaudio2_5.dll.so -%%OPENAL%%lib/wine/xaudio2_6.dll.so -%%OPENAL%%lib/wine/xaudio2_7.dll.so -%%OPENAL%%lib/wine/xaudio2_8.dll.so -%%OPENAL%%lib/wine/xaudio2_9.dll.so +lib/wine/xapofx1_1.dll.so +lib/wine/xapofx1_2.dll.so +lib/wine/xapofx1_3.dll.so +lib/wine/xapofx1_4.dll.so +lib/wine/xapofx1_5.dll.so +lib/wine/xaudio2_0.dll.so +lib/wine/xaudio2_1.dll.so +lib/wine/xaudio2_2.dll.so +lib/wine/xaudio2_3.dll.so +lib/wine/xaudio2_4.dll.so +lib/wine/xaudio2_5.dll.so +lib/wine/xaudio2_6.dll.so +lib/wine/xaudio2_7.dll.so +lib/wine/xaudio2_8.dll.so +lib/wine/xaudio2_9.dll.so lib/wine/xcopy.exe.so lib/wine/xinput1_1.dll.so lib/wine/xinput1_2.dll.so