diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/alsa-utils/Makefile | 6 | ||||
| -rw-r--r-- | package/dbus/Makefile | 2 | ||||
| -rw-r--r-- | package/mpd/Makefile | 18 | ||||
| -rw-r--r-- | package/mpdbox/Makefile | 4 | ||||
| -rw-r--r-- | package/pulseaudio/Makefile | 7 | ||||
| -rw-r--r-- | package/pulseaudio/files/pulseaudio.init | 4 | ||||
| -rw-r--r-- | package/pulseaudio/files/pulseaudio.postinst | 2 |
7 files changed, 30 insertions, 13 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 721c5757d..e2311e221 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.27.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3 -PKG_DESCR:= ALSA mixer utility +PKG_DESCR:= ALSA mixer/player utility PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread libgcc librt PKG_BUILDDEP:= alsa-lib @@ -35,7 +35,7 @@ endif alsa-utils-install: ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin - ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin + ${CP} ${WRKINST}/usr/bin/{aplay,amixer} ${IDIR_ALSA_UTILS}/usr/bin ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) ${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \ ${IDIR_ALSA_UTILS}/usr/bin diff --git a/package/dbus/Makefile b/package/dbus/Makefile index bb06e25d4..31596f56d 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b02e9c95027a416987b81f9893831061 PKG_DESCR:= DBUS daemon PKG_SECTION:= misc -PKG_DEPENDS:= libdbus +PKG_DEPENDS:= libdbus libexpat PKG_BUILDDEP:= expat util-linux PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ 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/package/mpdbox/Makefile b/package/mpdbox/Makefile index bda39ecc8..fd164e8ad 100644 --- a/package/mpdbox/Makefile +++ b/package/mpdbox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= mpdbox PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ac0dc1cc7141c1eca66d8ddd98574e0b PKG_DESCR:= MPD web interface PKG_SECTION:= multimedia @@ -24,5 +24,7 @@ mpdbox-install: $(INSTALL_DIR) $(IDIR_MPDBOX)/srv/www/htdocs $(CP) $(WRKBUILD)/* \ $(IDIR_MPDBOX)/srv/www/htdocs + $(CP) $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc.example \ + $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index be894b436..eba650096 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pulseaudio PKG_VERSION:= 4.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3 PKG_DESCR:= a sound system for POSIX OSes PKG_SECTION:= multimedia PKG_DEPENDS:= libltdl json-c libsndfile libudev libspeex libncurses -PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile libdbus +PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile dbus PKG_DEPENDS+= libgcc libpthread librt alsa-lib libsamplerate PKG_BUILDDEP:= libtool json-c libsndfile eudev speex libsndfile PKG_BUILDDEP+= flac libvorbis libogg util-linux dbus ncurses alsa-lib @@ -48,6 +48,9 @@ CONFIGURE_ARGS+= --disable-systemd \ --with-speex pulseaudio-install: + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/dbus-1 + $(CP) $(WRKINST)/etc/dbus-1/* \ + $(IDIR_PULSEAUDIO)/etc/dbus-1 $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse $(CP) $(WRKINST)/etc/pulse/* \ $(IDIR_PULSEAUDIO)/etc/pulse diff --git a/package/pulseaudio/files/pulseaudio.init b/package/pulseaudio/files/pulseaudio.init index 029174628..f928e3fe6 100644 --- a/package/pulseaudio/files/pulseaudio.init +++ b/package/pulseaudio/files/pulseaudio.init @@ -11,10 +11,10 @@ autostart) ;; start) if [ ! -d /var/run/pulse ]; then - mkdir -p /var/run/pulse && chown pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse + mkdir -p /var/run/pulse/ && chown -R pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse fi if [ ! -d /var/lib/pulse ]; then - mkdir -p /var/lib/pulse && chown pulse.pulse /var/lib/pulse && chmod 750 /var/lib/pulse + mkdir -p /var/lib/pulse/.pulse-cookie && chown -R pulse.pulse /var/lib/pulse && chmod 750 /var/lib/pulse fi /usr/bin/pulseaudio $pulseaudio_flags ;; diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst index 3e5b348a9..b339de93f 100644 --- a/package/pulseaudio/files/pulseaudio.postinst +++ b/package/pulseaudio/files/pulseaudio.postinst @@ -4,4 +4,4 @@ add_rcconf pulseaudio pulseaudio NO gid=$(get_next_gid) add_user pulse $(get_next_uid) $gid /var/run/pulse add_group pulse $gid -add_rcconf pulseaudio_flags pulseaudio_flags "--system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false" +add_rcconf pulseaudio_flags pulseaudio_flags "-D --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false" |