Re: [ptxdist] [PATCH v3] Add Music Player Daemon (MPD) support

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Sat, Jun 07, 2014 at 09:57:44AM +0200, Michael Grzeschik wrote:
> From: Sascha Hauer <s.hauer@pengutronix.de>
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Signed-off-by: Michael Grzeschik <mgr@pengutronix.de>
> ---
> v1..v2
> -aligned ifs
> -remove MPD in every config section
> -removed commented build stages
> -used MPD_ENABLE-* where needed
> -used simpler addprefix macro
> v2..v3
> -removed MPD_ENABLE-*
> -removed MPD_CONF_ENV
> -used ptx/endis instead
> -simplified install_copy for mpd
> -added EXAMPLECONF option
> 
>  rules/mpd.in   | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
>  rules/mpd.make | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 132 insertions(+)
>  create mode 100644 rules/mpd.in
>  create mode 100644 rules/mpd.make
> 
> diff --git a/rules/mpd.in b/rules/mpd.in
> new file mode 100644
> index 0000000..399bde6
> --- /dev/null
> +++ b/rules/mpd.in
> @@ -0,0 +1,61 @@
> +## SECTION=multimedia_sound
> +
> +menuconfig MPD
> +	tristate
> +	prompt "Music Player Daemon (MPD)     "
> +	select GLIB
> +	select ALSA_LIB		if MPD_ALSA
> +	select LIBID3TAG	if MPD_ID3
> +	select LIBMAD		if MPD_MAD
> +	select MPG123		if MPD_MPG123
> +	select LIBOGG		if MPD_VORBIS
> +	select LIBVORBIS	if MPD_VORBIS
> +	select FLAC		if MPD_FLAC
> +	select LIBCURL		if MPD_CURL
> +	select SQLITE		if MPD_SQLITE
> +	help
> +	  Music Player Daemon (MPD) is a flexible, powerful, server-side
> +	  application for playing music. Through plugins and libraries it
> +	  can play a variety of sound files while being controlled by its
> +	  network protocol.
> +
> +if MPD
> +
> +config MPD_EXAMPLECONF
> +	bool
> +	prompt "install /etc/mpd.conf"
> +	default y
> +
> +config MPD_ALSA
> +	prompt "Alsa support"
> +	bool
> +
> +config MPD_ID3
> +	prompt "ID3 support"
> +	bool
> +
> +config MPD_MAD
> +	prompt "MAD support"
> +	bool
> +
> +config MPD_MPG123
> +	prompt "MPG123 support"
> +	bool
> +
> +config MPD_VORBIS
> +	prompt "Vorbis support"
> +	bool
> +
> +config MPD_FLAC
> +	prompt "FLAC support"
> +	bool
> +
> +config MPD_CURL
> +	prompt "curl support"
> +	bool
> +
> +config MPD_SQLITE
> +	prompt "SQLite support"
> +	bool
> +
> +endif
> diff --git a/rules/mpd.make b/rules/mpd.make
> new file mode 100644
> index 0000000..c280630
> --- /dev/null
> +++ b/rules/mpd.make
> @@ -0,0 +1,71 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2013 by Sascha Hauer <s.hauer@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_MPD) += mpd
> +
> +#
> +# Paths and names
> +#
> +MPD_VERSION	:= 0.18.11
> +MPD_MD5		:= 6dd86793ad78d8b502f6721734f87ff7
> +MPD		:= mpd-$(MPD_VERSION)
> +MPD_SUFFIX	:= tar.gz
> +MPD_URL		:= http://www.musicpd.org/download/mpd/0.18/$(MPD).$(MPD_SUFFIX)
> +MPD_SOURCE	:= $(SRCDIR)/$(MPD).$(MPD_SUFFIX)
> +MPD_DIR		:= $(BUILDDIR)/$(MPD)
> +MPD_LICENSE	:= unknown
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +MPD_CONF_TOOL	:= autoconf
> +MPD_CONF_OPT	:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--$(call ptx/endis, PTXCONF_MPD_ALSA)-alsa \
> +	--$(call ptx/endis, PTXCONF_MPD_FFMPEG)-ffmpeg \
> +	--$(call ptx/endis, PTXCONF_MPD_ID3)-id3 \
> +	--$(call ptx/endis, PTXCONF_MPD_MAD)-mad \
> +	--$(call ptx/endis, PTXCONF_MPD_MPG123)-mpg123 \
> +	--$(call ptx/endis, PTXCONF_MPD_VORBIS)-vorbis \
> +	--$(call ptx/endis, PTXCONF_MPD_FLAC)-flac \
> +	--$(call ptx/endis, PTXCONF_MPD_CURL)-curl \
> +	--$(call ptx/endis, PTXCONF_MPD_SQLITE)-sqlite \

I did some more testing and noticed, that there are a lot more optional
features here. You need to add the appropriate configure option for all of
them. There is no need to make everything configurable but you need to
explicitly disable the rest.

Michael

> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/mpd.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, mpd)
> +	@$(call install_fixup, mpd,PRIORITY,optional)
> +	@$(call install_fixup, mpd,SECTION,base)
> +	@$(call install_fixup, mpd,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
> +	@$(call install_fixup, mpd,DESCRIPTION,missing)
> +
> +	@$(call install_copy, mpd, 0, 0, 0755, -, /usr/bin/mpd)
> +
> +ifdef PTXCONF_MPD_EXAMPLECONF
> +	@$(call install_copy, mpd, 0, 0, 0755, $(MPD_PKGDIR)/usr/share/doc/mpd/mpdconf.example, /etc/mpd.conf)
> +endif
> +
> +	@$(call install_finish, mpd)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.0.0.rc2
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de