mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

mpd: enable libmad globally 

Since making ffmpeg dependent on BUILD_PATENTED, the full variant
becomes unable to play mp3s. Change that.

libmad is superior to mpg123 because of its faster decoding speed on
soft float systems and because in MPD, it supports streams (HTTP for
example).

ffmpeg supports streams as well. Avoid libmad in that case.

Minor Makefile cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-08-18 21:02:27 -07:00
parent cb092479b5
commit f5ab71c6bc
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/mpd/Makefile
View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.21.25 PKG_VERSION:=0.21.25
PKG_RELEASE:=3 PKG_RELEASE:=4
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/
@ -34,7 +34,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 +boost $(ICONV_DEPENDS) \ DEPENDS:= +zlib +libcurl +libpthread +libmpdclient +boost $(ICONV_DEPENDS) \
+AUDIO_SUPPORT:alsa-lib +libexpat +libflac +libid3tag +libfaad2 +libopus +AUDIO_SUPPORT:alsa-lib +libexpat +libflac +libid3tag +libfaad2 +libopus
endef endef
define Package/mpd/Default/description define Package/mpd/Default/description
@ -47,7 +47,8 @@ endef
define Package/mpd-full define Package/mpd-full
$(call Package/mpd/Default) $(call Package/mpd/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= +BUILD_PATENTED:libffmpeg +libvorbis +libmms +libupnp +libshout +AUDIO_SUPPORT:pulseaudio-daemon +yajl DEPENDS+= +AUDIO_SUPPORT:pulseaudio-daemon +libvorbis +libmms +libupnp +libshout +yajl \
+BUILD_PATENTED:libffmpeg +!BUILD_PATENTED:libmad
PROVIDES:=mpd PROVIDES:=mpd
VARIANT:=full VARIANT:=full
endef endef
@ -98,10 +99,6 @@ define Package/mpd-avahi-service/conffiles
/etc/avahi/services/mpd.service /etc/avahi/services/mpd.service
endef endef
ifeq ($(CONFIG_AUDIO_SUPPORT),y)
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio
endif
MESON_ARGS += \ MESON_ARGS += \
-Ddocumentation=false \ -Ddocumentation=false \
-Dtest=false \ -Dtest=false \
@ -110,7 +107,7 @@ MESON_ARGS += \
-Ddaemon=false \ -Ddaemon=false \
-Dsystemd=disabled \ -Dsystemd=disabled \
-Dtcp=true \ -Dtcp=true \
-Dipv6=$(if $(CONFIG_IPV6),enabled,disabled) \ -Dipv6=$(if $(CONFIG_IPV6),en,dis)abled \
-Dlocal_socket=true \ -Dlocal_socket=true \
-Ddsd=false \ -Ddsd=false \
-Ddatabase=true \ -Ddatabase=true \
@ -169,7 +166,6 @@ MESON_ARGS += \
-Dzlib=enabled \ -Dzlib=enabled \
-Dzeroconf=disabled -Dzeroconf=disabled
ifeq ($(BUILD_VARIANT),full) ifeq ($(BUILD_VARIANT),full)
MESON_ARGS += \ MESON_ARGS += \
@ -177,7 +173,7 @@ ifeq ($(BUILD_VARIANT),full)
-Dmms=enabled \ -Dmms=enabled \
-Dsoundcloud=enabled \ -Dsoundcloud=enabled \
-Dffmpeg=$(if $(CONFIG_BUILD_PATENTED),en,dis)abled \ -Dffmpeg=$(if $(CONFIG_BUILD_PATENTED),en,dis)abled \
-Dmad=disabled \ -Dmad=$(if $(CONFIG_BUILD_PATENTED),dis,en)abled \
-Dtremor=disabled \ -Dtremor=disabled \
-Dvorbis=enabled \ -Dvorbis=enabled \
-Dfifo=true \ -Dfifo=true \
@ -186,6 +182,10 @@ ifeq ($(BUILD_VARIANT),full)
-Drecorder=true \ -Drecorder=true \
-Dshout=enabled \ -Dshout=enabled \
-Dyajl=enabled -Dyajl=enabled
ifeq ($(CONFIG_AUDIO_SUPPORT),y)
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio
endif
endif endif
ifeq ($(BUILD_VARIANT),mini) ifeq ($(BUILD_VARIANT),mini)