Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package opae for openSUSE:Factory checked in at 2021-09-10 23:41:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opae (Old) and /work/SRC/openSUSE:Factory/.opae.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opae" Fri Sep 10 23:41:24 2021 rev:11 rq:917903 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/opae/opae.changes 2021-07-10 00:03:10.870731962 +0200 +++ /work/SRC/openSUSE:Factory/.opae.new.1899/opae.changes 2021-09-10 23:41:47.814590389 +0200 @@ -1,0 +2,6 @@ +Fri Sep 10 08:45:59 UTC 2021 - Nicolas Morey-Chaisemartin <[email protected]> + +- Add opae-fix-support-with-newer-spdlog.patch to fix compilation + with spdlog >= 1.9.0 + +------------------------------------------------------------------- New: ---- opae-fix-support-with-newer-spdlog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opae.spec ++++++ --- /var/tmp/diff_new_pack.SAdEhH/_old 2021-09-10 23:41:48.318590925 +0200 +++ /var/tmp/diff_new_pack.SAdEhH/_new 2021-09-10 23:41:48.318590925 +0200 @@ -41,6 +41,7 @@ Patch2: opae-support-OBS-build.patch Patch3: opae-libs-fix-macro-indentation.patch Patch4: opae-libs-xfpga-fix-strnlen-argument.patch +Patch5: opae-fix-support-with-newer-spdlog.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: boost-devel BuildRequires: cli11-devel @@ -149,6 +150,7 @@ %patch2 %patch3 %patch4 +%patch5 %build export RPM_OPT_FLAGS ++++++ opae-fix-support-with-newer-spdlog.patch ++++++ commit c2e2f86b2dac24ccf8e7ad175d143f99fc9045f3 Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Fri Sep 10 10:35:03 2021 +0200 opae: fix support with newer spdlog spdlog >= 1.9.0 replaced SPDLOG_LEVEL_NAMES from a string array to an object array which breaks the call to CLI::IsMember Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> diff --git samples/dummy_afu/test_afu.h samples/dummy_afu/test_afu.h index 25287df15750..3d9f1cb53da3 100644 --- samples/dummy_afu/test_afu.h +++ samples/dummy_afu/test_afu.h @@ -131,6 +131,11 @@ private: }; +#define LEGACY_SPDLOG_LEVEL_NAMES \ + { \ + "trace", "debug", "info", "warning", "error", "critical", "off" \ + } + class test_afu { public: typedef int (*command_fn)(test_afu *afu, CLI::App *app); @@ -160,7 +165,7 @@ public: "[<domain>:]<bus>:<device>.<function>"); app_.add_option("-l,--log-level", log_level_, "stdout logging level")-> default_val(log_level_)-> - check(CLI::IsMember(SPDLOG_LEVEL_NAMES)); + check(CLI::IsMember(LEGACY_SPDLOG_LEVEL_NAMES)); app_.add_flag("-s,--shared", shared_, "open in shared mode, default is off"); app_.add_option("-t,--timeout", timeout_msec_, "test timeout (msec)")->default_val(timeout_msec_); }
