Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Aug 2021 07:43:49 GMT
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3f3a0267078b - main - emulators/wine: XAudio2 no longer depends on OpenAL
Message-ID:  <202108100743.17A7hnsk023014@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f3a0267078b3438d5453b5a4bf230cf282ca0e0

commit 3f3a0267078b3438d5453b5a4bf230cf282ca0e0
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2021-08-10 07:43:27 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
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 <iwtcex@gmail.com> [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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108100743.17A7hnsk023014>