summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-21 08:32:52 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-21 08:32:52 +0100
commit77222b888e22a787536ef2db03a2391f9b1f875a (patch)
tree599c31584caf2b7615cfd5151aaf0972c21ef40d
parent29f75042582d847a1651c0ff2569ef556ebc2845 (diff)
add pulse audio output
-rw-r--r--package/mpd/Makefile18
-rw-r--r--target/packages/pkg-available/mpdbox1
2 files changed, 16 insertions, 3 deletions
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 684c08f27..da3e2e334 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mpd
PKG_VERSION:= 0.18.5
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 63bcf6ce338caa2ae2cd6dc8e9710d5c
PKG_DESCR:= A music player daemon
PKG_SECTION:= multimedia
@@ -23,7 +23,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD
-PKG_FLAVOURS_MPD+= WITH_OPUS
+PKG_FLAVOURS_MPD+= WITH_OPUS WITH_PULSE
PKGFD_WITH_ALSA:= enable ALSA output
PKGFS_WITH_ALSA:= alsa-lib
@@ -112,6 +112,13 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y)
PKG_FDEPENDS+= libopus
endif
+PKGFD_WITH_PULSE:= enable PULSE support
+PKGFS_WITH_PULSE:= pulseaudio
+PKGFB_WITH_PULSE:= pulseaudio
+ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y)
+PKG_FDEPENDS+= pulseaudio
+endif
+
PKGFD_WITH_HTTPD:= enable HTTP output
include ${TOPDIR}/mk/package.mk
@@ -123,7 +130,6 @@ TARGET_CFLAGS+= -std=gnu99
CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no
CONFIGURE_ARGS+= --disable-jack \
--disable-fifo \
- --disable-pulse \
--disable-oss \
--disable-bzip2 \
--disable-libwrap \
@@ -142,6 +148,12 @@ else
CONFIGURE_ARGS+= --disable-httpd-output
endif
+ifneq (${ADK_PACKAGE_MPD_WITH_PULSE},)
+CONFIGURE_ARGS+= --enable-pulse
+else
+CONFIGURE_ARGS+= --disable-pulse
+endif
+
ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
CONFIGURE_ARGS+= --enable-alsa
else
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index 3a924816a..519250f0b 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -6,6 +6,7 @@ config ADK_PKG_MPDBOX
select ADK_PACKAGE_MPC
select ADK_PACKAGE_MPD
select ADK_PACKAGE_MPD_WITH_ALSA
+ select ADK_PACKAGE_MPD_WITH_PULSE
select ADK_PACKAGE_MPD_WITH_MP3
select ADK_PACKAGE_MPD_WITH_MP4
select ADK_PACKAGE_MPD_WITH_OGG