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

Merge pull request #13062 from neheb/mpd-ffm

Browse source 
mpd - remove ffmpeg support and add opus
This commit is contained in:
Rosen Penev 2020-08-12 13:12:36 -07:00 committed by GitHub
commit 50eff8c26a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sound/mpd/Makefile
View file

@ -7,17 +7,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.21.25 PKG_VERSION:=0.21.25
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.21/ PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.21/
PKG_HASH:=20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201 PKG_HASH:=20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_BUILD_PATENTED \
CONFIG_IPV6 \ CONFIG_IPV6 \
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -32,8 +33,8 @@ define Package/mpd/Default
CATEGORY:=Sound CATEGORY:=Sound
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 +boost $(ICONV_DEPENDS) \
+AUDIO_SUPPORT:alsa-lib +boost +libexpat +libflac +libid3tag +libfaad2 +AUDIO_SUPPORT:alsa-lib +libexpat +libflac +libid3tag +libfaad2 +libopus
endef endef
define Package/mpd/Default/description define Package/mpd/Default/description
@ -46,7 +47,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 +AUDIO_SUPPORT:pulseaudio-daemon +yajl DEPENDS+= +BUILD_PATENTED:libffmpeg +libvorbis +libmms +libupnp +libshout +AUDIO_SUPPORT:pulseaudio-daemon +yajl
PROVIDES:=mpd PROVIDES:=mpd
VARIANT:=full VARIANT:=full
endef endef
@ -139,7 +140,7 @@ MESON_ARGS += \
-Dmikmod=disabled \ -Dmikmod=disabled \
-Dmodplug=disabled \ -Dmodplug=disabled \
-Dmpcdec=disabled \ -Dmpcdec=disabled \
-Dopus=disabled \ -Dopus=enabled \
-Dsidplay=disabled \ -Dsidplay=disabled \
-Dsndfile=disabled \ -Dsndfile=disabled \
-Dwavpack=disabled \ -Dwavpack=disabled \
@ -175,7 +176,7 @@ ifeq ($(BUILD_VARIANT),full)
-Dupnp=enabled \ -Dupnp=enabled \
-Dmms=enabled \ -Dmms=enabled \
-Dsoundcloud=enabled \ -Dsoundcloud=enabled \
-Dffmpeg=enabled \ -Dffmpeg=$(if $(CONFIG_BUILD_PATENTED),en,dis)abled \
-Dmad=disabled \ -Dmad=disabled \
-Dtremor=disabled \ -Dtremor=disabled \
-Dvorbis=enabled \ -Dvorbis=enabled \