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

mpd: update to 0.21.25

Browse source 
pulseaudio-daemon depends on alsa-lib, which depends on @AUDIO_SUPPORT.
Enables -full on platforms lacking AUDIO_SUPPORT.

Simplified LDFLAGS slighly.

Removed pointless ICU dependency. I managed to patch meson.build to fix
iconv compilation. The original error was that without the header, it
was prefixing the iconv check with __buildin_ , which does not work
with uClibc-ng.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-07-20 17:50:38 -07:00
parent 5d42bf7550
commit dfdc430a4a
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sound/mpd/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.21.24 PKG_VERSION:=0.21.25
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:=https://www.musicpd.org/download/mpd/0.21/ PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.21/
PKG_HASH:=84632a7e82e672b3a6d71651a75d05fb7acd62645c33e3f3af5a1067cfa64cd6 PKG_HASH:=20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
@ -33,7 +33,7 @@ define Package/mpd/Default
TITLE:=Music Player Daemon TITLE:=Music Player Daemon
URL:=https://www.musicpd.org/ URL:=https://www.musicpd.org/
DEPENDS:= +zlib +libcurl +libpthread +libmpdclient +libstdcpp $(ICONV_DEPENDS) \ DEPENDS:= +zlib +libcurl +libpthread +libmpdclient +libstdcpp $(ICONV_DEPENDS) \
+AUDIO_SUPPORT:alsa-lib +boost +libexpat +libflac +libid3tag +libfaad2 +USE_UCLIBC:icu +AUDIO_SUPPORT:alsa-lib +boost +libexpat +libflac +libid3tag +libfaad2
endef endef
define Package/mpd/Default/description define Package/mpd/Default/description
@ -46,7 +46,7 @@ endef
define Package/mpd-full define Package/mpd-full
$(call Package/mpd/Default) $(call Package/mpd/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= +libffmpeg +libvorbis +libmms +libupnp +libshout +pulseaudio-daemon +yajl DEPENDS+= +libffmpeg +libvorbis +libmms +libupnp +libshout +AUDIO_SUPPORT:pulseaudio-daemon +yajl
PROVIDES:=mpd PROVIDES:=mpd
VARIANT:=full VARIANT:=full
endef endef
@ -98,9 +98,12 @@ define Package/mpd-avahi-service/conffiles
endef endef
TARGET_LDFLAGS += \ TARGET_LDFLAGS += \
$(if $(ICONV_FULL),-liconv,-Wl,--whole-archive -liconv -Wl,--no-whole-archive) \ -liconv \
$(if $(CONFIG_USE_GLIBC),-lpthread) \ $(if $(CONFIG_USE_GLIBC),-lpthread)
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio
ifeq ($(CONFIG_AUDIO_SUPPORT),y)
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio
endif
MESON_ARGS += \ MESON_ARGS += \
-Ddocumentation=false \ -Ddocumentation=false \
@ -152,7 +155,7 @@ MESON_ARGS += \
-Dwave_encoder=true \ -Dwave_encoder=true \
-Dlibsamplerate=disabled \ -Dlibsamplerate=disabled \
-Dsoxr=disabled \ -Dsoxr=disabled \
-Dalsa=$(if $(CONFIG_AUDIO_SUPPORT),enabled,disabled) \ -Dalsa=$(if $(CONFIG_AUDIO_SUPPORT),en,dis)abled \
-Dao=disabled \ -Dao=disabled \
-Dhttpd=true \ -Dhttpd=true \
-Djack=disabled \ -Djack=disabled \
@ -162,8 +165,8 @@ MESON_ARGS += \
-Dsolaris_output=disabled \ -Dsolaris_output=disabled \
-Ddbus=disabled \ -Ddbus=disabled \
-Dexpat=enabled \ -Dexpat=enabled \
-Dicu=$(if $(CONFIG_USE_UCLIBC),enabled,disabled) \ -Dicu=disabled \
-Diconv=$(if $(CONFIG_USE_UCLIBC),disabled,enabled) \ -Diconv=enabled \
-Dpcre=disabled \ -Dpcre=disabled \
-Dsqlite=disabled \ -Dsqlite=disabled \
-Dzlib=enabled \ -Dzlib=enabled \
@ -182,7 +185,7 @@ ifeq ($(BUILD_VARIANT),full)
-Dvorbis=enabled \ -Dvorbis=enabled \
-Dfifo=true \ -Dfifo=true \
-Dpipe=true \ -Dpipe=true \
-Dpulse=enabled \ -Dpulse=$(if $(CONFIG_AUDIO_SUPPORT),en,dis)abled \
-Drecorder=true \ -Drecorder=true \
-Dshout=enabled \ -Dshout=enabled \
-Dyajl=enabled -Dyajl=enabled

11
sound/mpd/patches/010-iconv.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/src/lib/icu/meson.build
+++ b/src/lib/icu/meson.build
@@ -18,7 +18,7 @@ if icu_dep.found()
'Init.cxx',
]
elif not get_option('iconv').disabled()
- have_iconv = compiler.has_function('iconv')
+ have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>')
conf.set('HAVE_ICONV', have_iconv)
if not have_iconv and get_option('iconv').enabled()
error('iconv() not available')