diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-24 18:27:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-24 18:27:33 +0100 |
| commit | 148249d08af2ef833175d3f9176c6709798d4a14 (patch) | |
| tree | dc39146d700ae5a224c45885719a2bc8934bd7eb /package/mpd/Makefile | |
| parent | 18a6922a938023cb061b7cd9895412549cb17288 (diff) | |
| parent | 826fae84981bf030b6bb9d20117a1a1634ba3334 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/mpd/Makefile')
| -rw-r--r-- | package/mpd/Makefile | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 684c08f27..589aa14b4 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,13 +5,13 @@ 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 -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 @@ -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 |