From 44eb12f3c7f2f1c601ddccabb63ca76fb65958e2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 7 Aug 2020 12:38:39 -0700 Subject: [PATCH 1/3] mpd: make ffmpeg support dependent on BUILD_PATENTED ffmpeg includes patented functionality. Signed-off-by: Rosen Penev --- sound/mpd/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index 00a4879ae8..c75a0167bd 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpd PKG_VERSION:=0.21.25 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.21/ @@ -18,6 +18,7 @@ PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CONFIG_DEPENDS:= \ + CONFIG_BUILD_PATENTED \ CONFIG_IPV6 \ PKG_INSTALL:=1 @@ -46,7 +47,7 @@ endef define Package/mpd-full $(call Package/mpd/Default) TITLE+= (full) - DEPENDS+= +libffmpeg +libvorbis +libmms +libupnp +libshout +AUDIO_SUPPORT:pulseaudio-daemon +yajl + DEPENDS+= +BUILD_PATENTED:libffmpeg +libvorbis +libmms +libupnp +libshout +AUDIO_SUPPORT:pulseaudio-daemon +yajl PROVIDES:=mpd VARIANT:=full endef @@ -175,7 +176,7 @@ ifeq ($(BUILD_VARIANT),full) -Dupnp=enabled \ -Dmms=enabled \ -Dsoundcloud=enabled \ - -Dffmpeg=enabled \ + -Dffmpeg=$(if $(CONFIG_BUILD_PATENTED),en,dis)abled \ -Dmad=disabled \ -Dtremor=disabled \ -Dvorbis=enabled \ From effa44f3b4c63c67630f9526d4273e2d13b290d8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 7 Aug 2020 13:04:06 -0700 Subject: [PATCH 2/3] mpd: enable opus support Signed-off-by: Rosen Penev --- sound/mpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index c75a0167bd..5ccebd3eac 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -33,8 +33,8 @@ define Package/mpd/Default CATEGORY:=Sound TITLE:=Music Player Daemon URL:=https://www.musicpd.org/ - DEPENDS:= +zlib +libcurl +libpthread +libmpdclient +libstdcpp $(ICONV_DEPENDS) \ - +AUDIO_SUPPORT:alsa-lib +boost +libexpat +libflac +libid3tag +libfaad2 + DEPENDS:= +zlib +libcurl +libpthread +libmpdclient +boost $(ICONV_DEPENDS) \ + +AUDIO_SUPPORT:alsa-lib +libexpat +libflac +libid3tag +libfaad2 +libopus endef define Package/mpd/Default/description @@ -140,7 +140,7 @@ MESON_ARGS += \ -Dmikmod=disabled \ -Dmodplug=disabled \ -Dmpcdec=disabled \ - -Dopus=disabled \ + -Dopus=enabled \ -Dsidplay=disabled \ -Dsndfile=disabled \ -Dwavpack=disabled \ From c7e00c8e3449ce12a68ce96a59b561caddd306a1 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 11 Aug 2020 11:27:59 -0700 Subject: [PATCH 3/3] mpd: remove maintainer on request Signed-off-by: Rosen Penev --- sound/mpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index 5ccebd3eac..6c5cea9c50 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -13,7 +13,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.21/ PKG_HASH:=20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201 -PKG_MAINTAINER:=Ted Hess +PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING