mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
mpd: update 0.22.9 -> 0.23.5
This resolves ffmpeg 5.0 issues. Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
605ffa2302
commit
e9f5b21fd5
-43
@@ -1,43 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
+6
-7
@@ -15,14 +15,13 @@ DEPENDS += " \
|
|||||||
icu \
|
icu \
|
||||||
dbus \
|
dbus \
|
||||||
expat \
|
expat \
|
||||||
|
fmt \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \
|
||||||
git://github.com/MusicPlayerDaemon/MPD;branch=v0.22.x;protocol=https \
|
file://mpd.conf.in \
|
||||||
file://0001-include-utility-for-std-forward.patch \
|
"
|
||||||
file://mpd.conf.in \
|
SRCREV = "df4b6b92f2c4bba1b55fe0a5559b19808abb28ff"
|
||||||
"
|
|
||||||
SRCREV = "18628bf89ebfa5a806971479a71cf9b5764e500e"
|
|
||||||
S = "${WORKDIR}/git"
|
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)}"
|
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)}"
|
||||||
@@ -63,7 +62,7 @@ PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled,"
|
|||||||
PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false"
|
PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false"
|
||||||
PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba"
|
PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba"
|
||||||
PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1"
|
PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1"
|
||||||
PACKAGECONFIG[upnp] = "-Dupnp=enabled,-Dupnp=disabled,libupnp"
|
PACKAGECONFIG[upnp] = "-Dupnp=pupnp,-Dupnp=disabled,libupnp"
|
||||||
PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg"
|
PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg"
|
||||||
PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
|
PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
|
||||||
PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib"
|
PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib"
|
||||||
Reference in New Issue
Block a user