summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-11-04 13:47:26 -0700
committerKhem Raj <raj.khem@gmail.com>2023-11-06 08:48:27 -0800
commit560ca7fdcfb714973256e8538ee9b94e7b6b3ba8 (patch)
tree952bccfebd767dffdde0845f595c5d396eb8e239 /meta-multimedia
parent5914277f9091dd38a9f891a553ed40df888fe552 (diff)
downloadmeta-openembedded-560ca7fdcfb714973256e8538ee9b94e7b6b3ba8.tar.gz
ncmpc: upgrade 0.47 -> 0.49
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch37
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.49.bb (renamed from meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb)7
2 files changed, 2 insertions, 42 deletions
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
deleted file mode 100644
index 92094af1f2..0000000000
--- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 2e8dc2c28c0938dbbb85ebbac2b9a60be9ccd9f3 Mon Sep 17 00:00:00 2001
2From: Max Kellermann <max@musicpd.org>
3Date: Wed, 23 Nov 2022 12:25:50 +0100
4Subject: [PATCH] SearchPage: use regular integer to fix -Wenum-constexpr-conversion
5
6Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/ncmpc/commit/ddd1757907f0376b5843f707bf182b7827ff6591]
7---
8 src/SearchPage.cxx | 6 +++---
9 1 file changed, 3 insertions(+), 3 deletions(-)
10
11diff --git a/src/SearchPage.cxx b/src/SearchPage.cxx
12index 2fa5edbc..3f91c4fe 100644
13--- a/src/SearchPage.cxx
14+++ b/src/SearchPage.cxx
15@@ -81,7 +81,7 @@ search_get_tag_id(const char *name)
16 }
17
18 struct SearchMode {
19- enum mpd_tag_type table;
20+ int table;
21 const char *label;
22 };
23
24@@ -89,8 +89,8 @@ static constexpr SearchMode mode[] = {
25 { MPD_TAG_TITLE, N_("Title") },
26 { MPD_TAG_ARTIST, N_("Artist") },
27 { MPD_TAG_ALBUM, N_("Album") },
28- { (enum mpd_tag_type)SEARCH_URI, N_("Filename") },
29- { (enum mpd_tag_type)SEARCH_ARTIST_TITLE, N_("Artist + Title") },
30+ { SEARCH_URI, N_("Filename") },
31+ { SEARCH_ARTIST_TITLE, N_("Artist + Title") },
32 { MPD_TAG_COUNT, nullptr }
33 };
34
35--
362.39.0
37
diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.49.bb
index 44046912ed..d93c054f45 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.49.bb
@@ -32,9 +32,6 @@ PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false"
32PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" 32PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false"
33PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" 33PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false"
34 34
35SRC_URI = " \ 35SRC_URI = "git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https"
36 git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https \ 36SRCREV = "f81f875fc5785383d24f54fb9bd3cf06efd915a4"
37 file://0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch \
38"
39SRCREV = "fc8de01c71acdf10ad07c7aae756dc522b848124"
40S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"