Bug 245824 - math/cgal: Update to 5.0.2 and dependents ports
Summary: math/cgal: Update to 5.0.2 and dependents ports
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Loïc Bartoletti
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-04-22 14:18 UTC by Loïc Bartoletti
Modified: 2020-05-08 05:36 UTC (History)
6 users (show)

See Also:
lbartoletti: maintainer-feedback+


Attachments
cgal5 (303.60 KB, patch)
2020-04-22 14:20 UTC, Loïc Bartoletti
no flags Details | Diff
databases/sfcgal (3.99 KB, patch)
2020-04-22 14:23 UTC, Loïc Bartoletti
lbartoletti: maintainer-approval+
Details | Diff
databases/postgis* (1.55 KB, patch)
2020-04-22 14:25 UTC, Loïc Bartoletti
lbartoletti: maintainer-approval+
Details | Diff
graphics/gdal (827 bytes, patch)
2020-04-22 14:26 UTC, Loïc Bartoletti
no flags Details | Diff
graphics/colmap (1.84 KB, patch)
2020-04-22 14:29 UTC, Loïc Bartoletti
no flags Details | Diff
cad/openscad (2.32 KB, patch)
2020-04-22 14:32 UTC, Loïc Bartoletti
no flags Details | Diff
cad/openscad-devel (1.06 KB, patch)
2020-04-22 14:33 UTC, Loïc Bartoletti
no flags Details | Diff
databases/pgrouting (2.67 KB, patch)
2020-04-22 14:35 UTC, Loïc Bartoletti
lbartoletti: maintainer-approval+
Details | Diff
games/flightgear-terragear (1.56 KB, patch)
2020-04-22 14:37 UTC, Loïc Bartoletti
no flags Details | Diff
cgal and all ports patched (319.39 KB, patch)
2020-04-22 14:41 UTC, Loïc Bartoletti
no flags Details | Diff
graphics/colmap (1.40 KB, patch)
2020-04-24 18:26 UTC, Jan Beich
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:18:50 UTC
Wen,

A new version of CGAL is available and it break everything.

The biggest change is that it is now "header only"[1], requires c++14 (and sometimes requires gmpxx for example for databases/sfcgal).

I've taken the patches when they exist or under discussion.

[1] But you can built libraries if you need to. https://doc.cgal.org/latest/Manual/installation.html

All ports have been tested with poudriere (10/11/HEAD i386/amd64)
I tested databases/sfcgal at works and with our CI.
Comment 1 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:20:49 UTC
Created attachment 213688 [details]
cgal5

math/cgal:

 * Update to 5.0.2

 Changelog:

   https://www.cgal.org/2020/02/25/cgal502/
Comment 2 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:23:38 UTC
Created attachment 213689 [details]
databases/sfcgal

databases/sfcgal:

  - Fix with cgal5 : use c++14 and add gmpxx link [1]

[1] https://github.com/Oslandia/SFCGAL/pull/218
Comment 3 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:25:25 UTC
Created attachment 213690 [details]
databases/postgis*

databases/postgis*:

  - bump portversion needed due to cgal and sfcgal changes
Comment 4 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:26:49 UTC
Created attachment 213691 [details]
graphics/gdal

graphics/gdal:

  - remove LIB_DEPENDS and add BUILD_DEPENDS
