Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0
@ 2014-01-13 22:17 Gustavo Zacarias
  2014-01-13 22:17 ` [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7 Gustavo Zacarias
  2014-01-13 22:22 ` [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0 Peter Korsgaard
  0 siblings, 2 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2014-01-13 22:17 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index 3db2843..70d3ed6 100644
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MPG123_VERSION = 1.16.0
+MPG123_VERSION = 1.17.0
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --disable-lfs-alias
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7
  2014-01-13 22:17 [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0 Gustavo Zacarias
@ 2014-01-13 22:17 ` Gustavo Zacarias
  2014-01-28 21:54   ` Thomas Petazzoni
  2014-01-13 22:22 ` [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0 Peter Korsgaard
  1 sibling, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2014-01-13 22:17 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/mpd/Config.in | 15 +++++++++++++++
 package/mpd/S95mpd    | 12 ++++++++----
 package/mpd/mpd.mk    | 18 +++++++++++++++---
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 62bdfa7..5a03a62 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -4,6 +4,8 @@ menuconfig BR2_PACKAGE_MPD
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	depends on !(BR2_avr32 || BR2_sparc) # gcc too old
+	depends on !BR2_UCLIBC_VERSION_0_9_32 # lacks signalfd
 	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)
@@ -142,6 +144,19 @@ config BR2_PACKAGE_MPD_MUSEPACK
 	  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
+	help
+	  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
diff --git a/package/mpd/S95mpd b/package/mpd/S95mpd
index a4f1271..f25135d 100644
--- a/package/mpd/S95mpd
+++ b/package/mpd/S95mpd
@@ -1,15 +1,19 @@
 #!/bin/sh
 
+# Sanity checks
+test -f /usr/bin/mpd || exit 0
+test -f /etc/mpd.conf || exit 0
+
 start() {
 	echo -n "Starting mpd: "
-	start-stop-daemon --start --quiet --background --exec /usr/bin/mpd
-	echo "OK"
+	start-stop-daemon --start --quiet --background --exec /usr/bin/mpd \
+		&& echo "OK" || echo "FAIL"
 }
 
 stop() {
 	echo -n "Stopping mpd: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid
-	echo "OK"
+	start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid \
+		&& echo "OK" || echo "FAIL"
 }
 
 case "$1" in
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 4367cae..4a7926c 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-MPD_VERSION_MAJOR = 0.17
-MPD_VERSION = $(MPD_VERSION_MAJOR).6
+MPD_VERSION_MAJOR = 0.18
+MPD_VERSION = $(MPD_VERSION_MAJOR).7
 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
 MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
 MPD_DEPENDENCIES = host-pkgconf libglib2
-MPD_LICENSE = GPLv2
+MPD_LICENSE = GPLv2+
 MPD_LICENSE_FILES = COPYING
 
 # Some options need an explicit --disable or --enable
@@ -82,6 +82,12 @@ else
 MPD_CONF_OPT += --disable-sndfile
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_OPUS),y)
+MPD_DEPENDENCIES += opus
+else
+MPD_CONF_OPT += --disable-opus
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_VORBIS),y)
 MPD_DEPENDENCIES += libvorbis
 else
@@ -100,6 +106,12 @@ else
 MPD_CONF_OPT += --disable-mpc
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y)
+MPD_DEPENDENCIES += yajl
+else
+MPD_CONF_OPT += --disable-soundcloud
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_SQLITE),y)
 MPD_DEPENDENCIES += sqlite
 else
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0
  2014-01-13 22:17 [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0 Gustavo Zacarias
  2014-01-13 22:17 ` [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7 Gustavo Zacarias
@ 2014-01-13 22:22 ` Peter Korsgaard
  1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2014-01-13 22:22 UTC (permalink / raw)
  To: buildroot

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

 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed both, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7
  2014-01-13 22:17 ` [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7 Gustavo Zacarias
@ 2014-01-28 21:54   ` Thomas Petazzoni
  2014-01-28 22:10     ` Gustavo Zacarias
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2014-01-28 21:54 UTC (permalink / raw)
  To: buildroot

Dear Gustavo Zacarias,

On Mon, 13 Jan 2014 19:17:18 -0300, Gustavo Zacarias wrote:

> +	depends on !(BR2_avr32 || BR2_sparc) # gcc too old

Shouldn't we test on the GCC version here instead? There may very well
be modern SPARC toolchains, for example.

Thanks!

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7
  2014-01-28 21:54   ` Thomas Petazzoni
@ 2014-01-28 22:10     ` Gustavo Zacarias
  2014-01-28 22:16       ` Thomas Petazzoni
  0 siblings, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2014-01-28 22:10 UTC (permalink / raw)
  To: buildroot

On 01/28/2014 06:54 PM, Thomas Petazzoni wrote:

>> +	depends on !(BR2_avr32 || BR2_sparc) # gcc too old
> 
> Shouldn't we test on the GCC version here instead? There may very well
> be modern SPARC toolchains, for example.

Probably, but currently we can't check that in external toolchains.
It was a compromise, for LEON (basically the only embedded SPARC out
there) we're stuck with gcc <= 4.4.x and mpd requires >= 4.6.x
The other option for running SPARC is very old Sun hardware which i
don't think anybody really cares about these days.
Removing the condition will leads to somewhat clear errors when building
mpd (it does an #error check in the source).
Regards.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7
  2014-01-28 22:10     ` Gustavo Zacarias
@ 2014-01-28 22:16       ` Thomas Petazzoni
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-01-28 22:16 UTC (permalink / raw)
  To: buildroot

Dear Gustavo Zacarias,

On Tue, 28 Jan 2014 19:10:35 -0300, Gustavo Zacarias wrote:

> >> +	depends on !(BR2_avr32 || BR2_sparc) # gcc too old
> > 
> > Shouldn't we test on the GCC version here instead? There may very well
> > be modern SPARC toolchains, for example.
> 
> Probably, but currently we can't check that in external toolchains.
> It was a compromise, for LEON (basically the only embedded SPARC out
> there) we're stuck with gcc <= 4.4.x and mpd requires >= 4.6.x
> The other option for running SPARC is very old Sun hardware which i
> don't think anybody really cares about these days.
> Removing the condition will leads to somewhat clear errors when building
> mpd (it does an #error check in the source).

Aah, right. Those external toolchains are really a pain, I'm wondering
who is the crazy guy insisting on having support for that in
Buildroot :)

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-01-28 22:16 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-13 22:17 [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0 Gustavo Zacarias
2014-01-13 22:17 ` [Buildroot] [PATCH 2/2] mpd: bump to version 0.18.7 Gustavo Zacarias
2014-01-28 21:54   ` Thomas Petazzoni
2014-01-28 22:10     ` Gustavo Zacarias
2014-01-28 22:16       ` Thomas Petazzoni
2014-01-13 22:22 ` [Buildroot] [PATCH 1/2] mpg123: bump to version 1.17.0 Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox