diff options
| -rw-r--r-- | package/libao/Makefile | 14 | ||||
| -rw-r--r-- | package/mpd/Makefile | 16 | ||||
| -rw-r--r-- | package/mpd/files/mpd.conf | 7 | ||||
| -rw-r--r-- | package/mpd/files/mpd.init | 2 |
4 files changed, 30 insertions, 9 deletions
diff --git a/package/libao/Makefile b/package/libao/Makefile index 116769b9a..6592afeec 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -5,24 +5,28 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libao PKG_VERSION:= 0.8.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b92cba3cbcf1ee9bc221118a85d23dcd PKG_DESCR:= A cross platform audio library PKG_SECTION:= libs +PKG_DEPENDS:= esound +PKG_BUILDDEP+= esound PKG_URL:= http://www.xiph.org/ao PKG_SITES:= http://downloads.xiph.org/releases/ao/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-esd \ +CONFIGURE_ARGS+= --enable-esd \ --disable-arts \ --disable-nas \ --disable-polyp post-install: - ${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib + ${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib/ao/plugins-2 ${CP} ${WRKINST}/usr/lib/libao.so* ${IDIR_LIBAO}/usr/lib/ - + ${CP} ${WRKINST}/usr/lib/ao/plugins-2/*.so \ + ${IDIR_LIBAO}/usr/lib/ao/plugins-2 + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mpd/Makefile b/package/mpd/Makefile index e28d38008..4325332db 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.15.8 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 6680970274c389fd07e2b35721de1764 PKG_DESCR:= A music player daemon PKG_SECTION:= net @@ -15,6 +15,10 @@ ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),) PKG_DEPENDS+= alsa-lib PKG_BUILDDEP+= alsa-lib endif +ifneq ($(ADK_PACKAGE_MPD_WITH_AO),) +PKG_DEPENDS+= libao +PKG_BUILDDEP+= libao +endif ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),) PKG_DEPENDS+= libid3tag libmad PKG_BUILDDEP+= libid3tag libmad @@ -58,10 +62,11 @@ endif PKG_URL:= http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} -PKG_FLAVOURS:= WITH_ALSA WITH_MP3 WITH_MP4 WITH_TREMOR \ +PKG_FLAVOURS:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR \ WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG \ WITH_SHOUT WITH_CURL PKGFD_WITH_ALSA:= enable ALSA output +PKGFD_WITH_AO:= enable Libao/ESD output PKGFD_WITH_MP3:= enable MP3 support PKGFD_WITH_MP4:= enable MP4 support PKGFD_WITH_OGG:= enable OGG support @@ -80,7 +85,6 @@ $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_D TCFLAGS+= -std=gnu99 XAKE_FLAGS+= MPD_CFLAGS='-D_GNU_SOURCE' CONFIGURE_ARGS+= --disable-httpd-output \ - --disable-ao \ --disable-jack \ --disable-fifo \ --disable-pulse \ @@ -96,6 +100,12 @@ else CONFIGURE_ARGS+= --disable-alsa endif +ifneq (${ADK_PACKAGE_MPD_WITH_AO},) +CONFIGURE_ARGS+= --enable-ao +else +CONFIGURE_ARGS+= --disable-ao +endif + ifneq (${ADK_PACKAGE_MPD_WITH_MP3},) CONFIGURE_ARGS+= --enable-id3 --enable-mad else diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf index 6e5309e86..49ef7d4f7 100644 --- a/package/mpd/files/mpd.conf +++ b/package/mpd/files/mpd.conf @@ -13,6 +13,13 @@ audio_output { device "hw:0,0" # optional format "44100:16:2" # optional } +# An example of an ESD output +#audio_output { +# type "ao" +# driver "esd" +# name "esd" +#} + # Volume control mixer mixer_type "alsa" diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init index 29482b365..1e7cf871f 100644 --- a/package/mpd/files/mpd.init +++ b/package/mpd/files/mpd.init @@ -1,6 +1,6 @@ #!/bin/sh #PKG mpd -#INIT 60 +#INIT 80 . /etc/rc.conf |