sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (76299b168978a26c145554f1e57a3b64c1d927ce)
- 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 (76299b168978a26c145554f1e57a3b64c1d927ce)
- Date: Fri, 3 Jan 2025 02:19:21 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
net/gerbera/HISTORY | 4 ++++
net/gerbera/PRE_BUILD | 4 ++++
net/gerbera/patches/0001-fmt-1.11.patch | 21 +++++++++++++++++++++
3 files changed, 29 insertions(+)
New commits:
commit 76299b168978a26c145554f1e57a3b64c1d927ce
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
net/gerbera: added patch to fix building with fmt 1.11.x
diff --git a/net/gerbera/HISTORY b/net/gerbera/HISTORY
index 38ae1ca..7f1a558 100644
--- a/net/gerbera/HISTORY
+++ b/net/gerbera/HISTORY
@@ -1,3 +1,7 @@
+2025-01-02 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/0001-fmt-1.11.patch: added patch from PR 3323 to
fix
+ building with fmt 1.11.x
+
2024-12-27 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.3.0
diff --git a/net/gerbera/PRE_BUILD b/net/gerbera/PRE_BUILD
new file mode 100755
index 0000000..f80ee7d
--- /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/0001-fmt-1.11.patch
b/net/gerbera/patches/0001-fmt-1.11.patch
new file mode 100644
index 0000000..6cbf84f
--- /dev/null
+++ b/net/gerbera/patches/0001-fmt-1.11.patch
@@ -0,0 +1,21 @@
+diff --unified --recursive --text --new-file
gerbera-2.3.0.orig/src/web/config_load.cc gerbera-2.3.0/src/web/config_load.cc
+--- gerbera-2.3.0.orig/src/web/config_load.cc 2024-12-29 10:46:14.272390575
+0100
++++ gerbera-2.3.0/src/web/config_load.cc 2024-12-29 10:46:28.379089688
+0100
+@@ -658,7 +658,7 @@
+
+ item = values.append_child(CONFIG_LOAD_ITEM);
+ createItem(item, cs->getItemPath(indexList, {
ConfigVal::A_TRANSCODING_MIMETYPE_FILTER,
ConfigVal::A_TRANSCODING_PROFILES_PROFLE_NOTRANSCODING }), cs->option,
ConfigVal::A_TRANSCODING_PROFILES_PROFLE_NOTRANSCODING, cs);
+- setValue(item, fmt::join(filter->getNoTranscodingMimeTypes(), ","));
++ setValue(item, fmt::format("{}",
fmt::join(filter->getNoTranscodingMimeTypes(), ",")));
+
+ item = values.append_child(CONFIG_LOAD_ITEM);
+ createItem(item, cs->getItemPath(indexList, {
ConfigVal::A_TRANSCODING_MIMETYPE_FILTER,
ConfigVal::A_TRANSCODING_PROFILES_PROFLE_CLIENTFLAGS }), cs->option,
ConfigVal::A_TRANSCODING_PROFILES_PROFLE_CLIENTFLAGS, cs);
+@@ -789,7 +789,7 @@
+ // scan mode (timed|inotify)
+ item = values.append_child(CONFIG_LOAD_ITEM);
+ createItem(item, ascs->getItemPath(indexList, {
ConfigVal::A_AUTOSCAN_DIRECTORY_MODE }), ascs->option,
ConfigVal::A_AUTOSCAN_DIRECTORY_MODE);
+- setValue(item,
AutoscanDirectory::mapScanmode(adir->getScanMode()));
++ setValue(item,
std::string(AutoscanDirectory::mapScanmode(adir->getScanMode())));
+
+ // interval for timed
+ item = values.append_child(CONFIG_LOAD_ITEM);
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (76299b168978a26c145554f1e57a3b64c1d927ce), Pavel Vinogradov, 01/02/2025
Archive powered by MHonArc 2.6.24.