[Buildroot] [PATCH 1/6] package/mpd: bump to version 0.19.6

[Buildroot] [PATCH 1/6] package/mpd: bump to version 0.19.6

[Jörg Krause]

Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
 package/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index c80de41..3be2ae5 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 MPD_VERSION_MAJOR = 0.19
-MPD_VERSION = $(MPD_VERSION_MAJOR).5
+MPD_VERSION = $(MPD_VERSION_MAJOR).6
 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
 MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
 MPD_DEPENDENCIES = host-pkgconf boost libglib2
-- 
2.1.3

[Buildroot] [PATCH 2/6] package/mpd: fix typo

[Jörg Krause]

Fix little type: it's UPnP, not UPnp.

Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
 package/mpd/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 1d38b1a..4097f52 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -279,7 +279,7 @@ config BR2_PACKAGE_MPD_TCP
 	  on different machines (the usual scenario).
 
 config BR2_PACKAGE_MPD_UPNP
-	bool "UPnp"
+	bool "UPnP"
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBUPNP
 	help
-- 
2.1.3

[Buildroot] [PATCH 2/6] package/mpd: fix typo

[Thomas Petazzoni]

Dear J?rg Krause,

On Mon,  8 Dec 2014 23:44:50 +0100, J?rg Krause wrote:
> Fix little type: it's UPnP, not UPnp.
> 
> Signed-off-by: J?rg Krause <jkrause@posteo.de>
> ---
>  package/mpd/Config.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/6] package/mpd: make all package names in help text uppercase

[Jörg Krause]

Make the package name uppercase to be consistent in all the help texts.

Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
 package/mpd/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 4097f52..3435b05 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -273,9 +273,9 @@ config BR2_PACKAGE_MPD_TCP
 	bool "tcp sockets"
 	default y
 	help
-	  Enable mpd to listen on tcp sockets.
+	  Enable MPD to listen on tcp sockets.
 
-	  You want this on if mpd and the client(s) work
+	  You want this on if MPD and the client(s) work
 	  on different machines (the usual scenario).
 
 config BR2_PACKAGE_MPD_UPNP
@@ -283,7 +283,7 @@ config BR2_PACKAGE_MPD_UPNP
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBUPNP
 	help
-	  Enable mpd UPnP client support.
+	  Enable MPD UPnP client support.
 
 endif
 
-- 
2.1.3

[Buildroot] [PATCH 3/6] package/mpd: make all package names in help text uppercase

[Thomas Petazzoni]

Dear J?rg Krause,

On Mon,  8 Dec 2014 23:44:51 +0100, J?rg Krause wrote:
> Make the package name uppercase to be consistent in all the help texts.
> 
> Signed-off-by: J?rg Krause <jkrause@posteo.de>
> ---
>  package/mpd/Config.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 4/6] package/mpd: fix line length for help text

[Jörg Krause]

Make help text lines not longer as 80 characters (one tab weights eight chars).

Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
 package/mpd/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 3435b05..901902b 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -65,8 +65,8 @@ config BR2_PACKAGE_MPD_AUDIOFILE
 config BR2_PACKAGE_MPD_DSD
 	bool "dsd"
 	help
-	  Enable Digital Speech Decoder (DSD) support to play audio files encoded
-	  in a digital speech format.
+	  Enable Digital Speech Decoder (DSD) support to play audio files
+	  encoded in a digital speech format.
 
 config BR2_PACKAGE_MPD_FAAD2
 	bool "faad2"
@@ -263,8 +263,8 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT
 	select BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY
 	help
 	  Enable Avahi (zeroconf) support.
-	  Select this for multicast DNS/DNS-SD service discovery support. This allows
-	  MPD to publish service information on a local network.
+	  Select this for multicast DNS/DNS-SD service discovery support. This
+	  allows MPD to publish service information on a local network.
 
 comment "avahi support needs a toolchain w/ dynamic library"
 	depends on BR2_PREFER_STATIC_LIB
-- 
2.1.3

[Buildroot] [PATCH 4/6] package/mpd: fix line length for help text

[Thomas Petazzoni]

Dear J?rg Krause,

On Mon,  8 Dec 2014 23:44:52 +0100, J?rg Krause wrote:
> Make help text lines not longer as 80 characters (one tab weights eight chars).
> 
> Signed-off-by: J?rg Krause <jkrause@posteo.de>
> ---
>  package/mpd/Config.in | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Applied, after wrapping some other help texts that were also too long
(at least from Emacs text wrapping perspective, which as we all know is
the absolute rule everyone must follow! :-))

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 5/6] package/mpd: enable neighbor discovery support

[Jörg Krause]

Enable support for neighbor discovery useful in Samba and UPnP networks.

Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
 package/mpd/Config.in | 10 ++++++++++
 package/mpd/mpd.mk    |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 901902b..57ed434 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -269,6 +269,16 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT
 comment "avahi support needs a toolchain w/ dynamic library"
 	depends on BR2_PREFER_STATIC_LIB
 
+config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT
+	bool "neighbor discovery support"
+	help
+	  Enable support for neighbor discovery.
+	  This option may be used in conjunction with the plugin samba to
+	  provide a list of SMB/CIFS servers or with the plugin UPnP to provide
+	  a list of UPnP servers on the local network.
+	  The neighbor plugin needs configuration in mpd.conf. For further
+	  information take a look at the MPD documentation.
+
 config BR2_PACKAGE_MPD_TCP
 	bool "tcp sockets"
 	default y
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 3be2ae5..85bbe8b 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -162,6 +162,12 @@ else
 MPD_CONF_OPTS += --disable-mpc
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT),y)
+MPD_CONF_OPTS += --enable-neighbor-plugins
+else
+MPD_CONF_OPTS += --disable-neighbor-plugins
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_OPUS),y)
 MPD_DEPENDENCIES += opus libogg
 MPD_CONF_OPTS += --enable-opus
-- 
2.1.3

[Buildroot] [PATCH 5/6] package/mpd: enable neighbor discovery support

[Thomas Petazzoni]

Dear J?rg Krause,

On Mon,  8 Dec 2014 23:44:53 +0100, J?rg Krause wrote:
> Enable support for neighbor discovery useful in Samba and UPnP networks.
> 
> Signed-off-by: J?rg Krause <jkrause@posteo.de>
> ---
>  package/mpd/Config.in | 10 ++++++++++
>  package/mpd/mpd.mk    |  6 ++++++
>  2 files changed, 16 insertions(+)
> 
> diff --git a/package/mpd/Config.in b/package/mpd/Config.in
> index 901902b..57ed434 100644
> --- a/package/mpd/Config.in
> +++ b/package/mpd/Config.in
> @@ -269,6 +269,16 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT
>  comment "avahi support needs a toolchain w/ dynamic library"
>  	depends on BR2_PREFER_STATIC_LIB
>  
> +config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT
> +	bool "neighbor discovery support"
> +	help
> +	  Enable support for neighbor discovery.
> +	  This option may be used in conjunction with the plugin samba to
> +	  provide a list of SMB/CIFS servers or with the plugin UPnP to provide
> +	  a list of UPnP servers on the local network.
> +	  The neighbor plugin needs configuration in mpd.conf. For further
> +	  information take a look at the MPD documentation.

After looking a bit at the MPD configure.ac script and Makefile.am, it
appeared to me that this feature doesn't do anything useful if there
isn't either smbclient or upnp support enabled, so I made this option
depends on smbclient or upnp support.

Applied with this change, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 6/6] package/mpd: enable OSS support

[Jörg Krause]

Add support for the OSS (Open Sound System).

Signed-off-by: J?rg Krause <jkrause@posteo.de>
---
 package/mpd/Config.in | 5 +++++
 package/mpd/mpd.mk    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 57ed434..50f9ad0 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -241,6 +241,11 @@ comment "jack support needs a toolchain w/ largefile"
 	depends on BR2_ARCH_HAS_ATOMICS
 	depends on !BR2_LARGEFILE
 
+config BR2_PACKAGE_MPD_OSS
+	bool "oss"
+	help
+	  Enable OSS (Open Sound System) output support.
+
 config BR2_PACKAGE_MPD_PULSEAUDIO
 	bool "pulseaudio"
 	depends on BR2_LARGEFILE # pulseaudio -> libsndfile
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 85bbe8b..132ad44 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -175,6 +175,12 @@ else
 MPD_CONF_OPTS += --disable-opus
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_OSS),y)
+MPD_CONF_OPTS += --enable-oss
+else
+MPD_CONF_OPTS += --disable-oss
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y)
 MPD_DEPENDENCIES += pulseaudio
 MPD_CONF_OPTS += --enable-pulse
-- 
2.1.3

[Buildroot] [PATCH 6/6] package/mpd: enable OSS support

[Thomas Petazzoni]

Dear J?rg Krause,

On Mon,  8 Dec 2014 23:44:54 +0100, J?rg Krause wrote:
> Add support for the OSS (Open Sound System).
> 
> Signed-off-by: J?rg Krause <jkrause@posteo.de>

Applied, after adjusting the commit title: the commit is not enabling
OSS support, it's adding an option to enable or disable the OSS
support. And in practice it actually disables it: it was enabled by
default by the mpd configure.ac script, unless --disable-oss is passed.
Now that we have the option which defaults to not enabled, the OSS
support will be disabled by default. I believe this is good as on most
Linux systems, ALSA is now used for audio, and OSS is deprecated.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com