From b60437b89c3b4f8d70e10f810be3b8dae5ad330d Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 16 Mar 2014 17:52:47 -0700 Subject: musicpd/mpd: bump to current upstream stable Bump music player daemon to the latest upstream stable release. Same as previous 0.18.4 recipe with trivial updates. Signed-off-by: Stephen Arnold Signed-off-by: Martin Jansa --- .../recipes-multimedia/musicpd/mpd_0.18.4.bb | 61 ---------------------- .../recipes-multimedia/musicpd/mpd_0.18.8.bb | 59 +++++++++++++++++++++ 2 files changed, 59 insertions(+), 61 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.8.bb (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb deleted file mode 100644 index 77ccc1f5b7..0000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "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 pulseaudio" - -SRC_URI = " \ - http://www.musicpd.org/download/${PN}/stable/${PN}-0.18.tar.xz \ - file://mpd.conf.in \ -" - -SRC_URI[md5sum] = "0d881fb32f9d31afcdb0bb13cb78b9ab" -SRC_URI[sha256sum] = "6b171985f192603150c879d105dc4d05d701ac60a2db41630a4dce823e068388" - -S = "${WORKDIR}/${PN}-0.18" - -inherit autotools useradd systemd - -EXTRA_OECONF = "enable_bzip2=yes" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" -PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" - -do_install_append() { - install -d ${D}/${localstatedir}/lib/mpd/music - chmod 775 ${D}/${localstatedir}/lib/mpd/music - install -d ${D}/${localstatedir}/lib/mpd/playlists - chown -R mpd ${D}/${localstatedir}/lib/mpd - chown mpd:mpd ${D}/${localstatedir}/lib/mpd/music - - install -d ${D}/${sysconfdir} - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf - sed -i \ - -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ - -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ - -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ - -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ - -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ - ${D}/${sysconfdir}/mpd.conf - - if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then - sed -i \ - 's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \ - ${D}/${systemd_unitdir}/system/mpd.service - fi -} - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "mpd.service" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = " \ - --system --no-create-home \ - --home ${localstatedir}/lib/mpd \ - --groups audio \ - --user-group mpd" diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.8.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.8.bb new file mode 100644 index 0000000000..b6882af246 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.8.bb @@ -0,0 +1,59 @@ +SUMMARY = "Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE ="http://www.musicpd.org" + +DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio" + +SRC_URI = " \ + http://www.musicpd.org/download/${PN}/stable/${P}.tar.xz \ + file://mpd.conf.in \ +" + +SRC_URI[md5sum] = "7bbe1caf5abe404dc985ca4f44984b1f" +SRC_URI[sha256sum] = "5366378e548fb77996cc33b0e15165ddd84f1e496bdd04616bd593aecdc26450" + +inherit autotools useradd systemd + +EXTRA_OECONF = "enable_bzip2=yes" +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" + +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" +PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" + +do_install_append() { + install -d ${D}/${localstatedir}/lib/mpd/music + chmod 775 ${D}/${localstatedir}/lib/mpd/music + install -d ${D}/${localstatedir}/lib/mpd/playlists + chown -R mpd ${D}/${localstatedir}/lib/mpd + chown mpd:mpd ${D}/${localstatedir}/lib/mpd/music + + install -d ${D}/${sysconfdir} + install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf + sed -i \ + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ + ${D}/${sysconfdir}/mpd.conf + + if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then + sed -i \ + 's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \ + ${D}/${systemd_unitdir}/system/mpd.service + fi +} + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "mpd.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = " \ + --system --no-create-home \ + --home ${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd" -- cgit 1.2.3-korg