diff options
| author | wiz <wiz@pkgsrc.org> | 2014-12-14 15:47:03 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-12-14 15:47:03 +0000 |
| commit | 85fd1a8910b15fb0a3b97c0e30384c5a20a36440 (patch) | |
| tree | 9a66458d794ee9f7dbae73df423ea605ff639195 | |
| parent | 34d4f0dd49f4ec9f7b967fe538fa0705adab6635 (diff) | |
| download | pkgsrc-85fd1a8910b15fb0a3b97c0e30384c5a20a36440.tar.gz | |
Update to 0.18.20:
ver 0.18.20 (2014/12/08)
* decoder
- ffmpeg: support FFmpeg 2.5
* fix build failure with musl
| -rw-r--r-- | audio/musicpd/Makefile | 5 | ||||
| -rw-r--r-- | audio/musicpd/distinfo | 9 | ||||
| -rw-r--r-- | audio/musicpd/options.mk | 3 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx | 16 |
4 files changed, 7 insertions, 26 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 078a512d8d5..828287b89ea 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -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 --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 737d233e1e3..2a03493e87a 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -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 --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index f1b0b3cf5d8..28cc0e63ebc 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -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 @@ 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 deleted file mode 100644 index 675070bec5d..00000000000 --- a/audio/musicpd/patches/patch-src_decoder_FfmpegDecoderPlugin.cxx +++ /dev/null @@ -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); |