* [Buildroot] [PATCH 01/10] mpg123: install to staging
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-19 22:52 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 02/10] libsndfile: bump to version 1.0.23 Gustavo Zacarias
` (8 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
I want this for mpd which is coming since it's better than mad IMHO.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/mpg123/mpg123.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index ddd891f..f6eaddb 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -8,6 +8,7 @@ MPG123_VERSION = 1.13.1
MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
+MPG123_INSTALL_STAGING = YES
MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu)
ifeq ($(BR2_arm),y)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 02/10] libsndfile: bump to version 1.0.23
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
2011-01-18 16:54 ` [Buildroot] [PATCH 01/10] mpg123: install to staging Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-19 22:52 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 03/10] libmad: install pkgconfig file Gustavo Zacarias
` (7 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/libsndfile/libsndfile.mk | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk
index acc0d1c..d554699 100644
--- a/package/multimedia/libsndfile/libsndfile.mk
+++ b/package/multimedia/libsndfile/libsndfile.mk
@@ -3,10 +3,9 @@
# libsndfile
#
#############################################################
-LIBSNDFILE_VERSION:=1.0.18
-LIBSNDFILE_SOURCE:=libsndfile-$(LIBSNDFILE_VERSION).tar.gz
-LIBSNDFILE_SITE:=http://www.mega-nerd.com/libsndfile
-LIBSNDFILE_LIBTOOL_PATCH:=NO
-LIBSNDFILE_INSTALL_STAGING:=YES
+
+LIBSNDFILE_VERSION = 1.0.23
+LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
+LIBSNDFILE_INSTALL_STAGING = YES
$(eval $(call AUTOTARGETS,package/multimedia,libsndfile))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 03/10] libmad: install pkgconfig file
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
2011-01-18 16:54 ` [Buildroot] [PATCH 01/10] mpg123: install to staging Gustavo Zacarias
2011-01-18 16:54 ` [Buildroot] [PATCH 02/10] libsndfile: bump to version 1.0.23 Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-20 8:53 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 04/10] wavpack: new package Gustavo Zacarias
` (6 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Make libmad install mad.pc into staging and target.
Needed for mpd.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/libmad/libmad.mk | 21 ++++++++++++++++-----
package/multimedia/libmad/mad.pc | 11 +++++++++++
2 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 package/multimedia/libmad/mad.pc
diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk
index ae83725..d129aad 100644
--- a/package/multimedia/libmad/libmad.mk
+++ b/package/multimedia/libmad/libmad.mk
@@ -4,18 +4,29 @@
#
#############################################################
-LIBMAD_VERSION=0.15.1b
-LIBMAD_SOURCE=libmad-$(LIBMAD_VERSION).tar.gz
-LIBMAD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad/
-LIBMAD_INSTALL_STAGING=YES
-LIBMAD_LIBTOOL_PATCH=NO
+LIBMAD_VERSION = 0.15.1b
+LIBMAD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad/
+LIBMAD_INSTALL_STAGING = YES
+LIBMAD_LIBTOOL_PATCH = NO
define LIBMAD_PREVENT_AUTOMAKE
# Prevent automake from running.
(cd $(@D); touch -c config* aclocal.m4 Makefile*);
endef
+define LIBMAD_INSTALL_STAGING_PC
+ $(INSTALL) -D package/multimedia/libmad/mad.pc \
+ $(STAGING_DIR)/usr/lib/pkgconfig/mad.pc
+endef
+
+define LIBMAD_INSTALL_TARGET_PC
+ $(INSTALL) -D package/multimedia/libmad/mad.pc \
+ $(TARGET_DIR)/usr/lib/pkgconfig/mad.pc
+endef
+
LIBMAD_POST_PATCH_HOOKS += LIBMAD_PREVENT_AUTOMAKE
+LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC
+LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
LIBMAD_CONF_OPT = \
--disable-debugging \
diff --git a/package/multimedia/libmad/mad.pc b/package/multimedia/libmad/mad.pc
new file mode 100644
index 0000000..d1b4801
--- /dev/null
+++ b/package/multimedia/libmad/mad.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: mad
+Description: MPEG Audio Decoder
+Requires:
+Version: 0.15.1b
+Libs: -L${libdir} -lmad -lm
+Cflags: -I${includedir}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 03/10] libmad: install pkgconfig file
2011-01-18 16:54 ` [Buildroot] [PATCH 03/10] libmad: install pkgconfig file Gustavo Zacarias
@ 2011-01-20 8:53 ` Peter Korsgaard
2011-01-20 8:56 ` Peter Korsgaard
0 siblings, 1 reply; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 8:53 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> new file mode 100644
Gustavo> index 0000000..d1b4801
Gustavo> --- /dev/null
Gustavo> +++ b/package/multimedia/libmad/mad.pc
Gustavo> @@ -0,0 +1,11 @@
Gustavo> +prefix=/usr
Gustavo> +exec_prefix=${prefix}
Gustavo> +libdir=${exec_prefix}/lib
Gustavo> +includedir=${prefix}/include
Gustavo> +
Gustavo> +Name: mad
Gustavo> +Description: MPEG Audio Decoder
Gustavo> +Requires:
Gustavo> +Version: 0.15.1b
Gustavo> +Libs: -L${libdir} -lmad -lm
Do we really need -lm? It's not in mad.pc on my Debian machine, and I
don't see any use of math.h in libmad.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 04/10] wavpack: new package
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
` (2 preceding siblings ...)
2011-01-18 16:54 ` [Buildroot] [PATCH 03/10] libmad: install pkgconfig file Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-20 12:13 ` Peter Korsgaard
2011-01-20 12:19 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 05/10] libsamplerate: " Gustavo Zacarias
` (5 subsequent siblings)
9 siblings, 2 replies; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Add new wavpack package, another lossless codec like flac.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/Config.in | 1 +
package/multimedia/wavpack/Config.in | 10 ++++++++++
package/multimedia/wavpack/wavpack.mk | 12 ++++++++++++
3 files changed, 23 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/wavpack/Config.in
create mode 100644 package/multimedia/wavpack/wavpack.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 6d2cbc7..ba6c927 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -33,4 +33,5 @@ source "package/multimedia/taglib/Config.in"
source "package/multimedia/tremor/Config.in"
source "package/multimedia/vlc/Config.in"
source "package/multimedia/vorbis-tools/Config.in"
+source "package/multimedia/wavpack/Config.in"
endmenu
diff --git a/package/multimedia/wavpack/Config.in b/package/multimedia/wavpack/Config.in
new file mode 100644
index 0000000..e18e6e7
--- /dev/null
+++ b/package/multimedia/wavpack/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_WAVPACK
+ bool "wavpack"
+ help
+ WavPack is a completely open audio compression format providing
+ lossless, high-quality lossy, and a unique hybrid compression mode.
+
+ Works on softfloat but it's not recommended since it uses
+ a big deal of CPU power.
+
+ http://www.wavpack.com/
diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk
new file mode 100644
index 0000000..28e2c31
--- /dev/null
+++ b/package/multimedia/wavpack/wavpack.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# wavpack
+#
+################################################################################
+
+WAVPACK_VERSION = 4.60.1
+WAVPACK_SITE = http://www.wavpack.com
+WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2
+WAVPACK_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package/multimedia,wavpack))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 04/10] wavpack: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 04/10] wavpack: new package Gustavo Zacarias
@ 2011-01-20 12:13 ` Peter Korsgaard
2011-01-20 12:19 ` Peter Korsgaard
1 sibling, 0 replies; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 12:13 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Add new wavpack package, another lossless codec like flac.
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/multimedia/Config.in | 1 +
Gustavo> package/multimedia/wavpack/Config.in | 10 ++++++++++
Gustavo> package/multimedia/wavpack/wavpack.mk | 12 ++++++++++++
Gustavo> 3 files changed, 23 insertions(+), 0 deletions(-)
Gustavo> create mode 100644 package/multimedia/wavpack/Config.in
Gustavo> create mode 100644 package/multimedia/wavpack/wavpack.mk
It seems like it needs iconv:
checking for ANSI C header files... (cached) yes
checking for cos in -lm... yes
checking host system type... (cached) powerpc-unknown-linux-gnu
checking iconv.h usability... no
checking iconv.h presence... no
checking for iconv.h... no
configure: error: Can't find iconv headers.
make[1]: ***
[/home/peko/source/buildroot/output2/build/wavpack-4.60.1/.stamp_configured]
Error 1
Care to fix and resend?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 04/10] wavpack: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 04/10] wavpack: new package Gustavo Zacarias
2011-01-20 12:13 ` Peter Korsgaard
@ 2011-01-20 12:19 ` Peter Korsgaard
2011-01-20 13:15 ` Gustavo Zacarias
1 sibling, 1 reply; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 12:19 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Hi,
Gustavo> +++ b/package/multimedia/wavpack/Config.in
Gustavo> @@ -0,0 +1,10 @@
Gustavo> +config BR2_PACKAGE_WAVPACK
Gustavo> + bool "wavpack"
Gustavo> + help
Gustavo> + WavPack is a completely open audio compression format providing
Gustavo> + lossless, high-quality lossy, and a unique hybrid compression mode.
Gustavo> +
Gustavo> + Works on softfloat but it's not recommended since it uses
Gustavo> + a big deal of CPU power.
CPUs without HW FPU are not necessarily low performance for integer
calculations. I don't know anything about wavpack, but from the
wikipedia page it seems like it doesn't use much FPU:
No floating-point arithmetic is used in WavPack's data path because,
according to the author, integer operations are less susceptible to
subtle chip-to-chip variations that could corrupt the lossless nature of
the compression (the Pentium floating point bug being an example). It is
possible that a lossless compressor that used floating-point math could
generate different output when running on that faulty Pentium. Even
disregarding actual bugs, floating-point math is complicated enough that
there could be subtle differences between "correct" implementations that
could cause trouble for this type of application.
So I would just drop this sentence.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 04/10] wavpack: new package
2011-01-20 12:19 ` Peter Korsgaard
@ 2011-01-20 13:15 ` Gustavo Zacarias
0 siblings, 0 replies; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-20 13:15 UTC (permalink / raw)
To: buildroot
On 01/20/11 09:19, Peter Korsgaard wrote:
> CPUs without HW FPU are not necessarily low performance for integer
> calculations. I don't know anything about wavpack, but from the
> wikipedia page it seems like it doesn't use much FPU:
>
> No floating-point arithmetic is used in WavPack's data path because,
> according to the author, integer operations are less susceptible to
> subtle chip-to-chip variations that could corrupt the lossless nature of
> the compression (the Pentium floating point bug being an example). It is
> possible that a lossless compressor that used floating-point math could
> generate different output when running on that faulty Pentium. Even
> disregarding actual bugs, floating-point math is complicated enough that
> there could be subtle differences between "correct" implementations that
> could cause trouble for this type of application.
>
> So I would just drop this sentence.
Fair enough, armv4t @ 200 mhz seems to handle it OK at ~50% CPU load.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 05/10] libsamplerate: new package
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
` (3 preceding siblings ...)
2011-01-18 16:54 ` [Buildroot] [PATCH 04/10] wavpack: new package Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-20 12:22 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 06/10] libcuefile: " Gustavo Zacarias
` (4 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/Config.in | 1 +
package/multimedia/libsamplerate/Config.in | 9 +++++++++
package/multimedia/libsamplerate/libsamplerate.mk | 17 +++++++++++++++++
3 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/libsamplerate/Config.in
create mode 100644 package/multimedia/libsamplerate/libsamplerate.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index ba6c927..cf44d64 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -20,6 +20,7 @@ source "package/multimedia/libmms/Config.in"
source "package/multimedia/libmpd/Config.in"
source "package/multimedia/libmpeg2/Config.in"
source "package/multimedia/libogg/Config.in"
+source "package/multimedia/libsamplerate/Config.in"
source "package/multimedia/libsndfile/Config.in"
source "package/multimedia/libtheora/Config.in"
source "package/multimedia/libvorbis/Config.in"
diff --git a/package/multimedia/libsamplerate/Config.in b/package/multimedia/libsamplerate/Config.in
new file mode 100644
index 0000000..4333b82
--- /dev/null
+++ b/package/multimedia/libsamplerate/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBSAMPLERATE
+ bool "libsamplerate"
+ help
+ Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter
+ for audio. One example of where such a thing would be useful
+ is converting audio from the CD sample rate of 44.1kHz
+ to the 48kHz sample rate used by DAT players.
+
+ http://www.mega-nerd.com/SRC/
diff --git a/package/multimedia/libsamplerate/libsamplerate.mk b/package/multimedia/libsamplerate/libsamplerate.mk
new file mode 100644
index 0000000..94b07a4
--- /dev/null
+++ b/package/multimedia/libsamplerate/libsamplerate.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libsamplerate
+#
+################################################################################
+
+LIBSAMPLERATE_VERSION = 0.1.7
+LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
+LIBSAMPLERATE_INSTALL_STAGING = YES
+LIBSAMPLERATE_DEPENDENCIES = host-pkg-config
+LIBSAMPLERATE_CONF_OPT = --disable-fftw --program-transform-name=''
+
+ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
+LIBSAMPLERATE_DEPENDENCIES += libsndfile
+endif
+
+$(eval $(call AUTOTARGETS,package/multimedia,libsamplerate))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 05/10] libsamplerate: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 05/10] libsamplerate: " Gustavo Zacarias
@ 2011-01-20 12:22 ` Peter Korsgaard
0 siblings, 0 replies; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 12:22 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/multimedia/Config.in | 1 +
Gustavo> package/multimedia/libsamplerate/Config.in | 9 +++++++++
Gustavo> package/multimedia/libsamplerate/libsamplerate.mk | 17 +++++++++++++++++
Gustavo> +++ b/package/multimedia/libsamplerate/Config.in
Gustavo> @@ -0,0 +1,9 @@
Gustavo> +config BR2_PACKAGE_LIBSAMPLERATE
Gustavo> + bool "libsamplerate"
Gustavo> + help
Gustavo> + Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter
Gustavo> + for audio. One example of where such a thing would be useful
Gustavo> + is converting audio from the CD sample rate of 44.1kHz
Gustavo> + to the 48kHz sample rate used by DAT players.
You have a long line / trailing spaces her, but I've fixed
that. Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 06/10] libcuefile: new package
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
` (4 preceding siblings ...)
2011-01-18 16:54 ` [Buildroot] [PATCH 05/10] libsamplerate: " Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-20 12:46 ` Peter Korsgaard
2011-01-20 20:29 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 07/10] libreplaygain: " Gustavo Zacarias
` (3 subsequent siblings)
9 siblings, 2 replies; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/Config.in | 1 +
package/multimedia/libcuefile/Config.in | 6 ++++
package/multimedia/libcuefile/libcuefile.mk | 41 +++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/libcuefile/Config.in
create mode 100644 package/multimedia/libcuefile/libcuefile.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index cf44d64..60105fc 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -12,6 +12,7 @@ source "package/multimedia/gst-plugins-bad/Config.in"
source "package/multimedia/gst-plugins-ugly/Config.in"
source "package/multimedia/libao/Config.in"
source "package/multimedia/libcdaudio/Config.in"
+source "package/multimedia/libcuefile/Config.in"
source "package/multimedia/libdvdread/Config.in"
source "package/multimedia/libdvdnav/Config.in"
source "package/multimedia/libid3tag/Config.in"
diff --git a/package/multimedia/libcuefile/Config.in b/package/multimedia/libcuefile/Config.in
new file mode 100644
index 0000000..416b3e1
--- /dev/null
+++ b/package/multimedia/libcuefile/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBCUEFILE
+ bool "libcuefile"
+ help
+ Cue File library from Musepack
+
+ http://www.musepack.net/
diff --git a/package/multimedia/libcuefile/libcuefile.mk b/package/multimedia/libcuefile/libcuefile.mk
new file mode 100644
index 0000000..728d6d0
--- /dev/null
+++ b/package/multimedia/libcuefile/libcuefile.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# libcuefile
+#
+################################################################################
+
+LIBCUEFILE_VERSION = r453
+LIBCUEFILE_SITE = http://files.musepack.net/source
+LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz
+LIBCUEFILE_DEPENDENCIES = host-cmake
+LIBCUEFILE_INSTALL_STAGING = YES
+
+# CMake doesn't support having the --sysroot option directly in the
+# compiler path, so move this option to the CFLAGS/CXXFLAGS variables.
+LIBCUEFILE_TARGET_CC = $(filter-out --sysroot=%,$(TARGET_CC))
+LIBCUEFILE_TARGET_CFLAGS = $(filter --sysroot=%,$(TARGET_CC)) $(TARGET_CFLAGS)
+
+define LIBCUEFILE_CONFIGURE_CMDS
+ (cd $(@D) ; \
+ $(HOST_DIR)/usr/bin/cmake . \
+ -DCMAKE_C_COMPILER:FILEPATH="$(LIBCUEFILE_TARGET_CC)" \
+ -DCMAKE_C_FLAGS:STRING="$(LIBCUEFILE_TARGET_CFLAGS)" \
+ -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
+ )
+endef
+
+define LIBCUEFILE_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define LIBCUEFILE_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install
+ cp -r $(@D)/include $(STAGING_DIR)/usr
+endef
+
+define LIBCUEFILE_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+ cp -r $(@D)/include $(TARGET_DIR)/usr
+endef
+
+$(eval $(call GENTARGETS,package/multimedia,libcuefile))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 06/10] libcuefile: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 06/10] libcuefile: " Gustavo Zacarias
@ 2011-01-20 12:46 ` Peter Korsgaard
2011-01-20 12:55 ` Gustavo Zacarias
2011-01-20 20:29 ` Peter Korsgaard
1 sibling, 1 reply; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 12:46 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/multimedia/Config.in | 1 +
Gustavo> package/multimedia/libcuefile/Config.in | 6 ++++
Gustavo> package/multimedia/libcuefile/libcuefile.mk | 41 +++++++++++++++++++++++++++
Gustavo> 3 files changed, 48 insertions(+), 0 deletions(-)
Gustavo> create mode 100644 package/multimedia/libcuefile/Config.in
Gustavo> create mode 100644 package/multimedia/libcuefile/libcuefile.mk
Gustavo> +++ b/package/multimedia/libcuefile/libcuefile.mk
Gustavo> @@ -0,0 +1,41 @@
Gustavo> +################################################################################
Gustavo> +#
Gustavo> +# libcuefile
Gustavo> +#
Gustavo> +################################################################################
Gustavo> +
Gustavo> +LIBCUEFILE_VERSION = r453
Gustavo> +LIBCUEFILE_SITE = http://files.musepack.net/source
Gustavo> +LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz
Gustavo> +LIBCUEFILE_DEPENDENCIES = host-cmake
Gustavo> +LIBCUEFILE_INSTALL_STAGING = YES
Gustavo> +
Gustavo> +# CMake doesn't support having the --sysroot option directly in the
Gustavo> +# compiler path, so move this option to the CFLAGS/CXXFLAGS variables.
Gustavo> +LIBCUEFILE_TARGET_CC = $(filter-out --sysroot=%,$(TARGET_CC))
Gustavo> +LIBCUEFILE_TARGET_CFLAGS = $(filter --sysroot=%,$(TARGET_CC)) $(TARGET_CFLAGS)
Cmake also seems to have problems with ccache:
CMake Error: your C compiler: "/home/peko/source/buildroot/output2/host/usr/bin/ccache /home/peko/source/buildroot/output2/host/usr/bin/powerpc-unknown-linux-uclibc-gcc" was not found. Please set CMAKE_C_COMPILER to a valid compiler path or name.
-- Configuring incomplete, errors occurred!
make[1]: ***
[/home/peko/source/buildroot/output2/build/libcuefile-r453/.stamp_configured]
Error 1
I don't know anything about cmake. Do you have any idea how to fix this?
Disable ccache for this build for now?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 06/10] libcuefile: new package
2011-01-20 12:46 ` Peter Korsgaard
@ 2011-01-20 12:55 ` Gustavo Zacarias
2011-01-20 16:34 ` Bjørn Forsman
2011-01-20 20:19 ` Peter Korsgaard
0 siblings, 2 replies; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-20 12:55 UTC (permalink / raw)
To: buildroot
On 01/20/11 09:46, Peter Korsgaard wrote:
> Cmake also seems to have problems with ccache:
>
> CMake Error: your C compiler: "/home/peko/source/buildroot/output2/host/usr/bin/ccache /home/peko/source/buildroot/output2/host/usr/bin/powerpc-unknown-linux-uclibc-gcc" was not found. Please set CMAKE_C_COMPILER to a valid compiler path or name.
> -- Configuring incomplete, errors occurred!
> make[1]: ***
> [/home/peko/source/buildroot/output2/build/libcuefile-r453/.stamp_configured]
> Error 1
>
> I don't know anything about cmake. Do you have any idea how to fix this?
> Disable ccache for this build for now?
*SIGH*
That's the reason i wrote "oh no, cmake" on IRC.
Does cdrkit fail too with ccache? (the other cmake package)
If there's an easy way to skip ccache for this package only i'm all for
it until we get cmake infra sorted out.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 06/10] libcuefile: new package
2011-01-20 12:55 ` Gustavo Zacarias
@ 2011-01-20 16:34 ` Bjørn Forsman
2011-01-20 20:19 ` Peter Korsgaard
1 sibling, 0 replies; 32+ messages in thread
From: Bjørn Forsman @ 2011-01-20 16:34 UTC (permalink / raw)
To: buildroot
On 20 January 2011 13:55, Gustavo Zacarias <gustavo@zacarias.com.ar> wrote:
> On 01/20/11 09:46, Peter Korsgaard wrote:
>
>> Cmake also seems to have problems with ccache:
>>
>> CMake Error: your C compiler: "/home/peko/source/buildroot/output2/host/usr/bin/ccache /home/peko/source/buildroot/output2/host/usr/bin/powerpc-unknown-linux-uclibc-gcc" was not found. ? Please set CMAKE_C_COMPILER to a valid compiler path or name.
>> -- Configuring incomplete, errors occurred!
>> make[1]: ***
>> [/home/peko/source/buildroot/output2/build/libcuefile-r453/.stamp_configured]
>> Error 1
>>
>> I don't know anything about cmake. Do you have any idea how to fix this?
>> Disable ccache for this build for now?
>
> *SIGH*
> That's the reason i wrote "oh no, cmake" on IRC.
> Does cdrkit fail too with ccache? (the other cmake package)
> If there's an easy way to skip ccache for this package only i'm all for
> it until we get cmake infra sorted out.
Yes, cdrkit also fail with ccache enabled. It is an issue with CMake
itself so any CMake based package would fail in the same way. I have
seen this issue too when working with the CMake infrastructure.
I've read that the easiest way to get CMake to work with ccache is by
symlinking gcc to ccache. Could we do this?
Best regards,
Bj?rn Forsman
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 06/10] libcuefile: new package
2011-01-20 12:55 ` Gustavo Zacarias
2011-01-20 16:34 ` Bjørn Forsman
@ 2011-01-20 20:19 ` Peter Korsgaard
1 sibling, 0 replies; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 20:19 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Hi,
>> I don't know anything about cmake. Do you have any idea how to fix
>> this? Disable ccache for this build for now?
Gustavo> *SIGH*
Gustavo> That's the reason i wrote "oh no, cmake" on IRC.
:/
Gustavo> Does cdrkit fail too with ccache? (the other cmake package)
Just tried, and it does:
CMake Error: your C compiler: "/home/peko/source/buildroot/output2/host/usr/bin/ccache /home/peko/source/buildroot/output2/host/usr/bin/powerpc-unknown-linux-uclibc-gcc" was not found. Please set CMAKE_C_COMPILER to a valid compiler path or name.
Gustavo> If there's an easy way to skip ccache for this package only
Gustavo> i'm all for it until we get cmake infra sorted out.
Presumably we just need to use TARGET_CC_NOCCACHE?
A quick test with cdrkit seems to confirm it.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 06/10] libcuefile: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 06/10] libcuefile: " Gustavo Zacarias
2011-01-20 12:46 ` Peter Korsgaard
@ 2011-01-20 20:29 ` Peter Korsgaard
1 sibling, 0 replies; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 20:29 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/multimedia/Config.in | 1 +
Gustavo> package/multimedia/libcuefile/Config.in | 6 ++++
Gustavo> package/multimedia/libcuefile/libcuefile.mk | 41 +++++++++++++++++++++++++++
Committed with the TARGET_CC_NOCCACHE fix for cmake.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 07/10] libreplaygain: new package
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
` (5 preceding siblings ...)
2011-01-18 16:54 ` [Buildroot] [PATCH 06/10] libcuefile: " Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-20 12:51 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 08/10] musepack: " Gustavo Zacarias
` (2 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/Config.in | 1 +
package/multimedia/libreplaygain/Config.in | 6 ++++++
package/multimedia/libreplaygain/libreplaygain.mk | 13 +++++++++++++
3 files changed, 20 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/libreplaygain/Config.in
create mode 100644 package/multimedia/libreplaygain/libreplaygain.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 60105fc..cbbf40e 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -21,6 +21,7 @@ source "package/multimedia/libmms/Config.in"
source "package/multimedia/libmpd/Config.in"
source "package/multimedia/libmpeg2/Config.in"
source "package/multimedia/libogg/Config.in"
+source "package/multimedia/libreplaygain/Config.in"
source "package/multimedia/libsamplerate/Config.in"
source "package/multimedia/libsndfile/Config.in"
source "package/multimedia/libtheora/Config.in"
diff --git a/package/multimedia/libreplaygain/Config.in b/package/multimedia/libreplaygain/Config.in
new file mode 100644
index 0000000..d0045b2
--- /dev/null
+++ b/package/multimedia/libreplaygain/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBREPLAYGAIN
+ bool "libreplaygain"
+ help
+ Replay Gain library from Musepack
+
+ http://www.musepack.net/
diff --git a/package/multimedia/libreplaygain/libreplaygain.mk b/package/multimedia/libreplaygain/libreplaygain.mk
new file mode 100644
index 0000000..3fec2c3
--- /dev/null
+++ b/package/multimedia/libreplaygain/libreplaygain.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libreplaygain
+#
+################################################################################
+
+LIBREPLAYGAIN_VERSION = r453
+LIBREPLAYGAIN_SITE = http://files.musepack.net/source
+LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
+LIBREPLAYGAIN_AUTORECONF = YES
+LIBREPLAYGAIN_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package/multimedia,libreplaygain))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 07/10] libreplaygain: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 07/10] libreplaygain: " Gustavo Zacarias
@ 2011-01-20 12:51 ` Peter Korsgaard
2011-01-20 12:52 ` Gustavo Zacarias
0 siblings, 1 reply; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 12:51 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> +++ b/package/multimedia/libreplaygain/libreplaygain.mk
Gustavo> @@ -0,0 +1,13 @@
Gustavo> +################################################################################
Gustavo> +#
Gustavo> +# libreplaygain
Gustavo> +#
Gustavo> +################################################################################
Gustavo> +
Gustavo> +LIBREPLAYGAIN_VERSION = r453
Gustavo> +LIBREPLAYGAIN_SITE = http://files.musepack.net/source
Gustavo> +LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
Gustavo> +LIBREPLAYGAIN_AUTORECONF = YES
Why autoreconf?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 07/10] libreplaygain: new package
2011-01-20 12:51 ` Peter Korsgaard
@ 2011-01-20 12:52 ` Gustavo Zacarias
2011-01-20 14:15 ` Peter Korsgaard
0 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-20 12:52 UTC (permalink / raw)
To: buildroot
On 01/20/11 09:51, Peter Korsgaard wrote:
> Gustavo> +++ b/package/multimedia/libreplaygain/libreplaygain.mk
> Gustavo> @@ -0,0 +1,13 @@
> Gustavo> +################################################################################
> Gustavo> +#
> Gustavo> +# libreplaygain
> Gustavo> +#
> Gustavo> +################################################################################
> Gustavo> +
> Gustavo> +LIBREPLAYGAIN_VERSION = r453
> Gustavo> +LIBREPLAYGAIN_SITE = http://files.musepack.net/source
> Gustavo> +LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
> Gustavo> +LIBREPLAYGAIN_AUTORECONF = YES
>
> Why autoreconf?
Why don't they ship configure? :-)
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 08/10] musepack: new package
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
` (6 preceding siblings ...)
2011-01-18 16:54 ` [Buildroot] [PATCH 07/10] libreplaygain: " Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-20 20:32 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 09/10] faad2: " Gustavo Zacarias
2011-01-18 16:54 ` [Buildroot] [PATCH 10/10] mpd: " Gustavo Zacarias
9 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/Config.in | 1 +
package/multimedia/musepack/Config.in | 11 +++++++++++
package/multimedia/musepack/musepack.mk | 14 ++++++++++++++
3 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/musepack/Config.in
create mode 100644 package/multimedia/musepack/musepack.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index cbbf40e..e73e47d 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -29,6 +29,7 @@ source "package/multimedia/libvorbis/Config.in"
source "package/multimedia/madplay/Config.in"
source "package/multimedia/mpg123/Config.in"
source "package/multimedia/mplayer/Config.in"
+source "package/multimedia/musepack/Config.in"
source "package/multimedia/speex/Config.in"
source "package/multimedia/swfdec/Config.in"
source "package/multimedia/festival/Config.in"
diff --git a/package/multimedia/musepack/Config.in b/package/multimedia/musepack/Config.in
new file mode 100644
index 0000000..2a966a4
--- /dev/null
+++ b/package/multimedia/musepack/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_MUSEPACK
+ bool "musepack"
+ select BR2_PACKAGE_LIBCUEFILE
+ select BR2_PACKAGE_LIBREPLAYGAIN
+ help
+ Musepack is an audio compression format with a strong emphasis
+ on high quality. It's not lossless, but it is designed
+ for transparency, so that you won't be able to hear differences
+ between the original wave file and the much smaller MPC file.
+
+ http://www.musepack.net/
diff --git a/package/multimedia/musepack/musepack.mk b/package/multimedia/musepack/musepack.mk
new file mode 100644
index 0000000..34581b6
--- /dev/null
+++ b/package/multimedia/musepack/musepack.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# musepack
+#
+################################################################################
+
+MUSEPACK_VERSION = r435
+MUSEPACK_SITE = http://files.musepack.net/source
+MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
+MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
+MUSEPACK_AUTORECONF = YES
+MUSEPACK_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package/multimedia,musepack))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 08/10] musepack: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 08/10] musepack: " Gustavo Zacarias
@ 2011-01-20 20:32 ` Peter Korsgaard
0 siblings, 0 replies; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 20:32 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/multimedia/Config.in | 1 +
Gustavo> package/multimedia/musepack/Config.in | 11 +++++++++++
Gustavo> package/multimedia/musepack/musepack.mk | 14 ++++++++++++++
Gustavo> 3 files changed, 26 insertions(+), 0 deletions(-)
Gustavo> create mode 100644 package/multimedia/musepack/Config.in
Gustavo> create mode 100644 package/multimedia/musepack/musepack.mk
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 09/10] faad2: new package
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
` (7 preceding siblings ...)
2011-01-18 16:54 ` [Buildroot] [PATCH 08/10] musepack: " Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-20 12:55 ` Peter Korsgaard
2011-01-18 16:54 ` [Buildroot] [PATCH 10/10] mpd: " Gustavo Zacarias
9 siblings, 1 reply; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/Config.in | 1 +
package/multimedia/faad2/Config.in | 6 ++++++
package/multimedia/faad2/faad2.mk | 11 +++++++++++
3 files changed, 18 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/faad2/Config.in
create mode 100644 package/multimedia/faad2/faad2.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index e73e47d..14c4145 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -2,6 +2,7 @@ menu "Audio and video libraries and applications"
source "package/multimedia/alsa-lib/Config.in"
source "package/multimedia/alsa-utils/Config.in"
source "package/multimedia/aumix/Config.in"
+source "package/multimedia/faad2/Config.in"
source "package/multimedia/flac/Config.in"
source "package/multimedia/ffmpeg/Config.in"
source "package/multimedia/gstreamer/Config.in"
diff --git a/package/multimedia/faad2/Config.in b/package/multimedia/faad2/Config.in
new file mode 100644
index 0000000..5b7fc1c
--- /dev/null
+++ b/package/multimedia/faad2/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_FAAD2
+ bool "faad2"
+ help
+ FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder,
+
+ http://www.audiocoding.com/faad2.html
diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk
new file mode 100644
index 0000000..04aee18
--- /dev/null
+++ b/package/multimedia/faad2/faad2.mk
@@ -0,0 +1,11 @@
+################################################################################
+#
+# faad2
+#
+################################################################################
+
+FAAD2_VERSION = 2.7
+FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faac
+FAAD2_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package/multimedia,faad2))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 10/10] mpd: new package
2011-01-18 16:54 [Buildroot] [PATCH 00/10] Add mpd to buildroot Gustavo Zacarias
` (8 preceding siblings ...)
2011-01-18 16:54 ` [Buildroot] [PATCH 09/10] faad2: " Gustavo Zacarias
@ 2011-01-18 16:54 ` Gustavo Zacarias
2011-01-18 18:29 ` Yoann Sculo
2011-01-20 13:07 ` Peter Korsgaard
9 siblings, 2 replies; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-18 16:54 UTC (permalink / raw)
To: buildroot
Add the Music Player Daemon package.
Enjoy, send me beers ;)
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/Config.in | 1 +
package/multimedia/mpd/Config.in | 138 ++++++++++++++++++++++++++++++++++++++
package/multimedia/mpd/S95mpd | 30 ++++++++
package/multimedia/mpd/mpd.conf | 32 +++++++++
package/multimedia/mpd/mpd.mk | 85 +++++++++++++++++++++++
5 files changed, 286 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/mpd/Config.in
create mode 100755 package/multimedia/mpd/S95mpd
create mode 100644 package/multimedia/mpd/mpd.conf
create mode 100644 package/multimedia/mpd/mpd.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 14c4145..ae26ceb 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -28,6 +28,7 @@ source "package/multimedia/libsndfile/Config.in"
source "package/multimedia/libtheora/Config.in"
source "package/multimedia/libvorbis/Config.in"
source "package/multimedia/madplay/Config.in"
+source "package/multimedia/mpd/Config.in"
source "package/multimedia/mpg123/Config.in"
source "package/multimedia/mplayer/Config.in"
source "package/multimedia/musepack/Config.in"
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
new file mode 100644
index 0000000..b902b7b
--- /dev/null
+++ b/package/multimedia/mpd/Config.in
@@ -0,0 +1,138 @@
+menuconfig BR2_PACKAGE_MPD
+ bool "mpd"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ help
+ 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.
+
+ http://www.musicpd.org
+
+if BR2_PACKAGE_MPD
+
+config BR2_PACKAGE_MPD_ALSA
+ bool "alsa"
+ select BR2_PACKAGE_ALSA_LIB
+ help
+ Enable alsa output support.
+
+config BR2_PACKAGE_MPD_AO
+ bool "ao"
+ select BR2_PACKAGE_LIBAO
+ help
+ Enable libao output support.
+
+config BR2_PACKAGE_MPD_BZIP2
+ bool "bzip2"
+ select BR2_PACKAGE_BZIP2
+ help
+ Enable bzip2 archive support.
+
+config BR2_PACKAGE_MPD_CURL
+ bool "curl"
+ select BR2_PACKAGE_LIBCURL
+ help
+ Enable curl streaming (http) support.
+
+config BR2_PACKAGE_MPD_FAAD2
+ bool "faad2"
+ select BR2_PACKAGE_FAAD2
+ help
+ Enable faad2 input support.
+ Select this if you want to play back MP4/AAC files.
+
+config BR2_PACKAGE_MPD_FLAC
+ bool "flac"
+ select BR2_PACKAGE_FLAC
+ help
+ Enable flac input/streaming support.
+ Select this if you want to play back FLAC files.
+
+config BR2_PACKAGE_MPD_LIBSAMPLERATE
+ bool "libsamplerate"
+ select BR2_PACKAGE_LIBSAMPLERATE
+ help
+ Enable libsamplerate input support.
+ Select this for software sample rate conversion.
+
+config BR2_PACKAGE_MPD_LIBSNDFILE
+ bool "libsndfile"
+ select BR2_PACKAGE_LIBSNDFILE
+ help
+ Enable libsndfile input/streaming support.
+ Select this if you want to play back WAV files.
+
+config BR2_PACKAGE_MPD_MAD
+ bool "mad"
+ select BR2_PACKAGE_LIBID3TAG
+ select BR2_PACKAGE_LIBMAD
+ help
+ Enable mad input support.
+ Select this if you want to play back MP3 files.
+ mpg123 has better quality support (24-bit) but doesn't seek.
+
+config BR2_PACKAGE_MPD_MPG123
+ bool "mpg123"
+ select BR2_PACKAGE_LIBID3TAG
+ select BR2_PACKAGE_MPG123
+ help
+ Enable mpg123 input support.
+ Select this if you want to play back MP3 files.
+ mpg123 has better quality support (24-bit) but doesn't seek.
+
+config BR2_PACKAGE_MPD_MUSEPACK
+ bool "musepack"
+ select BR2_PACKAGE_LIBCUE
+ select BR2_PACKAGE_LIBREPLAYGAIN
+ select BR2_PACKAGE_MUSEPACK
+ help
+ Enable musepack input support.
+ Select this if you want to play back MPC files.
+
+config BR2_PACKAGE_MPD_SQLITE
+ bool "sqlite"
+ select BR2_PACKAGE_SQLITE
+ help
+ Enable sqlite database support.
+ If you don't use sqlite it will use an ASCII database.
+
+config BR2_PACKAGE_MPD_TCP
+ bool "tcp sockets"
+ default y
+ help
+ Enable mpd to listen on tcp sockets.
+
+ You want this on if mpd and the client(s) work
+ on different machines (the usual scenario).
+
+config BR2_PACKAGE_MPD_TREMOR
+ bool "tremor"
+ select BR2_PACKAGE_LIBOGG
+ select BR2_PACKAGE_TREMOR
+ help
+ Enable vorbis input support.
+ Select this if you want to play back OGG files.
+
+config BR2_PACKAGE_MPD_VORBIS
+ bool "vorbis"
+ select BR2_PACKAGE_LIBOGG
+ select BR2_PACKAGE_LIBVORBIS
+ help
+ Enable vorbis input/streaming support.
+ Select this if you want to play back OGG files.
+
+config BR2_PACKAGE_MPD_WAVPACK
+ bool "wavpack"
+ select BR2_PACKAGE_WAVPACK
+ help
+ Enable wavpack input support.
+ Select this if you want to play back WV files.
+
+endif
+
+comment "mpd requires a toolchain with C++ and WCHAR support"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
diff --git a/package/multimedia/mpd/S95mpd b/package/multimedia/mpd/S95mpd
new file mode 100755
index 0000000..7c242f4
--- /dev/null
+++ b/package/multimedia/mpd/S95mpd
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+start() {
+ echo -n "Starting mpd: "
+ start-stop-daemon --start --quiet --background --exec /usr/bin/mpd
+ echo "OK"
+}
+
+stop() {
+ echo -n "Stopping mpd: "
+ start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid
+ echo "OK"
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ stop
+ sleep 1
+ start
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|restart}"
+ exit 1
+esac
diff --git a/package/multimedia/mpd/mpd.conf b/package/multimedia/mpd/mpd.conf
new file mode 100644
index 0000000..1a08ed0
--- /dev/null
+++ b/package/multimedia/mpd/mpd.conf
@@ -0,0 +1,32 @@
+#
+# Sample configuration file for mpd
+# This is a minimal configuration, see the manpage for more options
+#
+
+# Directory where the music is stored
+music_directory "/var/lib/mpd/music"
+
+# Directory where user-made playlists are stored (RW)
+playlist_directory "/mnt/mpd/playlists"
+
+# Database file (RW)
+db_file "/var/lib/mpd/database"
+
+# Log file (RW)
+log_file "/var/log/mpd.log"
+
+# Process ID file (RW)
+pid_file "/var/run/mpd.pid"
+
+# State file (RW)
+state_file "/var/lib/mpd/state"
+
+# User id to run the daemon as
+#user "nobody"
+
+# TCP socket binding
+bind_to_address "any"
+#bind_to_address "localhost"
+
+# Unix socket to listen on
+bind_to_address "/var/lib/mpd/socket"
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
new file mode 100644
index 0000000..15fb215
--- /dev/null
+++ b/package/multimedia/mpd/mpd.mk
@@ -0,0 +1,85 @@
+#############################################################
+#
+# mpd
+#
+#############################################################
+
+MPD_VERSION = 0.16.1
+MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
+MPD_DEPENDENCIES = host-pkg-config libglib2
+
+# Config.in selects most options to make life easier and avoid guess work
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+MPD_DEPENDENCIES += alsa-lib
+endif
+
+ifeq ($(BR2_PACKAGE_LIBAO),y)
+MPD_DEPENDENCIES += libao
+endif
+
+ifeq ($(BR2_PACKAGE_MPD_BZIP2),y)
+MPD_DEPENDENCIES += bzip2
+MPD_CONF_OPT += --enable-bzip2
+endif
+
+ifeq ($(BR2_PACKAGE_FAAD2),y)
+MPD_DEPENDENCIES += faad2
+endif
+
+ifeq ($(BR2_PACKAGE_FLAC),y)
+MPD_DEPENDENCIES += flac
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+MPD_DEPENDENCIES += libcurl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+MPD_DEPENDENCIES += libsamplerate
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
+MPD_DEPENDENCIES += libsndfile
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
+MPD_DEPENDENCIES += libvorbis
+endif
+
+ifeq ($(BR2_PACKAGE_MPG123),y)
+MPD_DEPENDENCIES += libid3tag mpg123
+endif
+
+ifeq ($(BR2_PACKAGE_MUSEPACK),y)
+MPD_DEPENDENCIES += musepack
+endif
+
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+MPD_DEPENDENCIES += sqlite
+endif
+
+ifneq ($(BR2_PACKAGE_MPD_TCP),y)
+MPD_CONF_OPT += --disable-tcp
+endif
+
+ifeq ($(BR2_PACKAGE_TREMOR),y)
+MPD_DEPENDENCIES += tremor
+MPD_CONF_OPT += --with-tremor
+endif
+
+ifeq ($(BR2_PACKAGE_WAVPACK),y)
+MPD_DEPENDENCIES += wavpack
+endif
+
+define MPD_INSTALL_EXTRA_FILES
+ [ ! -f $(TARGET_DIR)/etc/mpd.conf ] && \
+ $(INSTALL) -D package/multimedia/mpd/mpd.conf \
+ $(TARGET_DIR)/etc/mpd.conf
+ $(INSTALL) -m 0755 -D package/multimedia/mpd/S95mpd \
+ $(TARGET_DIR)/etc/init.d/S95mpd
+endef
+
+MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES
+
+$(eval $(call AUTOTARGETS,package/multimedia,mpd))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 10/10] mpd: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 10/10] mpd: " Gustavo Zacarias
@ 2011-01-18 18:29 ` Yoann Sculo
2011-01-20 13:07 ` Peter Korsgaard
1 sibling, 0 replies; 32+ messages in thread
From: Yoann Sculo @ 2011-01-18 18:29 UTC (permalink / raw)
To: buildroot
Oh thank you ;) !!
I wanted to do this patch for so many months... But I hadn't so much time to
do it.
So, thank you for your time and for your patch ;) I can cross this off my
huge todo list !
Yoann Sculo
2011/1/18 Gustavo Zacarias <gustavo@zacarias.com.ar>
> Add the Music Player Daemon package.
> Enjoy, send me beers ;)
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/multimedia/Config.in | 1 +
> package/multimedia/mpd/Config.in | 138
> ++++++++++++++++++++++++++++++++++++++
> package/multimedia/mpd/S95mpd | 30 ++++++++
> package/multimedia/mpd/mpd.conf | 32 +++++++++
> package/multimedia/mpd/mpd.mk | 85 +++++++++++++++++++++++
> 5 files changed, 286 insertions(+), 0 deletions(-)
> create mode 100644 package/multimedia/mpd/Config.in
> create mode 100755 package/multimedia/mpd/S95mpd
> create mode 100644 package/multimedia/mpd/mpd.conf
> create mode 100644 package/multimedia/mpd/mpd.mk
>
> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
> index 14c4145..ae26ceb 100644
> --- a/package/multimedia/Config.in
> +++ b/package/multimedia/Config.in
> @@ -28,6 +28,7 @@ source "package/multimedia/libsndfile/Config.in"
> source "package/multimedia/libtheora/Config.in"
> source "package/multimedia/libvorbis/Config.in"
> source "package/multimedia/madplay/Config.in"
> +source "package/multimedia/mpd/Config.in"
> source "package/multimedia/mpg123/Config.in"
> source "package/multimedia/mplayer/Config.in"
> source "package/multimedia/musepack/Config.in"
> diff --git a/package/multimedia/mpd/Config.in
> b/package/multimedia/mpd/Config.in
> new file mode 100644
> index 0000000..b902b7b
> --- /dev/null
> +++ b/package/multimedia/mpd/Config.in
> @@ -0,0 +1,138 @@
> +menuconfig BR2_PACKAGE_MPD
> + bool "mpd"
> + depends on BR2_INSTALL_LIBSTDCPP
> + depends on BR2_USE_WCHAR
> + select BR2_PACKAGE_LIBGLIB2
> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
> + help
> + 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.
> +
> + http://www.musicpd.org
> +
> +if BR2_PACKAGE_MPD
> +
> +config BR2_PACKAGE_MPD_ALSA
> + bool "alsa"
> + select BR2_PACKAGE_ALSA_LIB
> + help
> + Enable alsa output support.
> +
> +config BR2_PACKAGE_MPD_AO
> + bool "ao"
> + select BR2_PACKAGE_LIBAO
> + help
> + Enable libao output support.
> +
> +config BR2_PACKAGE_MPD_BZIP2
> + bool "bzip2"
> + select BR2_PACKAGE_BZIP2
> + help
> + Enable bzip2 archive support.
> +
> +config BR2_PACKAGE_MPD_CURL
> + bool "curl"
> + select BR2_PACKAGE_LIBCURL
> + help
> + Enable curl streaming (http) support.
> +
> +config BR2_PACKAGE_MPD_FAAD2
> + bool "faad2"
> + select BR2_PACKAGE_FAAD2
> + help
> + Enable faad2 input support.
> + Select this if you want to play back MP4/AAC files.
> +
> +config BR2_PACKAGE_MPD_FLAC
> + bool "flac"
> + select BR2_PACKAGE_FLAC
> + help
> + Enable flac input/streaming support.
> + Select this if you want to play back FLAC files.
> +
> +config BR2_PACKAGE_MPD_LIBSAMPLERATE
> + bool "libsamplerate"
> + select BR2_PACKAGE_LIBSAMPLERATE
> + help
> + Enable libsamplerate input support.
> + Select this for software sample rate conversion.
> +
> +config BR2_PACKAGE_MPD_LIBSNDFILE
> + bool "libsndfile"
> + select BR2_PACKAGE_LIBSNDFILE
> + help
> + Enable libsndfile input/streaming support.
> + Select this if you want to play back WAV files.
> +
> +config BR2_PACKAGE_MPD_MAD
> + bool "mad"
> + select BR2_PACKAGE_LIBID3TAG
> + select BR2_PACKAGE_LIBMAD
> + help
> + Enable mad input support.
> + Select this if you want to play back MP3 files.
> + mpg123 has better quality support (24-bit) but doesn't seek.
> +
> +config BR2_PACKAGE_MPD_MPG123
> + bool "mpg123"
> + select BR2_PACKAGE_LIBID3TAG
> + select BR2_PACKAGE_MPG123
> + help
> + Enable mpg123 input support.
> + Select this if you want to play back MP3 files.
> + mpg123 has better quality support (24-bit) but doesn't seek.
> +
> +config BR2_PACKAGE_MPD_MUSEPACK
> + bool "musepack"
> + select BR2_PACKAGE_LIBCUE
> + select BR2_PACKAGE_LIBREPLAYGAIN
> + select BR2_PACKAGE_MUSEPACK
> + help
> + Enable musepack input support.
> + Select this if you want to play back MPC files.
> +
> +config BR2_PACKAGE_MPD_SQLITE
> + bool "sqlite"
> + select BR2_PACKAGE_SQLITE
> + help
> + Enable sqlite database support.
> + If you don't use sqlite it will use an ASCII database.
> +
> +config BR2_PACKAGE_MPD_TCP
> + bool "tcp sockets"
> + default y
> + help
> + Enable mpd to listen on tcp sockets.
> +
> + You want this on if mpd and the client(s) work
> + on different machines (the usual scenario).
> +
> +config BR2_PACKAGE_MPD_TREMOR
> + bool "tremor"
> + select BR2_PACKAGE_LIBOGG
> + select BR2_PACKAGE_TREMOR
> + help
> + Enable vorbis input support.
> + Select this if you want to play back OGG files.
> +
> +config BR2_PACKAGE_MPD_VORBIS
> + bool "vorbis"
> + select BR2_PACKAGE_LIBOGG
> + select BR2_PACKAGE_LIBVORBIS
> + help
> + Enable vorbis input/streaming support.
> + Select this if you want to play back OGG files.
> +
> +config BR2_PACKAGE_MPD_WAVPACK
> + bool "wavpack"
> + select BR2_PACKAGE_WAVPACK
> + help
> + Enable wavpack input support.
> + Select this if you want to play back WV files.
> +
> +endif
> +
> +comment "mpd requires a toolchain with C++ and WCHAR support"
> + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
> diff --git a/package/multimedia/mpd/S95mpd b/package/multimedia/mpd/S95mpd
> new file mode 100755
> index 0000000..7c242f4
> --- /dev/null
> +++ b/package/multimedia/mpd/S95mpd
> @@ -0,0 +1,30 @@
> +#!/bin/sh
> +
> +start() {
> + echo -n "Starting mpd: "
> + start-stop-daemon --start --quiet --background --exec /usr/bin/mpd
> + echo "OK"
> +}
> +
> +stop() {
> + echo -n "Stopping mpd: "
> + start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid
> + echo "OK"
> +}
> +
> +case "$1" in
> + start)
> + start
> + ;;
> + stop)
> + stop
> + ;;
> + restart|reload)
> + stop
> + sleep 1
> + start
> + ;;
> + *)
> + echo $"Usage: $0 {start|stop|restart}"
> + exit 1
> +esac
> diff --git a/package/multimedia/mpd/mpd.conf
> b/package/multimedia/mpd/mpd.conf
> new file mode 100644
> index 0000000..1a08ed0
> --- /dev/null
> +++ b/package/multimedia/mpd/mpd.conf
> @@ -0,0 +1,32 @@
> +#
> +# Sample configuration file for mpd
> +# This is a minimal configuration, see the manpage for more options
> +#
> +
> +# Directory where the music is stored
> +music_directory "/var/lib/mpd/music"
> +
> +# Directory where user-made playlists are stored (RW)
> +playlist_directory "/mnt/mpd/playlists"
> +
> +# Database file (RW)
> +db_file "/var/lib/mpd/database"
> +
> +# Log file (RW)
> +log_file "/var/log/mpd.log"
> +
> +# Process ID file (RW)
> +pid_file "/var/run/mpd.pid"
> +
> +# State file (RW)
> +state_file "/var/lib/mpd/state"
> +
> +# User id to run the daemon as
> +#user "nobody"
> +
> +# TCP socket binding
> +bind_to_address "any"
> +#bind_to_address "localhost"
> +
> +# Unix socket to listen on
> +bind_to_address "/var/lib/mpd/socket"
> diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
> new file mode 100644
> index 0000000..15fb215
> --- /dev/null
> +++ b/package/multimedia/mpd/mpd.mk
> @@ -0,0 +1,85 @@
> +#############################################################
> +#
> +# mpd
> +#
> +#############################################################
> +
> +MPD_VERSION = 0.16.1
> +MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).
> dl.sourceforge.net/sourceforge/musicpd
> +MPD_DEPENDENCIES = host-pkg-config libglib2
> +
> +# Config.in selects most options to make life easier and avoid guess work
> +
> +ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
> +MPD_DEPENDENCIES += alsa-lib
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBAO),y)
> +MPD_DEPENDENCIES += libao
> +endif
> +
> +ifeq ($(BR2_PACKAGE_MPD_BZIP2),y)
> +MPD_DEPENDENCIES += bzip2
> +MPD_CONF_OPT += --enable-bzip2
> +endif
> +
> +ifeq ($(BR2_PACKAGE_FAAD2),y)
> +MPD_DEPENDENCIES += faad2
> +endif
> +
> +ifeq ($(BR2_PACKAGE_FLAC),y)
> +MPD_DEPENDENCIES += flac
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBCURL),y)
> +MPD_DEPENDENCIES += libcurl
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
> +MPD_DEPENDENCIES += libsamplerate
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
> +MPD_DEPENDENCIES += libsndfile
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
> +MPD_DEPENDENCIES += libvorbis
> +endif
> +
> +ifeq ($(BR2_PACKAGE_MPG123),y)
> +MPD_DEPENDENCIES += libid3tag mpg123
> +endif
> +
> +ifeq ($(BR2_PACKAGE_MUSEPACK),y)
> +MPD_DEPENDENCIES += musepack
> +endif
> +
> +ifeq ($(BR2_PACKAGE_SQLITE),y)
> +MPD_DEPENDENCIES += sqlite
> +endif
> +
> +ifneq ($(BR2_PACKAGE_MPD_TCP),y)
> +MPD_CONF_OPT += --disable-tcp
> +endif
> +
> +ifeq ($(BR2_PACKAGE_TREMOR),y)
> +MPD_DEPENDENCIES += tremor
> +MPD_CONF_OPT += --with-tremor
> +endif
> +
> +ifeq ($(BR2_PACKAGE_WAVPACK),y)
> +MPD_DEPENDENCIES += wavpack
> +endif
> +
> +define MPD_INSTALL_EXTRA_FILES
> + [ ! -f $(TARGET_DIR)/etc/mpd.conf ] && \
> + $(INSTALL) -D package/multimedia/mpd/mpd.conf \
> + $(TARGET_DIR)/etc/mpd.conf
> + $(INSTALL) -m 0755 -D package/multimedia/mpd/S95mpd \
> + $(TARGET_DIR)/etc/init.d/S95mpd
> +endef
> +
> +MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES
> +
> +$(eval $(call AUTOTARGETS,package/multimedia,mpd))
> --
> 1.7.3.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110118/36247df4/attachment-0001.html>
^ permalink raw reply [flat|nested] 32+ messages in thread* [Buildroot] [PATCH 10/10] mpd: new package
2011-01-18 16:54 ` [Buildroot] [PATCH 10/10] mpd: " Gustavo Zacarias
2011-01-18 18:29 ` Yoann Sculo
@ 2011-01-20 13:07 ` Peter Korsgaard
2011-01-20 13:23 ` Gustavo Zacarias
1 sibling, 1 reply; 32+ messages in thread
From: Peter Korsgaard @ 2011-01-20 13:07 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Add the Music Player Daemon package.
Gustavo> Enjoy, send me beers ;)
Come to FOSDEM and I'll buy you one ;)
Gustavo> diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
Gustavo> new file mode 100644
Gustavo> index 0000000..b902b7b
Gustavo> --- /dev/null
Gustavo> +++ b/package/multimedia/mpd/Config.in
Gustavo> @@ -0,0 +1,138 @@
Gustavo> +menuconfig BR2_PACKAGE_MPD
Gustavo> + bool "mpd"
Gustavo> + depends on BR2_INSTALL_LIBSTDCPP
Gustavo> + depends on BR2_USE_WCHAR
Gustavo> + select BR2_PACKAGE_LIBGLIB2
Gustavo> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
Gustavo> + help
Gustavo> + MPD is a flexible, powerful, server-side application
Gustavo> + for playing music. Through plugins and libraries
Gustavo> + it can play a variety of sound files while being
Gustavo> + controlled by its network protocol.
Gustavo> +
Gustavo> + http://www.musicpd.org
Gustavo> +
Gustavo> +if BR2_PACKAGE_MPD
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_ALSA
Gustavo> + bool "alsa"
Gustavo> + select BR2_PACKAGE_ALSA_LIB
Gustavo> + help
Gustavo> + Enable alsa output support.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_AO
Gustavo> + bool "ao"
Gustavo> + select BR2_PACKAGE_LIBAO
Gustavo> + help
Gustavo> + Enable libao output support.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_BZIP2
Gustavo> + bool "bzip2"
Gustavo> + select BR2_PACKAGE_BZIP2
Gustavo> + help
Gustavo> + Enable bzip2 archive support.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_CURL
Gustavo> + bool "curl"
Gustavo> + select BR2_PACKAGE_LIBCURL
Gustavo> + help
Gustavo> + Enable curl streaming (http) support.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_FAAD2
Gustavo> + bool "faad2"
Gustavo> + select BR2_PACKAGE_FAAD2
Gustavo> + help
Gustavo> + Enable faad2 input support.
Gustavo> + Select this if you want to play back MP4/AAC files.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_FLAC
Gustavo> + bool "flac"
Gustavo> + select BR2_PACKAGE_FLAC
Gustavo> + help
Gustavo> + Enable flac input/streaming support.
Gustavo> + Select this if you want to play back FLAC files.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_LIBSAMPLERATE
Gustavo> + bool "libsamplerate"
Gustavo> + select BR2_PACKAGE_LIBSAMPLERATE
Gustavo> + help
Gustavo> + Enable libsamplerate input support.
Gustavo> + Select this for software sample rate conversion.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_LIBSNDFILE
Gustavo> + bool "libsndfile"
Gustavo> + select BR2_PACKAGE_LIBSNDFILE
Gustavo> + help
Gustavo> + Enable libsndfile input/streaming support.
Gustavo> + Select this if you want to play back WAV files.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_MAD
Gustavo> + bool "mad"
Gustavo> + select BR2_PACKAGE_LIBID3TAG
Gustavo> + select BR2_PACKAGE_LIBMAD
Gustavo> + help
Gustavo> + Enable mad input support.
Gustavo> + Select this if you want to play back MP3 files.
Gustavo> + mpg123 has better quality support (24-bit) but doesn't seek.
I think it's a bit confusing to see the reference to mpg123 here.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_MPG123
Gustavo> + bool "mpg123"
Gustavo> + select BR2_PACKAGE_LIBID3TAG
Gustavo> + select BR2_PACKAGE_MPG123
Gustavo> + help
Gustavo> + Enable mpg123 input support.
Gustavo> + Select this if you want to play back MP3 files.
Gustavo> + mpg123 has better quality support (24-bit) but doesn't seek.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_MUSEPACK
Gustavo> + bool "musepack"
Gustavo> + select BR2_PACKAGE_LIBCUE
Gustavo> + select BR2_PACKAGE_LIBREPLAYGAIN
Gustavo> + select BR2_PACKAGE_MUSEPACK
Gustavo> + help
Gustavo> + Enable musepack input support.
Gustavo> + Select this if you want to play back MPC files.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_SQLITE
Gustavo> + bool "sqlite"
Gustavo> + select BR2_PACKAGE_SQLITE
Gustavo> + help
Gustavo> + Enable sqlite database support.
Gustavo> + If you don't use sqlite it will use an ASCII database.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_TCP
Gustavo> + bool "tcp sockets"
Gustavo> + default y
Gustavo> + help
Gustavo> + Enable mpd to listen on tcp sockets.
Gustavo> +
Gustavo> + You want this on if mpd and the client(s) work
Gustavo> + on different machines (the usual scenario).
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_TREMOR
Gustavo> + bool "tremor"
Gustavo> + select BR2_PACKAGE_LIBOGG
Gustavo> + select BR2_PACKAGE_TREMOR
Gustavo> + help
Gustavo> + Enable vorbis input support.
Gustavo> + Select this if you want to play back OGG files.
Gustavo> +
Gustavo> +config BR2_PACKAGE_MPD_VORBIS
Gustavo> + bool "vorbis"
Gustavo> + select BR2_PACKAGE_LIBOGG
Gustavo> + select BR2_PACKAGE_LIBVORBIS
Gustavo> + help
Gustavo> + Enable vorbis input/streaming support.
Gustavo> + Select this if you want to play back OGG files.
Trailing space. I think it would be good to add a little note about
when/why someone would want to use tremor instead of vorbis and
otherwise.
Gustavo> +++ b/package/multimedia/mpd/mpd.mk
Gustavo> @@ -0,0 +1,85 @@
Gustavo> +#############################################################
Gustavo> +#
Gustavo> +# mpd
Gustavo> +#
Gustavo> +#############################################################
Gustavo> +
Gustavo> +MPD_VERSION = 0.16.1
Gustavo> +MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
Gustavo> +MPD_DEPENDENCIES = host-pkg-config libglib2
Gustavo> +
Gustavo> +# Config.in selects most options to make life easier and avoid guess work
Gustavo> +
Gustavo> +ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
Gustavo> +MPD_DEPENDENCIES += alsa-lib
Gustavo> +endif
This is a bit confusing. The users sees config options to enable/disable
support for the various plugins, but those choices are not taken into
consideration.
E.G. if the user for some reason has faad enabled, but are not planning
on using it with mpd, then it will still be enabled no matter what they
set BR2_PACKAGE_MPD_FAAD2 to.
I think we should either get rid of those options, and just build
plugins for whatever libs are enabled (not really optimal), or otherwise
check the options here and pass the correct --enable / --disable options
to force the corresponding plugins to be enabled or not.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 10/10] mpd: new package
2011-01-20 13:07 ` Peter Korsgaard
@ 2011-01-20 13:23 ` Gustavo Zacarias
0 siblings, 0 replies; 32+ messages in thread
From: Gustavo Zacarias @ 2011-01-20 13:23 UTC (permalink / raw)
To: buildroot
On 01/20/11 10:07, Peter Korsgaard wrote:
> Gustavo> Add the Music Player Daemon package.
> Gustavo> Enjoy, send me beers ;)
>
> Come to FOSDEM and I'll buy you one ;)
Heh, that would be far more expensive that any insane amount of beer
people may throw my way :)
> I think it's a bit confusing to see the reference to mpg123 here.
It's just informative.
If you use mad to decode you get seek, but lack 24 bit love.
If you use mpg123 to decode you get 24 bit decode love but lack seek.
From what i could test mpd chooses the best one for the file you're
listening to, meaning most of the time mad.
However i lack a 24-bit encoded mp3 file to test reality (if it goes to
mpg123 for those), and also it's complicated by the fact that mpg123
won't do 24-bit on softfloat.
> Trailing space. I think it would be good to add a little note about
> when/why someone would want to use tremor instead of vorbis and
> otherwise.
Added.
> This is a bit confusing. The users sees config options to enable/disable
> support for the various plugins, but those choices are not taken into
> consideration.
>
> E.G. if the user for some reason has faad enabled, but are not planning
> on using it with mpd, then it will still be enabled no matter what they
> set BR2_PACKAGE_MPD_FAAD2 to.
>
> I think we should either get rid of those options, and just build
> plugins for whatever libs are enabled (not really optimal), or otherwise
> check the options here and pass the correct --enable / --disable options
> to force the corresponding plugins to be enabled or not.
Getting rid of the Config.in options will be a mess for users to know
how to get things rolling.
Most of the time mpd autodetects what it has, but not always, some
options must be explicitly enabled, case in point bzip2 support (which i
don't find really useful but added since we've got bzip2 as a package
anyway).
Is it that bad that people get a "freebie" if there's an extra supported
library around automatically enabled?
The overhead is pretty lightweight since they're all shared (unless
someone wants everything static that is).
^ permalink raw reply [flat|nested] 32+ messages in thread