Merge pull request #15291 from egorenar/mpd-lame-encoder

mpd-full: enable lame and vorbis encoders
This commit is contained in:
Rosen Penev 2021-03-28 12:54:04 -07:00 committed by GitHub
commit 1e0bfe608a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.22.6 PKG_VERSION:=0.22.6
PKG_RELEASE:=2 PKG_RELEASE:=3
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.22/ PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.22/
@ -48,7 +48,7 @@ define Package/mpd-full
$(call Package/mpd/Default) $(call Package/mpd/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= +AUDIO_SUPPORT:pulseaudio-daemon +libvorbis +libmms +libupnp +libshout +yajl \ DEPENDS+= +AUDIO_SUPPORT:pulseaudio-daemon +libvorbis +libmms +libupnp +libshout +yajl \
+libffmpeg +!BUILD_PATENTED:libmad +libffmpeg +lame-lib +!BUILD_PATENTED:libmad
PROVIDES:=mpd PROVIDES:=mpd
VARIANT:=full VARIANT:=full
endef endef
@ -188,7 +188,9 @@ ifeq ($(BUILD_VARIANT),full)
-Dpulse=$(if $(CONFIG_AUDIO_SUPPORT),en,dis)abled \ -Dpulse=$(if $(CONFIG_AUDIO_SUPPORT),en,dis)abled \
-Drecorder=true \ -Drecorder=true \
-Dshout=enabled \ -Dshout=enabled \
-Dyajl=enabled -Dyajl=enabled \
-Dvorbisenc=enabled \
-Dlame=enabled
ifeq ($(CONFIG_AUDIO_SUPPORT),y) ifeq ($(CONFIG_AUDIO_SUPPORT),y)
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio