From nobody Tue Nov 02 06:52:17 2021 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 B2CC3182ABF1; Tue, 2 Nov 2021 06:52:17 +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 4Hk0vP4jXZz4VQ5; Tue, 2 Nov 2021 06:52:17 +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 8342E207F2; Tue, 2 Nov 2021 06:52:17 +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 1A26qHUc030483; Tue, 2 Nov 2021 06:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A26qH4A030482; Tue, 2 Nov 2021 06:52:17 GMT (envelope-from git) Date: Tue, 2 Nov 2021 06:52:17 GMT Message-Id: <202111020652.1A26qH4A030482@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: e32f90cfd0b9 - main - emulators/wine-devel: Account for bundled mpg123 library 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e32f90cfd0b9ab6cc66e7f214e99dbc550575f0c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=e32f90cfd0b9ab6cc66e7f214e99dbc550575f0c commit e32f90cfd0b9ab6cc66e7f214e99dbc550575f0c Author: Gerald Pfeifer AuthorDate: 2021-11-02 06:27:04 +0000 Commit: Gerald Pfeifer CommitDate: 2021-11-02 06:27:04 +0000 emulators/wine-devel: Account for bundled mpg123 library Since version 6.20 Wine bundles and unconditionally uses its own copy of the mpg123 library. Accordingly remove the MPG123 option and associated logic, unconditionally package associated files (Mk/Scripts/check-stagedir.sh missed those [1]), and bump PORTREVISION. PR: 220950 [1] --- emulators/wine-devel/Makefile | 6 ++---- emulators/wine-devel/pkg-plist | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index c9e39010b86b..fa39752a0ace 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= wine DISTVERSION= 6.20 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -68,7 +69,7 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT OPENAL STAGING V4L WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=GNUTLS OPENAL X11 OPTIONS_SUB= yes @@ -97,9 +98,6 @@ LIBXSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel -MPG123_CONFIGURE_WITH= mpg123 -MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 - OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 7b798e79ce4d..ff4d60e469b0 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1699,7 +1699,7 @@ lib/wine/%%WINEARCH%%-unix/ksecdd.sys.so lib/wine/%%WINEARCH%%-unix/ksproxy.ax.so lib/wine/%%WINEARCH%%-unix/ksuser.dll.so lib/wine/%%WINEARCH%%-unix/ktmw32.dll.so -%%MPG123%%lib/wine/%%WINEARCH%%-unix/l3codeca.acm.so +lib/wine/%%WINEARCH%%-unix/l3codeca.acm.so lib/wine/%%WINEARCH%%-unix/libaclui.def lib/wine/%%WINEARCH%%-unix/libactiveds.def lib/wine/%%WINEARCH%%-unix/libadsiid.a @@ -1973,7 +1973,7 @@ lib/wine/%%WINEARCH%%-unix/mofcomp.exe.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/monodebg.vxd.so lib/wine/%%WINEARCH%%-unix/mountmgr.sys.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/mouse.drv16.so -%%MPG123%%lib/wine/%%WINEARCH%%-unix/mp3dmod.dll.so +lib/wine/%%WINEARCH%%-unix/mp3dmod.dll.so lib/wine/%%WINEARCH%%-unix/mpr.dll.so lib/wine/%%WINEARCH%%-unix/mprapi.dll.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/msacm.dll16.so @@ -2986,7 +2986,7 @@ lib/wine/%%WINEARCH%%-windows/ksecdd.sys lib/wine/%%WINEARCH%%-windows/ksproxy.ax lib/wine/%%WINEARCH%%-windows/ksuser.dll lib/wine/%%WINEARCH%%-windows/ktmw32.dll -%%MPG123%%lib/wine/%%WINEARCH%%-windows/l3codeca.acm +lib/wine/%%WINEARCH%%-windows/l3codeca.acm lib/wine/%%WINEARCH%%-windows/light.msstyles lib/wine/%%WINEARCH%%-windows/loadperf.dll lib/wine/%%WINEARCH%%-windows/localspl.dll @@ -3019,7 +3019,7 @@ lib/wine/%%WINEARCH%%-windows/mofcomp.exe %%WINE32%%lib/wine/%%WINEARCH%%-windows/monodebg.vxd lib/wine/%%WINEARCH%%-windows/mountmgr.sys %%WINE32%%lib/wine/%%WINEARCH%%-windows/mouse.drv16 -%%MPG123%%lib/wine/%%WINEARCH%%-windows/mp3dmod.dll +lib/wine/%%WINEARCH%%-windows/mp3dmod.dll lib/wine/%%WINEARCH%%-windows/mpr.dll lib/wine/%%WINEARCH%%-windows/mprapi.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/msacm.dll16