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

2014-05-16 Thread Michael Grzeschik
From: Sascha Hauer s.ha...@pengutronix.de

Signed-off-by: Sascha Hauer s.ha...@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 000..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 LIBID3TAGif MPD_ID3
+   select LIBMAD   if MPD_MAD
+   select MPG123   if MPD_MPG123
+   select LIBOGG   if MPD_VORBIS
+   select LIBVORBISif 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 000..d34857f
--- /dev/null
+++ b/rules/mpd.make
@@ -0,0 +1,77 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2013 by Sascha Hauer s.ha...@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.ha...@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


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

2013-09-09 Thread Michael Olbrich
On Sat, Aug 31, 2013 at 02:57:21PM +0200, Sascha Hauer wrote:
 Signed-off-by: Sascha Hauer s.ha...@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 000..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 000..d63c325
 --- /dev/null
 +++ b/rules/mpd.make
 @@ -0,0 +1,121 @@
 +# -*-makefile-*-
 +#
 +# Copyright (C) 2013 by Sascha Hauer s.ha...@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)

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

2013-08-31 Thread Sascha Hauer
Signed-off-by: Sascha Hauer s.ha...@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 000..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.
+
+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 000..d63c325
--- /dev/null
+++ b/rules/mpd.make
@@ -0,0 +1,121 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2013 by Sascha Hauer s.ha...@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, 

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

2013-08-31 Thread Alexander Aring
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.ha...@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 000..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.ha...@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


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

2013-08-31 Thread Sascha Hauer
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- |

-- 
ptxdist mailing list
ptxdist@pengutronix.de