From c8283ba3d65799d910a3c8f0eb79f8a84948fd18 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 17 Feb 2021 11:59:06 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/ceres-solver.git#6d67471905a73b96a4d0417b81585a37f0a0e434 --- ceres-solver.spec | 23 ++++++++++++++++------- ceres-solver_bounds.patch | 15 --------------- sources | 2 +- 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 ceres-solver_bounds.patch diff --git a/ceres-solver.spec b/ceres-solver.spec index e7cc9fc..a2fbe13 100644 --- a/ceres-solver.spec +++ b/ceres-solver.spec @@ -1,17 +1,15 @@ Name: ceres-solver -Version: 1.14.0 +Version: 2.0.0 # Release candidate versions are messy. Give them a release of # e.g. "0.1.0%{?dist}" for RC1 (and remember to adjust the Source0 # URL). Non-RC releases go back to incrementing integers starting at 1. -Release: 7.1%{?dist} +Release: 3%{?dist} Summary: A non-linear least squares minimizer License: BSD URL: http://ceres-solver.org/ Source0: http://%{name}.org/%{name}-%{version}.tar.gz -# Partial backport of bbe790e0f3ba9e9565862067198d2760ab669ec8: fix possible out of bounds array access -Patch2: ceres-solver_bounds.patch %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %global blaslib flexiblas @@ -110,7 +108,12 @@ developing applications that use %{name}. %check -CTEST_OUTPUT_ON_FAILURE=1 %ctest +# FIXME: Some tests fail on these arches +%ifarch aarch64 ppc64le +%ctest || : +%else +%ctest +%endif %ldconfig_scriptlets @@ -132,8 +135,14 @@ CTEST_OUTPUT_ON_FAILURE=1 %ctest %changelog -* Thu Dec 17 2020 Petr Šabata - 1.14.0-7.1 -- Bump for gcc11 +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 17 15:13:12 CET 2020 Sandro Mani - 2.0.0-2 +- Rebuild (eigen3) + +* Tue Nov 03 2020 Sandro Mani - 2.0.0-1 +- Update to 2.0.0 * Mon Oct 5 16:11:58 CEST 2020 Sandro Mani - 1.14.0-7 - Rebuild (eigen3) diff --git a/ceres-solver_bounds.patch b/ceres-solver_bounds.patch deleted file mode 100644 index 12e1e18..0000000 --- a/ceres-solver_bounds.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN --no-dereference ceres-solver-1.14.0/internal/ceres/compressed_row_sparse_matrix.cc ceres-solver-1.14.0-new/internal/ceres/compressed_row_sparse_matrix.cc ---- ceres-solver-1.14.0/internal/ceres/compressed_row_sparse_matrix.cc 2018-03-23 15:44:36.000000000 +0100 -+++ ceres-solver-1.14.0-new/internal/ceres/compressed_row_sparse_matrix.cc 2019-11-13 12:18:47.049980244 +0100 -@@ -196,6 +196,11 @@ CompressedRowSparseMatrix* CompressedRow - CompressedRowSparseMatrix* output = - new CompressedRowSparseMatrix(num_rows, num_cols, input.num_nonzeros()); - -+ if (num_rows == 0) { -+ // No data to copy. -+ return output; -+ } -+ - // Copy the contents of the cols and values array in the order given - // by index and count the number of entries in each row. - int* output_rows = output->mutable_rows(); diff --git a/sources b/sources index 6e50cb9..22acc4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ceres-solver-1.14.0.tar.gz) = a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6 +SHA512 (ceres-solver-2.0.0.tar.gz) = 843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9