* [Buildroot] [PATCH 2/8] package/mpd: sort plugins by type in Config.in
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
@ 2014-10-15 10:39 ` Jörg Krause
2014-10-15 10:56 ` Baruch Siach
2014-10-15 10:39 ` [Buildroot] [PATCH 3/8] package/mpd: sort plugins alphabetically in mpd.mk Jörg Krause
` (6 subsequent siblings)
7 siblings, 1 reply; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 10:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
package/mpd/Config.in | 218 ++++++++++++++++++++++++++------------------------
1 file changed, 115 insertions(+), 103 deletions(-)
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index cd7bbfd..e170b26 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -1,7 +1,6 @@
menuconfig BR2_PACKAGE_MPD
bool "mpd"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_LARGEFILE # boost
depends on BR2_USE_WCHAR # libglib2, flac
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
@@ -21,65 +20,45 @@ menuconfig BR2_PACKAGE_MPD
if BR2_PACKAGE_MPD
-config BR2_PACKAGE_MPD_ALSA
- bool "alsa"
- default y
- select BR2_PACKAGE_ALSA_LIB
- select BR2_PACKAGE_ALSA_LIB_PCM
- select BR2_PACKAGE_ALSA_LIB_MIXER
- help
- Enable alsa output support.
+comment "Archive plugins"
-config BR2_PACKAGE_MPD_AO
- bool "ao"
- select BR2_PACKAGE_LIBAO
- help
- Enable libao output support.
-
-config BR2_PACKAGE_MPD_AUDIOFILE
- bool "audiofile"
- select BR2_PACKAGE_AUDIOFILE
+config BR2_PACKAGE_MPD_BZIP2
+ bool "bzip2"
+ select BR2_PACKAGE_BZIP2
help
- Enable audiofile input/streaming support.
- Select this if you want to play back WAV files.
+ Enable bzip2 archive support.
-config BR2_PACKAGE_MPD_PULSEAUDIO
- bool "pulseaudio"
- depends on BR2_LARGEFILE # pulseaudio -> libsndfile
- depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
- select BR2_PACKAGE_PULSEAUDIO
+config BR2_PACKAGE_MPD_SQLITE
+ bool "sqlite"
+ select BR2_PACKAGE_SQLITE
help
- Enable pulseaudio output support.
+ Enable sqlite database support.
+ If you don't use sqlite it will use an ASCII database.
-comment "pulseaudio support needs a toolchain w/ largefile"
- depends on BR2_ARCH_HAS_ATOMICS
- depends on !BR2_LARGEFILE
+comment "Converter plugins"
-config BR2_PACKAGE_MPD_BZIP2
- bool "bzip2"
- select BR2_PACKAGE_BZIP2
+config BR2_PACKAGE_MPD_LIBSAMPLERATE
+ bool "libsamplerate"
+ select BR2_PACKAGE_LIBSAMPLERATE
help
- Enable bzip2 archive support.
+ Enable libsamplerate input support.
+ Select this for software sample rate conversion.
-config BR2_PACKAGE_MPD_CURL
- bool "curl"
- select BR2_PACKAGE_LIBCURL
+comment "Decoder plugins"
+
+config BR2_PACKAGE_MPD_AUDIOFILE
+ bool "audiofile"
+ select BR2_PACKAGE_AUDIOFILE
help
- Enable curl streaming (http) support.
+ Enable audiofile input/streaming support.
+ Select this if you want to play back WAV files.
config BR2_PACKAGE_MPD_FAAD2
bool "faad2"
select BR2_PACKAGE_FAAD2
help
- Enable faad2 input support.
- Select this if you want to play back MP4/AAC files.
-
-config BR2_PACKAGE_MPD_FLAC
- bool "flac"
- select BR2_PACKAGE_FLAC
- help
- Enable flac input/streaming support.
- Select this if you want to play back FLAC files.
+ Enable faad2 input support.
+ Select this if you want to play back MP4/AAC files.
config BR2_PACKAGE_MPD_FFMPEG
bool "ffmpeg"
@@ -87,32 +66,26 @@ config BR2_PACKAGE_MPD_FFMPEG
depends on BR2_LARGEFILE
depends on BR2_INET_IPV6
help
- Enable ffmpeg input support.
- Select this if you want to play back files supported by ffmpeg.
+ Enable ffmpeg input support.
+ Select this if you want to play back files supported by ffmpeg.
comment "ffmpeg support needs a toolchain w/ largefile, IPv6"
depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
-config BR2_PACKAGE_MPD_LAME
- bool "lame"
- select BR2_PACKAGE_LAME
- help
- Enable lame (mp3) encoding support.
-
-config BR2_PACKAGE_MPD_LIBSAMPLERATE
- bool "libsamplerate"
- select BR2_PACKAGE_LIBSAMPLERATE
+config BR2_PACKAGE_MPD_FLAC
+ bool "flac"
+ select BR2_PACKAGE_FLAC
help
- Enable libsamplerate input support.
- Select this for software sample rate conversion.
+ Enable flac input/streaming support.
+ Select this if you want to play back FLAC files.
config BR2_PACKAGE_MPD_LIBSNDFILE
bool "libsndfile"
select BR2_PACKAGE_LIBSNDFILE
depends on BR2_LARGEFILE
help
- Enable libsndfile input/streaming support.
- Select this if you want to play back WAV files.
+ Enable libsndfile input/streaming support.
+ Select this if you want to play back WAV files.
comment "libsndfile support needs a toolchain w/ largefile"
depends on !BR2_LARGEFILE
@@ -123,16 +96,16 @@ config BR2_PACKAGE_MPD_MAD
select BR2_PACKAGE_LIBID3TAG
select BR2_PACKAGE_LIBMAD
help
- Enable mad input support.
- Select this if you want to play back MP3 files.
+ Enable mad input support.
+ Select this if you want to play back MP3 files.
config BR2_PACKAGE_MPD_MPG123
bool "mpg123"
select BR2_PACKAGE_LIBID3TAG
select BR2_PACKAGE_MPG123
help
- Enable mpg123 input support.
- Select this if you want to play back MP3 files.
+ Enable mpg123 input support.
+ Select this if you want to play back MP3 files.
config BR2_PACKAGE_MPD_MUSEPACK
bool "musepack"
@@ -140,76 +113,115 @@ config BR2_PACKAGE_MPD_MUSEPACK
select BR2_PACKAGE_LIBREPLAYGAIN
select BR2_PACKAGE_MUSEPACK
help
- Enable musepack input support.
- Select this if you want to play back MPC files.
+ Enable musepack input support.
+ Select this if you want to play back MPC files.
config BR2_PACKAGE_MPD_OPUS
bool "opus"
select BR2_PACKAGE_OPUS
select BR2_PACKAGE_LIBOGG
help
- Enable opus input support.
- Select this if you want to play back OPUS encoded files.
+ 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
+config BR2_PACKAGE_MPD_TREMOR
+ bool "tremor"
+ select BR2_PACKAGE_LIBOGG
+ select BR2_PACKAGE_TREMOR
help
- Enable soundcloud.com playlist support.
+ Enable vorbis input support.
+ Select this if you want to play back OGG files on softfloat targets.
-config BR2_PACKAGE_MPD_SQLITE
- bool "sqlite"
- select BR2_PACKAGE_SQLITE
+config BR2_PACKAGE_MPD_VORBIS
+ bool "vorbis"
+ select BR2_PACKAGE_LIBOGG
+ select BR2_PACKAGE_LIBVORBIS
help
- Enable sqlite database support.
- If you don't use sqlite it will use an ASCII database.
+ Enable vorbis input/streaming support.
+ Select this if you want to play back OGG files on hardfloat targets.
-config BR2_PACKAGE_MPD_TCP
- bool "tcp sockets"
- default y
+config BR2_PACKAGE_MPD_WAVPACK
+ bool "wavpack"
+ select BR2_PACKAGE_WAVPACK
help
- Enable mpd to listen on tcp sockets.
+ Enable wavpack input support.
+ Select this if you want to play back WV files.
- You want this on if mpd and the client(s) work
- on different machines (the usual scenario).
+comment "Encoder plugins"
-config BR2_PACKAGE_MPD_TREMOR
- bool "tremor"
- select BR2_PACKAGE_LIBOGG
- select BR2_PACKAGE_TREMOR
+config BR2_PACKAGE_MPD_LAME
+ bool "lame"
+ select BR2_PACKAGE_LAME
help
- Enable vorbis input support.
- Select this if you want to play back OGG files on softfloat targets.
+ Enable lame (mp3) encoding support.
config BR2_PACKAGE_MPD_TWOLAME
bool "twolame"
depends on BR2_LARGEFILE # twolame -> libsndfile
select BR2_PACKAGE_TWOLAME
help
- Enable TwoLAME mp2 encoding.
+ Enable TwoLAME mp2 encoding.
comment "twolame support needs a toolchain w/ largefile"
depends on !BR2_LARGEFILE
-config BR2_PACKAGE_MPD_VORBIS
- bool "vorbis"
- select BR2_PACKAGE_LIBOGG
- select BR2_PACKAGE_LIBVORBIS
+comment "Input plugins"
+
+config BR2_PACKAGE_MPD_CURL
+ bool "curl"
+ select BR2_PACKAGE_LIBCURL
help
- Enable vorbis input/streaming support.
- Select this if you want to play back OGG files on hardfloat targets.
+ Enable curl streaming (http) support.
-config BR2_PACKAGE_MPD_WAVPACK
- bool "wavpack"
- select BR2_PACKAGE_WAVPACK
+config BR2_PACKAGE_MPD_SOUNDCLOUD
+ bool "soundcloud"
+ select BR2_PACKAGE_YAJL
+ help
+ Enable soundcloud.com playlist support.
+
+comment "Output plugins"
+
+config BR2_PACKAGE_MPD_ALSA
+ bool "alsa"
+ default y
+ select BR2_PACKAGE_ALSA_LIB
+ select BR2_PACKAGE_ALSA_LIB_PCM
+ select BR2_PACKAGE_ALSA_LIB_MIXER
+ help
+ Enable alsa output support.
+
+config BR2_PACKAGE_MPD_AO
+ bool "ao"
+ select BR2_PACKAGE_LIBAO
+ help
+ Enable libao output support.
+
+config BR2_PACKAGE_MPD_PULSEAUDIO
+ bool "pulseaudio"
+ depends on BR2_LARGEFILE # pulseaudio -> libsndfile
+ depends on BR2_ARCH_HAS_ATOMICS # pulseaudio
+ select BR2_PACKAGE_PULSEAUDIO
+ help
+ Enable pulseaudio output support.
+
+comment "pulseaudio support needs a toolchain w/ largefile"
+ depends on BR2_ARCH_HAS_ATOMICS
+ depends on !BR2_LARGEFILE
+
+comment "Miscellaneous plugins"
+
+config BR2_PACKAGE_MPD_TCP
+ bool "tcp sockets"
+ default y
help
- Enable wavpack input support.
- Select this if you want to play back WV files.
+ Enable mpd to listen on tcp sockets.
+ You want this on if mpd and the client(s) work
+ on different machines (the usual scenario).
endif
comment "mpd needs a toolchain w/ C++, threads, wchar"
depends on BR2_USE_MMU
depends on !(BR2_avr32 || BR2_sparc)
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
- !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE
+ !BR2_TOOLCHAIN_HAS_THREADS
--
2.1.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 2/8] package/mpd: sort plugins by type in Config.in
2014-10-15 10:39 ` [Buildroot] [PATCH 2/8] package/mpd: sort plugins by type in Config.in Jörg Krause
@ 2014-10-15 10:56 ` Baruch Siach
0 siblings, 0 replies; 11+ messages in thread
From: Baruch Siach @ 2014-10-15 10:56 UTC (permalink / raw)
To: buildroot
Hi J?rg,
On Wed, Oct 15, 2014 at 12:39:18PM +0200, J?rg Krause wrote:
> Signed-off-by: J?rg Krause <jkrause@posteo.de>
> ---
> package/mpd/Config.in | 218 ++++++++++++++++++++++++++------------------------
> 1 file changed, 115 insertions(+), 103 deletions(-)
>
> diff --git a/package/mpd/Config.in b/package/mpd/Config.in
> index cd7bbfd..e170b26 100644
> --- a/package/mpd/Config.in
> +++ b/package/mpd/Config.in
> @@ -1,7 +1,6 @@
> menuconfig BR2_PACKAGE_MPD
> bool "mpd"
> depends on BR2_INSTALL_LIBSTDCPP
> - depends on BR2_LARGEFILE # boost
You have just added this line in the previous patch. Why do you remove it now?
[snip]
> depends on BR2_USE_WCHAR # libglib2, flac
> depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> depends on BR2_USE_MMU # libglib2
> comment "mpd needs a toolchain w/ C++, threads, wchar"
> depends on BR2_USE_MMU
> depends on !(BR2_avr32 || BR2_sparc)
> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
> - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE
> + !BR2_TOOLCHAIN_HAS_THREADS
Same here.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/8] package/mpd: sort plugins alphabetically in mpd.mk
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 2/8] package/mpd: sort plugins by type in Config.in Jörg Krause
@ 2014-10-15 10:39 ` Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 4/8] package/mpd: enable support for libsoxr Jörg Krause
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 10:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
package/mpd/mpd.mk | 70 +++++++++++++++++++++++++++---------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 1542338..b10a60a 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -48,13 +48,6 @@ else
MPD_CONF_OPTS += --disable-audiofile
endif
-ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y)
-MPD_DEPENDENCIES += pulseaudio
-MPD_CONF_OPTS += --enable-pulse
-else
-MPD_CONF_OPTS += --disable-pulse
-endif
-
ifeq ($(BR2_PACKAGE_MPD_BZIP2),y)
MPD_DEPENDENCIES += bzip2
MPD_CONF_OPTS += --enable-bzip2
@@ -62,6 +55,13 @@ else
MPD_CONF_OPTS += --disable-bzip2
endif
+ifeq ($(BR2_PACKAGE_MPD_CURL),y)
+MPD_DEPENDENCIES += libcurl
+MPD_CONF_OPTS += --enable-curl
+else
+MPD_CONF_OPTS += --disable-curl
+endif
+
ifeq ($(BR2_PACKAGE_MPD_FAAD2),y)
MPD_DEPENDENCIES += faad2
MPD_CONF_OPTS += --enable-aac
@@ -69,6 +69,13 @@ else
MPD_CONF_OPTS += --disable-aac
endif
+ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y)
+MPD_DEPENDENCIES += ffmpeg
+MPD_CONF_OPTS += --enable-ffmpeg
+else
+MPD_CONF_OPTS += --disable-ffmpeg
+endif
+
ifeq ($(BR2_PACKAGE_MPD_FLAC),y)
MPD_DEPENDENCIES += flac
MPD_CONF_OPTS += --enable-flac
@@ -76,13 +83,6 @@ else
MPD_CONF_OPTS += --disable-flac
endif
-ifeq ($(BR2_PACKAGE_MPD_CURL),y)
-MPD_DEPENDENCIES += libcurl
-MPD_CONF_OPTS += --enable-curl
-else
-MPD_CONF_OPTS += --disable-curl
-endif
-
ifeq ($(BR2_PACKAGE_MPD_LAME),y)
MPD_DEPENDENCIES += lame
MPD_CONF_OPTS += --enable-lame-encoder
@@ -104,20 +104,6 @@ else
MPD_CONF_OPTS += --disable-sndfile
endif
-ifeq ($(BR2_PACKAGE_MPD_OPUS),y)
-MPD_DEPENDENCIES += opus libogg
-MPD_CONF_OPTS += --enable-opus
-else
-MPD_CONF_OPTS += --disable-opus
-endif
-
-ifeq ($(BR2_PACKAGE_MPD_VORBIS),y)
-MPD_DEPENDENCIES += libvorbis
-MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder
-else
-MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder
-endif
-
ifeq ($(BR2_PACKAGE_MPD_MAD),y)
MPD_DEPENDENCIES += libid3tag libmad
MPD_CONF_OPTS += --enable-mad
@@ -139,6 +125,20 @@ else
MPD_CONF_OPTS += --disable-mpc
endif
+ifeq ($(BR2_PACKAGE_MPD_OPUS),y)
+MPD_DEPENDENCIES += opus libogg
+MPD_CONF_OPTS += --enable-opus
+else
+MPD_CONF_OPTS += --disable-opus
+endif
+
+ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y)
+MPD_DEPENDENCIES += pulseaudio
+MPD_CONF_OPTS += --enable-pulse
+else
+MPD_CONF_OPTS += --disable-pulse
+endif
+
ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y)
MPD_DEPENDENCIES += yajl
MPD_CONF_OPTS += --enable-soundcloud
@@ -169,6 +169,13 @@ else
MPD_CONF_OPTS += --disable-twolame-encoder
endif
+ifeq ($(BR2_PACKAGE_MPD_VORBIS),y)
+MPD_DEPENDENCIES += libvorbis
+MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder
+else
+MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder
+endif
+
ifeq ($(BR2_PACKAGE_MPD_WAVPACK),y)
MPD_DEPENDENCIES += wavpack
MPD_CONF_OPTS += --enable-wavpack
@@ -176,13 +183,6 @@ else
MPD_CONF_OPTS += --disable-wavpack
endif
-ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y)
-MPD_DEPENDENCIES += ffmpeg
-MPD_CONF_OPTS += --enable-ffmpeg
-else
-MPD_CONF_OPTS += --disable-ffmpeg
-endif
-
define MPD_INSTALL_EXTRA_FILES
@if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \
$(INSTALL) -D package/mpd/mpd.conf \
--
2.1.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 4/8] package/mpd: enable support for libsoxr
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 2/8] package/mpd: sort plugins by type in Config.in Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 3/8] package/mpd: sort plugins alphabetically in mpd.mk Jörg Krause
@ 2014-10-15 10:39 ` Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 5/8] package/mpd: enable support for libsmbclient Jörg Krause
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 10:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
package/mpd/Config.in | 7 +++++++
package/mpd/mpd.mk | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index e170b26..4ab4a36 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -44,6 +44,13 @@ config BR2_PACKAGE_MPD_LIBSAMPLERATE
Enable libsamplerate input support.
Select this for software sample rate conversion.
+config BR2_PACKAGE_MPD_LIBSOXR
+ bool "libsoxr"
+ select BR2_PACKAGE_LIBSOXR
+ help
+ Enable libsoxr resampler support.
+ The SoX Resampler library performs software sample-rate conversion.
+
comment "Decoder plugins"
config BR2_PACKAGE_MPD_AUDIOFILE
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index b10a60a..92d7292 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -104,6 +104,13 @@ else
MPD_CONF_OPTS += --disable-sndfile
endif
+ifeq ($(BR2_PACKAGE_MPD_LIBSOXR),y)
+MPD_DEPENDENCIES += libsoxr
+MPD_CONF_OPTS += --enable-soxr
+else
+MPD_CONF_OPTS += --disable-soxr
+endif
+
ifeq ($(BR2_PACKAGE_MPD_MAD),y)
MPD_DEPENDENCIES += libid3tag libmad
MPD_CONF_OPTS += --enable-mad
--
2.1.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 5/8] package/mpd: enable support for libsmbclient
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
` (2 preceding siblings ...)
2014-10-15 10:39 ` [Buildroot] [PATCH 4/8] package/mpd: enable support for libsoxr Jörg Krause
@ 2014-10-15 10:39 ` Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 6/8] package/mpd: enable support for libnfs Jörg Krause
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 10:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
package/mpd/Config.in | 8 ++++++++
package/mpd/mpd.mk | 7 +++++++
2 files changed, 15 insertions(+)
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 4ab4a36..cce676c 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -180,6 +180,14 @@ config BR2_PACKAGE_MPD_CURL
help
Enable curl streaming (http) support.
+config BR2_PACKAGE_MPD_LIBSMBCLIENT
+ bool "samba"
+ depends on !BR2_nios2 # samba
+ select BR2_PACKAGE_SAMBA
+ select BR2_PACKAGE_SAMBA_LIBSMBCLIENT
+ help
+ Enable Samba support.
+
config BR2_PACKAGE_MPD_SOUNDCLOUD
bool "soundcloud"
select BR2_PACKAGE_YAJL
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 92d7292..ecd2a77 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -90,6 +90,13 @@ else
MPD_CONF_OPTS += --disable-lame-encoder
endif
+ifeq ($(BR2_PACKAGE_MPD_LIBSMBCLIENT),y)
+MPD_DEPENDENCIES += samba
+MPD_CONF_OPTS += --enable-smbclient
+else
+MPD_CONF_OPTS += --disable-smbclient
+endif
+
ifeq ($(BR2_PACKAGE_MPD_LIBSAMPLERATE),y)
MPD_DEPENDENCIES += libsamplerate
MPD_CONF_OPTS += --enable-lsr
--
2.1.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 6/8] package/mpd: enable support for libnfs
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
` (3 preceding siblings ...)
2014-10-15 10:39 ` [Buildroot] [PATCH 5/8] package/mpd: enable support for libsmbclient Jörg Krause
@ 2014-10-15 10:39 ` Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 7/8] package/mpd: enable support for dsd Jörg Krause
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 10:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
package/mpd/Config.in | 7 +++++++
package/mpd/mpd.mk | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index cce676c..18219ec 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -180,6 +180,13 @@ config BR2_PACKAGE_MPD_CURL
help
Enable curl streaming (http) support.
+config BR2_PACKAGE_MPD_LIBNFS
+ bool "nfs"
+ depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+ select BR2_PACKAGE_LIBNFS
+ help
+ Enable Network File System (NFS) support.
+
config BR2_PACKAGE_MPD_LIBSMBCLIENT
bool "samba"
depends on !BR2_nios2 # samba
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index ecd2a77..476bf0a 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -90,6 +90,14 @@ else
MPD_CONF_OPTS += --disable-lame-encoder
endif
+ifeq ($(BR2_PACKAGE_MPD_LIBNFS),y)
+PKG_CONFIG_PATH = "$(STAGING_DIR)/usr/lib/pkgconfig"
+MPD_DEPENDENCIES += libnfs
+MPD_CONF_OPTS += --enable-nfs
+else
+MPD_CONF_OPTS += --disable-nfs
+endif
+
ifeq ($(BR2_PACKAGE_MPD_LIBSMBCLIENT),y)
MPD_DEPENDENCIES += samba
MPD_CONF_OPTS += --enable-smbclient
--
2.1.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 7/8] package/mpd: enable support for dsd
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
` (4 preceding siblings ...)
2014-10-15 10:39 ` [Buildroot] [PATCH 6/8] package/mpd: enable support for libnfs Jörg Krause
@ 2014-10-15 10:39 ` Jörg Krause
2014-10-15 10:39 ` [Buildroot] [PATCH 8/8] package/mpd: fix zeroconf support Jörg Krause
2014-10-15 10:53 ` [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Baruch Siach
7 siblings, 0 replies; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 10:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
package/mpd/Config.in | 6 ++++++
package/mpd/mpd.mk | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 18219ec..339205a 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -60,6 +60,12 @@ config BR2_PACKAGE_MPD_AUDIOFILE
Enable audiofile input/streaming support.
Select this if you want to play back WAV files.
+config BR2_PACKAGE_MPD_DSD
+ bool "dsd"
+ help
+ Enable Digital Speech Decoder (DSD) support to play audio files encoded
+ in a digital speech format.
+
config BR2_PACKAGE_MPD_FAAD2
bool "faad2"
select BR2_PACKAGE_FAAD2
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 476bf0a..3370bc7 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -62,6 +62,12 @@ else
MPD_CONF_OPTS += --disable-curl
endif
+ifeq ($(BR2_PACKAGE_MPD_DSD),y)
+MPD_CONF_OPTS += --enable-dsd
+else
+MPD_CONF_OPTS += --disable-dsd
+endif
+
ifeq ($(BR2_PACKAGE_MPD_FAAD2),y)
MPD_DEPENDENCIES += faad2
MPD_CONF_OPTS += --enable-aac
--
2.1.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 8/8] package/mpd: fix zeroconf support
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
` (5 preceding siblings ...)
2014-10-15 10:39 ` [Buildroot] [PATCH 7/8] package/mpd: enable support for dsd Jörg Krause
@ 2014-10-15 10:39 ` Jörg Krause
2014-10-15 10:53 ` [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Baruch Siach
7 siblings, 0 replies; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 10:39 UTC (permalink / raw)
To: buildroot
Support for zeroconf depends on libdns_sd from avahi. This library is build
by avahi if avahi-daemon is enabled and dbus is selected.
Checking for symbol BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY instead of
BR2_PACKAGE_AVAHI_DAEMON ensures that dbus has been selected and therefore
libdns_sd has been built.
Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
package/mpd/mpd.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 3370bc7..a0d582c 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -13,7 +13,9 @@ MPD_LICENSE = GPLv2+
MPD_LICENSE_FILES = COPYING
# Some options need an explicit --disable or --enable
-ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
+
+# Zeroconf support depends on libdns_sd from avahi.
+ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y)
MPD_DEPENDENCIES += avahi
else
MPD_CONF_OPTS += --with-zeroconf=no
--
2.1.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19
2014-10-15 10:39 [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Jörg Krause
` (6 preceding siblings ...)
2014-10-15 10:39 ` [Buildroot] [PATCH 8/8] package/mpd: fix zeroconf support Jörg Krause
@ 2014-10-15 10:53 ` Baruch Siach
2014-10-15 13:16 ` Jörg Krause
7 siblings, 1 reply; 11+ messages in thread
From: Baruch Siach @ 2014-10-15 10:53 UTC (permalink / raw)
To: buildroot
Hi J?rg,
On Wed, Oct 15, 2014 at 12:39:17PM +0200, J?rg Krause wrote:
> * Bump to version 0.19
> * Add boost as dependency
> * Add support for libicu
>
> Signed-off-by: J?rg Krause <jkrause@posteo.de>
> ---
> package/mpd/Config.in | 3 ++-
> package/mpd/mpd.mk | 14 +++++++++++---
> 2 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/package/mpd/Config.in b/package/mpd/Config.in
> index 8884464..cd7bbfd 100644
> --- a/package/mpd/Config.in
> +++ b/package/mpd/Config.in
> @@ -1,6 +1,7 @@
> menuconfig BR2_PACKAGE_MPD
> bool "mpd"
> depends on BR2_INSTALL_LIBSTDCPP
> + depends on BR2_LARGEFILE # boost
You also need to add 'select BR2_PACKAGE_BOOST' to make sure boost gets built.
baruch
> depends on BR2_USE_WCHAR # libglib2, flac
> depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> depends on BR2_USE_MMU # libglib2
> @@ -211,4 +212,4 @@ comment "mpd needs a toolchain w/ C++, threads, wchar"
> depends on BR2_USE_MMU
> depends on !(BR2_avr32 || BR2_sparc)
> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
> - !BR2_TOOLCHAIN_HAS_THREADS
> + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19
2014-10-15 10:53 ` [Buildroot] [PATCH 1/8] package/mpd: bump to version 0.19 Baruch Siach
@ 2014-10-15 13:16 ` Jörg Krause
0 siblings, 0 replies; 11+ messages in thread
From: Jörg Krause @ 2014-10-15 13:16 UTC (permalink / raw)
To: buildroot
On 10/15/2014 12:53 PM, Baruch Siach wrote:
> Hi J?rg,
>
> On Wed, Oct 15, 2014 at 12:39:17PM +0200, J?rg Krause wrote:
>> * Bump to version 0.19
>> * Add boost as dependency
>> * Add support for libicu
>>
>> Signed-off-by: J?rg Krause <jkrause@posteo.de>
>> ---
>> package/mpd/Config.in | 3 ++-
>> package/mpd/mpd.mk | 14 +++++++++++---
>> 2 files changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/package/mpd/Config.in b/package/mpd/Config.in
>> index 8884464..cd7bbfd 100644
>> --- a/package/mpd/Config.in
>> +++ b/package/mpd/Config.in
>> @@ -1,6 +1,7 @@
>> menuconfig BR2_PACKAGE_MPD
>> bool "mpd"
>> depends on BR2_INSTALL_LIBSTDCPP
>> + depends on BR2_LARGEFILE # boost
> You also need to add 'select BR2_PACKAGE_BOOST' to make sure boost gets built.
Oops! Something went wrong here. I'll fix it. Thanks for the review!
^ permalink raw reply [flat|nested] 11+ messages in thread