Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package/fmt/fmt.hash
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion package/fmt/fmt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
148 changes: 148 additions & 0 deletions package/gerbera/0001-Fix-the-following-errors.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
From 7caa9ae9ebf5c4cded5a292701528ff1d5c4946e Mon Sep 17 00:00:00 2001
From: Downtown Allday <downtownallday@gmail.com>
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 <cstring>. 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 <bernd@kuhls.net>
---
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 <pugixml.hpp>
+#include <cstring>

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 <sys/select.h>
#include <thread>
#include <unistd.h>
+#include <cstring>
#ifdef SOLARIS
#include <sys/filio.h> // 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 <cstring>

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 <fcntl.h>
#include <fstream>
#include <sstream>
+#include <cstring>
#include <sys/stat.h>
#include <unistd.h>

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 <ifaddrs.h>
#include <netdb.h>
#include <regex>
+#include <cstring>

#ifdef SOLARIS
#include <sys/sockio.h>
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 <array>
#include <vector>
+#include <cstring>
#if FMT_VERSION >= 100202
#include <fmt/ranges.h>
#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 <cstring>

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 <mutex>
#include <pthread.h>
#include <thread>
+#include <cstring>

using ThreadProc = std::function<void(void* target)>;

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 <queue>
#include <regex>
#include <sstream>
+#include <cstring>

#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 <fmt/ranges.h>
#endif
#include <sstream>
+#include <cstring>

// URL FORMATTING CONSTANTS
#define URL_UI_PARAM_SEPARATOR '?'
47 changes: 47 additions & 0 deletions package/gerbera/0002-Fix-the-following-error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
From 9507706136fde8c324d95d5c84c78bae1703bafc Mon Sep 17 00:00:00 2001
From: Downtown Allday <downtownallday@gmail.com>
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 <bernd@kuhls.net>
---
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 <algorithm>
-#include <fmt/core.h>
+#include <fmt/format.h>
#include <map>
#include <memory>
#include <tuple>
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 <fmt/core.h>
+#include <fmt/format.h>
#include <stdexcept>
#include <string>