From 560ca7fdcfb714973256e8538ee9b94e7b6b3ba8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Nov 2023 13:47:26 -0700 Subject: [PATCH] ncmpc: upgrade 0.47 -> 0.49 Signed-off-by: Khem Raj --- ...egular-integer-to-fix-Wenum-constexp.patch | 37 ------------------- .../musicpd/{ncmpc_0.47.bb => ncmpc_0.49.bb} | 7 +--- 2 files changed, 2 insertions(+), 42 deletions(-) delete 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.47.bb => ncmpc_0.49.bb} (87%) 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 @@ -From 2e8dc2c28c0938dbbb85ebbac2b9a60be9ccd9f3 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -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.47.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.49.bb similarity index 87% rename from meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb rename to 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" PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" 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 = "fc8de01c71acdf10ad07c7aae756dc522b848124" +SRC_URI = "git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https" +SRCREV = "f81f875fc5785383d24f54fb9bd3cf06efd915a4" S = "${WORKDIR}/git"