Skip to contentSkip to conversation

Added mpd-mpc, mpc client to mpd

PATCH New Thierry Bultel 3 participants 7 messages Dec 12, 2014 – Jan 10, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 Added mpd-mpc, mpc client to mpd

---

Changes v2 -> v3
- dependency to host-pkgconf (noticed by J?rg Krause)
- optional dependency to libiconv
- configure environnement for C99 compiler

Changes v1 -> v2
- No needed dependency to mpd (suggested by Thomas)
- Added hash and license information

---
 package/Config.in            |  1 +
 package/mpd-mpc/Config.in    |  7 +++++++
 package/mpd-mpc/mpd-mpc.hash |  2 ++
 package/mpd-mpc/mpd-mpc.mk   | 23 +++++++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 package/mpd-mpc/Config.in
 create mode 100644 package/mpd-mpc/mpd-mpc.hash
 create mode 100644 package/mpd-mpc/mpd-mpc.mk
package/Config.in +1 -0
index dd3a46e..74ac5b1 100644
@@ -19,6 +19,7 @@ menu "Audio and video applications"
 	source "package/madplay/Config.in"
 	source "package/modplugtools/Config.in"
 	source "package/mpd/Config.in"
+	source "package/mpd-mpc/Config.in"
 	source "package/mpg123/Config.in"
 	source "package/mplayer/Config.in"
 	source "package/musepack/Config.in"
package/mpd-mpc/Config.in new file +7 -0
new file mode 100644
index 0000000..1debc83
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MPD_MPC
+	bool "mpd-mpc"
+	select BR2_PACKAGE_LIBMPDCLIENT
+	help
+	  A minimalist command line interface to MPD.
+
+	  http://www.musicpd.org/clients/mpc/
package/mpd-mpc/mpd-mpc.hash new file +2 -0
new file mode 100644
index 0000000..d1fa7b1
@@ -0,0 +1,2 @@
+# No upstream hashes for the following:
+sha1 dd1577cfff1d8324bc27c97fb26d88b845118800  mpc-0.26.tar.xz
package/mpd-mpc/mpd-mpc.mk new file +23 -0
new file mode 100644
index 0000000..70eab69
@@ -0,0 +1,23 @@
+################################################################################
+#
+# mpd-mpc
+#
+################################################################################
+
+MPD_MPC_VERSION_MAJOR = 0
+MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).26
+MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR)
+MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz
+MPD_MPC_LICENSE = GPLv2+
+MPD_MPC_LICENSE_FILES = COPYING
+MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient
+MPD_MPC_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+MPD_MPC_DEPENDENCIES += libiconv
+MPD_MPC_CONF_OPTS += --enable-iconv
+else
+MPD_MPC_CONF_OPTS += --disable-iconv
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.9.1
#1 lore raw

PATCH v3 2/2 mpd: group client and libraries under the same menu

---
 package/Config.in     |  6 ------
 package/mpd/Config.in | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)
package/Config.in +0 -6
index 74ac5b1..3339ca5 100644
@@ -19,11 +19,9 @@ menu "Audio and video applications"
 	source "package/madplay/Config.in"
 	source "package/modplugtools/Config.in"
 	source "package/mpd/Config.in"
-	source "package/mpd-mpc/Config.in"
 	source "package/mpg123/Config.in"
 	source "package/mplayer/Config.in"
 	source "package/musepack/Config.in"
-	source "package/ncmpc/Config.in"
 	source "package/on2-8170-libs/Config.in"
 	source "package/opus-tools/Config.in"
 	source "package/pulseaudio/Config.in"
@@ -31,13 +29,11 @@ menu "Audio and video applications"
 	source "package/tidsp-binaries/Config.in"
 	source "package/tstools/Config.in"
 	source "package/twolame/Config.in"
-	source "package/upmpdcli/Config.in"
 	source "package/vlc/Config.in"
 	source "package/vorbis-tools/Config.in"
 	source "package/wavpack/Config.in"
 	source "package/xbmc/Config.in"
 	source "package/yavta/Config.in"
-	source "package/ympd/Config.in"
 endmenu
 
 menu "Compressors and decompressors"
@@ -571,8 +567,6 @@ menu "Audio/Sound"
 	source "package/liblo/Config.in"
 	source "package/libmad/Config.in"
 	source "package/libmodplug/Config.in"
-	source "package/libmpd/Config.in"
-	source "package/libmpdclient/Config.in"
 	source "package/libreplaygain/Config.in"
 	source "package/libsamplerate/Config.in"
 	source "package/libsndfile/Config.in"
