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: adam
Date: Mon Aug 7 10:05:20 UTC 2023
Modified Files:
pkgsrc/multimedia/gerbera: Makefile distinfo
Added Files:
pkgsrc/multimedia/gerbera/patches: patch-2840
Log Message:
gerbera: fix build with fmtlib 10 - pull request patch
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/gerbera/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/gerbera/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/gerbera/patches/patch-2840
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/Makefile
diff -u pkgsrc/multimedia/gerbera/Makefile:1.18 pkgsrc/multimedia/gerbera/Makefile:1.19
--- pkgsrc/multimedia/gerbera/Makefile:1.18 Tue Jul 18 18:34:30 2023
+++ pkgsrc/multimedia/gerbera/Makefile Mon Aug 7 10:05:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/07/18 18:34:30 nia Exp $
+# $NetBSD: Makefile,v 1.19 2023/08/07 10:05:20 adam Exp $
DISTNAME= gerbera-1.12.1
PKGREVISION= 4
@@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/gerbera/ger
COMMENT= UPnP Media Server
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_CXX_FEATURES+= filesystem
@@ -71,6 +70,7 @@ post-install:
.include "../../audio/taglib/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.if !empty(PKGSRC_COMPILER:M*gcc*)
. include "../../devel/libatomic/buildlink3.mk"
.endif
Index: pkgsrc/multimedia/gerbera/distinfo
diff -u pkgsrc/multimedia/gerbera/distinfo:1.6 pkgsrc/multimedia/gerbera/distinfo:1.7
--- pkgsrc/multimedia/gerbera/distinfo:1.6 Mon Jan 16 20:43:52 2023
+++ pkgsrc/multimedia/gerbera/distinfo Mon Aug 7 10:05:20 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2023/01/16 20:43:52 adam Exp $
+$NetBSD: distinfo,v 1.7 2023/08/07 10:05:20 adam Exp $
BLAKE2s (gerbera-1.12.1.tar.gz) = 4e401a965dedd387f33ff50908a5206570f3fc189d5401116fac9a3d9db9654b
SHA512 (gerbera-1.12.1.tar.gz) = 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2
Size (gerbera-1.12.1.tar.gz) = 4368573 bytes
+SHA1 (patch-2840) = c330e08d778b7172c8fe442c13ae42005c25132d
SHA1 (patch-CMakeLists.txt) = 7b8e0e42547da4545be4fdf19dd27e6b5592f21d
SHA1 (patch-src_main.cc) = b7b59975bc477141c8a92af9200ba2b301e55926
Added files:
Index: pkgsrc/multimedia/gerbera/patches/patch-2840
diff -u /dev/null pkgsrc/multimedia/gerbera/patches/patch-2840:1.1
--- /dev/null Mon Aug 7 10:05:20 2023
+++ pkgsrc/multimedia/gerbera/patches/patch-2840 Mon Aug 7 10:05:20 2023
@@ -0,0 +1,130 @@
+$NetBSD: patch-2840,v 1.1 2023/08/07 10:05:20 adam Exp $
+
+buildfix: support fmtlib 10
+https://github.com/gerbera/gerbera/pull/2840
+
+--- src/config/setup/config_setup_array.cc
++++ src/config/setup/config_setup_array.cc
+@@ -137,11 +137,11 @@ std::vector<std::string> ConfigArraySetup::getXmlContent(const pugi::xml_node& o
+ std::vector<std::string> result;
+ if (initArray) {
+ if (!initArray(optValue, result, ConfigDefinition::mapConfigOption(nodeOption))) {
+- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue);
++ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.name());
+ }
+ } else {
+ if (!createOptionFromNode(optValue, result)) {
+- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue);
++ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.name());
+ }
+ }
+ if (result.empty()) {
+@@ -150,7 +150,7 @@ std::vector<std::string> ConfigArraySetup::getXmlContent(const pugi::xml_node& o
+ result = defaultEntries;
+ }
+ if (notEmpty && result.empty()) {
+- throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue);
++ throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue.name());
+ }
+ return result;
+ }
+--- src/config/setup/config_setup_autoscan.cc
++++ src/config/setup/config_setup_autoscan.cc
+@@ -245,7 +245,7 @@ std::shared_ptr<ConfigOption> ConfigAutoscanSetup::newOption(const pugi::xml_nod
+ {
+ auto result = std::vector<AutoscanDirectory>();
+ if (!createOptionFromNode(optValue, result)) {
+- throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue.name());
+ }
+ optionValue = std::make_shared<AutoscanListOption>(result);
+ return optionValue;
+--- src/config/setup/config_setup_client.cc
++++ src/config/setup/config_setup_client.cc
+@@ -183,7 +183,7 @@ std::shared_ptr<ConfigOption> ConfigClientSetup::newOption(const pugi::xml_node&
+ auto result = std::make_shared<ClientConfigList>();
+
+ if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) {
+- throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue.name());
+ }
+ optionValue = std::make_shared<ClientConfigListOption>(result);
+ return optionValue;
+--- src/config/setup/config_setup_dictionary.cc
++++ src/config/setup/config_setup_dictionary.cc
+@@ -163,11 +163,11 @@ std::map<std::string, std::string> ConfigDictionarySetup::getXmlContent(const pu
+ std::map<std::string, std::string> result;
+ if (initDict) {
+ if (!initDict(optValue, result)) {
+- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.name());
+ }
+ } else {
+ if (!createOptionFromNode(optValue, result) && required) {
+- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.name());
+ }
+ }
+ if (result.empty()) {
+@@ -176,7 +176,7 @@ std::map<std::string, std::string> ConfigDictionarySetup::getXmlContent(const pu
+ result = defaultEntries;
+ }
+ if (notEmpty && result.empty()) {
+- throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue);
++ throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue.name());
+ }
+ return result;
+ }
+--- src/config/setup/config_setup_dynamic.cc
++++ src/config/setup/config_setup_dynamic.cc
+@@ -192,7 +192,7 @@ std::shared_ptr<ConfigOption> ConfigDynamicContentSetup::newOption(const pugi::x
+ auto result = std::make_shared<DynamicContentList>();
+
+ if (!createOptionFromNode(optValue, result)) {
+- throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue.name());
+ }
+ optionValue = std::make_shared<DynamicContentListOption>(result);
+ return optionValue;
+--- src/config/setup/config_setup_transcoding.cc
++++ src/config/setup/config_setup_transcoding.cc
+@@ -501,7 +501,7 @@ std::shared_ptr<ConfigOption> ConfigTranscodingSetup::newOption(const pugi::xml_
+ auto result = std::make_shared<TranscodingProfileList>();
+
+ if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) {
+- throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue.name());
+ }
+ optionValue = std::make_shared<TranscodingProfileListOption>(result);
+ return optionValue;
+--- src/config/setup/config_setup_tweak.cc
++++ src/config/setup/config_setup_tweak.cc
+@@ -257,7 +257,7 @@ std::shared_ptr<ConfigOption> ConfigDirectorySetup::newOption(const pugi::xml_no
+ auto result = std::make_shared<DirectoryConfigList>();
+
+ if (!createOptionFromNode(optValue, result)) {
+- throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue.name());
+ }
+ optionValue = std::make_shared<DirectoryTweakOption>(result);
+ return optionValue;
+--- src/config/setup/config_setup_vector.cc
++++ src/config/setup/config_setup_vector.cc
+@@ -181,7 +181,7 @@ std::vector<std::vector<std::pair<std::string, std::string>>> ConfigVectorSetup:
+ {
+ std::vector<std::vector<std::pair<std::string, std::string>>> result;
+ if (!createOptionFromNode(optValue, result) && required) {
+- throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue);
++ throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue.name());
+ }
+ if (result.empty()) {
+ log_debug("{} assigning {} default values", xpath, defaultEntries.size());
+@@ -189,7 +189,7 @@ std::vector<std::vector<std::pair<std::string, std::string>>> ConfigVectorSetup:
+ result = defaultEntries;
+ }
+ if (notEmpty && result.empty()) {
+- throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue);
++ throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue.name());
+ }
+ return result;
+ }
Home |
Main Index |
Thread Index |
Old Index