76ec0815d7
Upstream has dropped pre-cgal-5.0 support and with that, reworked CGAL integration fully. Backporting relevant patches does not make sense. - Add patch to fix compilation with CGAL-5.4 + fix_build_with_cgal-5.4.patch - Add patch to fix compilation with newer Boost versions + fix_build_issue_with_overloaded_join.patch Constraint memoryperjob is allowing too small workers for OBS-URL: https://build.opensuse.org/package/show/graphics/openscad?expand=0&rev=45
23 lines
907 B
Diff
23 lines
907 B
Diff
Date: Sun, 03 Apr 2022 11:15:44 +0300
|
|
Subject: Fix build with CGAL-5.4
|
|
Upstream: modified from upstream commits
|
|
- c32efe043a65b7fd761751c8edb56f8deb6a9ed5
|
|
- 71f2831c0484c3f35cbf44e1d1dc2c857384100b
|
|
|
|
Index: openscad-2021.01/src/cgalutils-tess.cc
|
|
===================================================================
|
|
--- openscad-2021.01.orig/src/cgalutils-tess.cc
|
|
+++ openscad-2021.01/src/cgalutils-tess.cc
|
|
@@ -6,7 +6,10 @@
|
|
#pragma push_macro("NDEBUG")
|
|
#undef NDEBUG
|
|
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
|
|
-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
|
|
+#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(5,4,0)
|
|
+#include <CGAL/Projection_traits_3.h>
|
|
+typedef CGAL::Filtered_projection_traits_3<K> Projection;
|
|
+#elif CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
|
|
#include <CGAL/Triangulation_2_projection_traits_3.h>
|
|
#else
|
|
#include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
|