diff options
Diffstat (limited to 'audio/musicpd')
| -rw-r--r-- | audio/musicpd/Makefile | 3 | ||||
| -rw-r--r-- | audio/musicpd/distinfo | 3 | ||||
| -rw-r--r-- | audio/musicpd/options.mk | 42 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-aa | 13 |
4 files changed, 30 insertions, 31 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 28dcfff8459..4adfaa9b3c8 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2009/01/20 22:52:17 drochner Exp $ +# $NetBSD: Makefile,v 1.34 2009/01/28 18:06:21 drochner Exp $ DISTNAME= mpd-0.14.1 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/mpd/musicpd/} CATEGORIES= audio #MASTER_SITES= http://musicpd.org/uploads/files/ diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 93bb20ee462..db9f6b79bfb 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.15 2009/01/20 22:52:17 drochner Exp $ +$NetBSD: distinfo,v 1.16 2009/01/28 18:06:21 drochner Exp $ SHA1 (mpd-0.14.1.tar.bz2) = e87424caafca366c15744a31cbc34197474862f9 RMD160 (mpd-0.14.1.tar.bz2) = b3ae29717f22e4e7bf03a0356b6ca3a0c96bbb60 Size (mpd-0.14.1.tar.bz2) = 286850 bytes +SHA1 (patch-aa) = 7b2a39591c08ac8af3157880ca3ccfeaf6db6fd4 diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index 4aadb52bd44..d16381e4e0a 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.8 2009/01/11 20:57:20 ahoka Exp $ +# $NetBSD: options.mk,v 1.9 2009/01/28 18:06:21 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd -PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg shout -PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg shout +PKG_SUPPORTED_OPTIONS= aac audiofile flac id3 libmikmod musepack ogg inet6 +PKG_SUGGESTED_OPTIONS= aac audiofile flac id3 musepack ogg .include "../../mk/bsd.options.mk" @@ -15,38 +15,30 @@ CONFIGURE_ARGS+= --disable-aac .if !empty(PKG_OPTIONS:Maudiofile) . include "../../audio/libaudiofile/buildlink3.mk" -CONFIGURE_ARGS+= --with-audiofile=${BUILDLINK_PREFIX.audiofile} -CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes +CONFIGURE_ARGS+= --enable-audiofile .else CONFIGURE_ARGS+= --disable-audiofile .endif .if !empty(PKG_OPTIONS:Mflac) . include "../../audio/flac/buildlink3.mk" -CONFIGURE_ARGS+= --with-flac=${BUILDLINK_PREFIX.flac} +CONFIGURE_ARGS+= --enable-flac .else CONFIGURE_ARGS+= --disable-flac .endif -.if !empty(PKG_OPTIONS:Miconv) -. include "../../converters/libiconv/buildlink3.mk" -CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} -.else -CONFIGURE_ARGS+= --disable-iconv -.endif - .if !empty(PKG_OPTIONS:Mid3) . include "../../audio/libid3tag/buildlink3.mk" -CONFIGURE_ARGS+= --with-id3tag=${BUILDLINK_PREFIX.libid3tag} +CONFIGURE_ARGS+= --enable-id3 .else CONFIGURE_ARGS+= --disable-id3 .endif .if !empty(PKG_OPTIONS:Mlibmikmod) . include "../../audio/libmikmod/buildlink3.mk" -CONFIGURE_ARGS+= --with-libmikmod=${BUILDLINK_PREFIX.libmikmod} +CONFIGURE_ARGS+= --enable-mod .else -CONFIGURE_ARGS+= --disable-libmikmod +CONFIGURE_ARGS+= --disable-mod .endif .if !empty(PKG_OPTIONS:Mmusepack) @@ -59,21 +51,13 @@ CONFIGURE_ARGS+= --disable-mpc .if !empty(PKG_OPTIONS:Mogg) . include "../../audio/libvorbis/buildlink3.mk" -CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis} +CONFIGURE_ARGS+= --enable-oggvorbis .else -CONFIGURE_ARGS+= --disable-ogg +CONFIGURE_ARGS+= --disable-oggvorbis .endif -.if !empty(PKG_OPTIONS:Mshout) -. include "../../audio/libshout/buildlink3.mk" -CONFIGURE_ARGS+= --enable-shout +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 .else -CONFIGURE_ARGS+= --enable-shout -.endif - -# when IPv6 support is enabled, mpd doesn't listen on an IPv4 address. -#.if !empty(PKG_OPTIONS:Minet6) -#CONFIGURE_ARGS+= --enable-ipv6 -#.else CONFIGURE_ARGS+= --disable-ipv6 -#.endif +.endif diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa new file mode 100644 index 00000000000..36c19566d65 --- /dev/null +++ b/audio/musicpd/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.6 2009/01/28 18:06:21 drochner Exp $ + +--- ./src/decoder/mod_plugin.c.orig 2009-01-17 20:41:09.000000000 +0100 ++++ ./src/decoder/mod_plugin.c +@@ -195,8 +195,6 @@ mod_decode(struct decoder *decoder, cons + } + + mod_close(data); +- +- MikMod_Exit(); + } + + static struct tag *modTagDup(const char *file) |