From cc5c36afffd71e6e01a9371f1a7316fc10a8e3f9 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 29 Jun 2026 09:14:18 +0200 Subject: [PATCH 1/2] package/fmt: bump to version 12.2.0 changelog: https://github.com/fmtlib/fmt/releases/tag/12.2.0 LICENSE hash changed due to split-out of exceptions: https://github.com/fmtlib/fmt/commit/91d1aced0a846161135310249664506b4a56e196 Signed-off-by: Michael Nosthoff Signed-off-by: Julien Olivain --- package/fmt/fmt.hash | 4 ++-- package/fmt/fmt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 76bdd3171b1..094a755aacf 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 695fd197fa5aff8fc67b5f2bbc110490a875cdf7a41686ac8512fb480fa8ada7 fmt-12.1.0.zip -sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE +sha256 a2f4a8d51178f954e4c339007f77edd76ba0cb2e36f87a48e5a5403d9be5878f fmt-12.2.0.zip +sha256 a65fcc5a1095fc33cc37e4fff69366e49d7e92f613558a2b95ed1b70e33758b4 LICENSE diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 7d11cfddc3b..b1d25e077b4 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 12.1.0 +FMT_VERSION = 12.2.0 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception From 9ebfc351bea9556b35878a4629dc8c34dcfee3fc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 5 Jul 2026 19:26:16 +0200 Subject: [PATCH 2/2] package/gerbera: add upstream patches to fix build with fmt 12.2.0 Buildroot commit cc5c36afffd71e6e01a9371f1a7316fc10a8e3f9 bumped fmt to version 12.2.0 which breaks the gerbera build. To fix the problem we add two upstream patches. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- .../0001-Fix-the-following-errors.patch | 148 ++++++++++++++++++ .../0002-Fix-the-following-error.patch | 47 ++++++ 2 files changed, 195 insertions(+) create mode 100644 package/gerbera/0001-Fix-the-following-errors.patch create mode 100644 package/gerbera/0002-Fix-the-following-error.patch diff --git a/package/gerbera/0001-Fix-the-following-errors.patch b/package/gerbera/0001-Fix-the-following-errors.patch new file mode 100644 index 00000000000..c474d32aab6 --- /dev/null +++ b/package/gerbera/0001-Fix-the-following-errors.patch @@ -0,0 +1,148 @@ +From 7caa9ae9ebf5c4cded5a292701528ff1d5c4946e Mon Sep 17 00:00:00 2001 +From: Downtown Allday +Date: Fri, 3 Apr 2026 09:31:07 -0400 +Subject: [PATCH] Fix the following errors: error: no member named 'strerror' + in namespace 'std' error: no member named 'memcpy' in namespace 'std' error: + no member named 'strchr' in namespace 'std' + +all of these require . see: +https://en.cppreference.com/w/cpp/string/byte/strerror +https://en.cppreference.com/w/cpp/string/byte/memcpy +https://en.cppreference.com/w/cpp/string/byte/strchr + +Upstream: https://github.com/gerbera/gerbera/commit/7caa9ae9ebf5c4cded5a292701528ff1d5c4946e + +Signed-off-by: Bernd Kuhls +--- + src/config/setup/config_setup_path.cc | 1 + + src/content/inotify/mt_inotify.cc | 1 + + src/iohandler/mem_io_handler.cc | 1 + + src/util/grb_fs.cc | 1 + + src/util/grb_net.cc | 1 + + src/util/string_converter.cc | 1 + + src/util/thread_executor.cc | 1 + + src/util/thread_runner.h | 1 + + src/util/tools.cc | 1 + + src/util/url_utils.cc | 1 + + 10 files changed, 10 insertions(+) + +diff --git a/src/config/setup/config_setup_path.cc b/src/config/setup/config_setup_path.cc +index cdb7244e4..a10e3c9f2 100644 +--- a/src/config/setup/config_setup_path.cc ++++ b/src/config/setup/config_setup_path.cc +@@ -31,6 +31,7 @@ + #include "util/logger.h" + + #include ++#include + + bool ConfigPathSetup::checkPathValue(std::string& optValue, std::string& pathValue) const + { +diff --git a/src/content/inotify/mt_inotify.cc b/src/content/inotify/mt_inotify.cc +index e938e60a1..e140b5f4f 100644 +--- a/src/content/inotify/mt_inotify.cc ++++ b/src/content/inotify/mt_inotify.cc +@@ -52,6 +52,7 @@ + #include + #include + #include ++#include + #ifdef SOLARIS + #include // FIONREAD + #endif +diff --git a/src/iohandler/mem_io_handler.cc b/src/iohandler/mem_io_handler.cc +index 21e4a1960..ba16a10d7 100644 +--- a/src/iohandler/mem_io_handler.cc ++++ b/src/iohandler/mem_io_handler.cc +@@ -35,6 +35,7 @@ + #include "mem_io_handler.h" // API + + #include "exceptions.h" ++#include + + MemIOHandler::MemIOHandler(const void* buffer, int length) + : buffer(new char[length]) +diff --git a/src/util/grb_fs.cc b/src/util/grb_fs.cc +index cd3e612a7..09c892f2e 100644 +--- a/src/util/grb_fs.cc ++++ b/src/util/grb_fs.cc +@@ -30,6 +30,7 @@ Gerbera - https://gerbera.io/ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/util/grb_net.cc b/src/util/grb_net.cc +index 8986bfa4a..68395e001 100644 +--- a/src/util/grb_net.cc ++++ b/src/util/grb_net.cc +@@ -30,6 +30,7 @@ Gerbera - https://gerbera.io/ + #include + #include + #include ++#include + + #ifdef SOLARIS + #include +diff --git a/src/util/string_converter.cc b/src/util/string_converter.cc +index fa11e1de2..21e2760d9 100644 +--- a/src/util/string_converter.cc ++++ b/src/util/string_converter.cc +@@ -42,6 +42,7 @@ + + #include + #include ++#include + #if FMT_VERSION >= 100202 + #include + #endif +diff --git a/src/util/thread_executor.cc b/src/util/thread_executor.cc +index 669856272..ca0a1755c 100644 +--- a/src/util/thread_executor.cc ++++ b/src/util/thread_executor.cc +@@ -34,6 +34,7 @@ + #include "thread_executor.h" // API + + #include "util/logger.h" ++#include + + ThreadExecutor::~ThreadExecutor() + { +diff --git a/src/util/thread_runner.h b/src/util/thread_runner.h +index a2e55f8eb..08dbc8b9c 100644 +--- a/src/util/thread_runner.h ++++ b/src/util/thread_runner.h +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + using ThreadProc = std::function; + +diff --git a/src/util/tools.cc b/src/util/tools.cc +index 2174ff352..cc1877286 100644 +--- a/src/util/tools.cc ++++ b/src/util/tools.cc +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + + #ifdef __HAIKU__ + #define _DEFAULT_SOURCE +diff --git a/src/util/url_utils.cc b/src/util/url_utils.cc +index efb4099ec..3127d53fb 100644 +--- a/src/util/url_utils.cc ++++ b/src/util/url_utils.cc +@@ -30,6 +30,7 @@ Gerbera - https://gerbera.io/ + #include + #endif + #include ++#include + + // URL FORMATTING CONSTANTS + #define URL_UI_PARAM_SEPARATOR '?' diff --git a/package/gerbera/0002-Fix-the-following-error.patch b/package/gerbera/0002-Fix-the-following-error.patch new file mode 100644 index 00000000000..01f135bbed3 --- /dev/null +++ b/package/gerbera/0002-Fix-the-following-error.patch @@ -0,0 +1,47 @@ +From 9507706136fde8c324d95d5c84c78bae1703bafc Mon Sep 17 00:00:00 2001 +From: Downtown Allday +Date: Fri, 3 Apr 2026 09:34:00 -0400 +Subject: [PATCH] fix the following error: error: no member named 'format' in + namespace 'fmt' + +the comment in fmt/core.h says including 'format' via core is deprectated: +// Using fmt::format via fmt/core.h has been deprecated since version 11 +// and now requires an explicit opt in. +#ifdef FMT_DEPRECATED_HEAVY_CORE +# include "format.h" +#endif + +Upstream: https://github.com/gerbera/gerbera/commit/9507706136fde8c324d95d5c84c78bae1703bafc + +Signed-off-by: Bernd Kuhls +--- + src/database/search_handler.h | 2 +- + src/exceptions.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/search_handler.h b/src/database/search_handler.h +index ac5afb1b7..c1c99d00d 100644 +--- a/src/database/search_handler.h ++++ b/src/database/search_handler.h +@@ -32,7 +32,7 @@ + #include "util/tools.h" + + #include +-#include ++#include + #include + #include + #include +diff --git a/src/exceptions.h b/src/exceptions.h +index 180e63ad4..e5ed74f3d 100644 +--- a/src/exceptions.h ++++ b/src/exceptions.h +@@ -34,7 +34,7 @@ + #ifndef __EXCEPTIONS_H__ + #define __EXCEPTIONS_H__ + +-#include ++#include + #include + #include +