* [meta-oe][langdale][PATCH 1/2] ncmpc: Upgrade to 0.47
2023-02-27 21:42 [meta-oe][langdale][PATCH 0/2] Backport mpd and ncmpc upgrades Scott Murray
@ 2023-02-27 21:42 ` Scott Murray
2023-02-27 21:42 ` [meta-oe][langdale][PATCH 2/2] mpd: Upgrade to 0.23.12 release Scott Murray
1 sibling, 0 replies; 3+ messages in thread
From: Scott Murray @ 2023-02-27 21:42 UTC (permalink / raw)
To: openembedded-devel, Armin Kuster
From: Khem Raj <raj.khem@gmail.com>
Backport a patch to fix c++17 build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9b6baed24d5efe0820266ccf3567bcff42701a01)
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
...egular-integer-to-fix-Wenum-constexp.patch | 37 +++++++++++++++++++
.../musicpd/{ncmpc_0.46.bb => ncmpc_0.47.bb} | 3 +-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch
rename meta-multimedia/recipes-multimedia/musicpd/{ncmpc_0.46.bb => ncmpc_0.47.bb} (92%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch b/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch
new file mode 100644
index 000000000..92094af1f
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch
@@ -0,0 +1,37 @@
+From 2e8dc2c28c0938dbbb85ebbac2b9a60be9ccd9f3 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max@musicpd.org>
+Date: Wed, 23 Nov 2022 12:25:50 +0100
+Subject: [PATCH] SearchPage: use regular integer to fix -Wenum-constexpr-conversion
+
+Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/ncmpc/commit/ddd1757907f0376b5843f707bf182b7827ff6591]
+---
+ src/SearchPage.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/SearchPage.cxx b/src/SearchPage.cxx
+index 2fa5edbc..3f91c4fe 100644
+--- a/src/SearchPage.cxx
++++ b/src/SearchPage.cxx
+@@ -81,7 +81,7 @@ search_get_tag_id(const char *name)
+ }
+
+ struct SearchMode {
+- enum mpd_tag_type table;
++ int table;
+ const char *label;
+ };
+
+@@ -89,8 +89,8 @@ static constexpr SearchMode mode[] = {
+ { MPD_TAG_TITLE, N_("Title") },
+ { MPD_TAG_ARTIST, N_("Artist") },
+ { MPD_TAG_ALBUM, N_("Album") },
+- { (enum mpd_tag_type)SEARCH_URI, N_("Filename") },
+- { (enum mpd_tag_type)SEARCH_ARTIST_TITLE, N_("Artist + Title") },
++ { SEARCH_URI, N_("Filename") },
++ { SEARCH_ARTIST_TITLE, N_("Artist + Title") },
+ { MPD_TAG_COUNT, nullptr }
+ };
+
+--
+2.39.0
+
diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb
similarity index 92%
rename from meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb
rename to meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb
index a77d4f978..44046912e 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb
@@ -34,6 +34,7 @@ PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false"
SRC_URI = " \
git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https \
+ file://0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch \
"
-SRCREV = "b9b5e11e10d8f66cd672ffb51728aa447f78ecd4"
+SRCREV = "fc8de01c71acdf10ad07c7aae756dc522b848124"
S = "${WORKDIR}/git"
--
2.39.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [meta-oe][langdale][PATCH 2/2] mpd: Upgrade to 0.23.12 release
2023-02-27 21:42 [meta-oe][langdale][PATCH 0/2] Backport mpd and ncmpc upgrades Scott Murray
2023-02-27 21:42 ` [meta-oe][langdale][PATCH 1/2] ncmpc: Upgrade to 0.47 Scott Murray
@ 2023-02-27 21:42 ` Scott Murray
1 sibling, 0 replies; 3+ messages in thread
From: Scott Murray @ 2023-02-27 21:42 UTC (permalink / raw)
To: openembedded-devel, Armin Kuster
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ba5a86a51a459581d8f39afd95ddd27cca5def83)
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
.../musicpd/{mpd_0.23.9.bb => mpd_0.23.12.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.23.9.bb => mpd_0.23.12.bb} (98%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.9.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb
similarity index 98%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.9.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb
index e63c1b5e1..13938444c 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.9.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb
@@ -21,7 +21,7 @@ DEPENDS += " \
SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \
file://mpd.conf.in \
"
-SRCREV = "12147f6d5822899cc4316799b494c093b4b47f91"
+SRCREV = "d91da9679801224847c30147f5914785b6f8f240"
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)}"
--
2.39.0
^ permalink raw reply related [flat|nested] 3+ messages in thread