From 2cedae0aa9befe1135c83f007942d89ec906658e Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Tue, 8 Aug 2017 13:36:37 -0400 Subject: [PATCH] sound/mpd: Update to 0.20.9, work-around libiconv-stub link problem Rearrange dependencies General cleanup of Makefile Fix compilation and linking problems Signed-off-by: Daniel Engberg Signed-off-by: Ted Hess --- sound/mpd/Makefile | 66 ++++++++----------- .../patches/210-support_raw_pcm_streams.patch | 2 +- 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index a64cac4b7..8f6f4a94b 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpd -PKG_VERSION:=0.20.8 +PKG_VERSION:=0.20.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.20/ -PKG_HASH:=7d177f29663c4a0997413401e52bbf11d2bb472773bbcf9294f839c4b8751e35 +PKG_HASH:=cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-2.0 @@ -35,8 +35,7 @@ define Package/mpd/Default TITLE:=Music Player Daemon URL:=http://www.musicpd.org/ DEPENDS:= +glib2 +libcurl +libpthread +libmpdclient +libstdcpp $(ICONV_DEPENDS) \ - +libflac +BUILD_PATENTED:libmad +libvorbisidec +AUDIO_SUPPORT:alsa-lib \ - +boost +boost-container +libexpat + +AUDIO_SUPPORT:alsa-lib +boost +boost-container +libexpat endef define Package/mpd/Default/description @@ -49,9 +48,7 @@ endef define Package/mpd-full $(call Package/mpd/Default) TITLE+= (full) - DEPENDS+= \ - +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \ - +libmms +libogg +libsndfile +libvorbis +libupnp + DEPENDS+= +libffmpeg +libid3tag +libmms +libupnp +libshout PROVIDES:=mpd VARIANT:=full endef @@ -69,6 +66,7 @@ endef define Package/mpd-mini $(call Package/mpd/Default) TITLE+= (mini) + DEPENDS+= +libflac +libmpg123 +libvorbisidec PROVIDES:=mpd VARIANT:=mini endef @@ -101,8 +99,7 @@ define Package/mpd-avahi-service/conffiles /etc/avahi/services/mpd.service endef -TARGET_CFLAGS += -ggdb3 -TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv) +EXTRA_LDFLAGS += $(if $(ICONV_FULL),-liconv,-Wl,--whole-archive -liconv -Wl,--no-whole-archive) EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_VERSION_4_8),-std=gnu++11,-std=gnu++14) CONFIGURE_ARGS += \ @@ -110,74 +107,69 @@ CONFIGURE_ARGS += \ --disable-debug \ --disable-documentation \ --disable-test \ - --disable-werror \ - \ + --disable-aac \ + --disable-adplug \ --disable-ao \ + --disable-audiofile \ --disable-bzip2 \ + --disable-cdio-paranoia \ --disable-fluidsynth \ --disable-wildmidi \ --disable-gme \ --enable-inotify \ --disable-icu \ - --disable-eventfd \ + --enable-iconv \ --disable-iso9660 \ --disable-jack \ --disable-roar \ --disable-libwrap \ --disable-lsr \ + --disable-mad \ --disable-mikmod \ --disable-modplug \ --disable-mpc \ - --disable-mpg123 \ + --disable-nfs \ --disable-openal \ --disable-opus \ --disable-pulse \ --disable-sidplay \ + --disable-smbclient \ + --disable-sndfile \ --disable-solaris-output \ --disable-sqlite \ + --disable-systemd-daemon \ --disable-lame-encoder \ --disable-twolame-encoder \ --disable-shine-encoder \ + --disable-vorbis-encoder \ --enable-wave-encoder \ --disable-wavpack \ + --disable-webdav \ --disable-wildmidi \ --disable-zzip \ --with-zeroconf=no \ --disable-soxr \ - \ --enable-curl \ - --enable-flac \ --enable-httpd-output \ - $(call autoconf_bool,CONFIG_BUILD_PATENTED,mad) \ $(call autoconf_bool,CONFIG_AUDIO_SUPPORT,alsa) \ --enable-tcp \ - --enable-un \ + --disable-sndio \ + --disable-haiku -CONFIGURE_VARS += \ - FLAC_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/FLAC" \ - FLAC_LIBS="$(TARGET_LDFLAGS) -lFLAC" \ - $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \ - $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ ifeq ($(BUILD_VARIANT),full) CONFIGURE_ARGS += \ --enable-upnp \ - $(call autoconf_bool,CONFIG_BUILD_PATENTED,aac) \ - --enable-audiofile \ - --enable-fifo \ --enable-ffmpeg \ + --disable-flac \ --enable-id3 \ --enable-mms \ - --enable-flac \ + --disable-mpg123 \ --enable-pipe-output \ --enable-recorder-output \ - --disable-shout \ - --enable-sndfile \ - --enable-vorbis \ - --disable-vorbis-encoder \ - --with-tremor=yes \ - + --enable-shout \ + --disable-vorbis endif ifeq ($(BUILD_VARIANT),mini) @@ -185,20 +177,14 @@ ifeq ($(BUILD_VARIANT),mini) # oggflac is not compatible with tremor CONFIGURE_ARGS += \ --disable-upnp \ - --disable-aac \ - --disable-audiofile \ --disable-fifo \ --disable-ffmpeg \ --disable-id3 \ --disable-mms \ - --disable-pipe-output \ - --disable-recorder-output \ --disable-shout \ - --disable-sndfile \ - --disable-vorbis \ - --disable-vorbis-encoder \ + --enable-vorbis \ --with-tremor=yes \ - + --disable-recorder-output endif define Package/mpd/install diff --git a/sound/mpd/patches/210-support_raw_pcm_streams.patch b/sound/mpd/patches/210-support_raw_pcm_streams.patch index e06e232b2..7f31d7d06 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 -@@ -930,6 +930,7 @@ static const char *const ffmpeg_mime_typ +@@ -931,6 +931,7 @@ static const char *const ffmpeg_mime_typ "audio/qcelp", "audio/vorbis", "audio/vorbis+ogg",