[meta-multimedia,6/17] gerbera: upgrade 3.2.1 -> 3.3.0

Message ID	20261001030331.1581021-6-ankur.tyagi85@gmail.com
State	New
Headers	show Return-Path: <ankur.tyagi85@gmail.com> ip: 74.125.228.41, mailfrom: ankur.tyagi85@gmail.com) From: ankur.tyagi85@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Ankur Tyagi <ankur.tyagi85@gmail.com> Subject: [oe][meta-multimedia][PATCH 6/17] gerbera: upgrade 3.2.1 -> 3.3.0 Date: Thu, 1 Oct 2026 16:03:18 +1300 Message-ID: <20261001030331.1581021-6-ankur.tyagi85@gmail.com> In-Reply-To: <20261001030331.1581021-1-ankur.tyagi85@gmail.com> References: <20261001030331.1581021-1-ankur.tyagi85@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[meta-gnome,1/17] gnome-online-accounts-gtk: upgrade 3.50.10 -> 3.50.11 \| expand [meta-gnome,1/17] gnome-online-accounts-gtk: upgrade 3.50.10 -> 3.50.11 [meta-gnome,2/17] glycin: upgrade 2.2.0 -> 2.2.1 [meta-multimedia,3/17] aom: upgrade 3.14.1 -> 3.15.1 [meta-multimedia,4/17] pipewire: upgrade 1.6.8 -> 1.6.9 [meta-multimedia,5/17] wireplumber: upgrade 0.5.17 -> 0.5.18 [meta-multimedia,6/17] gerbera: upgrade 3.2.1 -> 3.3.0 [meta-multimedia,7/17] spandsp: upgrade 3.0.0 -> 3.1.1 [meta-multimedia,8/17] vlc: upgrade 3.0.23 -> 3.0.24 [meta-networking,9/17] dhcp-relay: set UPSTREAM_VERSION_UNKNOWN [meta-networking,10/17] wolfssl: upgrade 5.9.2 -> 5.9.4 [meta-networking,11/17] iscsi-initiator-utils: upgrade 2.1.12 -> 2.1.13 [meta-networking,12/17] squid: upgrade 7.6 -> 7.7 [meta-networking,13/17] frr: upgrade 10.6.1 -> 10.6.2 [meta-oe,14/17] iperf3: upgrade 3.21 -> 3.22 [meta-oe,15/17] leancrypto: upgrade 1.9.0 -> 1.9.1 [meta-oe,16/17] microsoft-gsl: upgrade 5.0.0 -> 5.0.1 [meta-oe,17/17] mpich: upgrade 5.0.1 -> 5.0.2

diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-build-against-fmt-12-include-fmt-format.h.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-build-against-fmt-12-include-fmt-format.h.patch deleted file mode 100644 index eaaf7869e5..0000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-build-against-fmt-12-include-fmt-format.h.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9507706136fd0000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj <khem.raj@oss.qualcomm.com> -Date: Wed, 8 Jul 2026 00:00:00 +0000 -Subject: [PATCH] fix build against fmt 12: include fmt/format.h - -Since fmt 11, <fmt/core.h> is a thin shim that only pulls in <fmt/base.h> -and no longer declares fmt::format() unless FMT_DEPRECATED_HEAVY_CORE is -defined. fmt 12.2.0 finishes the job and the build fails with: - - src/exceptions.cc:37:31: error: no member named 'format' in namespace 'fmt' - : std::runtime_error(fmt::format("{}: Error: {}", message, userMessage)) - -Include <fmt/format.h> in the central headers that expose fmt::format() -to the rest of the tree (exceptions.h via throw_std_runtime_error, and -search_handler.h) so all consumers see the declaration again. - -Backport of gerbera commit 9507706136fd. - -Upstream-Status: Backport [https://github.com/gerbera/gerbera/commit/9507706136fd] -Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> ---- - src/exceptions.h | 2 +- - src/database/search_handler.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/exceptions.h b/src/exceptions.h -index 1111111..2222222 100644 ---- a/src/exceptions.h -+++ b/src/exceptions.h -@@ -34,7 +34,7 @@ - #ifndef __EXCEPTIONS_H__ - #define __EXCEPTIONS_H__ - --#include <fmt/core.h> -+#include <fmt/format.h> - #include <stdexcept> - #include <string> - -diff --git a/src/database/search_handler.h b/src/database/search_handler.h -index 3333333..4444444 100644 ---- a/src/database/search_handler.h -+++ b/src/database/search_handler.h -@@ -32,7 +32,7 @@ - #include "util/tools.h" - - #include <algorithm> --#include <fmt/core.h> -+#include <fmt/format.h> - #include <map> - #include <memory> - #include <tuple> --- -2.43.0 diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0002-include-cstring-for-std-strerror-std-memcpy.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0002-include-cstring-for-std-strerror-std-memcpy.patch deleted file mode 100644 index 14742f4727..0000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0002-include-cstring-for-std-strerror-std-memcpy.patch +++ /dev/null @@ -1,204 +0,0 @@ -From 7caa9ae9ebf50000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Khem Raj <khem.raj@oss.qualcomm.com> -Date: Wed, 8 Jul 2026 00:00:01 +0000 -Subject: [PATCH] include <cstring> for std::strerror / std::memcpy / std::strchr - -Several translation units use std::strerror(), std::memcpy() and -std::strchr() but relied on <cstring> being pulled in transitively -through <fmt/core.h> (and other headers). With fmt 12 the fmt headers no -longer drag in <cstring>, so the build fails with: - - src/util/thread_runner.h:194:68: error: no member named 'strerror' in namespace 'std' - src/content/inotify/mt_inotify.cc:163:13: error: no member named 'memcpy' in namespace 'std' - src/util/url_utils.cc:144:24: error: no member named 'strchr' in namespace 'std' - -Include <cstring> explicitly in every file that uses these functions. - -Based on upstream gerbera commit 7caa9ae9ebf5, extended to cover all -affected translation units in this release. - -Upstream-Status: Backport [https://github.com/gerbera/gerbera/commit/7caa9ae9ebf5] -Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> ---- ---- a/src/main.cc -+++ b/src/main.cc -@@ -40,6 +40,7 @@ - #define GRB_LOG_FAC GrbLogFacility::server - - #include "config/config_definition.h" -+#include <cstring> - #include "config/config_manager.h" - #include "config/config_val.h" - #include "config/grb_runtime.h" ---- a/src/database/sqlite3/sqlite_database.cc -+++ b/src/database/sqlite3/sqlite_database.cc -@@ -33,6 +33,7 @@ - #define GRB_LOG_FAC GrbLogFacility::sqlite3 - - #include "sqlite_database.h" // API -+#include <cstring> - - #include "cds/cds_enums.h" - #include "config/config.h" ---- a/src/database/postgres/postgres_database.cc -+++ b/src/database/postgres/postgres_database.cc -@@ -25,6 +25,7 @@ - - #ifdef HAVE_PGSQL - #include "postgres_database.h" // API -+#include <cstring> - - #include "cds/cds_enums.h" - #include "config/config.h" ---- a/src/iohandler/mem_io_handler.cc -+++ b/src/iohandler/mem_io_handler.cc -@@ -33,6 +33,7 @@ - #define GRB_LOG_FAC GrbLogFacility::iohandler - - #include "mem_io_handler.h" // API -+#include <cstring> - - #include "exceptions.h" - ---- a/src/iohandler/process_io_handler.cc -+++ b/src/iohandler/process_io_handler.cc -@@ -33,6 +33,7 @@ - #define GRB_LOG_FAC GrbLogFacility::iohandler - - #include "process_io_handler.h" // API -+#include <cstring> - - #include "content/content.h" - #include "exceptions.h" ---- a/src/iohandler/curl_io_handler.cc -+++ b/src/iohandler/curl_io_handler.cc -@@ -34,6 +34,7 @@ - - #ifdef HAVE_CURL - #include "curl_io_handler.h" // API -+#include <cstring> - - #include "config/config.h" - #include "exceptions.h" ---- a/src/config/grb_runtime.cc -+++ b/src/config/grb_runtime.cc -@@ -22,6 +22,7 @@ - #define GRB_LOG_FAC GrbLogFacility::server - - #include "grb_runtime.h" // API -+#include <cstring> - - #include "config/config.h" - #include "config/config_definition.h" ---- a/src/util/grb_net.cc -+++ b/src/util/grb_net.cc -@@ -21,6 +21,7 @@ - /// @file util/grb_net.cc - #define GRB_LOG_FAC GrbLogFacility::clients - #include "grb_net.h" // API -+#include <cstring> - - #include "exceptions.h" - #include "logger.h" ---- a/src/util/grb_fs.cc -+++ b/src/util/grb_fs.cc -@@ -21,6 +21,7 @@ - /// @file util/grb_fs.cc - #define GRB_LOG_FAC GrbLogFacility::content - #include "grb_fs.h" // API -+#include <cstring> - - #include "exceptions.h" - #include "util/logger.h" ---- a/src/config/setup/config_setup_path.cc -+++ b/src/config/setup/config_setup_path.cc -@@ -25,6 +25,7 @@ - #define GRB_LOG_FAC GrbLogFacility::config - - #include "config_setup_path.h" // API -+#include <cstring> - - #include "config/config_definition.h" - #include "config/config_options.h" ---- a/src/util/thread_executor.cc -+++ b/src/util/thread_executor.cc -@@ -32,6 +32,7 @@ - /// @file util/thread_executor.cc - - #include "thread_executor.h" // API -+#include <cstring> - - #include "util/logger.h" - ---- a/src/util/thread_runner.h -+++ b/src/util/thread_runner.h -@@ -28,6 +28,7 @@ - - #include "config/config.h" - #include "thread_executor.h" -+#include <cstring> - #include "util/logger.h" - - #include <chrono> ---- a/src/util/string_converter.cc -+++ b/src/util/string_converter.cc -@@ -32,6 +32,7 @@ - /// @file util/string_converter.cc - #define GRB_LOG_FAC GrbLogFacility::util - #include "string_converter.h" // API -+#include <cstring> - - #include "common.h" - #include "config/config.h" ---- a/src/content/inotify/mt_inotify.cc -+++ b/src/content/inotify/mt_inotify.cc -@@ -41,6 +41,7 @@ - - #ifdef HAVE_INOTIFY - #include "mt_inotify.h" -+#include <cstring> - - #include "exceptions.h" - #include "util/logger.h" ---- a/src/metadata/metacontent_handler.cc -+++ b/src/metadata/metacontent_handler.cc -@@ -25,6 +25,7 @@ - #define GRB_LOG_FAC GrbLogFacility::metadata - - #include "metacontent_handler.h" // API -+#include <cstring> - - #include "cds/cds_item.h" - #include "cds/cds_objects.h" ---- a/src/transcoding/transcode_ext_handler.cc -+++ b/src/transcoding/transcode_ext_handler.cc -@@ -33,6 +33,7 @@ - #define GRB_LOG_FAC GrbLogFacility::transcoding - - #include "transcode_ext_handler.h" // API -+#include <cstring> - - #include "cds/cds_objects.h" - #include "config/config.h" ---- a/src/util/tools.cc -+++ b/src/util/tools.cc -@@ -32,6 +32,7 @@ - /// @file util/tools.cc - #define GRB_LOG_FAC GrbLogFacility::content - #include "tools.h" // API -+#include <cstring> - - #include "config/config.h" - #include "contrib/md5.h" ---- a/src/util/url_utils.cc -+++ b/src/util/url_utils.cc -@@ -22,6 +22,7 @@ - /// @file util/url_utils.cc - #define GRB_LOG_FAC GrbLogFacility::content - #include "url_utils.h" // API -+#include <cstring> - - #include "exceptions.h" - --- -2.43.0 diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.2.1.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.3.0.bb similarity index 88% rename from meta-multimedia/recipes-multimedia/gerbera/gerbera_3.2.1.bb rename to meta-multimedia/recipes-multimedia/gerbera/gerbera_3.3.0.bb index 8ae899d3ec..3d28273f30 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.2.1.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_3.3.0.bb @@ -4,10 +4,8 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master;tag=v${PV} \ - file://0001-fix-build-against-fmt-12-include-fmt-format.h.patch \ - file://0002-include-cstring-for-std-strerror-std-memcpy.patch \ " -SRCREV = "a6a2bb2991d197a52755a488fc943566d654d3bd" +SRCREV = "28361d9e22812c9d7042a85b355a17c8f8495217" DEPENDS = "pugixml sqlite3 zlib fmt spdlog util-linux-libuuid libupnp libnsl2 icu jsoncpp cxxopts"

[meta-multimedia,6/17] gerbera: upgrade 3.2.1 -> 3.3.0

Commit Message

Patch