audio/mpd: remove tremor flavor

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

audio/mpd: remove tremor flavor

David Coppa-4

Hi!

The tremor flavor is only useful on arm but since mpd now needs
gcc-4.8 to build, tremor does not make sense anymore...

OK to remove?

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- Makefile 27 Nov 2014 13:52:08 -0000 1.67
+++ Makefile 27 Nov 2014 15:09:43 -0000
@@ -2,6 +2,7 @@
 
 COMMENT = Music Player Daemon
 DISTNAME = mpd-0.19.5
+REVISION = 0
 CATEGORIES = audio
 HOMEPAGE = http://www.musicpd.org/
 MAINTAINER = David Coppa <[hidden email]>
@@ -11,11 +12,12 @@ PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB = FLAC ao audiofile avcodec avformat \
  avutil bz2 c cdio cdio_cdda \
- cdio_paranoia curl expat glib-2.0 \
- gthread-2.0 icudata icui18n icuuc \
- id3tag m mad mikmod mpdclient ogg \
- opus pthread samplerate sndfile \
- sndio z
+ cdio_paranoia curl expat faad glib-2.0 \
+ gthread-2.0 icudata icui18n icuuc id3tag \
+ m mikmod mp3lame mpcdec mpdclient ogg \
+ opus pthread samplerate shout sndfile \
+ sndio speex theora vorbis vorbisenc \
+ vorbisfile z
 
 MASTER_SITES = http://www.musicpd.org/download/mpd/stable/
 
@@ -25,24 +27,25 @@ MODGCC4_LANGS = c++
 
 BUILD_DEPENDS = devel/boost
 
-LIB_DEPENDS = devel/libaudiofile \
+LIB_DEPENDS = audio/faad>=2.6.1p0 \
+ audio/flac \
+ audio/lame \
  audio/libao \
  audio/libcdio \
- audio/libsamplerate \
- audio/flac \
  audio/libid3tag \
- audio/libmad \
  audio/libmikmod \
- audio/opus \
  audio/libmpdclient \
+ audio/libsamplerate \
+ audio/libvorbis \
+ audio/musepack \
+ audio/opus \
  devel/glib2 \
+ devel/libaudiofile \
  graphics/ffmpeg \
  net/curl \
+ net/libshout \
  textproc/icu4c
 
-FLAVORS = tremor
-FLAVOR ?=
-
 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \
  --disable-adplug \
@@ -53,6 +56,7 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbi
  --disable-inotify \
  --disable-jack \
  --disable-libwrap \
+ --disable-mad \
  --disable-mms \
  --disable-modplug \
  --disable-mpg123 \
@@ -73,50 +77,32 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbi
  --disable-upnp \
  --disable-wavpack \
  --disable-wildmidi \
+ --enable-aac \
  --enable-ao \
  --enable-audiofile \
  --enable-bzip2 \
  --enable-cdio-paranoia \
  --enable-curl \
  --enable-ffmpeg \
+ --enable-lame-encoder \
  --enable-lsr \
- --enable-mad \
  --enable-mikmod \
  --enable-mpc \
  --enable-opus \
  --enable-pipe-output \
+ --enable-shout \
  --enable-sndfile \
+ --enable-vorbis \
+ --enable-vorbis-encoder \
+ --enable-wave-encoder \
  --enable-zlib \
  --with-pollmethod=poll \
  --with-zeroconf=no \
  --without-systemdsystemunitdir
 
-# OggFLAC and tremor tests, initgroups(3)
+# OggFLAC tests, initgroups(3)
 CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
  CPPFLAGS="-I${LOCALBASE}/include -D_BSD_SOURCE"
-
-.if ${FLAVOR:Mtremor}
-CONFIGURE_ARGS += --with-tremor \
- --disable-shout \
- --disable-vorbis-encoder \
- --disable-lame-encoder \
- --disable-aac \
- --disable-mpc
-LIB_DEPENDS += audio/tremor
-WANTLIB += vorbisidec
-.else
-WANTLIB += theora vorbis vorbisfile vorbisenc speex mp3lame \
- shout faad mpcdec
-LIB_DEPENDS += audio/libvorbis \
- audio/speex \
- audio/lame \
- net/libshout \
- audio/faad>=2.6.1p0 \
- audio/musepack
-CONFIGURE_ARGS += --enable-aac \
- --enable-shout \
- --enable-vorbis-encoder
-.endif
 
 post-install:
  ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpd

Reply | Threaded
Open this post in threaded view
|

Re: audio/mpd: remove tremor flavor

Landry Breuil-5
On Thu, Nov 27, 2014 at 08:18:54AM -0700, David Coppa wrote:
>
> Hi!
>
> The tremor flavor is only useful on arm but since mpd now needs
> gcc-4.8 to build, tremor does not make sense anymore...
>
> OK to remove?

I think arm has other usability and hw support issues to deal with right
now to not bother with arm-only flavors.. and given the dependency chain
of mpd, i even doubt the tremor flavor builds at all there.
Please also unlink mpd,tremor from the build in audio/Makefile.

Landry