[PATCH v2 1/3] mpd: update to 0.20.22

[PATCH v2 1/3] mpd: update to 0.20.22

[Max Kellermann]

From: Max Kellermann <max.kellermann@gmail.com>

Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
---
 .../musicpd/{mpd_0.20.21.bb => mpd_0.20.22.bb}               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.20.21.bb => mpd_0.20.22.bb} (97%)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
similarity index 97%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
index d4edd5b31..3c92f8d03 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
@@ -20,7 +20,7 @@ SRC_URI = " \
     git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \
     file://mpd.conf.in \
 "
-SRCREV = "98afae2520fbe5a322f803335b3142612fda4762"
+SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "enable_bzip2=yes"
@@ -88,6 +88,9 @@ do_install_append() {
             's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \
             ${D}/${systemd_unitdir}/system/mpd.service
     fi
+
+    # we don't need the icon
+    rm -rf ${D}${datadir}/icons
 }
 
 RPROVIDES_${PN} += "${PN}-systemd"
-- 
2.19.1

[PATCH v2 2/3] mpd: remove deprecated "enable_bzip2=yes" line

[Max Kellermann]

From: Max Kellermann <max.kellermann@gmail.com>

This should have been removed in commit
5a06148e58ca5a7558dd4b438a61d22caa8dfffe

Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
---
 meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
index 3c92f8d03..92514d87d 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
@@ -23,7 +23,6 @@ SRC_URI = " \
 SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d"
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF = "enable_bzip2=yes"
 EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
 PACKAGECONFIG ??= "alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib"
-- 
2.19.1

[PATCH v2 3/3] mpd: eliminate systemd ExecStart edit

[Max Kellermann]

From: Max Kellermann <max.kellermann@gmail.com>

This was never necessary because MPD's build script already inserts
the correct path.

Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
---
 meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
index 92514d87d..6c6ad4237 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
@@ -82,12 +82,6 @@ do_install_append() {
         -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
-
     # we don't need the icon
     rm -rf ${D}${datadir}/icons
 }
-- 
2.19.1