mpd: bump to version 0.18.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2014-01-13 19:17:18 -03:00 committed by Peter Korsgaard
parent 2194440bfd
commit 1753c3bf2a
3 changed files with 38 additions and 7 deletions

View File

@ -4,6 +4,8 @@ menuconfig BR2_PACKAGE_MPD
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2 depends on BR2_USE_MMU # libglib2
depends on !(BR2_avr32 || BR2_sparc) # gcc too old
depends on !BR2_UCLIBC_VERSION_0_9_32 # lacks signalfd
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
@ -142,6 +144,19 @@ config BR2_PACKAGE_MPD_MUSEPACK
Enable musepack input support. Enable musepack input support.
Select this if you want to play back MPC files. Select this if you want to play back MPC files.
config BR2_PACKAGE_MPD_OPUS
bool "opus"
select BR2_PACKAGE_OPUS
help
Enable opus input support.
Select this if you want to play back OPUS encoded files.
config BR2_PACKAGE_MPD_SOUNDCLOUD
bool "soundcloud"
select BR2_PACKAGE_YAJL
help
Enable soundcloud.com playlist support.
config BR2_PACKAGE_MPD_SQLITE config BR2_PACKAGE_MPD_SQLITE
bool "sqlite" bool "sqlite"
select BR2_PACKAGE_SQLITE select BR2_PACKAGE_SQLITE

View File

@ -1,15 +1,19 @@
#!/bin/sh #!/bin/sh
# Sanity checks
test -f /usr/bin/mpd || exit 0
test -f /etc/mpd.conf || exit 0
start() { start() {
echo -n "Starting mpd: " echo -n "Starting mpd: "
start-stop-daemon --start --quiet --background --exec /usr/bin/mpd start-stop-daemon --start --quiet --background --exec /usr/bin/mpd \
echo "OK" && echo "OK" || echo "FAIL"
} }
stop() { stop() {
echo -n "Stopping mpd: " echo -n "Stopping mpd: "
start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid \
echo "OK" && echo "OK" || echo "FAIL"
} }
case "$1" in case "$1" in

View File

@ -4,12 +4,12 @@
# #
################################################################################ ################################################################################
MPD_VERSION_MAJOR = 0.17 MPD_VERSION_MAJOR = 0.18
MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_VERSION = $(MPD_VERSION_MAJOR).7
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
MPD_DEPENDENCIES = host-pkgconf libglib2 MPD_DEPENDENCIES = host-pkgconf libglib2
MPD_LICENSE = GPLv2 MPD_LICENSE = GPLv2+
MPD_LICENSE_FILES = COPYING MPD_LICENSE_FILES = COPYING
# Some options need an explicit --disable or --enable # Some options need an explicit --disable or --enable
@ -82,6 +82,12 @@ else
MPD_CONF_OPT += --disable-sndfile MPD_CONF_OPT += --disable-sndfile
endif endif
ifeq ($(BR2_PACKAGE_MPD_OPUS),y)
MPD_DEPENDENCIES += opus
else
MPD_CONF_OPT += --disable-opus
endif
ifeq ($(BR2_PACKAGE_MPD_VORBIS),y) ifeq ($(BR2_PACKAGE_MPD_VORBIS),y)
MPD_DEPENDENCIES += libvorbis MPD_DEPENDENCIES += libvorbis
else else
@ -100,6 +106,12 @@ else
MPD_CONF_OPT += --disable-mpc MPD_CONF_OPT += --disable-mpc
endif endif
ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y)
MPD_DEPENDENCIES += yajl
else
MPD_CONF_OPT += --disable-soundcloud
endif
ifeq ($(BR2_PACKAGE_MPD_SQLITE),y) ifeq ($(BR2_PACKAGE_MPD_SQLITE),y)
MPD_DEPENDENCIES += sqlite MPD_DEPENDENCIES += sqlite
else else