summaryrefslogtreecommitdiffstats
path: root/package/mpd
diff options
context:
space:
mode:
Diffstat (limited to 'package/mpd')
-rw-r--r--package/mpd/Config.in38
-rw-r--r--package/mpd/Makefile6
2 files changed, 27 insertions, 17 deletions
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index f95fef651..873b31085 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -1,32 +1,42 @@
+menu "mpd............................... Music Player Daemon"
+
config BR2_PACKAGE_MPD
- tristate "MPD - Music Player Daemon"
+ prompt "mpd............................... Music Player Daemon"
+ tristate
default m if CONFIG_DEVEL
help
- MPD is a music player supporting flac, mp3 and ogg files.
- It is typically controlled over a network using one of it's many
- clients including mpc(console), gmpc(gnome), phpmp(php) etc.
+ MPD is a music player supporting flac, mp3 and ogg files.
+ It is typically controlled over a network using one of it's many
+ clients including mpc(console), gmpc(gnome), phpmp(php) etc.
+
+ http://www.musicpd.org/
-config BR2_PACKAGE_MPD_MP3
- bool "MP3 Support - Enable mp3 support"
+config BR2_COMPILE_MPD_WITH_MP3
+ prompt "MP3 support"
+ bool
default y
depends BR2_PACKAGE_MPD
select BR2_PACKAGE_LIBMAD
select BR2_PACKAGE_LIBID3TAG
help
- Enable mp3 support (libmad).
+ Enable mp3 support (libmad).
-config BR2_PACKAGE_MPD_OGG
- bool "OGG Support - Enable ogg support"
+config BR2_COMPILE_MPD_WITH_OGG
+ prompt "Ogg Support"
+ bool
default y
depends BR2_PACKAGE_MPD
select BR2_PACKAGE_LIBVORBISIDEC
help
- Enable ogg support (tremor).
+ Enable ogg support (tremor).
-config BR2_PACKAGE_MPD_FLAC
- bool "FLAC Support - Enable flac support"
- default n
+config BR2_COMPILE_MPD_WITH_FLAC
+ prompt "FLAC Support"
+ bool
+ default y
depends BR2_PACKAGE_MPD
select BR2_PACKAGE_LIBFLAC
help
- Enable flac support (libflac).
+ Enable flac support (libflac).
+
+endmenu
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 288b62a8e..71775379f 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -23,7 +23,7 @@ PKG_CONFIGURE_OPTIONS := \
--disable-mpc \
--disable-aac \
-ifneq ($(BR2_PACKAGE_MPD_MP3),)
+ifneq ($(BR2_COMPILE_MPD_WITH_MP3),)
PKG_DEPENDS += libid3tag libmad
PKG_CONFIGURE_OPTIONS += \
--with-id3tag-includes=$(STAGING_DIR)/usr/include \
@@ -34,7 +34,7 @@ else
PKG_CONFIGURE_OPTIONS += --disable-id3 --disable-mp3
endif
-ifneq ($(BR2_PACKAGE_MPD_OGG),)
+ifneq ($(BR2_COMPILE_MPD_WITH_OGG),)
PKG_DEPENDS += libvorbisidec
PKG_CONFIGURE_OPTIONS += \
--with-tremor \
@@ -44,7 +44,7 @@ else
PKG_CONFIGURE_OPTIONS += --disable-ogg
endif
-ifneq ($(BR2_PACKAGE_MPD_FLAC),)
+ifneq ($(BR2_COMPILE_MPD_WITH_FLAC),)
PKG_DEPENDS += libflac
PKG_CONFIGURE_OPTIONS += \
--with-libFLAC-includes=$(STAGING_DIR)/usr/include \