[pkgsrc/trunk]: pkgsrc/audio/musicpd add am option to use shoutcast as a soun...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1d840b64e8b
branches:  trunk
changeset: 396669:a1d840b64e8b
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Jul 30 16:51:04 2009 +0000

description:
add am option to use shoutcast as a sound output device, from
Guillaume Lasmayous per PR pkg/41469, with some minor adaption by me,
also fix some harmless but annoying diagnostic message if flac
albums are played

diffstat:

 audio/musicpd/distinfo         |   3 ++-
 audio/musicpd/options.mk       |  12 ++++++++++--
 audio/musicpd/patches/patch-aa |  12 ++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r 8fdefe55ba12 -r a1d840b64e8b audio/musicpd/distinfo
--- a/audio/musicpd/distinfo    Thu Jul 30 16:46:45 2009 +0000
+++ b/audio/musicpd/distinfo    Thu Jul 30 16:51:04 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2009/07/27 20:08:38 drochner Exp $
+$NetBSD: distinfo,v 1.20 2009/07/30 16:51:04 drochner Exp $
 
 SHA1 (mpd-0.15.1.tar.bz2) = eca8821e2c34b37232621b7219e39f0a6d67d190
 RMD160 (mpd-0.15.1.tar.bz2) = 595370f38b8f6fe80b14551214956088562f3d9c
 Size (mpd-0.15.1.tar.bz2) = 385800 bytes
+SHA1 (patch-aa) = 14c63f15f09d6d22770b90a30cc49951c8d1d38a
diff -r 8fdefe55ba12 -r a1d840b64e8b audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Thu Jul 30 16:46:45 2009 +0000
+++ b/audio/musicpd/options.mk  Thu Jul 30 16:51:04 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2009/07/27 20:08:38 drochner Exp $
+# $NetBSD: options.mk,v 1.13 2009/07/30 16:51:04 drochner Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao jack libmikmod musepack ogg inet6
+PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao jack libmikmod musepack ogg inet6 shout
 PKG_SUGGESTED_OPTIONS= aac audiofile curl flac id3 libao musepack ogg
 
 .include "../../mk/bsd.options.mk"
@@ -85,3 +85,11 @@
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mshout)
+.  include "../../audio/libshout/buildlink3.mk"
+.  include "../../audio/lame/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-shout
+.else
+CONFIGURE_ARGS+=       --disable-shout
+.endif
diff -r 8fdefe55ba12 -r a1d840b64e8b audio/musicpd/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/musicpd/patches/patch-aa    Thu Jul 30 16:51:04 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.9 2009/07/30 16:51:04 drochner Exp $
+
+--- src/decoder/flac_plugin.c.orig     2009-07-15 22:34:47.000000000 +0200
++++ src/decoder/flac_plugin.c
+@@ -619,6 +619,7 @@ flac_container_decode(struct decoder* de
+               // we only need to break at the end of track if we are in "cue mode"
+               if (data.time >= data.total_time)
+               {
++                      break;
+                       flacPrintErroredState(flac_get_state(flac_dec));
+                       flac_finish(flac_dec);
+               }