From 91171954ea9552298829e495210a0ea5db9865a0 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Wed, 25 Jul 2018 11:47:21 -0400 Subject: [PATCH] mpd: Update to 0.20.20. Re-enable flac encoder for mpd-full Signed-off-by: Ted Hess --- sound/mpd/Makefile | 11 +++++------ sound/mpd/patches/210-support_raw_pcm_streams.patch | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index 771984cba..132f22fb0 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpd -PKG_VERSION:=0.20.9 -PKG_RELEASE:=2 +PKG_VERSION:=0.20.20 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.20/ -PKG_HASH:=cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7 +PKG_HASH:=a9e458c6e07cdf62649de7722e1e5a7f13aa82eeb397bfbbebc07cf5cf273584 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-2.0 @@ -35,7 +35,7 @@ define Package/mpd/Default TITLE:=Music Player Daemon URL:=http://www.musicpd.org/ DEPENDS:= +zlib +libcurl +libpthread +libmpdclient +libstdcpp $(ICONV_DEPENDS) \ - +AUDIO_SUPPORT:alsa-lib +boost +boost-container +libexpat + +AUDIO_SUPPORT:alsa-lib +boost +boost-container +libexpat +libflac endef define Package/mpd/Default/description @@ -66,7 +66,7 @@ endef define Package/mpd-mini $(call Package/mpd/Default) TITLE+= (mini) - DEPENDS+= +libflac +libmpg123 +libvorbisidec + DEPENDS+= +libmpg123 +libvorbisidec PROVIDES:=mpd VARIANT:=mini endef @@ -162,7 +162,6 @@ ifeq ($(BUILD_VARIANT),full) CONFIGURE_ARGS += \ --enable-upnp \ --enable-ffmpeg \ - --disable-flac \ --enable-id3 \ --enable-mms \ --disable-mpg123 \ diff --git a/sound/mpd/patches/210-support_raw_pcm_streams.patch b/sound/mpd/patches/210-support_raw_pcm_streams.patch index 7f31d7d06..a8981cdd6 100644 --- a/sound/mpd/patches/210-support_raw_pcm_streams.patch +++ b/sound/mpd/patches/210-support_raw_pcm_streams.patch @@ -1,6 +1,6 @@ --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx -@@ -931,6 +931,7 @@ static const char *const ffmpeg_mime_typ +@@ -937,6 +937,7 @@ static const char *const ffmpeg_mime_typ "audio/qcelp", "audio/vorbis", "audio/vorbis+ogg",