From 77222b888e22a787536ef2db03a2391f9b1f875a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 21 Jan 2014 08:32:52 +0100
Subject: add pulse audio output

---
 package/mpd/Makefile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'package/mpd/Makefile')

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
-- 
cgit v1.2.3


From 3ddc55dee12ba398dd691922766120da0950562a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 24 Jan 2014 11:23:12 +0100
Subject: fix compile and dependencies

---
 package/mpd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/mpd/Makefile')

diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index da3e2e334..589aa14b4 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		63bcf6ce338caa2ae2cd6dc8e9710d5c
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		glib libstdcxx libgcc libiconv
-PKG_FDEPENDS:=		glib libstdcxx libgcc libiconv
-PKG_BUILDDEP:=		glib
+PKG_DEPENDS:=		glib libstdcxx libgcc libiconv-tiny libmpdclient
+PKG_FDEPENDS:=		glib libstdcxx libgcc libiconv-tiny libmpdclient
+PKG_BUILDDEP:=		glib libmpdclient
 PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.18/
 PKG_NEED_CXX:=		1
-- 
cgit v1.2.3