[Buildroot] [PATCH 1/3] mpd: default to tremor input plugin

[Buildroot] [PATCH 1/3] mpd: default to tremor input plugin

[Gustavo Zacarias]

MPD requires at least one input plugin to build.
If there's none selected default to tremor (vorbis).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/multimedia/mpd/Config.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 9404082..049c0fc 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -4,6 +4,7 @@ menuconfig BR2_PACKAGE_MPD
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBGLIB2
 	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)
 	help
 	  MPD is a flexible, powerful, server-side application
 	  for playing music. Through plugins and libraries
-- 
1.7.3.4

[Buildroot] [PATCH 2/3] mpd: forcibly disable oggflac without flac

[Gustavo Zacarias]

If flac and libogg were both built but flac isn't selected in mpd it
will be picked up anyway.
Forcibly disable oggflac support if flac support is disabled for
consistency.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/multimedia/mpd/mpd.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 3653152..d6658ae 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -35,7 +35,7 @@ endif
 ifeq ($(BR2_PACKAGE_MPD_FLAC),y)
 MPD_DEPENDENCIES += flac
 else
-MPD_CONF_OPT += --without-flac
+MPD_CONF_OPT += --without-flac --disable-oggflac
 endif
 
 ifeq ($(BR2_PACKAGE_MPD_CURL),y)
-- 
1.7.3.4

[Buildroot] [PATCH 3/3] mpd: move ffmpeg option up

[Gustavo Zacarias]

Move the ffmpeg option up to keep the pretty sort order.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/multimedia/mpd/Config.in |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 049c0fc..b3491f2 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -56,6 +56,17 @@ config BR2_PACKAGE_MPD_FLAC
 	  Enable flac input/streaming support.
 	  Select this if you want to play back FLAC files.
 
+config BR2_PACKAGE_MPD_FFMPEG
+	bool "ffmpeg"
+	select BR2_PACKAGE_FFMPEG
+	depends on BR2_LARGEFILE
+	help
+	  Enable ffmpeg input support.
+	  Select this if you want to play back files supported by ffmpeg.
+
+comment "ffmpeg support requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
+
 config BR2_PACKAGE_MPD_LAME
 	bool "lame"
 	select BR2_PACKAGE_LAME
@@ -147,17 +158,6 @@ config BR2_PACKAGE_MPD_WAVPACK
 	  Enable wavpack input support.
 	  Select this if you want to play back WV files.
 
-config BR2_PACKAGE_MPD_FFMPEG
-	bool "ffmpeg"
-	select BR2_PACKAGE_FFMPEG
-	depends on BR2_LARGEFILE
-	help
-	  Enable ffmpeg input support.
-	  Select this if you want to play back files supported by ffmpeg.
-
-comment "ffmpeg support requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
-
 endif
 
 comment "mpd requires a toolchain with C++ and WCHAR support"
-- 
1.7.3.4

[Buildroot] [PATCH 1/3] mpd: default to tremor input plugin

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> MPD requires at least one input plugin to build.
 Gustavo> If there's none selected default to tremor (vorbis).

Committed all 3, thanks.

-- 
Bye, Peter Korsgaard