sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (cca97b3d8671805e02a6c00dfdeac24bec1629ba)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (cca97b3d8671805e02a6c00dfdeac24bec1629ba)
- Date: Thu, 18 Sep 2025 00:48:45 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
net/gerbera/DETAILS | 4 +-
net/gerbera/HISTORY | 4 ++
net/gerbera/PRE_BUILD | 4 ++
net/gerbera/patches/fmt-12.patch | 72
+++++++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+), 2 deletions(-)
New commits:
commit cca97b3d8671805e02a6c00dfdeac24bec1629ba
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
net/gerbera: version 2.6.1
diff --git a/net/gerbera/DETAILS b/net/gerbera/DETAILS
index d3b4898..1ab996b 100755
--- a/net/gerbera/DETAILS
+++ b/net/gerbera/DETAILS
@@ -1,7 +1,7 @@
. "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=gerbera
- VERSION=2.5.0
-
SOURCE_HASH="sha512:f8b172b2a55d38a4ac32de52f519be51876ed523bd7d45098c31b4eaa5f28bc8c542b2927b2e75dc7c508bd7e0232e90c69b8851f8fcfe48494c873ff3586e93"
+ VERSION=2.6.1
+
SOURCE_HASH="sha512:30de613d4de07b68dedcd0048c94b0a630ab9c0d4a12f801373fb2de8a7d3d4f2076535edceb88cc5e2c082605ad015351ed8c16fee70870b791998412d24e7b"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="https://github.com/${SPELL}/${SPELL}/archive/v${VERSION}.tar.gz"
# Watch: https://github.com/gerbera/gerbera/tags tags/v([0-9.]+)[.]tar
diff --git a/net/gerbera/HISTORY b/net/gerbera/HISTORY
index e300cad..fcca91e 100644
--- a/net/gerbera/HISTORY
+++ b/net/gerbera/HISTORY
@@ -1,3 +1,7 @@
+2025-09-17 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.6.1
+ * PRE_BUILD, patches/fmt-12.patch: added to build with fmt >= 12.0.0
+
2025-05-28 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.5.0
diff --git a/net/gerbera/PRE_BUILD b/net/gerbera/PRE_BUILD
new file mode 100755
index 0000000..6c5c8c9
--- /dev/null
+++ b/net/gerbera/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir "patches"
diff --git a/net/gerbera/patches/fmt-12.patch
b/net/gerbera/patches/fmt-12.patch
new file mode 100644
index 0000000..2229c0c
--- /dev/null
+++ b/net/gerbera/patches/fmt-12.patch
@@ -0,0 +1,72 @@
+From f8e158bc72986e46b93d05358c29db0c10f2fe9f Mon Sep 17 00:00:00 2001
+From: Karlchen <k_straussberger AT netzland.net>
+Date: Wed, 17 Sep 2025 21:18:49 +0200
+Subject: [PATCH] Update to fmt 12.0.0
+
+---
+ .github/workflows/publish-deb.yml | 1 -
+ ChangeLog.md | 1 +
+ README.md | 4 ++--
+ ReleaseNotes.md | 3 ++-
+ scripts/versions.sh | 6 +++---
+ src/web/config_load.cc | 4 ++++
+ 6 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/.github/workflows/publish-deb.yml
b/.github/workflows/publish-deb.yml
+index 48d33d0d0..00f123528 100644
+--- a/.github/workflows/publish-deb.yml
++++ b/.github/workflows/publish-deb.yml
+@@ -27,7 +27,6 @@ jobs:
+ - "ubuntu:20.04"
+ - "ubuntu:22.04"
+ - "ubuntu:24.04"
+- - "ubuntu:24.10"
+ - "ubuntu:25.04"
+ - "debian:bullseye"
+ - "debian:bookworm"
+diff --git a/scripts/versions.sh b/scripts/versions.sh
+index 030d65630..185947f15 100644
+--- a/scripts/versions.sh
++++ b/scripts/versions.sh
+@@ -45,7 +45,7 @@ elif [[ "${GERBERA_ENV-head}" == "default" ]]; then
+ EXIV2="v0.27.7"
+ EXIF="v0.6.24"
+ FFMPEGTHUMBNAILER="2.2.2"
+- FMT="9.1.0"
++ FMT="11.2.0"
+ GOOGLETEST="1.10.0"
+ LASTFM="0.4.0"
+ MATROSKA="1.5.2"
+@@ -65,7 +65,7 @@ else
+ EXIV2="v0.28.7"
+ EXIF="v0.6.25"
+ FFMPEGTHUMBNAILER="2.2.3"
+- FMT="11.2.0"
++ FMT="12.0.0"
+ GOOGLETEST="1.17.0"
+ LASTFM="0.4.0"
+ MATROSKA="1.7.1"
+@@ -76,6 +76,6 @@ else
+ WAVPACK="5.8.1"
+ TAGLIB="2.1.1"
+ JSONCPP="1.9.6"
+- CMAKE="4.0.3"
++ CMAKE="4.1.1"
+
+ fi
+diff --git a/src/web/config_load.cc b/src/web/config_load.cc
+index 8b296c43e..4259ae333 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);
+ }
+
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (cca97b3d8671805e02a6c00dfdeac24bec1629ba), Pavel Vinogradov, 09/17/2025
Archive powered by MHonArc 2.6.24.