package/mpd/Config.in +21 -0
index 0e115f6..a885a17 100644
@@ -1,3 +1,5 @@
+menu "mpd"
+
 menuconfig BR2_PACKAGE_MPD
 	bool "mpd"
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -309,8 +311,27 @@ config BR2_PACKAGE_MPD_UPNP
 
 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
+
+menu "mpd frontends"
+	source "package/upmpdcli/Config.in"
+endmenu
+
+menu "mpd libraries"
+	source "package/libmpd/Config.in"
+	source "package/libmpdclient/Config.in"
+endmenu
+
+menu "mpd clients"
+	source "package/mpd-mpc/Config.in"
+	source "package/ncmpc/Config.in"
+	source "package/ympd/Config.in"
+endmenu
+
+endmenu
Signature · 1 line
1.9.1
#2 lore raw

PATCH v3 2/2 mpd: group client and libraries under the same menu

Quoted 67 lines · Thierry Bultel
package/Config.in +0 -6
index 74ac5b1..3339ca5 100644
@@ -19,11 +19,9 @@ menu "Audio and video applications"
        source "package/madplay/Config.in"
        source "package/modplugtools/Config.in"
        source "package/mpd/Config.in"
-       source "package/mpd-mpc/Config.in"
        source "package/mpg123/Config.in"
        source "package/mplayer/Config.in"
        source "package/musepack/Config.in"
-       source "package/ncmpc/Config.in"
        source "package/on2-8170-libs/Config.in"
        source "package/opus-tools/Config.in"
        source "package/pulseaudio/Config.in"
@@ -31,13 +29,11 @@ menu "Audio and video applications"
        source "package/tidsp-binaries/Config.in"
        source "package/tstools/Config.in"
        source "package/twolame/Config.in"
-       source "package/upmpdcli/Config.in"
        source "package/vlc/Config.in"
        source "package/vorbis-tools/Config.in"
        source "package/wavpack/Config.in"
        source "package/xbmc/Config.in"
        source "package/yavta/Config.in"
-       source "package/ympd/Config.in"
 endmenu
 
 menu "Compressors and decompressors"
@@ -571,8 +567,6 @@ menu "Audio/Sound"
        source "package/liblo/Config.in"
        source "package/libmad/Config.in"
        source "package/libmodplug/Config.in"
-       source "package/libmpd/Config.in"
-       source "package/libmpdclient/Config.in"
        source "package/libreplaygain/Config.in"
        source "package/libsamplerate/Config.in"
        source "package/libsndfile/Config.in"
package/mpd/Config.in +11 -0
index 0e115f6..a885a17 100644
@@ -1,3 +1,5 @@
+menu "mpd"
+
 menuconfig BR2_PACKAGE_MPD
        bool "mpd"
        depends on BR2_INSTALL_LIBSTDCPP
@@ -309,8 +311,27 @@ config BR2_PACKAGE_MPD_UPNP
 
 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
+
+menu "mpd frontends"
+       source "package/upmpdcli/Config.in"
+endmenu
+
+menu "mpd libraries"
+       source "package/libmpd/Config.in"

package/mpd/Config.in config BR2_PACKAGE_MPD_UPNP · line 337

Quoted 10 lines
package/mpd/Config.in +10 -0
+       source "package/libmpdclient/Config.in"
+endmenu
+
+menu "mpd clients"
+       source "package/mpd-mpc/Config.in"
+       source "package/ncmpc/Config.in"
+       source "package/ympd/Config.in"
+endmenu
+
+endmenu

Thinking about this again and trying this patch, I suggest we leave it as it is. It is not in the sense of Buildroot, because these are individual packages and not package options. But many thanks for the effort!

Btw: This patch should be a seperate patch, there was no v1 or v2 for this one.

#3 lore raw

PATCH v3 2/2 mpd: group client and libraries under the same menu

Le 13/12/2014 00:55, J?rg Krause a ?crit :

Quoted 75 lines · Thierry Bultel
Quoted 74 lines
package/Config.in +0 -6
index 74ac5b1..3339ca5 100644
@@ -19,11 +19,9 @@ menu "Audio and video applications"
         source "package/madplay/Config.in"
         source "package/modplugtools/Config.in"
         source "package/mpd/Config.in"
-       source "package/mpd-mpc/Config.in"
         source "package/mpg123/Config.in"
         source "package/mplayer/Config.in"
         source "package/musepack/Config.in"
