Skip to contentSkip to conversation

package/mpd: bump to version 0.19

PATCH New Jörg Krause 3 participants 4 messages Oct 12, 2014 – Oct 14, 2014

lore
Share & tools
lore

Jörg Krause

author
#0 lore raw

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

Bump to new major version 0.19 and add new dependencies:
* boost
* icu (support for Unicode is enabled by default)

Support for new features will be added by additional patches.

Signed-off-by J?rg Krause <[email protected]>
---
 package/mpd/Config.in | 13 ++++++++++++-
 package/mpd/mpd.mk    | 13 ++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)
package/mpd/Config.in +12 -1
index 8884464..c4a263a 100644
@@ -1,12 +1,14 @@
 menuconfig BR2_PACKAGE_MPD
 	bool "mpd"
+	depends on BR2_LARGEFILE # boost
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # libglib2, flac
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, boost
 	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)

@@ -92,6 +94,15 @@ 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_ICU
+	bool "icu"
+	default y
+	depends on !BR2_BINFMT_FLAT
+	depends on BR2_ARCH_HAS_ATOMICS
+	select BR2_PACKAGE_ICU
+	help
+	  Enable libicu for Unicode support.
+
 config BR2_PACKAGE_MPD_LAME
 	bool "lame"
 	select BR2_PACKAGE_LAME
package/mpd/mpd.mk +10 -3
index 932df08..b98043d 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
 

@@ -175,6 +175,13 @@ else
 MPD_CONF_OPTS += --disable-ffmpeg
 endif
 
+# icu is enabled by default
+ifeq ($(BR2_PACKAGE_MPD_ICU),y)
+MPD_DEPENDENCIES += icu
+else
+MPD_CONF_OPTS += --disable-icu
+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
#1 lore raw

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

Dear J?rg Krause,

package/mpd/Config.in line 3

Quoted 8 lines · J?rg Krause
package/mpd/Config.in +1 -0
index 8884464..c4a263a 100644
@@ -1,12 +1,14 @@
 menuconfig BR2_PACKAGE_MPD
 	bool "mpd"
+	depends on BR2_LARGEFILE # boost

Then the comment at the bottom of mpd's Config.in should be updated as well.

package/mpd/Config.in config BR2_PACKAGE_MPD_FFMPEG · line 98

Quoted 2 lines
package/mpd/Config.in +2 -0
+config BR2_PACKAGE_MPD_ICU
+	bool "icu"

"icu support", or "Unicode support"

package/mpd/Config.in config BR2_PACKAGE_MPD_FFMPEG · line 99

Quoted 1 line
package/mpd/Config.in +1 -0
+	default y

Any reason to enable it by default?

package/mpd/mpd.mk line 8

Quoted 12 lines
package/mpd/mpd.mk +2 -2
index 932df08..b98043d 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)

The MPD_VERSION_MAJOR variable becomes a bit useless, but ok, we can believe that they will do some 0.19.x release in the future.

Quoted 8 lines
package/mpd/mpd.mk +1 -1
 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

package/mpd/mpd.mk else · line 180

Quoted 6 lines
package/mpd/mpd.mk +3 -0
@@ -175,6 +175,13 @@ else
 MPD_CONF_OPTS += --disable-ffmpeg
 endif
 
+# icu is enabled by default
+ifeq ($(BR2_PACKAGE_MPD_ICU),y)
+MPD_DEPENDENCIES += icu

MPD_CONF_OPTS += --enable-icu

package/mpd/mpd.mk else · line 187

Quoted 7 lines
package/mpd/mpd.mk +4 -0
+else
+MPD_CONF_OPTS += --disable-icu
+endif
+
 define MPD_INSTALL_EXTRA_FILES
 	@if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \
 		$(INSTALL) -D package/mpd/mpd.conf \

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

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

Dear Thomas Petazzoni,

Quoted 4 lines · Thomas Petazzoni

Dear J?rg Krause,

On Sun, 12 Oct 2014 21:10:57 +0200, J?rg Krause wrote:

Quoted 11 lines

package/mpd/Config.in line 3

Quoted 8 lines
package/mpd/Config.in +1 -0
index 8884464..c4a263a 100644
@@ -1,12 +1,14 @@
  menuconfig BR2_PACKAGE_MPD
  	bool "mpd"
+	depends on BR2_LARGEFILE # boost

Then the comment at the bottom of mpd's Config.in should be updated as well.

Done.

Quoted 3 lines

package/mpd/Config.in config BR2_PACKAGE_MPD_FFMPEG · line 98

Quoted 2 lines
package/mpd/Config.in +2 -0
+config BR2_PACKAGE_MPD_ICU
+	bool "icu"

"icu support", or "Unicode support"

Done.

Quoted 2 lines

package/mpd/Config.in config BR2_PACKAGE_MPD_FFMPEG · line 99

Quoted 1 line
package/mpd/Config.in +1 -0
+	default y

Any reason to enable it by default?

Unicode support is enabled by default in mpd configure. It has to be disabled by the user. I just wanted to be consistent in the sense of the mpd configure file.

Quoted 8 lines
Quoted 8 lines
package/mpd/mpd.mk +0 -0
index 932df08..b98043d 100644
@@ -4,11 +4,11 @@
  #
  ################################################################################
Quoted 6 lines

package/mpd/mpd.mk line 8

Quoted 4 lines
package/mpd/mpd.mk +2 -2
-MPD_VERSION_MAJOR = 0.18
-MPD_VERSION = $(MPD_VERSION_MAJOR).16
+MPD_VERSION_MAJOR = 0.19
+MPD_VERSION = $(MPD_VERSION_MAJOR)

The MPD_VERSION_MAJOR variable becomes a bit useless, but ok, we can believe that they will do some 0.19.x release in the future.

Yeah, I think so, too.

Quoted 8 lines
Quoted 8 lines
package/mpd/mpd.mk +1 -1
  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
Quoted 8 lines

package/mpd/mpd.mk else · line 180

Quoted 7 lines
package/mpd/mpd.mk +3 -0
@@ -175,6 +175,13 @@ else
  MPD_CONF_OPTS += --disable-ffmpeg
  endif
 
+# icu is enabled by default
+ifeq ($(BR2_PACKAGE_MPD_ICU),y)
+MPD_DEPENDENCIES += icu

MPD_CONF_OPTS += --enable-icu

As described above, icu (unicode support) is enabled by default. But I will add this.

Quoted 8 lines

package/mpd/mpd.mk else · line 187

Quoted 8 lines
package/mpd/mpd.mk +4 -0
+else
+MPD_CONF_OPTS += --disable-icu
+endif
+
  define MPD_INSTALL_EXTRA_FILES
  	@if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \
  		$(INSTALL) -D package/mpd/mpd.conf \

Many thanks for the review!

J?rg

#3 lore raw

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

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?rg" == J?rg Krause <[email protected]> writes:

Hi,

Quoted 6 lines
Quoted 2 lines

package/mpd/Config.in config BR2_PACKAGE_MPD_FFMPEG · line 99

Quoted 1 line
package/mpd/Config.in +1 -0
+	default y

Any reason to enable it by default?

Unicode support is enabled by default in mpd configure. It has to be disabled by the user. I just wanted to be consistent in the sense of the mpd configure file.

We normally try to keep the buildroot configuration as minimal as possible by default. If mpd works sanely without unicode, then this shouldn't be enabled by default.

Signature · 1 line
Bye, Peter Korsgaard