package/mpd: bump to version 0.19

PATCH New Jörg Krause 3 participants 11 messages Oct 16, 2014 – Oct 27, 2014

lore

Share & tools

lore

Jörg Krause

author

2014-10-16 22:28 UTC #0 lore raw

PATCH v3 1/8 package/mpd: bump to version 0.19

* Bump to version 0.19
* Add boost as dependency
* Add support for libicu

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- none
Changes v1 -> v2:
- fix missing dependency of boost

---
 package/mpd/Config.in |  4 +++-
 package/mpd/mpd.mk    | 14 +++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

package/mpd/Config.in +3 -1

index 8884464..f2dbbb0 100644
@@ -1,12 +1,14 @@
 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
 	# avr32, sparc & CS powerpc gcc are too old
 	depends on !(BR2_avr32 || BR2_sparc)
 	depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
+	select BR2_PACKAGE_BOOST
 	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)

@@ -211,4 +213,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

package/mpd/mpd.mk +11 -3

index 932df08..1542338 100644
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-MPD_VERSION_MAJOR = 0.18
-MPD_VERSION = $(MPD_VERSION_MAJOR).16
+MPD_VERSION_MAJOR = 0.19
+MPD_VERSION = $(MPD_VERSION_MAJOR)
 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
 MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
-MPD_DEPENDENCIES = host-pkgconf libglib2
+MPD_DEPENDENCIES = host-pkgconf boost libglib2
 MPD_LICENSE = GPLv2+
 MPD_LICENSE_FILES = COPYING

@@ -19,6 +19,14 @@ else
 MPD_CONF_OPTS += --with-zeroconf=no
 endif
 
+# MPD prefers libicu for utf8 collation instead of libglib2.
+ifeq ($(BR2_PACKAGE_ICU),y)
+MPD_DEPENDENCIES += icu
+MPD_CONF_OPTS += --enable-icu
+else
+MPD_CONF_OPTS += --disable-icu
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_ALSA),y)
 MPD_DEPENDENCIES += alsa-lib
 MPD_CONF_OPTS += --enable-alsa

Signature · 1 line

2.1.2

Jörg Krause

author

2014-10-24 19:51 UTC #1 lore raw

PATCH v3 1/8 package/mpd: bump to version 0.19

Hi all,

Quoted 64 lines · J?rg Krause

* Bump to version 0.19
* Add boost as dependency
* Add support for libicu

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- none
Changes v1 -> v2:
- fix missing dependency of boost

---
  package/mpd/Config.in |  4 +++-
  package/mpd/mpd.mk    | 14 +++++++++++---
  2 files changed, 14 insertions(+), 4 deletions(-)

package/mpd/Config.in +3 -1

index 8884464..f2dbbb0 100644
@@ -1,12 +1,14 @@
  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
  	# avr32, sparc & CS powerpc gcc are too old
  	depends on !(BR2_avr32 || BR2_sparc)
  	depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
+	select BR2_PACKAGE_BOOST
  	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)

@@ -211,4 +213,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

package/mpd/mpd.mk +4 -3

index 932df08..1542338 100644
@@ -4,11 +4,11 @@
  #
  ################################################################################
 
-MPD_VERSION_MAJOR = 0.18
-MPD_VERSION = $(MPD_VERSION_MAJOR).16
+MPD_VERSION_MAJOR = 0.19
+MPD_VERSION = $(MPD_VERSION_MAJOR)
  MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
  MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
-MPD_DEPENDENCIES = host-pkgconf libglib2
+MPD_DEPENDENCIES = host-pkgconf boost libglib2
  MPD_LICENSE = GPLv2+
  MPD_LICENSE_FILES = COPYING

@@ -19,6 +19,14 @@ else
  MPD_CONF_OPTS += --with-zeroconf=no
  endif
 
+# MPD prefers libicu for utf8 collation instead of libglib2.

package/mpd/mpd.mk else · line 32

Quoted 10 lines

package/mpd/mpd.mk +7 -0

+ifeq ($(BR2_PACKAGE_ICU),y)
+MPD_DEPENDENCIES += icu
+MPD_CONF_OPTS += --enable-icu
+else
+MPD_CONF_OPTS += --disable-icu
+endif
+
  ifeq ($(BR2_PACKAGE_MPD_ALSA),y)
  MPD_DEPENDENCIES += alsa-lib
  MPD_CONF_OPTS += --enable-alsa

sorry for being impatient. Is there anything to take into consideration for this series of patches?

J?rg
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20141024/95860461/attachment.html>

