mpd: initial add 0.16.7
PATCH 1/6 mpd: initial add 0.16.7
--- meta-oe/recipes-multimedia/musicpd/mpd/mpd | 43 +++ meta-oe/recipes-multimedia/musicpd/mpd/mpd.conf | 420 ++++++++++++++++++++++ meta-oe/recipes-multimedia/musicpd/mpd_0.16.7.bb | 42 +++ 3 files changed, 505 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-multimedia/musicpd/mpd/mpd create mode 100644 meta-oe/recipes-multimedia/musicpd/mpd/mpd.conf create mode 100644 meta-oe/recipes-multimedia/musicpd/mpd_0.16.7.bb
meta-oe/recipes-multimedia/musicpd/mpd/mpd new file +43 -0
@@ -0,0 +1,43 @@ +#!/bin/sh +DESC="The Music Player Daemon" +DAEMON=/usr/bin/mpd +MPDCONF=/etc/mpd.conf +PIDFILE=$(sed -n 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF) +DBFILE=$(sed -n 's/^[[:space:]]*db_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF) + +case "$1" in + start) + if [ -z "$PIDFILE" -o -z "$DBFILE" ]; then + echo "$MPDCONF must have db_file and pid_file set; cannot start daemon." + exit 1 + fi + + PIDDIR=$(dirname "$PIDFILE") + if [ ! -d "$PIDDIR" ]; then + mkdir -m 0755 $PIDDIR + chown mpd:audio $PIDDIR + fi + + echo "Starting $DESC" + start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --exec "$DAEMON" "$MPDCONF" + ;; + + stop) + if [ -z "$PIDFILE" ]; then + echo "$MPDCONF must have pid_file set; cannot stop daemon." + exit 1 + fi + echo "Stopping $DESC" + $DAEMON --kill "$MPDCONF" + ;; + + restart) + $0 stop >/dev/null 2>&1 + $0 start + ;; + + *) + echo "Usage: $0 {start|stop|restart}" + exit 0 + ;; +esac
meta-oe/recipes-multimedia/musicpd/mpd/mpd.conf new file +420 -0
420 lines not on this page · raw message
meta-oe/recipes-multimedia/musicpd/mpd_0.16.7.bb new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
1.7.4.4
PATCH 2/6 libmpd: initial add 11.8.17
--- .../recipes-multimedia/musicpd/libmpd_11.8.17.bb | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-multimedia/musicpd/libmpd_11.8.17.bb
meta-oe/recipes-multimedia/musicpd/libmpd_11.8.17.bb new file +11 -0
@@ -0,0 +1,11 @@ +DESCRIPTION = "Music Player Daemon library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE ="http://sourceforge.net/projects/musicpd" +DEPENDS = "glib-2.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "5ae3d87467d52aef3345407adb0a2488" +SRC_URI[sha256sum] = "fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83" + +inherit autotools
Signature · 1 line
1.7.4.4
PATCH 3/6 xfmpc: initial add 0.2.2
In reply to Andreas Müller--- meta-xfce/recipes-apps/xfmpc/xfmpc_0.2.2.bb | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 meta-xfce/recipes-apps/xfmpc/xfmpc_0.2.2.bb
meta-xfce/recipes-apps/xfmpc/xfmpc_0.2.2.bb new file +13 -0
@@ -0,0 +1,13 @@ +DESCRIPTION = "Music Player Daemon (MPD) client written in GTK+" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfmpc" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "gtk+ libxfce4util libxfce4ui libmpd vala-native" + +# for now we reccomend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +inherit xfce-app + +SRC_URI[md5sum] = "e4e198850c2467c47783969ac9c16ec0" +SRC_URI[sha256sum] = "ed0cc2940bd5928bb30fab1531c22185a97bd0cc5beacd9e3be4d4cd994a6862"
Signature · 1 line
1.7.4.4
PATCH 4/6 xfce4-mpc-plugin: initial add 0.4.2
In reply to Andreas Müller--- .../mpc/xfce4-mpc-plugin_0.4.2.bb | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 meta-xfce/recipes-panel-plugins/mpc/xfce4-mpc-plugin_0.4.2.bb
meta-xfce/recipes-panel-plugins/mpc/xfce4-mpc-plugin_0.4.2.bb new file +15 -0
@@ -0,0 +1,15 @@ +DESCRIPTION = "Simple client plugin for Music Player Daemon" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" +SECTION = "x11/application" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" + +inherit xfce-panel-plugin + +DEPENDS += "libmpd" + +# for now we reccomend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +SRC_URI[md5sum] = "45cfce0f9c4de5a3f51b006ef8caa515" +SRC_URI[sha256sum] = "5fa2e8c1217d80c2777d92650ba054cabf916e1452635a118005282886271714"
Signature · 1 line
1.7.4.4
PATCH 5/6 xfce4-mixer: initial add 4.8.0
In reply to Andreas Müller--- .../recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb
meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb new file +14 -0
@@ -0,0 +1,14 @@ +DESCRIPTION = "A volume control application based on GStreamer" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf" + +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "3fa3a9973e18c04da26709a654e242ff" +SRC_URI[sha256sum] = "9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab" + +RDEPENDS_${PN} = "gst-meta-audio"
Signature · 1 line
1.7.4.4
PATCH 6/6 task-xfce-extended: add xfmpc, xfce4-mpc-plugin and xfce4-mixer
In reply to Andreas Müller--- meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb +4 -1
@@ -3,7 +3,7 @@ SECTION = "x11/wm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r1" +PR = "r2" inherit task
@@ -33,8 +33,11 @@ RRECOMMENDS_${PN} = " \ xfce4-diskperf-plugin \ xfce4-netload-plugin \ xfce4-genmon-plugin \ + xfce4-mpc-plugin \ \ xfce4-appfinder \ xfce4-screenshooter \ + xfce4-mixer \ + xfmpc \ ristretto \ "
Signature · 1 line
1.7.4.4
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 18-03-12 21:40, Andreas Müller schreef:
Quoted 13 lines
Signed-off-by Andreas Müller <[email protected]> ---meta-oe/recipes-multimedia/musicpd/mpd/mpd | 43 +++
meta-oe/recipes-multimedia/musicpd/mpd/mpd.conf| 420 ++++++++++++++++++++++ meta-oe/recipes-multimedia/musicpd/mpd_0.16.7.bb | 42 +++ 3 files changed, 505 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-multimedia/musicpd/mpd/mpd create mode 100644meta-oe/recipes-multimedia/musicpd/mpd/mpd.confcreate mode 100644 meta-oe/recipes-multimedia/musicpd/mpd_0.16.7.bb(quoted diff) +0
-0b/meta-oe/recipes-multimedia/musicpd/mpd/mpd new file mode 100644 index 0000000..f71142a ---
/dev/null+++ b/meta-oe/recipes-multimedia/musicpd/mpd/mpd @@ -0,0 +1,43 @@ +#!/bin/sh
Review
Quoted 2 lines
(quoted diff) +2
-0+DESC="The Music Player Daemon" +DAEMON=/usr/bin/mpd +MPDCONF=/etc/mpd.conf
The above hardcodes $bindir and $sysconfdir, which it shouldn't do. Furthermore I'd like to stop maintaining our own initsystem in meta-oe and switch to upstream initscripts as much as possible and include systemd units by default as well.
The above script is missing LSB headers as well.
Quoted 18 lines
(quoted diff) +0
-0b/meta-oe/recipes-multimedia/musicpd/mpd_0.16.7.bb new file mode 100644 index 0000000..bc07415 ---
/dev/null+++ b/meta-oe/recipes-multimedia/musicpd/mpd_0.16.7.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE ="http://sourceforge.net/projects/musicpd" + +DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite
bzip2 \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '',
'libmad lame libid3tag', d)}" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \ +
file://mpd \ + file://mpd.conf \ +" + +SRC_URI[md5sum] =
"3d0e7c36646e80386b32966bd4268e8d" +SRC_URI[sha256sum] = "47c10553389752c7fa072cf87c2bd30c552de75819fcf8286f3e7cc14ff0e32e" +(quoted diff) +2
-0+inherit autotools update-rc.d useradd + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = " \ + --system --no-create-home \ + --home${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd"
+ +INITSCRIPT_NAME = "mpd" +INITSCRIPT_PARAMS = "defaults 95" +
Quoted 8 lines
+do_install_append() { + install -d ${D}/${sysconfdir}/init.d +
install -m 755 ${WORKDIR}/mpd ${D}/${sysconfdir}/init.d + install -m
644${WORKDIR}/mpd.conf${D}/${sysconfdir}/mpd.conf+ + install -d
${D}/${localstatedir}/lib/mpd/music + chown -R mpd
${D}/${localstatedir}/lib/mpd + chmod 775
${D}/${localstatedir}/lib/mpd/music + + install -d
${D}/${localstatedir}/lib/mpd/playlists +} + +EXTRA_OECONF = "enable_bzip2=yes"
Move EXTRA_OECONF above do_install
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk9nLH0ACgkQMkyGM64RGpGpXgCfYjVyTXG604Idt2RF2RhqwN/a 5oYAoKvt1joz6oRquBIauc4zeLpbNCFn
=9Ewh
-----END PGP SIGNATURE-----
Quoted 4 lines · Koen Kooi
Review
Quoted 2 lines
(quoted diff) +2
-0+DESC="The Music Player Daemon" +DAEMON=/usr/bin/mpd +MPDCONF=/etc/mpd.confThe above hardcodes $bindir and $sysconfdir, which it shouldn't do.
mpd.in + sed in V2. OK?
Quoted 2 lines
Furthermore I'd like to stop maintaining our own initsystem in meta-oe and switch to upstream initscripts as much as possible
The package itself does not contain an initscript so I implemented it close to that found in debian-lenny package. What upstream source do you suggest (matching also above requirement not hardcoding paths)?
Quoted 1 line
and include systemd units by default as well.
This requirement I did not know and did not find any source for that - some suggestion?
Quoted 1 line
The above script is missing LSB headers as well.
This initscript as is does not need.
Quoted 1 line
Move
EXTRA_OECONFabovedo_install
V2
regards
Andreas
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 19-03-12 16:24, Andreas Müller schreef:
Quoted 7 lines
Quoted 4 lines · Koen Kooi
Review
Quoted 2 lines
(quoted diff) +2
-0+DESC="The Music Player Daemon" +DAEMON=/usr/bin/mpd +MPDCONF=/etc/mpd.confThe above hardcodes $bindir and $sysconfdir, which it shouldn't do.
mpd.in + sed in V2. OK?
sound good to me.
Quoted 9 lines
Quoted 2 lines
Furthermore I'd like to stop maintaining our own initsystem in meta-oe and switch to upstream initscripts as much as possible
The package itself does not contain an initscript so I implemented it close to that found in debian-lenny package. What upstream source do you suggest (matching also above requirement not hardcoding paths)?
Quoted 1 line
and include systemd units by default as well.
This requirement I did not know and did not find any source for that - some suggestion?
Fedora or arch should have one.
Quoted 3 lines
Quoted 2 lines
The above script is missing LSB headers as well.
This initscript as is does not need.
AIUI OE-core requires lsb headers for all sysvinitscripts and systemd works a lot better when those headers are present as well.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk9ngp8ACgkQMkyGM64RGpE97QCdFLCl80NB97Vug3qfiJladmA8 gGQAoIKOWTiq6QGM+mjqdJnAx+T7S1Q+
=okI0
-----END PGP SIGNATURE-----
Quoted 24 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 19-03-12 16:24, Andreas Müller schreef:
Quoted 7 lines
Quoted 4 lines · Koen Kooi
Review
Quoted 2 lines
(quoted diff) +2
-0+DESC="The Music Player Daemon" +DAEMON=/usr/bin/mpd +MPDCONF=/etc/mpd.confThe above hardcodes $bindir and $sysconfdir, which it shouldn't do.
mpd.in + sed in V2. OK?
sound good to me.
Quoted 9 lines
Quoted 2 lines
Furthermore I'd like to stop maintaining our own initsystem in meta-oe and switch to upstream initscripts as much as possible
The package itself does not contain an initscript so I implemented it close to that found in debian-lenny package. What upstream source do you suggest (matching also above requirement not hardcoding paths)?
Quoted 1 line
and include systemd units by default as well.
This requirement I did not know and did not find any source for that - some suggestion?
Quoted 9 lines
Fedora or arch should have one.
Quoted 3 lines
Quoted 2 lines
The above script is missing LSB headers as well.
This initscript as is does not need.
AIUI OE-core requires lsb headers for all sysvinitscripts and systemd works a lot better when those headers are present as well.
Another question: How about adding the mpd stuff into meta-multimedia ( as a starter - e.g. in subdir recipes-audio )?
Andreas
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 20-03-12 09:37, Andreas Müller schreef:
Quoted 30 lines
Quoted 28 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Op 19-03-12 16:24, Andreas Müller schreef:
Quoted 8 lines
Quoted 5 lines · Koen Kooi
Review
Quoted 2 lines
(quoted diff) +2
-0+DESC="The Music Player Daemon" +DAEMON=/usr/bin/mpd +MPDCONF=/etc/mpd.confThe above hardcodes $bindir and $sysconfdir, which it shouldn't do.
mpd.in + sed in V2. OK?
sound good to me.
Quoted 10 lines
Quoted 2 lines
Furthermore I'd like to stop maintaining our own initsystem in meta-oe and switch to upstream initscripts as much as possible
The package itself does not contain an initscript so I implemented it close to that found in debian-lenny package. What upstream source do you suggest (matching also above requirement not hardcoding paths)?
Quoted 1 line
and include systemd units by default as well.
This requirement I did not know and did not find any source for that
- some suggestion?Fedora or arch should have one.
Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
The above script is missing LSB headers as well.
This initscript as is does not need.
AIUI OE-core requires lsb headers for all sysvinitscripts and systemd works a lot better when those headers are present as well.
Another question: How about adding the mpd stuff into meta-multimedia ( as a starter - e.g. in subdir recipes-audio )?
That'd be great! We'll need to sort out some of the dependencies, I'm not sure if meta-mm depends on meta-oe or vice versa.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk9ovFgACgkQMkyGM64RGpGVjQCfeUmeLu1Wh4XuJm4UQKW/D7Az BUoAoJUe6rXPN2YdU7S4/VdbQ3Knt7mJ
=KzxL
-----END PGP SIGNATURE-----