The package rpms/earcut-hpp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/earcut-hpp.git/commit/?id=3aabf11....
Change:
-%ifarch %{arm64} ppc64le s390x
Thanks.
Full change:
============
commit 220483bec727eb9a9653d34c658292870deabce6
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Sep 8 07:29:39 2022 -0400
Fix missing “export” in spec file
diff --git a/earcut-hpp.spec b/earcut-hpp.spec
index 9ab595e..f70b733 100644
--- a/earcut-hpp.spec
+++ b/earcut-hpp.spec
@@ -83,7 +83,7 @@ sed -r -i 's/(setprecision\()6(\))/\116\2/' test/test.cpp
# add this flag too if they want the behavior of the library to exactly match
# upstream’s expectations.
%set_build_flags
-CXXFLAGS="${CXXFLAGS-} -ffp-contract=off"
+export CXXFLAGS="${CXXFLAGS-} -ffp-contract=off"
# We do want to build the tests, but we have no use for the benchmarks or the
# visualizer program.
commit 3220fee87aa403ecc0666fdc3c514f32dec2e111
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Sep 8 07:22:14 2022 -0400
Fix missing upstream bug URL in spec file comment
diff --git a/earcut-hpp.spec b/earcut-hpp.spec
index 115e38d..9ab595e 100644
--- a/earcut-hpp.spec
+++ b/earcut-hpp.spec
@@ -77,7 +77,7 @@ sed -r -i 's/(setprecision\()6(\))/\116\2/' test/test.cpp
# and also
#
# New test “issue142” in 2.2.4 fails on aarch64, ppc64le, s390x
-# foo
+#
https://github.com/mapbox/earcut.hpp/issues/103
#
# Since this library is header-only, dependent packages should be advised to
# add this flag too if they want the behavior of the library to exactly match
commit 3aabf1163e05736bb94ecb9da50c79ec5dbfbe1b
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Sep 7 12:48:32 2022 -0400
Fix new test failures on aarch64, ppc64le, s390x
https://github.com/mapbox/earcut.hpp/issues/103
diff --git a/earcut-hpp.spec b/earcut-hpp.spec
index 9ad79d3..115e38d 100644
--- a/earcut-hpp.spec
+++ b/earcut-hpp.spec
@@ -62,18 +62,29 @@ Provides: %{name}-static = %{version}-%{release}
# Increase precision of test output so we can understand any failures:
sed -r -i 's/(setprecision\()6(\))/\116\2/' test/test.cpp
-%ifarch %{arm64} ppc64le s390x
-# With increased format precision in test/test.cpp, as above:
-# > not ok 83 earcut deviation 0.0000000000052002% is not less than
-# > 0.0000000000043556%
-# Loosen tolerance for “self_touching” test on certain architectures
-#
https://github.com/mapbox/earcut.hpp/issues/97
-sed -r -i 's/4\.35559[[:digit:]]+e-14/6\.2002e-14/' \
- 'test/fixtures/self_touching.cpp'
-%endif
-
%build
+# Disabling floating-point contraction fixes certain failures on aarch64,
+# ppc64le, and s390x. See:
+#
+# Test “self_touching” fails on aarch64, ppc64le, s390x
+#
https://github.com/mapbox/earcut.hpp/issues/97
+#
+# particularly
+#
+#
https://github.com/mapbox/earcut.hpp/issues/97#issuecomment-1032813710
+#
+# and also
+#
+# New test “issue142” in 2.2.4 fails on aarch64, ppc64le, s390x
+# foo
+#
+# Since this library is header-only, dependent packages should be advised to
+# add this flag too if they want the behavior of the library to exactly match
+# upstream’s expectations.
+%set_build_flags
+CXXFLAGS="${CXXFLAGS-} -ffp-contract=off"
+
# We do want to build the tests, but we have no use for the benchmarks or the
# visualizer program.
%cmake \
commit 27f899ff02e63bb2d97b1b25aa6b1230d631a5d7
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Sep 7 08:09:12 2022 -0400
Update to 2.2.4 (close RHBZ#2124846)
diff --git a/.gitignore b/.gitignore
index 204f04d..67bc5c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/earcut.hpp-2.2.3.tar.gz
+/earcut.hpp-2.2.4.tar.gz
diff --git a/96.patch b/96.patch
deleted file mode 100644
index abced75..0000000
--- a/96.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6e3944e1e164e50575addc11e218773d45c61b8a Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code(a)musicinmybrain.net>
-Date: Tue, 21 Sep 2021 17:59:54 -0400
-Subject: [PATCH] Include headers for everything used in std::
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Manual implementation of the “include what you use” idea, i.e., do not
-rely on implementation-dependent recursive includes.
-
-Added:
-
-- cstddef for: std::size_t
-- limits for: std::numeric_limits
-- utility for: std::forward, std::move
-
-Assumed to be specialized in user code, or a header included therefrom:
-
- std::get<Point>, std::tuple_element<Point>
----
- include/mapbox/earcut.hpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/mapbox/earcut.hpp b/include/mapbox/earcut.hpp
-index 01bd7e9..e7d4308 100644
---- a/include/mapbox/earcut.hpp
-+++ b/include/mapbox/earcut.hpp
-@@ -3,7 +3,10 @@
- #include <algorithm>
- #include <cassert>
- #include <cmath>
-+#include <cstddef>
-+#include <limits>
- #include <memory>
-+#include <utility>
- #include <vector>
-
- namespace mapbox {
diff --git a/earcut-hpp.spec b/earcut-hpp.spec
index f4c9cc1..9ad79d3 100644
--- a/earcut-hpp.spec
+++ b/earcut-hpp.spec
@@ -1,6 +1,6 @@
Name: earcut-hpp
Summary: Fast, header-only polygon triangulation
-Version: 2.2.3
+Version: 2.2.4
Release: %autorelease
URL:
https://github.com/mapbox/earcut.hpp
@@ -19,10 +19,6 @@ License: ISC
Source0: %{url}/archive/v%{version}/earcut.hpp-%{version}.tar.gz
-# Include headers for everything used in std::
-#
https://github.com/mapbox/earcut.hpp/pull/96
-Patch: %{url}/pull/96.patch
-
BuildRequires: gcc-c++
BuildRequires: cmake
# Our choice; the default UNIX Makefiles backend would also work
diff --git a/sources b/sources
index cb95fe7..3f48449 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (earcut.hpp-2.2.3.tar.gz) =
f87f0084dbbcda85b409c326587a376d443f2484b6a69c216d2ad94ea8ea238912dfe1174b464b08faec10ea5c29ebae6478e7abfe5ff682a7b043784c1e3acf
+SHA512 (earcut.hpp-2.2.4.tar.gz) =
87f52bf99273dc47f78ebacd4ee0ccbab4edd3f9b85d97aed1c0d1165b3e2523e1a71f3a37a118e82170e79d57a2e09644d4115facb63dc6f704affb9c428e6b
commit 3da0f92dfa57090d812e03e2a5433d135cac1ed5
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Aug 1 08:24:31 2022 -0400
Confirm that License is SPDX ISC (no License field change)
diff --git a/earcut-hpp.spec b/earcut-hpp.spec
index 6b7f14a..f4c9cc1 100644
--- a/earcut-hpp.spec
+++ b/earcut-hpp.spec
@@ -4,7 +4,18 @@ Version: 2.2.3
Release: %autorelease
URL:
https://github.com/mapbox/earcut.hpp
+# SPDX
License: ISC
+# A copy of libtess2 (
https://github.com/memononen/libtess2) is bundled with
+# the tests as a reference implementation (test/comparison/libtess2/).
+#
+# We do not treat it as a bundled system library (no virtual Provides, for
+# example) because it is provably used only in the tests, and does not
+# contribute to anything installed in the binary RPM. This means that its
+# SGI-B-2.0 license also does not need to appear in the License tag.
+#
+# All of this is just as well, as libtess2 is unmaintained and we would rather
+# not have to package it separately.
Source0: %{url}/archive/v%{version}/earcut.hpp-%{version}.tar.gz
@@ -20,14 +31,6 @@ BuildRequires: ninja-build
# For tests (and benchmarks, if enabled):
BuildRequires: pkgconfig(opengl)
-# A copy of libtess2 (
https://github.com/memononen/libtess2) is bundled with
-# the tests as a reference implementation.
-#
-# We do not treat it as a bundled system library (no virtual Provides, for
-# example) because it is provably used only in the tests, and does not
-# contribute to anything installed in the binary RPM. This is just as well, as
-# libtess2 is unmaintained and we would rather not have to package it
-# separately.
# No compiled binaries are installed, so this would be empty.
%global debug_package %{nil}
commit b235a85f9a641bce7b437cd190ed85944d2f3695
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sat Apr 16 09:40:00 2022 -0400
Stop numbering patches
diff --git a/earcut-hpp.spec b/earcut-hpp.spec
index 27cf6c9..6b7f14a 100644
--- a/earcut-hpp.spec
+++ b/earcut-hpp.spec
@@ -10,7 +10,7 @@ Source0: %{url}/archive/v%{version}/earcut.hpp-%{version}.tar.gz
# Include headers for everything used in std::
#
https://github.com/mapbox/earcut.hpp/pull/96
-Patch0:
https://github.com/mapbox/earcut.hpp/pull/96.patch
+Patch: %{url}/pull/96.patch
BuildRequires: gcc-c++
BuildRequires: cmake