Yann E. MORIN

2014-10-24 23:33 UTC #2 lore raw

PATCH v3 1/8 package/mpd: bump to version 0.19

J?rg, All,

On 2014-10-24 21:51 +0200, J?rg Krause spake thusly:

Quoted 44 lines

Hi all,
On 10/17/2014 12:28 AM, Jo:rg Krause wrote:
* Bump to version 0.19
* Add boost as dependency* Add support for libicu
Signed-off-by: Jo:rg Krause [1]<[email protected]>---Changes v2 -> v3:
- noneChanges v1 -> v2: - fix missing dependency of boost
 --- package/mpd/Config.in |  4 +++- package/mpd/mpd.mk    | 14 +++++++++++---
  2 files changed, 14 insertions(+), 4 deletions(-)
 diff --git a/package/mpd/Config.in b/package/mpd/Config.in
 index 8884464..f2dbbb0 100644--- a/package/mpd/Config.in
 +++ b/package/mpd/Config.in@@ -1,12 +1,14 @@
  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       # avr32, sparc & CS powerpc gcc are too old
         depends on !(BR2_avr32 || BR2_sparc)    depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
 +       select BR2_PACKAGE_BOOST        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)
 @@ -211,4 +213,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
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 932df08..1542338 100644--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk@@ -4,11 +4,11 @@
# ################################################################################ -MPD_VERSION_MAJOR = 0.18-MPD_VERSION = $(MPD_VERSION_MAJOR).16
+MPD_VERSION_MAJOR = 0.19+MPD_VERSION = $(MPD_VERSION_MAJOR)
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE =
[2]http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) -MPD_DEPENDENCIES = host-pkgconf libglib2
+MPD_DEPENDENCIES = host-pkgconf boost libglib2
MPD_LICENSE = GPLv2+ MPD_LICENSE_FILES = COPYING
@@ -19,6 +19,14 @@ else MPD_CONF_OPTS += --with-zeroconf=no
endif +# MPD prefers libicu for utf8 collation instead of libglib2.
+ifeq ($(BR2_PACKAGE_ICU),y)+MPD_DEPENDENCIES += icu
+MPD_CONF_OPTS += --enable-icu+else+MPD_CONF_OPTS += --disable-icu +endif+ ifeq ($(BR2_PACKAGE_MPD_ALSA),y) MPD_DEPENDENCIES += alsa-lib
MPD_CONF_OPTS += --enable-alsa

Quoted 1 line

sorry for being impatient. Is there anything to take into consideration for this series of patches?

Someone has to review those patches.

We have limited time available to review the many patches that are being sent, so it can take a bit of time for patches to be applied.

Just look at the pending list of patches:
http://patchwork.ozlabs.org/project/buildroot/list/

You can help reduce this list by reviewing (and testing) pending patches, see:
http://buildroot.net/downloads/manual/manual.html#_reviewing_and_testing_patches

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Jörg Krause

author

2014-10-16 22:28 UTC #3 lore raw

PATCH v3 2/8 package/mpd: sort plugins by type in Config.in

In reply to Jörg Krause

* sort plugins by type
* fix indentation of config symbols help text

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- fix indentation of help texts
- add commit log
Changes v1 -> v2:
- fix dependency in comment

---
 package/mpd/Config.in | 183 +++++++++++++++++++++++++++-----------------------
 1 file changed, 98 insertions(+), 85 deletions(-)

package/mpd/Config.in +98 ~~-85~~

index f2dbbb0..5ef1d3f 100644
@@ -22,20 +22,31 @@ 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
+comment "Archive plugins"
+
+config BR2_PACKAGE_MPD_BZIP2
+	bool "bzip2"
+	select BR2_PACKAGE_BZIP2
 	help
-	  Enable alsa output support.
+	  Enable bzip2 archive support.
 
-config BR2_PACKAGE_MPD_AO
-	bool "ao"
-	select BR2_PACKAGE_LIBAO
+config BR2_PACKAGE_MPD_SQLITE
+	bool "sqlite"
+	select BR2_PACKAGE_SQLITE
 	help
-	  Enable libao output support.
+	  Enable sqlite database support.
+	  If you don't use sqlite it will use an ASCII database.
+
+comment "Converter plugins"
+
+config BR2_PACKAGE_MPD_LIBSAMPLERATE
+	bool "libsamplerate"
+	select BR2_PACKAGE_LIBSAMPLERATE
+	help
+	  Enable libsamplerate input support.
+	  Select this for software sample rate conversion.
+
+comment "Decoder plugins"
 
 config BR2_PACKAGE_MPD_AUDIOFILE
 	bool "audiofile"

