diff options
| author | wiz <wiz@pkgsrc.org> | 2014-12-08 12:59:53 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-12-08 12:59:53 +0000 |
| commit | 2a4b0c8452c67e6623c5990e4b381d39db62c37b (patch) | |
| tree | 3938f44902e3e05bd797de45fc2c100a80a64fc5 /audio/musicpd | |
| parent | b492d1f9ebbf08a3f3ab065be50691dc252ae5b6 (diff) | |
| download | pkgsrc-2a4b0c8452c67e6623c5990e4b381d39db62c37b.tar.gz | |
Fix build with ffmpeg2-2.5 and depend on it.
Bump PKGREVISION.
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 | 3 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx | 16 |
4 files changed, 22 insertions, 3 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index df2aa223dbf..078a512d8d5 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -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 --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 64810470bb6..737d233e1e3 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -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 --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index 3009843a944..f1b0b3cf5d8 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -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 @@ CONFIGURE_ARGS+= --disable-aac .endif .if !empty(PKG_OPTIONS:Mffmpeg) +BUILDLINK_API_DEPENDS.ffmpeg2+= ffmpeg2>=2.5 . include "../../multimedia/ffmpeg2/buildlink3.mk" CONFIGURE_ARGS+= --enable-ffmpeg .else diff --git a/audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx b/audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx new file mode 100644 index 00000000000..675070bec5d --- /dev/null +++ b/audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx @@ -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); |