> Attached is my first pass at removing some duplicate dependencies. FLAC > is still required for the encoder side of things, mpd doesn't have a > way to specify only the encoder like it does for other plugins. Also as > far as I can tell ffmpeg does not have opus support at least in mpd > right now that's still required as well. > > I also reordered WANTLIB and LIB_DEPENDS to be alphabetical. > > Input appreciated.
I think it's a good way forward (but I am not the maintainer). We might want to look into removing the tremor flavor as well and merge it, no? > > -- > James Turner > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/audio/mpd/Makefile,v > retrieving revision 1.59 > diff -u -p -u -p -r1.59 Makefile > --- Makefile 6 Jun 2014 14:53:37 -0000 1.59 > +++ Makefile 6 Jun 2014 21:15:23 -0000 > @@ -2,7 +2,7 @@ > > COMMENT = Music Player Daemon > DISTNAME = mpd-0.18.11 > -REVISION = 0 > +REVISION = 1 > CATEGORIES = audio > HOMEPAGE = http://www.musicpd.org/ > MAINTAINER = David Coppa <[email protected]> > @@ -10,10 +10,10 @@ MAINTAINER = David Coppa <dcoppa@openbs > # GPLv2+ > PERMIT_PACKAGE_CDROM = Yes > > -WANTLIB = FLAC ao audiofile avcodec avformat avutil c \ > - cdio cdio_cdda cdio_paranoia curl glib-2.0 \ > - gthread-2.0 id3tag m mad mikmod ogg pthread \ > - samplerate sndfile sndio bz2 mpdclient opus z > +WANTLIB = FLAC ao avcodec avformat avutil bz2 c cdio \ > + cdio_cdda cdio_paranoia curl glib-2.0 \ > + gthread-2.0 id3tag m mikmod mpdclient ogg \ > + opus pthread samplerate sndfile sndio z > > MASTER_SITES = http://www.musicpd.org/download/mpd/stable/ > > @@ -21,33 +21,35 @@ MODULES = devel/gettext gcc4 > MODGCC4_ARCHS = i386 amd64 powerpc sparc64 > MODGCC4_LANGS = c++ > > -LIB_DEPENDS = devel/libaudiofile \ > +LIB_DEPENDS = audio/flac \ > audio/libao \ > audio/libcdio \ > - audio/libsamplerate \ > - audio/flac \ > audio/libid3tag \ > - audio/libmad \ > audio/libmikmod \ > - audio/opus \ > audio/libmpdclient \ > + audio/libsamplerate \ > + audio/opus \ > + devel/glib2 \ > graphics/ffmpeg \ > - net/curl \ > - devel/glib2 > + net/curl > > FLAVORS = tremor > FLAVOR ?= > > CONFIGURE_STYLE = gnu > CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \ > + --disable-aac \ > --disable-alsa \ > + --disable-audiofile \ > --disable-fluidsynth \ > --disable-gme \ > --disable-inotify \ > --disable-jack \ > --disable-libwrap \ > + --disable-mad \ > --disable-mms \ > --disable-modplug \ > + --disable-mpc \ > --disable-mpg123 \ > --disable-oss \ > --disable-openal \ > @@ -58,16 +60,15 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbi > --disable-sqlite \ > --disable-systemd-daemon \ > --disable-twolame-encoder \ > + --disable-vorbis \ > --disable-wavpack \ > --enable-ao \ > - --enable-audiofile \ > --enable-cdio-paranoia \ > --enable-curl \ > --enable-ffmpeg \ > + --enable-flac \ > --enable-lsr \ > - --enable-mad \ > --enable-mikmod \ > - --enable-mpc \ > --enable-pipe-output \ > --enable-sndfile \ > --with-zeroconf=no \ > @@ -79,23 +80,18 @@ CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE} > > .if ${FLAVOR:Mtremor} > CONFIGURE_ARGS += --with-tremor \ > - --disable-shout \ > - --disable-vorbis-encoder \ > --disable-lame-encoder \ > - --disable-aac \ > - --disable-mpc > + --disable-shout \ > + --disable-vorbis-encoder > LIB_DEPENDS += audio/tremor > WANTLIB += vorbisidec > .else > -WANTLIB += theora vorbis vorbisfile vorbisenc speex mp3lame \ > - shout faad mpcdec > -LIB_DEPENDS += audio/libvorbis \ > +WANTLIB += mp3lame shout speex theora vorbis vorbisenc > +LIB_DEPENDS += audio/lame \ > + audio/libvorbis \ > audio/speex \ > - audio/lame \ > - net/libshout \ > - audio/faad>=2.6.1p0 \ > - audio/musepack > -CONFIGURE_ARGS += --enable-aac \ > + net/libshout > +CONFIGURE_ARGS += --enable-lame-encoder \ > --enable-shout \ > --enable-vorbis-encoder > .endif > -- Antoine