@@ -44,30 +55,6 @@ config BR2_PACKAGE_MPD_AUDIOFILE
 	  Enable audiofile input/streaming support.
 	  Select this if you want to play back WAV files.
 
-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
-
-config BR2_PACKAGE_MPD_BZIP2
-	bool "bzip2"
-	select BR2_PACKAGE_BZIP2
-	help
-	  Enable bzip2 archive support.
-
-config BR2_PACKAGE_MPD_CURL
-	bool "curl"
-	select BR2_PACKAGE_LIBCURL
-	help
-	  Enable curl streaming (http) support.
-
 config BR2_PACKAGE_MPD_FAAD2
 	bool "faad2"
 	select BR2_PACKAGE_FAAD2

@@ -75,13 +62,6 @@ config BR2_PACKAGE_MPD_FAAD2
 	  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.
-
 config BR2_PACKAGE_MPD_FFMPEG
 	bool "ffmpeg"
 	select BR2_PACKAGE_FFMPEG

@@ -94,18 +74,12 @@ config BR2_PACKAGE_MPD_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"

@@ -152,28 +126,6 @@ config BR2_PACKAGE_MPD_OPUS
 	  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
-	bool "sqlite"
-	select BR2_PACKAGE_SQLITE
-	help
-	  Enable sqlite database support.
-	  If you don't use sqlite it will use an ASCII database.
-
-config BR2_PACKAGE_MPD_TCP
-	bool "tcp sockets"
-	default y
-	help
-	  Enable mpd to listen on tcp sockets.
-
-	  You want this on if mpd and the client(s) work
-	  on different machines (the usual scenario).
-
 config BR2_PACKAGE_MPD_TREMOR
 	bool "tremor"
 	select BR2_PACKAGE_LIBOGG

@@ -182,16 +134,6 @@ config BR2_PACKAGE_MPD_TREMOR
 	  Enable vorbis input support.
 	  Select this if you want to play back OGG files on softfloat targets.
 
-config BR2_PACKAGE_MPD_TWOLAME
-	bool "twolame"
-	depends on BR2_LARGEFILE # twolame -> libsndfile
-	select BR2_PACKAGE_TWOLAME
-	help
-	  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

@@ -207,6 +149,77 @@ config BR2_PACKAGE_MPD_WAVPACK
 	  Enable wavpack input support.
 	  Select this if you want to play back WV files.
 
+comment "Encoder plugins"
+
+config BR2_PACKAGE_MPD_LAME
+	bool "lame"
+	select BR2_PACKAGE_LAME
+	help
+	  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.
+
+comment "twolame support needs a toolchain w/ largefile"
+	depends on !BR2_LARGEFILE
+
+comment "Input plugins"
+
+config BR2_PACKAGE_MPD_CURL
+	bool "curl"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  Enable curl streaming (http) support.
+
+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 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"

Signature · 1 line

2.1.2

Jörg Krause

author

2014-10-16 22:28 UTC #4 lore raw

PATCH v3 3/8 package/mpd: sort plugins alphabetically in mpd.mk

In reply to Jörg Krause

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- none
Changes v1 -> v2:
- none

---
 package/mpd/mpd.mk | 70 +++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

package/mpd/mpd.mk +35 ~~-35~~

index 1542338..b10a60a 100644
@@ -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 \

Signature · 1 line

2.1.2

Jörg Krause

author

2014-10-16 22:28 UTC #5 lore raw

PATCH v3 4/8 package/mpd: enable support for libsoxr

In reply to Jörg Krause

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- fix indentation of help text
Changes v1 -> v2:
- none

---
 package/mpd/Config.in | 7 +++++++
 package/mpd/mpd.mk    | 7 +++++++
 2 files changed, 14 insertions(+)

package/mpd/Config.in +7 -0

index 5ef1d3f..e62a37d 100644
@@ -46,6 +46,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

package/mpd/mpd.mk +7 -0

index b10a60a..92d7292 100644
@@ -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

Signature · 1 line

2.1.2

Jörg Krause

author

2014-10-16 22:29 UTC #6 lore raw

PATCH v3 5/8 package/mpd: enable support for libsmbclient

In reply to Jörg Krause

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- fix indentation of help text
Changes v1 -> v2:
- none

---
 package/mpd/Config.in | 8 ++++++++
 package/mpd/mpd.mk    | 7 +++++++
 2 files changed, 15 insertions(+)

package/mpd/Config.in +8 -0