Comment 5 Wen Heping freebsd_committer freebsd_triage 2020-04-22 14:29:25 UTC
(In reply to Loïc Bartoletti from comment #0)
Please go ahead !

wen
Comment 6 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:29:44 UTC
Created attachment 213692 [details]
graphics/colmap

graphics/colmap:

  - remove LIB_DEPENDS and add BUILD_DEPENDS
  - Use c++14 and force set(CMAKE_CXX_STANDARD 14) if CGAL option is set on
Comment 7 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:32:40 UTC
Created attachment 213693 [details]
cad/openscad

cad/openscad:

  - remove LIB_DEPENDS and add BUILD_DEPENDS
  - Take patches from upstream [1]

[1] https://github.com/openscad/openscad/pull/3163
Comment 8 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:33:43 UTC
Created attachment 213694 [details]
cad/openscad-devel

cad/openscad-devel:

  - remove LIB_DEPENDS and add BUILD_DEPENDS
  - Use c++14
Comment 9 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:35:03 UTC
Created attachment 213695 [details]
databases/pgrouting

databases/pgrouting:

  - Update to 3.0.0 rc1 (CGAL is removed upstream)
Comment 10 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:37:48 UTC
Created attachment 213696 [details]
games/flightgear-terragear

games/flightgear-terragear:

  - remove LIB_DEPENDS and add BUILD_DEPENDS
  - fix Boost error (ld: error: undefined symbol: boost::thread::hardware_concurrency())
Comment 11 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:41:59 UTC
Created attachment 213697 [details]
cgal and all ports patched
Comment 12 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-22 14:42:06 UTC
cc jbeich@  graphics/colmap 
cc sunpoet@  graphics/gdal 
cc mr@  cad/openscad and  cad/openscad-devel

cc tcberner@ and swills@ (mentors)

I'm unsure about the "BUILD_DEPENDS=	${LOCALBASE}/lib/cmake/CGAL/UseCGAL.cmake:math/cgal"
Comment 13 Tobias C. Berner freebsd_committer freebsd_triage 2020-04-22 18:09:26 UTC
(In reply to Loïc Bartoletti from comment #12)
Yeah, long paths in the depends also make me uncomfortable...

You could switch to depending on the package by version
https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-depend.html#makefile-version-dependency

eg:
BULD_DEPENDS=cgal>=0:math/cgal


mfg Tobias
Comment 14 Jan Beich freebsd_committer freebsd_triage 2020-04-24 18:26:29 UTC
Created attachment 213762 [details]
graphics/colmap

(In reply to Loïc Bartoletti from comment #6)
Can you try this version instead?

> -USES=		cmake compiler:${OPENMP}c++11-lib eigen:3 gl localbase qt:5 \
> +USES=		cmake compiler:${OPENMP}c++14-lang eigen:3 gl localbase qt:5 \

${OPENMP} expands to gcc- on i386/aarch64/armv6/armv7 which would break build because USES=compiler:gcc-c++14-lang doesn't exist.

> ++    set(CMAKE_CXX_STANDARD 14)

Submitted upstream as https://github.com/colmap/colmap/pull/853
Comment 15 Loïc Bartoletti freebsd_committer freebsd_triage 2020-04-26 06:10:32 UTC
(In reply to Jan Beich from comment #14)
It works. Thanks!
Comment 16 commit-hook freebsd_committer freebsd_triage 2020-05-08 05:27:45 UTC
A commit references this bug:

Author: lbartoletti
Date: Fri May  8 05:27:26 UTC 2020
New revision: 534324
URL: https://svnweb.freebsd.org/changeset/ports/534324

Log:
  databases/pgrouting: Update to 3.0.0

  - Remove the math/cgal dependency
  - Use postgis30

  PR:		245824
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D24578

Changes:
  head/databases/pgrouting/Makefile
  head/databases/pgrouting/distinfo
  head/databases/pgrouting/pkg-plist
Comment 17 commit-hook freebsd_committer freebsd_triage 2020-05-08 05:35:48 UTC
A commit references this bug:

Author: lbartoletti
Date: Fri May  8 05:35:15 UTC 2020
New revision: 534326
URL: https://svnweb.freebsd.org/changeset/ports/534326

Log:
  smath/cgal: Update to 5.0.2

  The new version of CGAL brings improvements and a lot of changes, including 2 major ones [1](header only[2] and require c++14) requiring to patch all software depending on it.

  [1] https://www.cgal.org/2019/11/08/cgal50/
  [2] https://doc.cgal.org/latest/Manual/installation.html

  math/cgal:

     - Update to 5.0.2

  databases/sfcgal:

     - Fix with cgal5 : use c++14 and add gmpxx link

  databases/postgis*:

     - bump portversion needed due to cgal and sfcgal changes

  cad/openscad:

     - remove LIB_DEPENDS and add BUILD_DEPENDS
     - Use c++14

  cad/openscad-devel:

     - remove LIB_DEPENDS and add BUILD_DEPENDS
     - Use c++14

  games/flightgear-terragear:

     - remove LIB_DEPENDS and add BUILD_DEPENDS
     - fix Boost error (ld: error: undefined symbol: boost::thread::hardware_concurrency())

  graphics/colmap:

     - remove LIB_DEPENDS and add BUILD_DEPENDS
     - fix CMAKE_CXX_FLAGS with c++14

  PR:		245824
  Approved by:	wen, jbeich, tcberner (mentor)
  Differential Revision:	D24578

Changes:
  head/cad/openscad/Makefile
  head/cad/openscad/distinfo
  head/cad/openscad-devel/Makefile
  head/databases/postgis23/Makefile
  head/databases/postgis24/Makefile
  head/databases/postgis25/Makefile
  head/databases/postgis30/Makefile
  head/databases/sfcgal/Makefile
  head/databases/sfcgal/files/
  head/databases/sfcgal/files/patch-CMakeLists.txt
  head/databases/sfcgal/files/patch-src_CMakeLists.txt
  head/databases/sfcgal/files/patch-src_config.h.cmake
  head/games/flightgear-terragear/Makefile
  head/games/flightgear-terragear/files/patch-src_CMakeLists.txt
  head/graphics/colmap/Makefile
  head/graphics/colmap/distinfo
  head/math/cgal/Makefile
  head/math/cgal/distinfo
  head/math/cgal/pkg-plist
Comment 18 Loïc Bartoletti freebsd_committer freebsd_triage 2020-05-08 05:36:35 UTC
Commited, thanks!