cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

mpd: Upgrade to 0.19.10, refresh patches

Browse Source 
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess
2015-06-26 16:46:05 -04:00
parent 7c0d75e013
commit 8b09195b2b
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/mpd/Makefile
+11 -15
View File
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.18.23 PKG_VERSION:=0.19.10
PKG_RELEASE:=1 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.18/ PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.19/
PKG_MD5SUM:=fcdfe8b3a7a21a87b6776204e6eb7814 PKG_MD5SUM:=da4bc3e47afd0faf9e7a67168e012102
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@@ -28,15 +28,15 @@ PKG_CONFIG_DEPENDS:= \
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/mpd/Default define Package/mpd/Default
SECTION:=sound SECTION:=sound
CATEGORY:=Sound CATEGORY:=Sound
TITLE:=Music Player Daemon TITLE:=Music Player Daemon
URL:=http://www.musicpd.org/ URL:=http://www.musicpd.org/
DEPENDS:= +glib2 +libcurl +libpthread +libmpdclient $(ICONV_DEPENDS) +libstdcpp \ DEPENDS:= +glib2 +libcurl +libpthread +libmpdclient +libstdcpp \
+libflac +BUILD_PATENTED:libmad +libvorbisidec +AUDIO_SUPPORT:alsa-lib +libflac +BUILD_PATENTED:libmad +libvorbisidec +AUDIO_SUPPORT:alsa-lib \
+boost +boost-container +libexpat
endef endef
define Package/mpd/Default/description define Package/mpd/Default/description
@@ -51,7 +51,7 @@ $(call Package/mpd/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= \ DEPENDS+= \
+libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \ +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \
+libmms +libogg +libsndfile +libvorbis +libmms +libogg +libsndfile +libvorbis +libupnp
PROVIDES:=mpd PROVIDES:=mpd
VARIANT:=full VARIANT:=full
endef endef
@@ -105,17 +105,15 @@ CONFIGURE_ARGS += \
$(call autoconf_bool,CONFIG_IPV6,ipv6) \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \
--disable-debug \ --disable-debug \
--disable-documentation \ --disable-documentation \
--disable-gprof \
--disable-test \ --disable-test \
--disable-werror \ --disable-werror \
\ \
--disable-ao \ --disable-ao \
--disable-bzip2 \ --disable-bzip2 \
--enable-cue \
--disable-ffado \
--disable-fluidsynth \ --disable-fluidsynth \
--disable-gme \ --disable-gme \
--enable-inotify \ --enable-inotify \
--disable-icu \
--disable-eventfd \ --disable-eventfd \
--disable-iso9660 \ --disable-iso9660 \
--disable-jack \ --disable-jack \
@@ -126,13 +124,11 @@ CONFIGURE_ARGS += \
--disable-modplug \ --disable-modplug \
--disable-mpc \ --disable-mpc \
--disable-mpg123 \ --disable-mpg123 \
--disable-mvp \
--disable-openal \ --disable-openal \
--disable-opus \ --disable-opus \
--disable-pulse \ --disable-pulse \
--disable-sidplay \ --disable-sidplay \
--disable-solaris-output \ --disable-solaris-output \
--disable-soup \
--disable-sqlite \ --disable-sqlite \
--disable-twolame-encoder \ --disable-twolame-encoder \
--enable-wave-encoder \ --enable-wave-encoder \
@@ -155,11 +151,12 @@ 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) TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
ifeq ($(BUILD_VARIANT),full) ifeq ($(BUILD_VARIANT),full)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-upnp \
$(call autoconf_bool,CONFIG_BUILD_PATENTED,aac) \ $(call autoconf_bool,CONFIG_BUILD_PATENTED,aac) \
--enable-audiofile \ --enable-audiofile \
--enable-fifo \ --enable-fifo \
@@ -183,14 +180,13 @@ ifeq ($(BUILD_VARIANT),mini)
# oggflac is not compatible with tremor # oggflac is not compatible with tremor
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-upnp \
--disable-aac \ --disable-aac \
--disable-audiofile \ --disable-audiofile \
--disable-fifo \ --disable-fifo \
--disable-ffmpeg \ --disable-ffmpeg \
--disable-id3 \ --disable-id3 \
--disable-lastfm \
--disable-mms \ --disable-mms \
--disable-oggflac \
--disable-pipe-output \ --disable-pipe-output \
--disable-recorder-output \ --disable-recorder-output \
--disable-shout \ --disable-shout \
sound/mpd/patches/210-support_raw_pcm_streams.patch
+3 -3
View File
@@ -1,6 +1,6 @@
--- a/src/decoder/FfmpegDecoderPlugin.cxx --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -666,6 +666,7 @@ static const char *const ffmpeg_mime_typ @@ -765,6 +765,7 @@ static const char *const ffmpeg_mime_typ
"audio/qcelp", "audio/qcelp",
"audio/vorbis", "audio/vorbis",
"audio/vorbis+ogg", "audio/vorbis+ogg",
sound/mpd/patches/220-handle_slow_server_stream_startup.patch
+3 -3
View File
@@ -1,6 +1,6 @@
--- a/src/decoder/FfmpegDecoderPlugin.cxx --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -376,6 +376,13 @@ ffmpeg_probe(Decoder *decoder, InputStre @@ -458,6 +458,13 @@ ffmpeg_probe(Decoder *decoder, InputStre
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(decoder, is, buffer, BUFFER_SIZE);