* Re: [ptxdist] [PATCH] Add Music Player Daemon (MPD) support
2013-08-31 12:57 [ptxdist] [PATCH] Add Music Player Daemon (MPD) support Sascha Hauer
@ 2013-08-31 13:17 ` Alexander Aring
2013-08-31 13:34 ` Sascha Hauer
2013-09-04 7:09 ` Michael Olbrich
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Alexander Aring @ 2013-08-31 13:17 UTC (permalink / raw)
To: ptxdist
Hi Sascha,
cool. MPD is one of my favorites music player!
On Sat, Aug 31, 2013 at 02:57:21PM +0200, Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> rules/mpd.in | 55 ++++++++++++++++++++++++++
> rules/mpd.make | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 176 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..24d63fb
> --- /dev/null
> +++ b/rules/mpd.in
> @@ -0,0 +1,55 @@
> +## SECTION=multimedia_sound
> +
> +menuconfig MPD
> + tristate
> + prompt "Music Player Daemon (MPD) "
> + 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.
...
> +# @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# 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, $(MPD_DIR)/src/mpd, /usr/bin/mpd)
> +
Maybe we should add to install the mpdconf.example from doc directory to
/etc/mpd.conf. Without the conf mpd doesn't start and it's simple to
modify it and put it into the projectroot directory.
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ptxdist] [PATCH] Add Music Player Daemon (MPD) support
2013-08-31 13:17 ` Alexander Aring
@ 2013-08-31 13:34 ` Sascha Hauer
0 siblings, 0 replies; 11+ messages in thread
From: Sascha Hauer @ 2013-08-31 13:34 UTC (permalink / raw)
To: ptxdist
Hi Alex,
On Sat, Aug 31, 2013 at 03:17:53PM +0200, Alexander Aring wrote:
> Hi Sascha,
>
> cool. MPD is one of my favorites music player!
Mine aswell. And together with a USB sound card it's a perfect match for
my beaglebone ;)
> Maybe we should add to install the mpdconf.example from doc directory to
> /etc/mpd.conf. Without the conf mpd doesn't start and it's simple to
> modify it and put it into the projectroot directory.
I thought that in the moment I hit the send button. Yes, I'll add it in
the next version.
Sascha
--
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH] Add Music Player Daemon (MPD) support
2013-08-31 12:57 [ptxdist] [PATCH] Add Music Player Daemon (MPD) support Sascha Hauer
2013-08-31 13:17 ` Alexander Aring
@ 2013-09-04 7:09 ` Michael Olbrich
2013-09-09 8:46 ` Michael Olbrich
2014-05-16 10:05 ` Michael Grzeschik
3 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2013-09-04 7:09 UTC (permalink / raw)
To: ptxdist
On Sat, Aug 31, 2013 at 02:57:21PM +0200, Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> rules/mpd.in | 55 ++++++++++++++++++++++++++
> rules/mpd.make | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 176 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..24d63fb
> --- /dev/null
> +++ b/rules/mpd.in
> @@ -0,0 +1,55 @@
> +## SECTION=multimedia_sound
> +
> +menuconfig MPD
> + tristate
> + prompt "Music Player Daemon (MPD) "
> + 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
Please align the 'if's
> + 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_ALSA
> + prompt "MPD Alsa support"
> + bool
Hmmm, it's the MPD submenu, so saying "MPD ..." everywhere seems a bit
redundant.
> +
> +config MPD_ID3
> + prompt "MPD ID3 support"
> + bool
> +
> +config MPD_MAD
> + prompt "MPD MAD support"
> + bool
> +
> +config MPD_MPG123
> + prompt "MPD MPG123 support"
> + bool
> +
> +config MPD_VORBIS
> + prompt "MPD Vorbis support"
> + bool
> +
> +config MPD_FLAC
> + prompt "MPD FLAC support"
> + bool
> +
> +config MPD_CURL
> + prompt "MPD curl support"
> + bool
> +
> +config MPD_SQLITE
> + prompt "MPD SQLite support"
> + bool
> +
> +endif
> diff --git a/rules/mpd.make b/rules/mpd.make
> new file mode 100644
> index 0000000..d63c325
> --- /dev/null
> +++ b/rules/mpd.make
> @@ -0,0 +1,121 @@
> +# -*-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.17.5
> +MPD_MD5 := b70230c1c810ce85a824332f0ac40a8f
> +MPD := mpd-$(MPD_VERSION)
> +MPD_SUFFIX := tar.gz
> +MPD_URL := http://www.musicpd.org/download/mpd/0.17/$(MPD).$(MPD_SUFFIX)
> +MPD_SOURCE := $(SRCDIR)/$(MPD).$(MPD_SUFFIX)
> +MPD_DIR := $(BUILDDIR)/$(MPD)
> +MPD_LICENSE := unknown
> +
> +# ----------------------------------------------------------------------------
> +# Get
> +# ----------------------------------------------------------------------------
> +
> +#$(MPD_SOURCE):
> +# @$(call targetinfo)
> +# @$(call get, MPD)
> +
remove.
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +MPD_ENABLE-$(PTXCONF_MPD_ALSA) += alsa
> +MPD_ENABLE-$(PTXCONF_MPD_FFMPEG) += ffmpeg
> +MPD_ENABLE-$(PTXCONF_MPD_ID3) += id3
> +MPD_ENABLE-$(PTXCONF_MPD_MAD) += mad
> +MPD_ENABLE-$(PTXCONF_MPD_MPG123) += mpg123
> +MPD_ENABLE-$(PTXCONF_MPD_CURL) += curl
> +MPD_ENABLE-$(PTXCONF_MPD_SQLITE) += sqlite
> +
> +MPD_ENABLEC-y += $(MPD_ENABLE-y)
> +MPD_ENABLEC- += $(MPD_ENABLE-)
> +MPD_ENABLEP-y += $(MPD_ENABLE-y)
You copied that from gstreamer or something like that right?
You don't need this here. just use MPD_ENABLE-* everywhere. The C/P stuff
is for packages with configure switches and modules that are mostly but not
always the same.
> +
> +MPD_CONF_ENV := $(CROSS_ENV)
> +
> +#
> +# autoconf
> +#
> +MPD_CONF_TOOL := autoconf
> +MPD_CONF_OPT := $(CROSS_AUTOCONF_USR)
> +
> +ifneq ($(call remove_quotes,$(MPD_ENABLEC-y)),)
> +MPD_CONF_OPT += --enable-$(subst $(space),$(space)--enable-,$(strip $(MPD_ENABLEC-y)))
> +endif
MPD_CONF_OPT += $(addprefix --enable-,$(MPD_ENABLE-y))
Is probably simpler.
> +
> +ifneq ($(call remove_quotes,$(MPD_ENABLEC-)),)
> +MPD_CONF_OPT += --disable-$(subst $(space),$(space)--disable-,$(strip $(MPD_ENABLEC-)))
> +endif
The same here.
> +
> +$(STATEDIR)/mpd.prepare:
> + @$(call targetinfo)
> + @$(call clean, $(MPD_DIR)/config.cache)
> + cd $(MPD_DIR) && \
> + $(MPD_PATH) $(MPD_CONF_ENV) \
> + ./configure $(MPD_CONF_OPT)
> + @$(call touch)
remove
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/mpd.compile:
> +# @$(call targetinfo)
> +# @$(call world/compile, MPD)
> +# @$(call touch)
> +
remove
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/mpd.install:
> +# @$(call targetinfo)
> +# @$(call world/install, MPD)
> +# @$(call touch)
> +
remove
> +# ----------------------------------------------------------------------------
> +# 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, $(MPD_DIR)/src/mpd, /usr/bin/mpd)
> +
> + @$(call install_finish, mpd)
> +
> + @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/mpd.clean:
> +# @$(call targetinfo)
> +# @$(call clean_pkg, MPD)
> +
remove
Michael
> +# vim: syntax=make
> --
> 1.8.4.rc3
>
>
> --
> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH] Add Music Player Daemon (MPD) support
2013-08-31 12:57 [ptxdist] [PATCH] Add Music Player Daemon (MPD) support Sascha Hauer
2013-08-31 13:17 ` Alexander Aring
2013-09-04 7:09 ` Michael Olbrich
@ 2013-09-09 8:46 ` Michael Olbrich
2014-05-16 10:05 ` Michael Grzeschik
3 siblings, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2013-09-09 8:46 UTC (permalink / raw)
To: ptxdist
On Sat, Aug 31, 2013 at 02:57:21PM +0200, Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> rules/mpd.in | 55 ++++++++++++++++++++++++++
> rules/mpd.make | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 176 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..24d63fb
> --- /dev/null
> +++ b/rules/mpd.in
> @@ -0,0 +1,55 @@
> +## SECTION=multimedia_sound
> +
> +menuconfig MPD
> + tristate
> + prompt "Music Player Daemon (MPD) "
select GLIB
Michael
> + 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_ALSA
> + prompt "MPD Alsa support"
> + bool
> +
> +config MPD_ID3
> + prompt "MPD ID3 support"
> + bool
> +
> +config MPD_MAD
> + prompt "MPD MAD support"
> + bool
> +
> +config MPD_MPG123
> + prompt "MPD MPG123 support"
> + bool
> +
> +config MPD_VORBIS
> + prompt "MPD Vorbis support"
> + bool
> +
> +config MPD_FLAC
> + prompt "MPD FLAC support"
> + bool
> +
> +config MPD_CURL
> + prompt "MPD curl support"
> + bool
> +
> +config MPD_SQLITE
> + prompt "MPD SQLite support"
> + bool
> +
> +endif
> diff --git a/rules/mpd.make b/rules/mpd.make
> new file mode 100644
> index 0000000..d63c325
> --- /dev/null
> +++ b/rules/mpd.make
> @@ -0,0 +1,121 @@
> +# -*-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.17.5
> +MPD_MD5 := b70230c1c810ce85a824332f0ac40a8f
> +MPD := mpd-$(MPD_VERSION)
> +MPD_SUFFIX := tar.gz
> +MPD_URL := http://www.musicpd.org/download/mpd/0.17/$(MPD).$(MPD_SUFFIX)
> +MPD_SOURCE := $(SRCDIR)/$(MPD).$(MPD_SUFFIX)
> +MPD_DIR := $(BUILDDIR)/$(MPD)
> +MPD_LICENSE := unknown
> +
> +# ----------------------------------------------------------------------------
> +# Get
> +# ----------------------------------------------------------------------------
> +
> +#$(MPD_SOURCE):
> +# @$(call targetinfo)
> +# @$(call get, MPD)
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +MPD_ENABLE-$(PTXCONF_MPD_ALSA) += alsa
> +MPD_ENABLE-$(PTXCONF_MPD_FFMPEG) += ffmpeg
> +MPD_ENABLE-$(PTXCONF_MPD_ID3) += id3
> +MPD_ENABLE-$(PTXCONF_MPD_MAD) += mad
> +MPD_ENABLE-$(PTXCONF_MPD_MPG123) += mpg123
> +MPD_ENABLE-$(PTXCONF_MPD_CURL) += curl
> +MPD_ENABLE-$(PTXCONF_MPD_SQLITE) += sqlite
> +
> +MPD_ENABLEC-y += $(MPD_ENABLE-y)
> +MPD_ENABLEC- += $(MPD_ENABLE-)
> +MPD_ENABLEP-y += $(MPD_ENABLE-y)
> +
> +MPD_CONF_ENV := $(CROSS_ENV)
> +
> +#
> +# autoconf
> +#
> +MPD_CONF_TOOL := autoconf
> +MPD_CONF_OPT := $(CROSS_AUTOCONF_USR)
> +
> +ifneq ($(call remove_quotes,$(MPD_ENABLEC-y)),)
> +MPD_CONF_OPT += --enable-$(subst $(space),$(space)--enable-,$(strip $(MPD_ENABLEC-y)))
> +endif
> +
> +ifneq ($(call remove_quotes,$(MPD_ENABLEC-)),)
> +MPD_CONF_OPT += --disable-$(subst $(space),$(space)--disable-,$(strip $(MPD_ENABLEC-)))
> +endif
> +
> +$(STATEDIR)/mpd.prepare:
> + @$(call targetinfo)
> + @$(call clean, $(MPD_DIR)/config.cache)
> + cd $(MPD_DIR) && \
> + $(MPD_PATH) $(MPD_CONF_ENV) \
> + ./configure $(MPD_CONF_OPT)
> + @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/mpd.compile:
> +# @$(call targetinfo)
> +# @$(call world/compile, MPD)
> +# @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/mpd.install:
> +# @$(call targetinfo)
> +# @$(call world/install, MPD)
> +# @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# 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, $(MPD_DIR)/src/mpd, /usr/bin/mpd)
> +
> + @$(call install_finish, mpd)
> +
> + @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/mpd.clean:
> +# @$(call targetinfo)
> +# @$(call clean_pkg, MPD)
> +
> +# vim: syntax=make
> --
> 1.8.4.rc3
>
>
> --
> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH] Add Music Player Daemon (MPD) support
2013-08-31 12:57 [ptxdist] [PATCH] Add Music Player Daemon (MPD) support Sascha Hauer
` (2 preceding siblings ...)
2013-09-09 8:46 ` Michael Olbrich
@ 2014-05-16 10:05 ` Michael Grzeschik
2014-05-16 10:33 ` Alexander Aring
2014-06-02 8:39 ` Michael Olbrich
3 siblings, 2 replies; 11+ messages in thread
From: Michael Grzeschik @ 2014-05-16 10:05 UTC (permalink / raw)
To: ptxdist
From: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
-aligned ifs
-remove MPD in every config section
-removed commented build stages
-used MPD_ENABLE-* where needed
-used simpler addprefix macro
rules/mpd.in | 56 ++++++++++++++++++++++++++++++++++++++++++
rules/mpd.make | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 133 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..742cdd1
--- /dev/null
+++ b/rules/mpd.in
@@ -0,0 +1,56 @@
+## 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_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..d34857f
--- /dev/null
+++ b/rules/mpd.make
@@ -0,0 +1,77 @@
+# -*-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
+# ----------------------------------------------------------------------------
+
+MPD_ENABLE-$(PTXCONF_MPD_ALSA) += alsa
+MPD_ENABLE-$(PTXCONF_MPD_FFMPEG) += ffmpeg
+MPD_ENABLE-$(PTXCONF_MPD_ID3) += id3
+MPD_ENABLE-$(PTXCONF_MPD_MAD) += mad
+MPD_ENABLE-$(PTXCONF_MPD_MPG123) += mpg123
+MPD_ENABLE-$(PTXCONF_MPD_VORBIS) += vorbis
+MPD_ENABLE-$(PTXCONF_MPD_FLAC) += flac
+MPD_ENABLE-$(PTXCONF_MPD_CURL) += curl
+MPD_ENABLE-$(PTXCONF_MPD_SQLITE) += sqlite
+
+MPD_CONF_ENV := $(CROSS_ENV)
+
+#
+# autoconf
+#
+MPD_CONF_TOOL := autoconf
+MPD_CONF_OPT := $(CROSS_AUTOCONF_USR)
+
+ifneq ($(call remove_quotes,$(MPD_ENABLE-y)),)
+MPD_CONF_OPT += $(addprefix --enable-,$(MPD_ENABLE-y))
+endif
+
+ifneq ($(call remove_quotes,$(MPD_ENABLE-)),)
+MPD_CONF_OPT += $(addprefix --disable-,$(MPD_ENABLE-))
+endif
+
+# ----------------------------------------------------------------------------
+# 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, $(MPD_DIR)/src/mpd, /usr/bin/mpd)
+
+ @$(call install_finish, mpd)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.0.0.rc0
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ptxdist] [PATCH] Add Music Player Daemon (MPD) support
2014-05-16 10:05 ` Michael Grzeschik
@ 2014-05-16 10:33 ` Alexander Aring
2014-06-02 8:39 ` Michael Olbrich
1 sibling, 0 replies; 11+ messages in thread
From: Alexander Aring @ 2014-05-16 10:33 UTC (permalink / raw)
To: ptxdist
Hi,
what's about to install the mpd.conf as example?
There is an example conf in the mpd src package.
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH] Add Music Player Daemon (MPD) support
2014-05-16 10:05 ` Michael Grzeschik
2014-05-16 10:33 ` Alexander Aring
@ 2014-06-02 8:39 ` Michael Olbrich
2014-06-07 7:57 ` [ptxdist] [PATCH v3] " Michael Grzeschik
1 sibling, 1 reply; 11+ messages in thread
From: Michael Olbrich @ 2014-06-02 8:39 UTC (permalink / raw)
To: ptxdist
On Fri, May 16, 2014 at 12:05:00PM +0200, Michael Grzeschik wrote:
> From: Sascha Hauer <s.hauer@pengutronix.de>
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> -aligned ifs
> -remove MPD in every config section
> -removed commented build stages
> -used MPD_ENABLE-* where needed
> -used simpler addprefix macro
>
> rules/mpd.in | 56 ++++++++++++++++++++++++++++++++++++++++++
> rules/mpd.make | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 133 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..742cdd1
> --- /dev/null
> +++ b/rules/mpd.in
> @@ -0,0 +1,56 @@
> +## 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_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..d34857f
> --- /dev/null
> +++ b/rules/mpd.make
> @@ -0,0 +1,77 @@
> +# -*-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
> +# ----------------------------------------------------------------------------
> +
> +MPD_ENABLE-$(PTXCONF_MPD_ALSA) += alsa
> +MPD_ENABLE-$(PTXCONF_MPD_FFMPEG) += ffmpeg
> +MPD_ENABLE-$(PTXCONF_MPD_ID3) += id3
> +MPD_ENABLE-$(PTXCONF_MPD_MAD) += mad
> +MPD_ENABLE-$(PTXCONF_MPD_MPG123) += mpg123
> +MPD_ENABLE-$(PTXCONF_MPD_VORBIS) += vorbis
> +MPD_ENABLE-$(PTXCONF_MPD_FLAC) += flac
> +MPD_ENABLE-$(PTXCONF_MPD_CURL) += curl
> +MPD_ENABLE-$(PTXCONF_MPD_SQLITE) += sqlite
This is only useful if both prepare and targetinstall need this.
> +
> +MPD_CONF_ENV := $(CROSS_ENV)
remove
> +
> +#
> +# autoconf
> +#
> +MPD_CONF_TOOL := autoconf
> +MPD_CONF_OPT := $(CROSS_AUTOCONF_USR)
just use ptx/endis here for all.
> +
> +ifneq ($(call remove_quotes,$(MPD_ENABLE-y)),)
> +MPD_CONF_OPT += $(addprefix --enable-,$(MPD_ENABLE-y))
> +endif
> +
> +ifneq ($(call remove_quotes,$(MPD_ENABLE-)),)
> +MPD_CONF_OPT += $(addprefix --disable-,$(MPD_ENABLE-))
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# 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, $(MPD_DIR)/src/mpd, /usr/bin/mpd)
@$(call install_copy, mpd, 0, 0, 0755, -, /usr/bin/mpd)
should work.
Michael
> +
> + @$(call install_finish, mpd)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.0.0.rc0
>
>
> --
> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH v3] Add Music Player Daemon (MPD) support
2014-06-02 8:39 ` Michael Olbrich
@ 2014-06-07 7:57 ` Michael Grzeschik
2014-06-07 19:03 ` Marc Kleine-Budde
2014-06-10 5:42 ` Michael Olbrich
0 siblings, 2 replies; 11+ messages in thread
From: Michael Grzeschik @ 2014-06-07 7:57 UTC (permalink / raw)
To: ptxdist
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 \
+
+# ----------------------------------------------------------------------------
+# 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH v3] Add Music Player Daemon (MPD) support
2014-06-07 7:57 ` [ptxdist] [PATCH v3] " Michael Grzeschik
@ 2014-06-07 19:03 ` Marc Kleine-Budde
2014-06-10 5:42 ` Michael Olbrich
1 sibling, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2014-06-07 19:03 UTC (permalink / raw)
To: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 4998 bytes --]
On 06/07/2014 09:57 AM, 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 \
> +
> +# ----------------------------------------------------------------------------
> +# 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)
0644
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]
[-- Attachment #2: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [ptxdist] [PATCH v3] Add Music Player Daemon (MPD) support
2014-06-07 7:57 ` [ptxdist] [PATCH v3] " Michael Grzeschik
2014-06-07 19:03 ` Marc Kleine-Budde
@ 2014-06-10 5:42 ` Michael Olbrich
1 sibling, 0 replies; 11+ messages in thread
From: Michael Olbrich @ 2014-06-10 5:42 UTC (permalink / raw)
To: ptxdist
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
^ permalink raw reply [flat|nested] 11+ messages in thread