[PATCH 1/2] ncmpc: update to 0.33

[PATCH 1/2] ncmpc: update to 0.33

[Max Kellermann]

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

Several build options have been changed from "boolean" to "feature",
and thus we have to change "true/false" to "enabled/disabled".
---
 .../musicpd/{ncmpc_0.32.bb => ncmpc_0.33.bb}           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename meta-multimedia/recipes-multimedia/musicpd/{ncmpc_0.32.bb => ncmpc_0.33.bb} (80%)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
similarity index 80%
rename from meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
rename to meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
index 62885bba1..9e8522a9e 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
@@ -15,11 +15,11 @@ DEPENDS += " \
 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[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc"
+PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled"
 PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false"
-PACKAGECONFIG[mouse] = "-Dmouse=true,-Dmouse=false"
-PACKAGECONFIG[nls] = "-Dnls=true,-Dnls=false,gettext-native"
+PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled"
+PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native"
 
 PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false"
 PACKAGECONFIG[artist_screen] = "-Dartist_screen=true,-Dartist_screen=false"
@@ -33,5 +33,5 @@ PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false"
 SRC_URI = " \
     git://github.com/MusicPlayerDaemon/ncmpc \
 "
-SRCREV = "b03703653d3f4a418c4a8b6a9e32834dd882a185"
+SRCREV = "8e98f89ff07b140e6357dab2a9a9f6432ae0e521"
 S = "${WORKDIR}/git"
-- 
2.19.1

[PATCH 2/2] ncmpc: add PACKAGECONFIG[regex]

[Max Kellermann]

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

---
 meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
index 9e8522a9e..8468d125d 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
@@ -7,12 +7,11 @@ inherit meson
 
 DEPENDS += " \
     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 locale mouse nls regex help_screen artist_screen search_screen song_screen key_screen lyrics_screen outputs_screen"
 
 PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false"
 PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc"
@@ -20,6 +19,7 @@ PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled"
 PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false"
 PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled"
 PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native"
+PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre"
 
 PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false"
 PACKAGECONFIG[artist_screen] = "-Dartist_screen=true,-Dartist_screen=false"
-- 
2.19.1

Re: [PATCH 2/2] ncmpc: add PACKAGECONFIG[regex]

[akuster808]

On 10/23/18 5:38 PM, Max Kellermann wrote:
> From: Max Kellermann <max.kellermann@gmail.com>


Can these two patches be squished together ?

>
> ---
>  meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
> index 9e8522a9e..8468d125d 100644
> --- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
> +++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb
> @@ -7,12 +7,11 @@ inherit meson
>  
>  DEPENDS += " \
>      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 locale mouse nls regex help_screen artist_screen search_screen song_screen key_screen lyrics_screen outputs_screen"
>  
>  PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false"
>  PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc"
> @@ -20,6 +19,7 @@ PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled"
>  PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false"
>  PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled"
>  PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native"
> +PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre"
>  
>  PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false"
>  PACKAGECONFIG[artist_screen] = "-Dartist_screen=true,-Dartist_screen=false"

Re: [PATCH 2/2] ncmpc: add PACKAGECONFIG[regex]

[Max Kellermann]

On 2018/10/24 00:34, akuster808 <akuster808@gmail.com> wrote:
> Can these two patches be squished together ?

Technically yes, but why?  They are unrelated.