[pkgsrc/trunk]: pkgsrc/audio/musicpd Fix build with ffmpeg2-2.5 and depend on...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdfee8f96504
branches:  trunk
changeset: 642969:cdfee8f96504
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 08 12:59:53 2014 +0000

description:
Fix build with ffmpeg2-2.5 and depend on it.
Bump PKGREVISION.

diffstat:

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

diffs (62 lines):

diff -r 611c2d843874 -r cdfee8f96504 audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Mon Dec 08 12:58:36 2014 +0000
+++ b/audio/musicpd/Makefile    Mon Dec 08 12:59:53 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2014/12/01 11:26:16 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2014/12/08 12:59:53 wiz Exp $
 
 DISTNAME=              mpd-0.18.19
 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 611c2d843874 -r cdfee8f96504 audio/musicpd/distinfo
--- a/audio/musicpd/distinfo    Mon Dec 08 12:58:36 2014 +0000
+++ b/audio/musicpd/distinfo    Mon Dec 08 12:59:53 2014 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.51 2014/12/01 11:26:16 wiz Exp $
+$NetBSD: distinfo,v 1.52 2014/12/08 12:59:53 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 (patch-src_output_HttpdOutputPlugin.cxx) = 6e046d00a4e59c905d8fe014afe854aac1337e8d
diff -r 611c2d843874 -r cdfee8f96504 audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Mon Dec 08 12:58:36 2014 +0000
+++ b/audio/musicpd/options.mk  Mon Dec 08 12:59:53 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2014/08/21 14:29:12 wiz Exp $
+# $NetBSD: options.mk,v 1.25 2014/12/08 12:59:53 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,6 +61,7 @@
 .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 611c2d843874 -r cdfee8f96504 audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx   Mon Dec 08 12:59:53 2014 +0000
@@ -0,0 +1,16 @@
+$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);