![](https://seccdn.libravatar.org/avatar/128a7b98d536a9cf9b4d4d5a90d63475.jpg?s=120&d=mm&r=g)
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gerbera for openSUSE:Factory checked in at 2024-01-03 12:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gerbera (Old) and /work/SRC/openSUSE:Factory/.gerbera.new.28375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gerbera" Wed Jan 3 12:27:50 2024 rev:12 rq:1135991 version:1.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gerbera/gerbera.changes 2023-06-16 16:55:27.269923461 +0200 +++ /work/SRC/openSUSE:Factory/.gerbera.new.28375/gerbera.changes 2024-01-03 12:27:52.981821695 +0100 @@ -1,0 +2,11 @@ +Sun Dec 31 19:15:11 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de> + +- fix build on Tumbleweed with fmtlib 10 (boo#1218445) + add gerbera-1.12.1-buildfix-support-fmtlib-10.patch + +------------------------------------------------------------------- +Fri Oct 6 07:21:59 UTC 2023 - Paolo Stivanin <info@paolostivanin.com> + +- Use better macro for selecting a newer GCC on Leap. + +------------------------------------------------------------------- New: ---- gerbera-1.12.1-buildfix-support-fmtlib-10.patch BETA DEBUG BEGIN: New:- fix build on Tumbleweed with fmtlib 10 (boo#1218445) add gerbera-1.12.1-buildfix-support-fmtlib-10.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gerbera.spec ++++++ --- /var/tmp/diff_new_pack.uaJafh/_old 2024-01-03 12:27:53.641845797 +0100 +++ /var/tmp/diff_new_pack.uaJafh/_new 2024-01-03 12:27:53.645845944 +0100 @@ -16,6 +16,10 @@ # +%if 0%{?suse_version} && 0%{?suse_version} < 1590 +%global force_gcc_version 12 +%endif + Name: gerbera Version: 1.12.1 Release: 0 @@ -27,6 +31,7 @@ Source1: config.xml Source2: gerbera.sysusers.in Patch0: harden_gerbera.service.patch +Patch1: gerbera-1.12.1-buildfix-support-fmtlib-10.patch BuildRequires: ccache BuildRequires: cmake >= 3.13 BuildRequires: fdupes @@ -57,11 +62,7 @@ BuildRequires: pkgconfig(zlib) Requires: logrotate %{?systemd_requires} -%if 0%{?suse_version} <= 1550 -BuildRequires: gcc10-c++ -%else -BuildRequires: gcc-c++ -%endif +BuildRequires: gcc%{?force_gcc_version}-c++ >= 12 %description Gerbera is a UPnP media server which allows streaming digital @@ -84,9 +85,8 @@ -DWITH_AVCODEC=1 \ -DWITH_EXIF=0 \ -DWITH_EXIV2=1 \ -%if 0%{?suse_version} <= 1550 - -DCMAKE_CXX_COMPILER=g++-10 \ - -DCMAKE_C_COMPILER=gcc-10 \ +%if 0%{?force_gcc_version} + -DCMAKE_CXX_COMPILER=%{_bindir}/g++-%{?force_gcc_version} \ %endif -DWITH_FFMPEGTHUMBNAILER=1 \ -DWITH_INOTIFY=1 \ ++++++ gerbera-1.12.1-buildfix-support-fmtlib-10.patch ++++++ From 37957aac0aea776e6f843af2358916f81056a405 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA <mtasaka@fedoraproject.org> Date: Thu, 29 Jun 2023 22:09:15 +0900 Subject: [PATCH] buildfix: support fmtlib 10 References: https://bugzilla.opensuse.org/show_bug.cgi?id=1218445 With fmtlib10, fmt::format does not accept pugi::xml_node as it is. Use name() member function, as this usage appear on other places of gerbera source code. Closes #2839 . --- src/config/setup/config_setup_array.cc | 6 +++--- src/config/setup/config_setup_autoscan.cc | 2 +- src/config/setup/config_setup_client.cc | 2 +- src/config/setup/config_setup_dictionary.cc | 6 +++--- src/config/setup/config_setup_dynamic.cc | 2 +- src/config/setup/config_setup_transcoding.cc | 2 +- src/config/setup/config_setup_tweak.cc | 2 +- src/config/setup/config_setup_vector.cc | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/config/setup/config_setup_array.cc b/src/config/setup/config_setup_array.cc index 62dd5c9a7..a5f8958ce 100644 --- a/src/config/setup/config_setup_array.cc +++ b/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; } diff --git a/src/config/setup/config_setup_autoscan.cc b/src/config/setup/config_setup_autoscan.cc index 9ae4e61f8..5e1394585 100644 --- a/src/config/setup/config_setup_autoscan.cc +++ b/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; diff --git a/src/config/setup/config_setup_client.cc b/src/config/setup/config_setup_client.cc index ffd12fc01..857db3c3e 100644 --- a/src/config/setup/config_setup_client.cc +++ b/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; diff --git a/src/config/setup/config_setup_dictionary.cc b/src/config/setup/config_setup_dictionary.cc index 003b4cc59..69d1a7255 100644 --- a/src/config/setup/config_setup_dictionary.cc +++ b/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; } diff --git a/src/config/setup/config_setup_dynamic.cc b/src/config/setup/config_setup_dynamic.cc index 0074cb6d3..d6962afe6 100644 --- a/src/config/setup/config_setup_dynamic.cc +++ b/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; diff --git a/src/config/setup/config_setup_transcoding.cc b/src/config/setup/config_setup_transcoding.cc index 17d1780dc..1f6fb0604 100644 --- a/src/config/setup/config_setup_transcoding.cc +++ b/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; diff --git a/src/config/setup/config_setup_tweak.cc b/src/config/setup/config_setup_tweak.cc index 65dae2759..4da9fca1b 100644 --- a/src/config/setup/config_setup_tweak.cc +++ b/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; diff --git a/src/config/setup/config_setup_vector.cc b/src/config/setup/config_setup_vector.cc index e5efe2767..9a9670569 100644 --- a/src/config/setup/config_setup_vector.cc +++ b/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; }
participants (1)
-
Source-Sync