[PATCH 1/2] ncmpc: update to the 0.32 release tag

[PATCH 1/2] ncmpc: update to the 0.32 release tag

[Max Kellermann]

From: Max Kellermann <max.kellermann@gmail.com>

Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
---
 meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
index 936596a25..bc7764424 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
@@ -7,17 +7,14 @@ inherit meson
 
 DEPENDS += " \
     gettext-native \
-    glib-2.0 \
+    boost \
+    pcre \
     ncurses \
     libmpdclient \
 "
 
-# We're using a 0.32 pre-release commit which contains a fix for a
-# build failure.
-PV = "0.32~git${SRCPV}"
-
 SRC_URI = " \
     git://github.com/MusicPlayerDaemon/ncmpc \
 "
-SRCREV = "1150f7931de7588643437069dd798724dc1ceb47"
+SRCREV = "b03703653d3f4a418c4a8b6a9e32834dd882a185"
 S = "${WORKDIR}/git"
-- 
2.19.0

[PATCH 2/2] ncmpc: add various PACKAGECONFIGs

[Max Kellermann]

From: Max Kellermann <max.kellermann@gmail.com>

Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
---
 .../recipes-multimedia/musicpd/ncmpc_0.32.bb  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
index bc7764424..62885bba1 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
@@ -6,13 +6,30 @@ HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/"
 inherit meson
 
 DEPENDS += " \
-    gettext-native \
     boost \
     pcre \
     ncurses \
     libmpdclient \
 "
 
+PACKAGECONFIG ??= "colors locale mouse nls help_screen artist_screen search_screen song_screen key_screen lyrics_screen outputs_screen"
+
+PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false"
+PACKAGECONFIG[lirc] = "-Dlirc=true,-Dlirc=false,lirc"
+PACKAGECONFIG[locale] = "-Dlocale=true,-Dlocale=false"
+PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false"
+PACKAGECONFIG[mouse] = "-Dmouse=true,-Dmouse=false"
+PACKAGECONFIG[nls] = "-Dnls=true,-Dnls=false,gettext-native"
+
+PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false"
+PACKAGECONFIG[artist_screen] = "-Dartist_screen=true,-Dartist_screen=false"
+PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false"
+PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false"
+PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false"
+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 \
 "
-- 
2.19.0