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]
This commit is contained in:
Gerald Pfeifer 2021-11-02 06:27:04 +00:00
parent 4c9814bf5c
commit e32f90cfd0
2 changed files with 6 additions and 8 deletions

View file

@ -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

View file

@ -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