From b86476b4f9644053aa3e64521863231cb3cb0c82 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 29 Jun 2021 19:39:54 -0700
Subject: [PATCH] mpd: Update to 0.22.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix build with clang

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
---
 ...0001-include-utility-for-std-forward.patch | 43 +++++++++++++++++++
 .../musicpd/{mpd_0.22.6.bb => mpd_0.22.9.bb}  |  3 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch
 rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.22.6.bb => mpd_0.22.9.bb} (97%)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch
new file mode 100644
index 0000000000..68ccb65835
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch
@@ -0,0 +1,43 @@
+From 9bb962148672a3c20fb0119d7f71789b8ef3dc02 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 29 Jun 2021 19:31:34 -0700
+Subject: [PATCH] include <utility> for std::forward
+
+Fixes
+../git/src/Log.hxx:121:42: error: no member named 'forward' in namespace 'std'
+        LogFormat(LogLevel::ERROR, e, fmt, std::forward<Args>(args)...);
+
+Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/1201]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/Log.hxx                   | 1 +
+ src/lib/expat/ExpatParser.hxx | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/Log.hxx b/src/Log.hxx
+index a295ed9f6..87097b086 100644
+--- a/src/Log.hxx
++++ b/src/Log.hxx
+@@ -24,6 +24,7 @@
+ #include "util/Compiler.h"
+ 
+ #include <exception>
++#include <utility>
+ 
+ class Domain;
+ 
+diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx
+index e1723d109..4b5221e89 100644
+--- a/src/lib/expat/ExpatParser.hxx
++++ b/src/lib/expat/ExpatParser.hxx
+@@ -25,6 +25,7 @@
+ #include <expat.h>
+ 
+ #include <stdexcept>
++#include <utility>
+ 
+ class InputStream;
+ 
+-- 
+2.32.0
+
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb
similarity index 97%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb
index b1fa96e1be..c112a40ce9 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb
@@ -19,9 +19,10 @@ DEPENDS += " \
 
 SRC_URI = " \
     git://github.com/MusicPlayerDaemon/MPD;branch=v0.22.x \
+    file://0001-include-utility-for-std-forward.patch \
     file://mpd.conf.in \
 "
-SRCREV = "938728820b11d4544a071994fe3c63c6ab710e8e"
+SRCREV = "18628bf89ebfa5a806971479a71cf9b5764e500e"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}"