Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mpd: Upgrade Music Player Daemon to 0.20.8

Browse source 
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess 2017-05-20 11:30:38 -04:00
parent 3b8681fc66
commit 50d84f13a2
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sound/mpd/Makefile
View file

@ -1,6 +1,4 @@
# #
# Copyright (C) 2015-2016 Ted Hess
#
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
@ -8,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.19.19 PKG_VERSION:=0.20.8
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.19/ PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.20/
PKG_MD5SUM:=6e4fca9a9c26dad08b61bac9a91802db PKG_HASH:=7d177f29663c4a0997413401e52bbf11d2bb472773bbcf9294f839c4b8751e35
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -102,6 +100,10 @@ define Package/mpd-avahi-service/conffiles
/etc/avahi/services/mpd.service /etc/avahi/services/mpd.service
endef endef
TARGET_CFLAGS += -ggdb3
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv)
EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_VERSION_4_8),-std=gnu++11,-std=gnu++14)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
$(call autoconf_bool,CONFIG_IPV6,ipv6) \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \
--disable-debug \ --disable-debug \
@ -156,8 +158,6 @@ CONFIGURE_VARS += \
$(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \ $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
$(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv)
ifeq ($(BUILD_VARIANT),full) ifeq ($(BUILD_VARIANT),full)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
@ -167,16 +167,14 @@ ifeq ($(BUILD_VARIANT),full)
--enable-fifo \ --enable-fifo \
--enable-ffmpeg \ --enable-ffmpeg \
--enable-id3 \ --enable-id3 \
--enable-lastfm \
--enable-mms \ --enable-mms \
--enable-oggflac \ --enable-flac \
--enable-pipe-output \ --enable-pipe-output \
--enable-recorder-output \ --enable-recorder-output \
--disable-shout \ --disable-shout \
--enable-sndfile \ --enable-sndfile \
--enable-vorbis \ --enable-vorbis \
--disable-vorbis-encoder \ --disable-vorbis-encoder \
--with-faad="$(STAGING_DIR)/usr" \
--with-tremor=yes \ --with-tremor=yes \
endif endif

2
sound/mpd/patches/210-support_raw_pcm_streams.patch
View file

@ -1,6 +1,6 @@
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -777,6 +777,7 @@ static const char *const ffmpeg_mime_typ @@ -930,6 +930,7 @@ static const char *const ffmpeg_mime_typ
"audio/qcelp", "audio/qcelp",
"audio/vorbis", "audio/vorbis",
"audio/vorbis+ogg", "audio/vorbis+ogg",

8
sound/mpd/patches/220-handle_slow_server_stream_startup.patch
View file

@ -1,16 +1,16 @@
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -465,6 +465,13 @@ ffmpeg_probe(Decoder *decoder, InputStre @@ -478,6 +478,13 @@ ffmpeg_probe(DecoderClient *client, Inpu
unsigned char buffer[BUFFER_SIZE]; unsigned char buffer[BUFFER_SIZE];
size_t nbytes = decoder_read(decoder, is, buffer, BUFFER_SIZE); size_t nbytes = decoder_read(client, is, buffer, BUFFER_SIZE);
+ +
+ if ((nbytes > 0) && (nbytes < 1024)) + if ((nbytes > 0) && (nbytes < 1024))
+ { + {
+ // Gobble some more data if header is small + // Gobble some more data if header is small
+ nbytes += decoder_read(decoder, is, buffer + nbytes, BUFFER_SIZE - nbytes); + nbytes += decoder_read(client, is, buffer + nbytes, BUFFER_SIZE - nbytes);
+ } + }
+ +
if (nbytes <= PADDING || !is.LockRewind(IgnoreError())) if (nbytes <= PADDING)
return nullptr; return nullptr;