-       source "package/ncmpc/Config.in"
         source "package/on2-8170-libs/Config.in"
         source "package/opus-tools/Config.in"
         source "package/pulseaudio/Config.in"
@@ -31,13 +29,11 @@ menu "Audio and video applications"
         source "package/tidsp-binaries/Config.in"
         source "package/tstools/Config.in"
         source "package/twolame/Config.in"
-       source "package/upmpdcli/Config.in"
         source "package/vlc/Config.in"
         source "package/vorbis-tools/Config.in"
         source "package/wavpack/Config.in"
         source "package/xbmc/Config.in"
         source "package/yavta/Config.in"
-       source "package/ympd/Config.in"
  endmenu
 
  menu "Compressors and decompressors"
@@ -571,8 +567,6 @@ menu "Audio/Sound"
         source "package/liblo/Config.in"
         source "package/libmad/Config.in"
         source "package/libmodplug/Config.in"
-       source "package/libmpd/Config.in"
-       source "package/libmpdclient/Config.in"
         source "package/libreplaygain/Config.in"
         source "package/libsamplerate/Config.in"
         source "package/libsndfile/Config.in"
package/mpd/Config.in +18 -0
index 0e115f6..a885a17 100644
@@ -1,3 +1,5 @@
+menu "mpd"
+
  menuconfig BR2_PACKAGE_MPD
         bool "mpd"
         depends on BR2_INSTALL_LIBSTDCPP
@@ -309,8 +311,27 @@ config BR2_PACKAGE_MPD_UPNP
 
  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
+
+menu "mpd frontends"
+       source "package/upmpdcli/Config.in"
+endmenu
+
+menu "mpd libraries"
+       source "package/libmpd/Config.in"
+       source "package/libmpdclient/Config.in"
+endmenu
+
+menu "mpd clients"
+       source "package/mpd-mpc/Config.in"
+       source "package/ncmpc/Config.in"
+       source "package/ympd/Config.in"
Quoted 9 lines

package/mpd/Config.in config BR2_PACKAGE_MPD_UPNP · line 329

Quoted 3 lines
package/mpd/Config.in +3 -0
+endmenu
+
+endmenu

Thinking about this again and trying this patch, I suggest we leave it as it is. It is not in the sense of Buildroot, because these are individual packages and not package options. But many thanks for the effort!

with the patch, they keep independent, but are just under a "mpd" menu.

Quoted 3 lines

Btw: This patch should be a seperate patch, there was no v1 or v2 for this one.

yes, I was asking myself how to do, because patch 2 is dependent of patch 1 (need the mpd-mpc line).

#4 lore raw

PATCH v3 2/2 mpd: group client and libraries under the same menu

In reply to Thierry Bultel

Dear Thierry Bultel,

Quoted 5 lines · Thierry Bultel
---
 package/Config.in     |  6 ------
 package/mpd/Config.in | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

We don't typically try to create categories for such a small number of packages. I've asked Yann and Gustavo, and they agree with this opinion. So I'm sorry, but we'll reject this patch.

Best regards,

Thomas

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

PATCH v3 1/2 Added mpd-mpc, mpc client to mpd

In reply to Thierry Bultel
Quoted 7 lines · Thierry Bultel

---

Changes v2 -> v3
- dependency to host-pkgconf (noticed by J?rg Krause)
- optional dependency to libiconv
- configure environnement for C99 compiler

Quoted 5 lines

Changes v1 -> v2
- No needed dependency to mpd (suggested by Thomas)
- Added hash and license information

Looks good to me!

Builds successfully on ARM target with musl.

#6 lore raw

PATCH v3 1/2 Added mpd-mpc, mpc client to mpd

In reply to Thierry Bultel

Dear Thierry Bultel,

Quoted 7 lines · Thierry Bultel

---

Changes v2 -> v3
- dependency to host-pkgconf (noticed by J?rg Krause)
- optional dependency to libiconv
- configure environnement for C99 compiler

Quoted 5 lines

Changes v1 -> v2
- No needed dependency to mpd (suggested by Thomas)
- Added hash and license information

Committed, thanks, with a few changes:

[Thomas:
- Changed hash file to use SHA256
- Remove libiconv handling, since the iconv detection in mpc is
broken: if it's not available in the C library, it expects to find iconv() in libintl (from gettext). But it's actually libiconv that provides iconv() for non-locale capable uClibc toolchains. But since anyway the package builds fine without iconv() support and properly detects when it's available, don't bother with this.]

If you can report to upstream the libiconv detection problem, it would be good.

Thanks,

Thomas

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