From d29d1368478df621c2426820e1a6019225467234 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 20 Dec 2021 13:41:16 +0100
Subject: [PATCH] package/ncmpc: bump to version 0.46

- boost is not needed since
  https://github.com/MusicPlayerDaemon/ncmpc/commit/6eb958602091752c20e8dbb32041bedc637d24ee
- pcre has been replaced by pcre2 since
  https://github.com/MusicPlayerDaemon/ncmpc/commit/f2ea0d39a3d0ed20a958f7e7dd902de7ea2875b7

https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v0.46/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/ncmpc/Config.in  |  9 +++------
 package/ncmpc/ncmpc.hash |  2 +-
 package/ncmpc/ncmpc.mk   | 10 +++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/package/ncmpc/Config.in b/package/ncmpc/Config.in
index 0e062460a7..4155404fcf 100644
--- a/package/ncmpc/Config.in
+++ b/package/ncmpc/Config.in
@@ -2,11 +2,8 @@ config BR2_PACKAGE_NCMPC
 	bool "ncmpc"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_WCHAR # boost
-	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
-	select BR2_PACKAGE_BOOST
-	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_LIBMPDCLIENT
 	select BR2_PACKAGE_NCURSES
 	help
@@ -16,7 +13,7 @@ config BR2_PACKAGE_NCMPC
 
 	  http://www.musicpd.org/clients/ncmpc/
 
-comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 7"
+comment "ncmpc needs a toolchain w/ C++, wchar, gcc >= 7"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7
diff --git a/package/ncmpc/ncmpc.hash b/package/ncmpc/ncmpc.hash
index b8f79a70b5..a5d6698a61 100644
--- a/package/ncmpc/ncmpc.hash
+++ b/package/ncmpc/ncmpc.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256  17ff446447e002f2ed4342b7324263a830df7d76bcf177dce928f7d3a6f1f785  ncmpc-0.45.tar.xz
+sha256  177f77cf09dd4ab914e8438be399cdd5d83c9aa992abc8d9abac006bb092934e  ncmpc-0.46.tar.xz
 
 # Hash for license file:
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk
index 9a394ba356..91859cbc24 100644
--- a/package/ncmpc/ncmpc.mk
+++ b/package/ncmpc/ncmpc.mk
@@ -5,11 +5,10 @@
 ################################################################################
 
 NCMPC_VERSION_MAJOR = 0
-NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).45
+NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).46
 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz
 NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR)
 NCMPC_DEPENDENCIES = \
-	boost \
 	host-pkgconf \
 	libmpdclient \
 	ncurses \
@@ -21,7 +20,8 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project
 NCMPC_CONF_OPTS = \
 	-Dcurses=ncurses \
 	-Ddocumentation=disabled \
-	$(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled)
+	$(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) \
+	$(if $(BR2_TOOLCHAIN_HAS_THREADS),-Dsignalfd=true,-Dsignalfd=false)
 
 ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y)
 NCMPC_DEPENDENCIES += lirc-tools
@@ -30,8 +30,8 @@ else
 NCMPC_CONF_OPTS += -Dlirc=disabled
 endif
 
-ifeq ($(BR2_PACKAGE_PCRE),y)
-NCMPC_DEPENDENCIES += pcre
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+NCMPC_DEPENDENCIES += pcre2
 NCMPC_CONF_OPTS += -Dregex=enabled
 else
 NCMPC_CONF_OPTS += -Dregex=disabled