From f8bf78911576672443a8d11eaf99bed4d383acef Mon Sep 17 00:00:00 2001
From: Michael Nosthoff <buildroot@heine.tech>
Date: Mon, 3 Nov 2025 12:52:07 +0100
Subject: [PATCH] package/gerbera: bump to version 2.6.1

- new dependencies on icu and jsoncpp
- fixes most deprecations of fmt >= 12

- add upstream patch which fixes another deprecation of fmt >=12

Release Notes:
https://github.com/gerbera/gerbera/releases/tag/v2.5.0
https://github.com/gerbera/gerbera/releases/tag/v2.6.0
https://github.com/gerbera/gerbera/releases/tag/v2.6.1

Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 package/gerbera/0001-fix_fmt_12.patch | 29 +++++++++++++++++++++++++++
 package/gerbera/Config.in             |  2 ++
 package/gerbera/gerbera.hash          |  2 +-
 package/gerbera/gerbera.mk            |  4 +++-
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 package/gerbera/0001-fix_fmt_12.patch

diff --git a/package/gerbera/0001-fix_fmt_12.patch b/package/gerbera/0001-fix_fmt_12.patch
new file mode 100644
index 0000000000..a10b78dae6
--- /dev/null
+++ b/package/gerbera/0001-fix_fmt_12.patch
@@ -0,0 +1,29 @@
+From f8e158bc72986e46b93d05358c29db0c10f2fe9f Mon Sep 17 00:00:00 2001
+From: Karlchen <k_straussberger@netzland.net>
+Date: Wed, 17 Sep 2025 21:18:49 +0200
+Subject: [PATCH] Update to fmt 12.0.0
+
+Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
+Upstream: https://github.com/gerbera/gerbera/commit/f8e158bc72986e46b93d05358c29db0c10f2fe9f
+[buildroot@heine.tech: removed all patch content not patching actual code]
+
+---
+ src/web/config_load.cc            | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/web/config_load.cc b/src/web/config_load.cc
+index 8b296c43e0..4259ae3331 100644
+--- a/src/web/config_load.cc
++++ b/src/web/config_load.cc
+@@ -150,7 +150,11 @@ void Web::ConfigLoad::addNewValue(
+ template <typename T>
+ void Web::ConfigLoad::setValue(Json::Value& item, const T& value)
+ {
++#if FMT_VERSION >= 120000
++    static_assert(fmt::is_formattable<T, fmt::format_context>::value, "T must be formattable");
++#else
+     static_assert(fmt::has_formatter<T, fmt::format_context>::value, "T must be formattable");
++#endif
+     item[CONFIG_LOAD_VALUE] = fmt::to_string(value);
+ }
+ 
diff --git a/package/gerbera/Config.in b/package/gerbera/Config.in
index 46a163ec78..3372d86fba 100644
--- a/package/gerbera/Config.in
+++ b/package/gerbera/Config.in
@@ -8,6 +8,8 @@ config BR2_PACKAGE_GERBERA
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_WCHAR # fmt
 	select BR2_PACKAGE_FMT
+	select BR2_PACKAGE_ICU
+	select BR2_PACKAGE_JSONCPP
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBUPNP if !BR2_PACKAGE_LIBNPUPNP
 	select BR2_PACKAGE_PUGIXML
diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash
index edbe655dde..3056ff11ac 100644
--- a/package/gerbera/gerbera.hash
+++ b/package/gerbera/gerbera.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  563ee3941b0347a91f5a3e9fe151032bd0e26868bfe7b7c68a7c095f8b07677b  gerbera-2.4.1.tar.gz
+sha256  6a7ed1c73bd86bdddd76bcb6c4bcd2e42788a20eb1f3165e0ea9f456abccd3ed  gerbera-2.6.1.tar.gz
 sha256  cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6  LICENSE.md
diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk
index 9434f6fe64..d2d68db686 100644
--- a/package/gerbera/gerbera.mk
+++ b/package/gerbera/gerbera.mk
@@ -4,12 +4,14 @@
 #
 ################################################################################
 
-GERBERA_VERSION = 2.4.1
+GERBERA_VERSION = 2.6.1
 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION))
 GERBERA_LICENSE = GPL-2.0
 GERBERA_LICENSE_FILES = LICENSE.md
 GERBERA_DEPENDENCIES = \
 	fmt \
+	icu \
+	jsoncpp \
 	host-pkgconf \
 	pugixml \
 	spdlog \