[pkgsrc/trunk]: pkgsrc/audio/musicpd Update to 0.18.20:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/04f7c07efadc
branches:  trunk
changeset: 643335:04f7c07efadc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Dec 14 15:47:03 2014 +0000

description:
Update to 0.18.20:

ver 0.18.20 (2014/12/08)
* decoder
  - ffmpeg: support FFmpeg 2.5
* fix build failure with musl

diffstat:

 audio/musicpd/Makefile                                          |   5 +-
 audio/musicpd/distinfo                                          |   9 ++---
 audio/musicpd/options.mk                                        |   3 +-
 audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx |  16 ----------
 4 files changed, 7 insertions(+), 26 deletions(-)

diffs (66 lines):

diff -r b0816345ca46 -r 04f7c07efadc audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Sun Dec 14 15:43:45 2014 +0000
+++ b/audio/musicpd/Makefile    Sun Dec 14 15:47:03 2014 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2014/12/08 12:59:53 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2014/12/14 15:47:03 wiz Exp $
 
-DISTNAME=              mpd-0.18.19
+DISTNAME=              mpd-0.18.20
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=           1
 CATEGORIES=            audio
 MASTER_SITES=          http://www.musicpd.org/download/mpd/0.18/
 #MASTER_SITES=         ${MASTER_SITE_SOURCEFORGE:=musicpd/}
diff -r b0816345ca46 -r 04f7c07efadc audio/musicpd/distinfo
--- a/audio/musicpd/distinfo    Sun Dec 14 15:43:45 2014 +0000
+++ b/audio/musicpd/distinfo    Sun Dec 14 15:47:03 2014 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.52 2014/12/08 12:59:53 wiz Exp $
+$NetBSD: distinfo,v 1.53 2014/12/14 15:47:03 wiz Exp $
 
-SHA1 (mpd-0.18.19.tar.xz) = 4267db5011e81d63179fd3c9208c87f4e67eba6f
-RMD160 (mpd-0.18.19.tar.xz) = 15b01b5c263f3b14487301f7183cf6b2bed737a4
-Size (mpd-0.18.19.tar.xz) = 587084 bytes
-SHA1 (patch-src_decoder_FfmpegDecoderPlugin.cxx) = a8d5014c9d432eba6fe00ac8354be865b772ffb4
+SHA1 (mpd-0.18.20.tar.xz) = 75c0ee5ac6c0e252c33c638100e9ff780e4dfc85
+RMD160 (mpd-0.18.20.tar.xz) = b764a9300bdfa7b768181675e9cf58e43d09099f
+Size (mpd-0.18.20.tar.xz) = 587320 bytes
 SHA1 (patch-src_output_HttpdOutputPlugin.cxx) = 6e046d00a4e59c905d8fe014afe854aac1337e8d
diff -r b0816345ca46 -r 04f7c07efadc audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Sun Dec 14 15:43:45 2014 +0000
+++ b/audio/musicpd/options.mk  Sun Dec 14 15:47:03 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.25 2014/12/08 12:59:53 wiz Exp $
+# $NetBSD: options.mk,v 1.26 2014/12/14 15:47:03 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.musicpd
 PKG_SUPPORTED_OPTIONS= adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libmpdclient libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud 
openal opus pulseaudio shout sqlite3 tremor twolame vorbis wavpack zziplib
@@ -61,7 +61,6 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
-BUILDLINK_API_DEPENDS.ffmpeg2+=        ffmpeg2>=2.5
 .  include "../../multimedia/ffmpeg2/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-ffmpeg
 .else
diff -r b0816345ca46 -r 04f7c07efadc audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx
--- a/audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx   Sun Dec 14 15:43:45 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_decoder_FfmpegDecoderPlugin.cxx,v 1.1 2014/12/08 12:59:53 wiz Exp $
-
-fix build with ffmpeg2-2.5
-http://bugs.musicpd.org/view.php?id=4235
-
---- src/decoder/FfmpegDecoderPlugin.cxx.orig   2014-11-18 19:52:54.000000000 +0000
-+++ src/decoder/FfmpegDecoderPlugin.cxx
-@@ -397,7 +397,7 @@ ffmpeg_probe(Decoder *decoder, InputStre
-       /* this attribute was added in libav/ffmpeg version 11, but
-          unfortunately it's "uint8_t" instead of "char", and it's
-          not "const" - wtf? */
--      avpd.mime_type = (uint8_t *)const_cast<char *>(is.GetMimeType());
-+      avpd.mime_type = const_cast<char *>(is.GetMimeType());
- #endif
- 
-       return av_probe_input_format(&avpd, true);