pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/multimedia/gerbera
Module Name: pkgsrc
Committed By: wiz
Date: Thu Jun 25 08:16:54 UTC 2026
Modified Files:
pkgsrc/multimedia/gerbera: distinfo
Added Files:
pkgsrc/multimedia/gerbera/patches:
patch-src_config_setup_config__setup__path.cc
patch-src_content_inotify_mt__inotify.cc
patch-src_database_search__handler.h
patch-src_database_sqlite3_sqlite__database.cc
patch-src_exceptions.h patch-src_iohandler_curl__io__handler.cc
patch-src_iohandler_mem__io__handler.cc
patch-src_iohandler_process__io__handler.cc
patch-src_metadata_metacontent__handler.cc
patch-src_transcoding_transcode__ext__handler.cc
patch-src_util_grb__fs.cc patch-src_util_grb__net.cc
patch-src_util_string__converter.cc
patch-src_util_thread__executor.cc patch-src_util_thread__runner.h
patch-src_util_tools.cc patch-src_util_url__utils.cc
Log Message:
gerbera: fix build
Not sure where these std:: problems come from, the fmt changes
are needed for fmtlib 12.2.0
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/gerbera/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/gerbera/patches/patch-src_config_setup_config__setup__path.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_content_inotify_mt__inotify.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_database_search__handler.h \
pkgsrc/multimedia/gerbera/patches/patch-src_database_sqlite3_sqlite__database.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_exceptions.h \
pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_curl__io__handler.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_mem__io__handler.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_process__io__handler.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_metadata_metacontent__handler.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_transcoding_transcode__ext__handler.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__fs.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__net.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__executor.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__runner.h \
pkgsrc/multimedia/gerbera/patches/patch-src_util_tools.cc \
pkgsrc/multimedia/gerbera/patches/patch-src_util_url__utils.cc
cvs rdiff -u -r0 -r1.5 \
pkgsrc/multimedia/gerbera/patches/patch-src_util_string__converter.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/multimedia/gerbera/distinfo
diff -u pkgsrc/multimedia/gerbera/distinfo:1.12 pkgsrc/multimedia/gerbera/distinfo:1.13
--- pkgsrc/multimedia/gerbera/distinfo:1.12 Sat Feb 7 23:11:45 2026
+++ pkgsrc/multimedia/gerbera/distinfo Thu Jun 25 08:16:53 2026
@@ -1,7 +1,24 @@
-$NetBSD: distinfo,v 1.12 2026/02/07 23:11:45 khorben Exp $
+$NetBSD: distinfo,v 1.13 2026/06/25 08:16:53 wiz Exp $
BLAKE2s (gerbera-3.0.0.tar.gz) = cc092c0713a9203ee7202f913f2f120066b43a37cf311b926cb118e5b6334e51
SHA512 (gerbera-3.0.0.tar.gz) = c57e52fb1012687caa78b2a35751602afbb67d204acb2895c74121e07c2163162899b5bbbb81ecbedcaf5e3c84ae7c0453eee7b4fa4e4145ecd44b9d507b09ef
Size (gerbera-3.0.0.tar.gz) = 9916800 bytes
SHA1 (patch-CMakeLists.txt) = 7b8e0e42547da4545be4fdf19dd27e6b5592f21d
SHA1 (patch-src_config_grb__runtime.cc) = f3118cbffe4fa13bb3a552f31d86cb9bc486b95f
+SHA1 (patch-src_config_setup_config__setup__path.cc) = d1009b7fc964af82a37ab94a31f40df91481afa2
+SHA1 (patch-src_content_inotify_mt__inotify.cc) = 6fb057556146b13e2208d8c7c1061d11f4a1580d
+SHA1 (patch-src_database_search__handler.h) = 29770f35aac4b0c3d611082e7fad32a351cb7c98
+SHA1 (patch-src_database_sqlite3_sqlite__database.cc) = a9b6c4f2e9130b91a81a78d83a5010c228de2ace
+SHA1 (patch-src_exceptions.h) = c8dc96720b329a8dd9c5547b255b3c399b214178
+SHA1 (patch-src_iohandler_curl__io__handler.cc) = 95229c952147b6a829807d49c5350da3227bfc01
+SHA1 (patch-src_iohandler_mem__io__handler.cc) = 2eb064e9baa47f136a914b546d6dfdab47457415
+SHA1 (patch-src_iohandler_process__io__handler.cc) = b28d15682307f70620203fd08d01781b4a1b7e2e
+SHA1 (patch-src_metadata_metacontent__handler.cc) = fe221b8463c237ea8f56f1c544eaa934fb4419fd
+SHA1 (patch-src_transcoding_transcode__ext__handler.cc) = 2ebac4b4f3791cb4b6eedc1c12f4162b8073784c
+SHA1 (patch-src_util_grb__fs.cc) = 8ce707de57333efa3256177ca87cadd67f4c610f
+SHA1 (patch-src_util_grb__net.cc) = b8e82b8af5ff07d7465d56ecfc706f4490f500aa
+SHA1 (patch-src_util_string__converter.cc) = fb6535b2fe428e6e0328c3caa91dae73be77cdd9
+SHA1 (patch-src_util_thread__executor.cc) = 3cabc159a216865b3e96212bac4097e957c75aed
+SHA1 (patch-src_util_thread__runner.h) = 55369375992cf16f63e23816235bc1fe61faa795
+SHA1 (patch-src_util_tools.cc) = d91bfaeb8d0357fae97a4ab1c92dc08fcb66739a
+SHA1 (patch-src_util_url__utils.cc) = 124aaac305373e955f263aebb228cb93974c5937
Added files:
Index: pkgsrc/multimedia/gerbera/patches/patch-src_config_setup_config__setup__path.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_config_setup_config__setup__path.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_config_setup_config__setup__path.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_config_setup_config__setup__path.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/config/setup/config_setup_path.cc.orig 2026-06-25 07:58:51.173207423 +0000
++++ src/config/setup/config_setup_path.cc
+@@ -60,7 +60,7 @@ bool ConfigPathSetup::checkExecutable(std::string& opt
+
+ int err = 0;
+ if (!isExecutable(tmpPath, &err)) {
+- log_warning("Error in configuration, file {} is not executable: {} for '{}'", optValue, std::strerror(err), cpath);
++ log_warning("Error in configuration, file {} is not executable: {} for '{}'", optValue, strerror(err), cpath);
+ return !isSet(ConfigPathArguments::mustExist);
+ }
+ return true;
Index: pkgsrc/multimedia/gerbera/patches/patch-src_content_inotify_mt__inotify.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_content_inotify_mt__inotify.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_content_inotify_mt__inotify.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,58 @@
+$NetBSD: patch-src_content_inotify_mt__inotify.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/content/inotify/mt_inotify.cc.orig 2026-06-25 08:07:25.541654487 +0000
++++ src/content/inotify/mt_inotify.cc
+@@ -108,12 +108,12 @@ int Inotify::addWatch(const fs::path& path, InotifyFla
+ throw_fmt_system_error("The user limit on the total number of inotify watches was reached or the kernel failed to allocate a needed resource.");
+ if (errno == EACCES) {
+ if (retryCount > 0) {
+- log_debug("Retrying {} to add inotify watch for {}: {}", retryCount, path.c_str(), std::strerror(errno));
++ log_debug("Retrying {} to add inotify watch for {}: {}", retryCount, path.c_str(), strerror(errno));
+ std::this_thread::sleep_for(std::chrono::milliseconds(100));
+ retryCount--;
+ continue;
+ } else {
+- log_warning("Cannot add inotify watch for {}: {}", path.c_str(), std::strerror(errno));
++ log_warning("Cannot add inotify watch for {}: {}", path.c_str(), strerror(errno));
+ return -1;
+ }
+ }
+@@ -128,7 +128,7 @@ void Inotify::removeWatch(int wd) const
+ void Inotify::removeWatch(int wd) const
+ {
+ if (inotify_rm_watch(inotify_fd, wd) < 0) {
+- log_debug("Error removing watch: {}", std::strerror(errno));
++ log_debug("Error removing watch: {}", strerror(errno));
+ }
+ }
+
+@@ -160,7 +160,7 @@ struct inotify_event* Inotify::nextEvent()
+
+ // how much of the event do we have?
+ bytes = reinterpret_cast<char*>(event.data()) + bytes - reinterpret_cast<char*>(ret);
+- std::memcpy(event.data(), ret, bytes);
++ memcpy(event.data(), ret, bytes);
+ return nextEvent();
+ }
+ return ret;
+@@ -196,7 +196,7 @@ struct inotify_event* Inotify::nextEvent()
+ if (FD_ISSET(stop_fd_read, &readFds)) {
+ char buf;
+ if (read(stop_fd_read, &buf, 1) == -1) {
+- log_error("Inotify: could not read stop: {}", std::strerror(errno));
++ log_error("Inotify: could not read stop: {}", strerror(errno));
+ }
+ }
+
+@@ -241,7 +241,7 @@ void Inotify::stop() const
+ {
+ char stop = 's';
+ if (write(stop_fd_write, &stop, 1) == -1) {
+- log_error("inotify: could not send stop: {}", std::strerror(errno));
++ log_error("inotify: could not send stop: {}", strerror(errno));
+ }
+ }
+
Index: pkgsrc/multimedia/gerbera/patches/patch-src_database_search__handler.h
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_database_search__handler.h:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_database_search__handler.h Thu Jun 25 08:16:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_database_search__handler.h,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/database/search_handler.h.orig 2026-06-25 07:59:32.782514264 +0000
++++ src/database/search_handler.h
+@@ -33,6 +33,7 @@
+
+ #include <algorithm>
+ #include <fmt/core.h>
++#include <fmt/format.h>
+ #include <map>
+ #include <memory>
+ #include <tuple>
Index: pkgsrc/multimedia/gerbera/patches/patch-src_database_sqlite3_sqlite__database.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_database_sqlite3_sqlite__database.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_database_sqlite3_sqlite__database.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_database_sqlite3_sqlite__database.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/database/sqlite3/sqlite_database.cc.orig 2026-06-25 08:00:54.461931648 +0000
++++ src/database/sqlite3/sqlite_database.cc
+@@ -179,7 +179,7 @@ void Sqlite3Database::run()
+
+ // check for db-file
+ if (!dbFile.isWritable())
+- throw DatabaseException("", fmt::format("Error while accessing sqlite database file ({}): {}", dbFilePath.c_str(), std::strerror(errno)));
++ throw DatabaseException("", fmt::format("Error while accessing sqlite database file ({}): {}", dbFilePath.c_str(), strerror(errno)));
+
+ taskQueueOpen = true;
+ threadRunner = std::make_unique<StdThreadRunner>(
+@@ -188,7 +188,7 @@ void Sqlite3Database::run()
+ inst->threadProc(); }, this);
+
+ if (!threadRunner->isAlive()) {
+- throw DatabaseException("", fmt::format("Could not start sqlite thread: {}", std::strerror(errno)));
++ throw DatabaseException("", fmt::format("Could not start sqlite thread: {}", strerror(errno)));
+ }
+
+ // wait for sqlite3 thread to become ready
Index: pkgsrc/multimedia/gerbera/patches/patch-src_exceptions.h
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_exceptions.h:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_exceptions.h Thu Jun 25 08:16:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_exceptions.h,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/exceptions.h.orig 2026-06-25 08:08:45.581012687 +0000
++++ src/exceptions.h
+@@ -35,6 +35,7 @@
+ #define __EXCEPTIONS_H__
+
+ #include <fmt/core.h>
++#include <fmt/format.h>
+ #include <stdexcept>
+ #include <string>
+
Index: pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_curl__io__handler.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_curl__io__handler.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_curl__io__handler.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_iohandler_curl__io__handler.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/iohandler/curl_io_handler.cc.orig 2026-06-25 08:06:49.062007872 +0000
++++ src/iohandler/curl_io_handler.cc
+@@ -237,9 +237,9 @@ std::size_t CurlIOHandler::curlCallback(void* ptr, std
+
+ lock.unlock();
+
+- std::memcpy(ego->buffer + bLocal, ptr, write1);
++ memcpy(ego->buffer + bLocal, ptr, write1);
+ if (write2)
+- std::memcpy(ego->buffer, static_cast<char*>(ptr) + maxWrite, write2);
++ memcpy(ego->buffer, static_cast<char*>(ptr) + maxWrite, write2);
+
+ lock.lock();
+
Index: pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_mem__io__handler.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_mem__io__handler.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_mem__io__handler.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_iohandler_mem__io__handler.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/iohandler/mem_io_handler.cc.orig 2026-06-25 08:09:40.536374639 +0000
++++ src/iohandler/mem_io_handler.cc
+@@ -40,14 +40,14 @@ MemIOHandler::MemIOHandler(const void* buffer, int len
+ : buffer(new char[length])
+ , length(length)
+ {
+- std::memcpy(this->buffer, buffer, length);
++ memcpy(this->buffer, buffer, length);
+ }
+
+ MemIOHandler::MemIOHandler(const std::string& str)
+ : buffer(new char[str.length()])
+ , length(str.length())
+ {
+- std::memcpy(this->buffer, str.c_str(), length);
++ memcpy(this->buffer, str.c_str(), length);
+ }
+
+ MemIOHandler::~MemIOHandler()
+@@ -73,7 +73,7 @@ grb_read_t MemIOHandler::read(std::byte* buf, std::siz
+ if (length > static_cast<std::size_t>(rest))
+ length = rest;
+
+- std::memcpy(buf, buffer + pos, length);
++ memcpy(buf, buffer + pos, length);
+ pos = pos + length;
+ ret = length;
+
Index: pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_process__io__handler.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_process__io__handler.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_iohandler_process__io__handler.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_iohandler_process__io__handler.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/iohandler/process_io_handler.cc.orig 2026-06-25 08:04:59.795206674 +0000
++++ src/iohandler/process_io_handler.cc
+@@ -148,7 +148,7 @@ void ProcessIOHandler::open(enum UpnpOpenFileMode mode
+
+ if (fd == -1) {
+ if (errno == ENXIO) {
+- throw TryAgainException(fmt::format("open failed: {}", std::strerror(errno)));
++ throw TryAgainException(fmt::format("open failed: {}", strerror(errno)));
+ }
+
+ killAll();
Index: pkgsrc/multimedia/gerbera/patches/patch-src_metadata_metacontent__handler.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_metadata_metacontent__handler.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_metadata_metacontent__handler.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_metadata_metacontent__handler.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/metadata/metacontent_handler.cc.orig 2026-06-25 08:00:09.711859564 +0000
++++ src/metadata/metacontent_handler.cc
+@@ -316,7 +316,7 @@ std::unique_ptr<IOHandler> FanArtHandler::serveContent
+ struct stat statbuf;
+ int ret = stat(path.c_str(), &statbuf);
+ if (ret != 0) {
+- log_warning("File does not exist: {} ({})", path.c_str(), std::strerror(errno));
++ log_warning("File does not exist: {} ({})", path.c_str(), strerror(errno));
+ return nullptr;
+ }
+ return std::make_unique<FileIOHandler>(path);
+@@ -381,7 +381,7 @@ std::unique_ptr<IOHandler> ContainerArtHandler::serveC
+ struct stat statbuf;
+ int ret = stat(path.c_str(), &statbuf);
+ if (ret != 0) {
+- log_warning("File does not exist: {} ({})", path.c_str(), std::strerror(errno));
++ log_warning("File does not exist: {} ({})", path.c_str(), strerror(errno));
+ return nullptr;
+ }
+ return std::make_unique<FileIOHandler>(path);
+@@ -465,7 +465,7 @@ std::unique_ptr<IOHandler> SubtitleHandler::serveConte
+ struct stat statbuf;
+ int ret = stat(path.c_str(), &statbuf);
+ if (ret != 0) {
+- log_warning("File does not exist: {} ({})", path.c_str(), std::strerror(errno));
++ log_warning("File does not exist: {} ({})", path.c_str(), strerror(errno));
+ return nullptr;
+ }
+ return std::make_unique<FileIOHandler>(path);
+@@ -556,7 +556,7 @@ std::unique_ptr<IOHandler> ResourceHandler::serveConte
+ struct stat statbuf;
+ int ret = stat(path.c_str(), &statbuf);
+ if (ret != 0) {
+- log_warning("File does not exist: {} ({})", path.string(), std::strerror(errno));
++ log_warning("File does not exist: {} ({})", path.string(), strerror(errno));
+ return nullptr;
+ }
+ return std::make_unique<FileIOHandler>(path);
Index: pkgsrc/multimedia/gerbera/patches/patch-src_transcoding_transcode__ext__handler.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_transcoding_transcode__ext__handler.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_transcoding_transcode__ext__handler.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_transcoding_transcode__ext__handler.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/transcoding/transcode_ext_handler.cc.orig 2026-06-25 08:02:29.570134085 +0000
++++ src/transcoding/transcode_ext_handler.cc
+@@ -128,7 +128,7 @@ fs::path TranscodeExternalHandler::makeFifo()
+
+ err = chmod(fifoPath.c_str(), S_IWUSR | S_IRUSR);
+ if (err != 0) {
+- log_error("Failed to change location permissions: {}", std::strerror(errno));
++ log_error("Failed to change location permissions: {}", strerror(errno));
+ }
+ return fifoPath;
+ }
+@@ -151,7 +151,7 @@ void TranscodeExternalHandler::checkTranscoder(const s
+
+ int err = 0;
+ if (!isExecutable(check, &err))
+- throw_std_runtime_error("Transcoder {} is not executable: {}", profile->getCommand().c_str(), std::strerror(err));
++ throw_std_runtime_error("Transcoder {} is not executable: {}", profile->getCommand().c_str(), strerror(err));
+ }
+
+ #ifdef HAVE_CURL
Index: pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__fs.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__fs.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__fs.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,75 @@
+$NetBSD: patch-src_util_grb__fs.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/util/grb_fs.cc.orig 2026-06-25 08:05:39.961557093 +0000
++++ src/util/grb_fs.cc
+@@ -167,7 +167,7 @@ std::FILE* GrbFile::open(const char* mode, bool fail)
+ if (!fd) {
+ if (fail)
+ throw_fmt_system_error("Could not open {}", path.c_str());
+- log_error("Could not open {}: {}", path.c_str(), std::strerror(errno));
++ log_error("Could not open {}: {}", path.c_str(), strerror(errno));
+ }
+ return fd;
+ }
+@@ -245,7 +245,7 @@ void GrbFile::setPermissions()
+ {
+ auto err = chmod(path.c_str(), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+ if (err != 0) {
+- log_error("Failed to change location {} permissions: {}", path.c_str(), std::strerror(errno));
++ log_error("Failed to change location {} permissions: {}", path.c_str(), strerror(errno));
+ }
+ }
+
+@@ -253,7 +253,7 @@ bool GrbFile::isWritable()
+ {
+ auto err = access(path.c_str(), R_OK | W_OK);
+ if (err != 0 && errno != ENOENT) {
+- log_error("Failed to check file {} write permissions: {}", path.c_str(), std::strerror(errno));
++ log_error("Failed to check file {} write permissions: {}", path.c_str(), strerror(errno));
+ return false;
+ }
+ return true;
+@@ -264,7 +264,7 @@ bool GrbFile::isReadable(bool warn)
+ auto err = access(path.c_str(), R_OK);
+ if (err != 0) {
+ if (warn)
+- log_error("Failed to check file {} read permissions: {}", path.c_str(), std::strerror(errno));
++ log_error("Failed to check file {} read permissions: {}", path.c_str(), strerror(errno));
+ return false;
+ }
+ return true;
+@@ -280,7 +280,7 @@ bool isTheora(const fs::path& oggFilename)
+ throw_std_runtime_error("Error reading {}", oggFilename.c_str());
+ }
+
+- if (std::memcmp(buffer, "OggS", 4) != 0) {
++ if (memcmp(buffer, "OggS", 4) != 0) {
+ return false;
+ }
+
+@@ -292,7 +292,7 @@ bool isTheora(const fs::path& oggFilename)
+ throw_std_runtime_error("Error reading {}", oggFilename.c_str());
+ }
+
+- return std::memcmp(buffer, "\x80theora", 7) == 0;
++ return memcmp(buffer, "\x80theora", 7) == 0;
+ }
+
+ fs::path getLastPath(const fs::path& path)
+@@ -316,11 +316,11 @@ std::string getAVIFourCC(const fs::path& aviFilename)
+
+ buffer[FCC_OFFSET + 5] = '\0';
+
+- if (std::strncmp(buffer, "RIFF", 4) != 0) {
++ if (strncmp(buffer, "RIFF", 4) != 0) {
+ return {};
+ }
+
+- if (std::strncmp(buffer + 8, "AVI ", 4) != 0) {
++ if (strncmp(buffer + 8, "AVI ", 4) != 0) {
+ return {};
+ }
+
Index: pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__net.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__net.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_util_grb__net.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_util_grb__net.cc,v 1.1 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/util/grb_net.cc.orig 2026-06-25 08:03:37.070727737 +0000
++++ src/util/grb_net.cc
+@@ -68,9 +68,9 @@ static int sockAddrCmpAddr(const struct sockaddr* sa,
+
+ if (sa->sa_family == AF_INET6) {
+ if (prefix > 0 && prefix < 129) {
+- return std::memcmp((SOCK_ADDR_IN6_ADDR(sa)).s6_addr, (SOCK_ADDR_IN6_ADDR(sb).s6_addr), sizeof(SOCK_ADDR_IN6_ADDR(sa).s6_addr[0]) * prefix / 8);
++ return memcmp((SOCK_ADDR_IN6_ADDR(sa)).s6_addr, (SOCK_ADDR_IN6_ADDR(sb).s6_addr), sizeof(SOCK_ADDR_IN6_ADDR(sa).s6_addr[0]) * prefix / 8);
+ }
+- return std::memcmp(&(SOCK_ADDR_IN6_ADDR(sa)), &(SOCK_ADDR_IN6_ADDR(sb)), sizeof(SOCK_ADDR_IN6_ADDR(sa)));
++ return memcmp(&(SOCK_ADDR_IN6_ADDR(sa)), &(SOCK_ADDR_IN6_ADDR(sb)), sizeof(SOCK_ADDR_IN6_ADDR(sa)));
+ }
+
+ throw_std_runtime_error("Unsupported address family: {}", sa->sa_family);
+@@ -155,14 +155,14 @@ std::string GrbNet::getHostName()
+ int len = addr->sa_family == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in);
+ int ret = getnameinfo(addr, len, hoststr, sizeof(hoststr), portstr, sizeof(portstr), NI_NOFQDN);
+ if (ret != 0) {
+- log_warning("Could not determine getnameinfo: {}", std::strerror(errno));
++ log_warning("Could not determine getnameinfo: {}", strerror(errno));
+ hoststr[0] = '\0';
+ }
+ hostName = hoststr;
+ if (hostName.empty()) {
+ ret = getnameinfo(addr, len, hoststr, sizeof(hoststr), portstr, sizeof(portstr), NI_NUMERICHOST);
+ if (ret != 0) {
+- log_warning("Could not determine getnameinfo: {}", std::strerror(errno));
++ log_warning("Could not determine getnameinfo: {}", strerror(errno));
+ hoststr[0] = '\0';
+ return hostName;
+ }
+@@ -200,7 +200,7 @@ std::string GrbNet::ipToInterface(const std::string& i
+ char host[NI_MAXHOST] = "";
+
+ if (getifaddrs(&ifaddr) == -1) {
+- log_error("Could not getifaddrs: {}", std::strerror(errno));
++ log_error("Could not getifaddrs: {}", strerror(errno));
+ }
+
+ for (auto ifa = ifaddr; ifa; ifa = ifa->ifa_next) {
Index: pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__executor.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__executor.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__executor.cc Thu Jun 25 08:16:54 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_util_thread__executor.cc,v 1.1 2026/06/25 08:16:54 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/util/thread_executor.cc.orig 2026-06-25 08:08:22.982910419 +0000
++++ src/util/thread_executor.cc
+@@ -53,7 +53,7 @@ void ThreadExecutor::startThread()
+ this);
+
+ if (ret != 0) {
+- log_error("Could not start thread: {}", std::strerror(ret));
++ log_error("Could not start thread: {}", strerror(ret));
+ } else {
+ threadRunning = true;
+ }
Index: pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__runner.h
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__runner.h:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_util_thread__runner.h Thu Jun 25 08:16:54 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_util_thread__runner.h,v 1.1 2026/06/25 08:16:54 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/util/thread_runner.h.orig 2026-06-25 07:57:05.592665777 +0000
++++ src/util/thread_runner.h
+@@ -35,6 +35,7 @@
+ #include <functional>
+ #include <mutex>
+ #include <pthread.h>
++#include <string.h>
+ #include <thread>
+
+ using ThreadProc = std::function<void(void* target)>;
+@@ -191,7 +192,7 @@ class ThreadRunner : public ThreadExecutor { (protecte
+ this);
+
+ if (ret != 0) {
+- log_error("Could not start thread {}: {}", threadName, std::strerror(ret));
++ log_error("Could not start thread {}: {}", threadName, strerror(ret));
+ } else {
+ threadRunning = true;
+ }
Index: pkgsrc/multimedia/gerbera/patches/patch-src_util_tools.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_util_tools.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_util_tools.cc Thu Jun 25 08:16:54 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_util_tools.cc,v 1.1 2026/06/25 08:16:54 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/util/tools.cc.orig 2026-06-25 08:01:45.989715123 +0000
++++ src/util/tools.cc
+@@ -270,8 +270,8 @@ std::string hexDecodeString(std::string_view encoded)
+
+ auto buf = std::string(len / 2, '\0');
+ for (std::size_t i = 0; i < len; i += 2) {
+- auto chi = std::strchr(hexChars, ptr[i]);
+- auto clo = std::strchr(hexChars, ptr[i + 1]);
++ auto chi = strchr(hexChars, ptr[i]);
++ auto clo = strchr(hexChars, ptr[i + 1]);
+ std::size_t hi = chi ? chi - hexChars : 0;
+ std::size_t lo = clo ? clo - hexChars : 0;
+
Index: pkgsrc/multimedia/gerbera/patches/patch-src_util_url__utils.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_util_url__utils.cc:1.1
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_util_url__utils.cc Thu Jun 25 08:16:54 2026
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_util_url__utils.cc,v 1.1 2026/06/25 08:16:54 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/util/url_utils.cc.orig 2026-06-25 08:10:22.024508085 +0000
++++ src/util/url_utils.cc
+@@ -141,10 +141,10 @@ std::string urlUnescape(std::string_view str)
+ char chi = data[i++];
+ char clo = data[i++];
+
+- auto pos = std::strchr(hexCharS2, chi);
++ auto pos = strchr(hexCharS2, chi);
+ int hi = pos ? pos - hexCharS2 : 0;
+
+- pos = std::strchr(hexCharS2, clo);
++ pos = strchr(hexCharS2, clo);
+ int lo = pos ? pos - hexCharS2 : 0;
+
+ int ascii = (hi << 4) | lo;
+@@ -186,11 +186,11 @@ std::map<std::string, std::string> dictDecode(std::str
+ const char* data = url.data();
+ const char* dataEnd = data + url.length();
+ while (data < dataEnd) {
+- const char* ampPos = std::strchr(data, '&');
++ const char* ampPos = strchr(data, '&');
+ if (!ampPos) {
+ ampPos = dataEnd;
+ }
+- const char* eqPos = std::strchr(data, '=');
++ const char* eqPos = strchr(data, '=');
+ if (eqPos && eqPos < ampPos) {
+ auto key = std::string_view(data, eqPos - data);
+ auto value = std::string_view(eqPos + 1, ampPos - eqPos - 1);
Index: pkgsrc/multimedia/gerbera/patches/patch-src_util_string__converter.cc
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-src_util_string__converter.cc:1.5
--- /dev/null Thu Jun 25 08:16:54 2026
+++ pkgsrc/multimedia/gerbera/patches/patch-src_util_string__converter.cc Thu Jun 25 08:16:53 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_util_string__converter.cc,v 1.5 2026/06/25 08:16:53 wiz Exp $
+
+Fix build.
+https://github.com/gerbera/gerbera/issues/3897
+
+--- src/util/string_converter.cc.orig 2026-06-25 08:04:46.598053683 +0000
++++ src/util/string_converter.cc
+@@ -144,7 +144,7 @@ std::pair<std::string, std::string> StringConverter::_
+ #endif
+
+ if (ret == -1) {
+- std::string err = fmt::format("iconv: {}", std::strerror(errno));
++ std::string err = fmt::format("iconv: {}", strerror(errno));
+ switch (errno) {
+ case EILSEQ:
+ case EINVAL: {
Home |
Main Index |
Thread Index |
Old Index