Hello community, here is the log from the commit of package RigelEngine for openSUSE:Factory checked in at 2020-09-01 20:09:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/RigelEngine (Old) and /work/SRC/openSUSE:Factory/.RigelEngine.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "RigelEngine" Tue Sep 1 20:09:05 2020 rev:3 rq:830848 version:0.6.1beta Changes: -------- --- /work/SRC/openSUSE:Factory/RigelEngine/RigelEngine.changes 2020-07-06 16:29:14.199151844 +0200 +++ /work/SRC/openSUSE:Factory/.RigelEngine.new.3399/RigelEngine.changes 2020-09-01 20:09:47.868660588 +0200 @@ -1,0 +2,7 @@ +Mon Aug 31 12:23:10 UTC 2020 - Guillaume GARDET <[email protected]> + +- Use openGL ES on %arm and aarch64 +- Fix build on %arm and aarch64 with: + * rigelengine-fix-nlohmann-json-hpp.patch + +------------------------------------------------------------------- New: ---- rigelengine-fix-nlohmann-json-hpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ RigelEngine.spec ++++++ --- /var/tmp/diff_new_pack.I7sobZ/_old 2020-09-01 20:09:50.124661643 +0200 +++ /var/tmp/diff_new_pack.I7sobZ/_new 2020-09-01 20:09:50.128661645 +0200 @@ -27,6 +27,8 @@ URL: https://github.com/lethal-guitar/RigelEngine Source: %{name}-%{version}.tar.xz Patch0: RigelEngine-fix-build.patch +# PATCH-FIX-UPSTREAM - https://github.com/lethal-guitar/RigelEngine/issues/586 +Patch1: rigelengine-fix-nlohmann-json-hpp.patch BuildRequires: boost-devel BuildRequires: cmake >= 3.12 %if 0%{?sle_version} >= 150100 && 0%{?sle_version} < 160000 && 0%{?is_opensuse} @@ -50,13 +52,20 @@ %prep %setup -q %patch0 -p1 +pushd 3rd_party/nlohmann +%patch1 -p2 +popd %build %if 0%{?sle_version} >= 150100 && 0%{?is_opensuse} export CC="gcc-9" export CXX="g++-9" %endif -%cmake +%cmake \ +%ifarch %arm aarch64 + -DUSE_GL_ES=1 \ +%endif + %make_jobs %install ++++++ rigelengine-fix-nlohmann-json-hpp.patch ++++++ diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 70ce011a8..38e515966 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -9456,7 +9456,7 @@ class lexer : public lexer_base<BasicJsonType> std::string result; for (const auto c : token_string) { - if ('\x00' <= c and c <= '\x1F') + if (static_cast<unsigned char>(c) <= '\x1F') { // escape control characters std::array<char, 9> cs{{}};
