Re: audio/xmms2: mad -> mpg123

[Raphael Graf]

On 07/15/18 16:08, Christian Weisgerber wrote:

It looks like somebody wanted xmms2 to use fixed-point integer audio
decoders, maybe for use on old arm systems.  I already switched the
port from tremor to vorbis, and I would now like to propose to use
libmpg123 over libmad.  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.

Would anybody who uses xmms2 like to test this?

This works fine for me (tested on amd64).

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile    11 Jul 2018 13:38:03 -0000      1.46
+++ Makefile    15 Jul 2018 14:00:09 -0000
@@ -6,7 +6,7 @@ BROKEN-sparc64 =        waf build goes into an
  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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/xmms2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   11 Jul 2018 13:38:03 -0000      1.6
+++ pkg/PLIST   15 Jul 2018 14:00:09 -0000
@@ -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