index e62a37d..09df556 100644
@@ -182,6 +182,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

package/mpd/mpd.mk +7 -0

index 92d7292..ecd2a77 100644
@@ -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

Signature · 1 line

2.1.2

Jörg Krause

author

2014-10-16 22:29 UTC #7 lore raw

PATCH v3 6/8 package/mpd: enable support for libnfs

In reply to Jörg Krause

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- fix indentation of help text
- remove setting PKG_CONFIG_PATH (issue of pkg-config not finding libnfs is

    fixed by commit 28b163f3162c91afaed1e5c5c59d10d18cfa7dbc)
Changes v1 -> v2:
  - none
---
 package/mpd/Config.in | 7 +++++++
 package/mpd/mpd.mk    | 7 +++++++
 2 files changed, 14 insertions(+)

package/mpd/Config.in +7 -0

index 09df556..4294daf 100644
@@ -182,6 +182,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

package/mpd/mpd.mk +7 -0

index ecd2a77..ef89f3d 100644
@@ -90,6 +90,13 @@ else
 MPD_CONF_OPTS += --disable-lame-encoder
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_LIBNFS),y)
+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

Signature · 1 line

2.1.2

Jörg Krause

author

2014-10-16 22:29 UTC #8 lore raw

PATCH v3 7/8 package/mpd: enable support for dsd

In reply to Jörg Krause

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- fix indentation of help text
Changes v1 -> v2:
- none

---
 package/mpd/Config.in | 6 ++++++
 package/mpd/mpd.mk    | 6 ++++++
 2 files changed, 12 insertions(+)

package/mpd/Config.in +6 -0

index 4294daf..73bfaf7 100644
@@ -62,6 +62,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

package/mpd/mpd.mk +6 -0

index ef89f3d..4eca183 100644
@@ -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

Signature · 1 line

2.1.2

Jörg Krause

author

2014-10-16 22:29 UTC #9 lore raw

PATCH v3 8/8 package/mpd: fix zeroconf support

In reply to Jörg Krause

Add a config option to explicitly enable Avahi support in MPD.

Signed-off-by J?rg Krause <[email protected]>

---
Changes v2 -> v3:
- add Config.in option instead of checking against BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY
- change commit log
Changes v1 -> v2:
- none

---
 package/mpd/Config.in | 14 ++++++++++++++
 package/mpd/mpd.mk    |  5 ++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

package/mpd/Config.in +14 -0

index 73bfaf7..2f01854 100644
@@ -240,6 +240,20 @@ comment "pulseaudio support needs a toolchain w/ largefile"
 
 comment "Miscellaneous plugins"
 
+config BR2_PACKAGE_MPD_AVAHI_SUPPORT
+	bool "avahi (zeroconf) support"
+	depends on !BR2_PREFER_STATIC_LIB # avahi
+	select BR2_PACKAGE_AVAHI
+	select BR2_PACKAGE_AVAHI_DAEMON
+	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.
+
+comment "avahi support needs a toolchain w/ dynamic library"
+	depends on BR2_PREFER_STATIC_LIB
+
 config BR2_PACKAGE_MPD_TCP
 	bool "tcp sockets"
 	default y

package/mpd/mpd.mk +4 -1

index 4eca183..ae37b14 100644
@@ -13,8 +13,11 @@ 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_MPD_AVAHI_SUPPORT),y)
 MPD_DEPENDENCIES += avahi
+MPD_CONF_OPTS += --with-zeroconf=avahi
 else
 MPD_CONF_OPTS += --with-zeroconf=no
 endif

Signature · 1 line

2.1.2

Thomas Petazzoni

2014-10-27 22:10 UTC #10 lore raw

PATCH v3 1/8 package/mpd: bump to version 0.19

In reply to Jörg Krause

Dear J?rg Krause,

Quoted 10 lines · J?rg Krause

* Bump to version 0.19
* Add boost as dependency
* Add support for libicu
Signed-off-by J?rg Krause <[email protected]>
---
Changes v2 -> v3:
- none
Changes v1 -> v2:
- fix missing dependency of boost

Quoted 4 lines

---
 package/mpd/Config.in |  4 +++-
 package/mpd/mpd.mk    | 14 +++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

Entire series applied, thanks. There was just one patch where you forgot to add a comment related to a new toolchain dependency (the nfs patch), but other than that, I haven't seen any other issue. I did one build test of a certain configuration, and for the other configurations we'll see what the autobuilders have to say :-)

Thanks!

Thomas

Signature · 3 lines

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