Bug 274200 - math/ceres-solver: upgrade to 2.2.0rc1 and unbreak
Summary: math/ceres-solver: upgrade to 2.2.0rc1 and unbreak
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Thierry Thomas
URL:
Keywords:
Depends on:
Blocks: 274203
  Show dependency tree / graph
 
Reported: 2023-10-01 18:12 UTC by Thierry Thomas
Modified: 2023-11-03 21:28 UTC (History)
1 user (show)

See Also:
yuri: maintainer-feedback+

Attachments
upgrade to 2.2.0rc1 and unbreak (7.53 KB, patch)
2023-10-01 18:12 UTC, Thierry Thomas 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Thierry Thomas freebsd_committer freebsd_triage 2023-10-01 18:12:36 UTC 
Created attachment 245357 [details]
upgrade to 2.2.0rc1 and unbreak

Remove the patches. All tests pass
Comment 1 Thierry Thomas freebsd_committer freebsd_triage 2023-10-01 19:24:13 UTC 
And according to https://github.com/ceres-solver/ceres-solver/issues/1009#issuecomment-1742154017 2.2.0rc2 should be released by next Monday.
Comment 2 Yuri Victorovich freebsd_committer freebsd_triage 2023-10-02 00:36:47 UTC 
Hi Therry,

Thank you for the patch.

Approved. Please commit it.


Thanks,
Yuri
Comment 3 Thierry Thomas freebsd_committer freebsd_triage 2023-10-02 17:02:03 UTC 
Committed, thanks!
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-10-02 17:02:07 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b736288ff0e0aec0932ed931017bc8170c43b502

commit b736288ff0e0aec0932ed931017bc8170c43b502
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-10-01 18:08:29 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2023-10-02 17:01:36 +0000

    math/ceres-solver: upgrade to 2.2.0rc1 and unbreak

    Remove the patches. All tests pass.

    PR:             274200
    Approved by:    yuri (maintainer)

 math/ceres-solver/Makefile                         |  5 +--
 math/ceres-solver/distinfo                         |  6 +--
 .../files/patch-cmake_FindSuiteSparse.cmake (gone) | 52 ----------------------
 ...patch-internal_ceres_covariance__impl.cc (gone) | 14 ------
 math/ceres-solver/pkg-plist                        |  7 ++-
 5 files changed, 7 insertions(+), 77 deletions(-)
Comment 5 Robert Clausecker freebsd_committer freebsd_triage 2023-10-03 15:04:58 UTC 
This update breaks graphics/colmap.  Please fix or revert.
Comment 6 Robert Clausecker freebsd_committer freebsd_triage 2023-10-03 15:05:58 UTC 
Colmap issue: https://github.com/colmap/colmap/issues/1496
Comment 7 Thierry Thomas freebsd_committer freebsd_triage 2023-10-03 17:31:26 UTC 
(In reply to Robert Clausecker from comment #5)
Reverting won't fix colmap, because ceres-solver was broken.
Comment 8 Thierry Thomas freebsd_committer freebsd_triage 2023-10-03 17:40:44 UTC 
(In reply to Robert Clausecker from comment #6)
Thanks, I shall follow this issue, and also try to fix it.
Comment 9 Robert Clausecker freebsd_committer freebsd_triage 2023-10-03 17:55:49 UTC 
Thank you for your quick response.

I hope we can get this worked out.
Comment 10 Thierry Thomas freebsd_committer freebsd_triage 2023-10-03 19:42:28 UTC 
It was a easy one!

Just set CXXSTD to c++17:

diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index e987e56dc394..87ffebfd68cd 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -28,6 +28,7 @@ LIB_DEPENDS=  libboost_filesystem.so:devel/boost-libs \
 
 USES=          cmake compiler:${OPENMP}c++11-lib desktop-file-utils eigen:3 gl \
                localbase python:env qt:5 sqlite
+USE_CXXSTD=    c++17
 USE_GITHUB=    yes
 USE_GL=                gl glew
 USE_QT=                core gui widgets buildtools:build opengl:build qmake:build
Comment 11 Robert Clausecker freebsd_committer freebsd_triage 2023-10-03 19:59:10 UTC 
(In reply to Thierry Thomas from comment #10)

Great!  Will test and commit that patch shortly.
Comment 12 commit-hook freebsd_committer freebsd_triage 2023-10-04 20:04:24 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=943d012d6dd00e22fe04f4a84400c11cd2bcac55

commit 943d012d6dd00e22fe04f4a84400c11cd2bcac55
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-10-03 20:04:27 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-04 20:01:38 +0000

    graphics/colmap: fix build with ceres-solver-2.2.0.r1

    PR:             274200
    Reported by:    fuz (maintainer)
    See also:       https://github.com/colmap/colmap/issues/1496

 graphics/colmap/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Comment 13 commit-hook freebsd_committer freebsd_triage 2023-11-03 21:25:36 UTC 
A commit in branch 2023Q4 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=26e0b956622eaefdba0fbf1bfa63790482341c54

commit 26e0b956622eaefdba0fbf1bfa63790482341c54
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-10-03 20:04:27 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-11-03 21:19:00 +0000

    graphics/colmap: fix build with ceres-solver-2.2.0.r1

    PR:             274200
    Reported by:    fuz (maintainer)
    See also:       https://github.com/colmap/colmap/issues/1496

    (cherry picked from commit 943d012d6dd00e22fe04f4a84400c11cd2bcac55)

 graphics/colmap/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Comment 14 Robert Clausecker freebsd_committer freebsd_triage 2023-11-03 21:28:01 UTC 
This patch was cherry-picked as it seems to help on the quarterly branch, too.