Switch the MP3 decoder from libmad to libmp123.

mpg123 is still maintained upstream and also faster, in case somebody
runs this on a really, really slow machine.  All our archs support
floating point, so there is no reason to use the fixed-point libmad
for MP3 decoding.

Tested by rapha@
This commit is contained in:
naddy 2018-07-18 19:36:37 +00:00
parent 8f2bed6b4e
commit 7bf30a2ab8
2 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.46 2018/07/11 13:38:03 naddy Exp $
# $OpenBSD: Makefile,v 1.47 2018/07/18 19:36:37 naddy Exp $
COMMENT = audio player daemon with library management
BROKEN-sparc64 = waf build goes into an infinite loop
@ -6,7 +6,7 @@ BROKEN-sparc64 = waf build goes into an infinite loop
V = 0.8
DISTNAME = xmms2-${V}DrO_o
PKGNAME = xmms2-${V}
REVISION = 9
REVISION = 10
SHARED_LIBS += xmmsclient++ 2.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 1.0 # 1.0.0
@ -24,7 +24,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += FLAC ao avahi-client avahi-common avahi-glib avcodec
WANTLIB += avutil c curl curses gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 intl jack m mad ogg pcre perl pthread readline
WANTLIB += gthread-2.0 intl jack m mpg123 ogg pcre perl pthread readline
WANTLIB += sndfile speex sqlite3 ${COMPILER_LIBCXX} vorbis vorbisfile
WANTLIB += vpx x264 xml2 opus swresample x265 ${MODPY_WANTLIB}
@ -47,7 +47,7 @@ LIB_DEPENDS = devel/glib2 \
audio/jack \
textproc/libxml \
net/curl \
audio/libmad \
audio/mpg123 \
net/avahi \
audio/libsndfile
@ -71,7 +71,7 @@ do-configure:
--no-cython \
--disable-shmvis-server \
--without-optionals=medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mms,modplug,mpg123,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
post-configure:
# avoid linking to bogus libraries

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2018/07/11 13:38:03 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2018/07/18 19:36:37 naddy Exp $
bin/nyxmms2
@bin bin/xmms2
@bin bin/xmms2-et
@ -120,8 +120,8 @@ lib/xmms2/libxmms_id3v2.so
lib/xmms2/libxmms_jack.so
lib/xmms2/libxmms_karaoke.so
lib/xmms2/libxmms_m3u.so
lib/xmms2/libxmms_mad.so
lib/xmms2/libxmms_mp4.so
lib/xmms2/libxmms_mpg123.so
lib/xmms2/libxmms_normalize.so
lib/xmms2/libxmms_null.so
lib/xmms2/libxmms_nulstripper.so