[pkgsrc/trunk]: pkgsrc/audio/musicpd Update MPD (musicpd) to 0.14.2.

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd16384809df
branches:  trunk
changeset: 556329:bd16384809df
user:      asau <asau%pkgsrc.org@localhost>
date:      Thu Mar 19 21:35:14 2009 +0000

description:
Update MPD (musicpd) to 0.14.2.

This release contains bug fixes for many decoder plugins.
This release also adds True Audio file support and WAV streaming
in the ffmpeg decoder plugin.

pkgsrc changes: support "jack" option (default "off") to utilize
JACK audio server.

Patch provided by Peter Bex in private mail.

diffstat:

 audio/musicpd/Makefile         |   5 ++---
 audio/musicpd/distinfo         |   9 ++++-----
 audio/musicpd/options.mk       |  11 +++++++++--
 audio/musicpd/patches/patch-aa |  38 --------------------------------------
 4 files changed, 15 insertions(+), 48 deletions(-)

diffs (96 lines):

diff -r 32d73234dfd8 -r bd16384809df audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Thu Mar 19 20:12:00 2009 +0000
+++ b/audio/musicpd/Makefile    Thu Mar 19 21:35:14 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2009/03/17 18:16:20 asau Exp $
+# $NetBSD: Makefile,v 1.36 2009/03/19 21:35:14 asau Exp $
 
-DISTNAME=              mpd-0.14.1
-PKGREVISION=           2
+DISTNAME=              mpd-0.14.2
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
 CATEGORIES=            audio
 #MASTER_SITES=         http://musicpd.org/uploads/files/
diff -r 32d73234dfd8 -r bd16384809df audio/musicpd/distinfo
--- a/audio/musicpd/distinfo    Thu Mar 19 20:12:00 2009 +0000
+++ b/audio/musicpd/distinfo    Thu Mar 19 21:35:14 2009 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.17 2009/02/11 18:30:42 drochner Exp $
+$NetBSD: distinfo,v 1.18 2009/03/19 21:35:14 asau 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) = e80bb8ec79992a29704b818143caccf777e346f9
+SHA1 (mpd-0.14.2.tar.bz2) = 1ac9f6eff72c9e061af670e195da824310f3d922
+RMD160 (mpd-0.14.2.tar.bz2) = 4580907acdf361713bf3fe881a47871e84dfa864
+Size (mpd-0.14.2.tar.bz2) = 287115 bytes
diff -r 32d73234dfd8 -r bd16384809df audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Thu Mar 19 20:12:00 2009 +0000
+++ b/audio/musicpd/options.mk  Thu Mar 19 21:35:14 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.10 2009/03/17 18:16:20 asau Exp $
+# $NetBSD: options.mk,v 1.11 2009/03/19 21:35:14 asau Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao libmikmod musepack ogg inet6
+PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao jack libmikmod musepack ogg inet6
 PKG_SUGGESTED_OPTIONS= aac audiofile curl flac id3 libao musepack ogg
 
 .include "../../mk/bsd.options.mk"
@@ -48,6 +48,13 @@
 CONFIGURE_ARGS+=       --disable-ao
 .endif
 
+.if !empty(PKG_OPTIONS:Mjack)
+.  include "../../audio/jack/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-jack
+.else
+CONFIGURE_ARGS+=       --disable-jack
+.endif
+
 .if !empty(PKG_OPTIONS:Mlibmikmod)
 .  include "../../audio/libmikmod/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-mod
diff -r 32d73234dfd8 -r bd16384809df audio/musicpd/patches/patch-aa
--- a/audio/musicpd/patches/patch-aa    Thu Mar 19 20:12:00 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2009/02/11 18:30:42 drochner Exp $
-
---- src/decoder/mod_plugin.c.orig      2009-01-17 20:41:09.000000000 +0100
-+++ src/decoder/mod_plugin.c
-@@ -172,7 +172,6 @@ mod_decode(struct decoder *decoder, cons
- 
-       if (!(data = mod_open(path))) {
-               ERROR("failed to open mod: %s\n", path);
--              MikMod_Exit();
-               return;
-       }
- 
-@@ -195,8 +194,6 @@ mod_decode(struct decoder *decoder, cons
-       }
- 
-       mod_close(data);
--
--      MikMod_Exit();
- }
- 
- static struct tag *modTagDup(const char *file)
-@@ -212,7 +209,6 @@ static struct tag *modTagDup(const char 
- 
-       if (moduleHandle == NULL) {
-               DEBUG("modTagDup: Failed to open file: %s\n", file);
--              MikMod_Exit();
-               return NULL;
- 
-       }
-@@ -228,8 +224,6 @@ static struct tag *modTagDup(const char 
-       if (title)
-               tag_add_item(ret, TAG_ITEM_TITLE, title);
- 
--      MikMod_Exit();
--
-       return ret;
- }
-