pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

prusaslicer: Fix build with latest CGAL/boost.



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sat Mar 14 11:08:55 2026 +1100
Changeset:	9859c88a9007a99b3c11f7bb90d29e6cfa9577f9

Modified Files:
	prusaslicer/distinfo
Added Files:
	prusaslicer/patches/patch-src_libslic3r_Geometry_VoronoiUtilsCgal.cpp
	prusaslicer/patches/patch-src_libslic3r_MeshBoolean.cpp
	prusaslicer/patches/patch-src_libslic3r_SLA_SupportIslands_VoronoiDiagramCGAL.cpp
	prusaslicer/patches/patch-src_libslic3r_Triangulation.cpp

Log Message:
prusaslicer: Fix build with latest CGAL/boost.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9859c88a9007a99b3c11f7bb90d29e6cfa9577f9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/distinfo                               |  4 ++++
 ...tch-src_libslic3r_Geometry_VoronoiUtilsCgal.cpp | 23 ++++++++++++++++++++++
 .../patches/patch-src_libslic3r_MeshBoolean.cpp    | 15 ++++++++++++++
 ...lic3r_SLA_SupportIslands_VoronoiDiagramCGAL.cpp | 22 +++++++++++++++++++++
 .../patches/patch-src_libslic3r_Triangulation.cpp  | 15 ++++++++++++++
 5 files changed, 79 insertions(+)

diffs:
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 72ff196c6c..b1329567af 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -15,10 +15,14 @@ SHA1 (patch-src_libslic3r_CutSurface.cpp) = a6a702e0fe32bc9b37136299e14c715f6294
 SHA1 (patch-src_libslic3r_GCodeSender.cpp) = de2e506662aae4383f1230409e6d5efac1cfae3a
 SHA1 (patch-src_libslic3r_GCodeSender.hpp) = e069f3c596e102e5f3f1339f29cd1d12a7c82dfb
 SHA1 (patch-src_libslic3r_GCode_PostProcessor.cpp) = 4b080e5f3cdd2918103f99f3401d36b840aa3fa3
+SHA1 (patch-src_libslic3r_Geometry_VoronoiUtilsCgal.cpp) = a15e139b380d5ad6a79c640e1a439ba17dfed7fa
+SHA1 (patch-src_libslic3r_MeshBoolean.cpp) = ad6911f6bfd5e77da70e0d30cd0071009f6f8531
 SHA1 (patch-src_libslic3r_Platform.cpp) = 3066585efc98ba4963e41bda5952df38a7b095a0
 SHA1 (patch-src_libslic3r_Platform.hpp) = 5626058616d04396bff6c8550951d04fe03249e4
+SHA1 (patch-src_libslic3r_SLA_SupportIslands_VoronoiDiagramCGAL.cpp) = 20a7e64673b7a59b7633b5ffe12da50c3be935d6
 SHA1 (patch-src_libslic3r_SupportSpotsGenerator.cpp) = b1080470f18e873ad7b39a5e56b4aabd8be87011
 SHA1 (patch-src_libslic3r_Thread.cpp) = 8aa488b933baa97132058f88a82eef8db73ab2f5
+SHA1 (patch-src_libslic3r_Triangulation.cpp) = 0ffb5d4a3f5e564b76ff59ec2376210c6b52390b
 SHA1 (patch-src_libslic3r_Utils_DirectoriesUtils.cpp) = 02c874c348016d572ddf8fed3171aabe2d4550c0
 SHA1 (patch-src_occt__wrapper_CMakeLists.txt) = d1d3405bd68e32d204eaf95a578f4f837571f391
 SHA1 (patch-src_slic3r_CMakeLists.txt) = f6ad2741c3eb3c28550cedf5a07799866944b247
diff --git a/prusaslicer/patches/patch-src_libslic3r_Geometry_VoronoiUtilsCgal.cpp b/prusaslicer/patches/patch-src_libslic3r_Geometry_VoronoiUtilsCgal.cpp
new file mode 100644
index 0000000000..a954654ed4
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_Geometry_VoronoiUtilsCgal.cpp
@@ -0,0 +1,23 @@
+$NetBSD$
+
+Fix build with latest CGAL/boost.
+
+--- src/libslic3r/Geometry/VoronoiUtilsCgal.cpp.orig	2026-03-13 22:56:17.138721281 +0000
++++ src/libslic3r/Geometry/VoronoiUtilsCgal.cpp
+@@ -2,6 +2,9 @@
+ ///|/
+ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+ ///|/
++
++#include <boost/mpl/if.hpp>
++
+ #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+ #include <CGAL/Arr_segment_traits_2.h>
+ #include <CGAL/Surface_sweep_2_algorithms.h>
+@@ -333,4 +336,4 @@ VoronoiUtilsCgal::is_voronoi_diagram_pla
+     return true;
+ }
+ 
+-} // namespace Slic3r::Geometry
+\ No newline at end of file
++} // namespace Slic3r::Geometry
diff --git a/prusaslicer/patches/patch-src_libslic3r_MeshBoolean.cpp b/prusaslicer/patches/patch-src_libslic3r_MeshBoolean.cpp
new file mode 100644
index 0000000000..d621f6ef96
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_MeshBoolean.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix build with latest CGAL/boost.
+
+--- src/libslic3r/MeshBoolean.cpp.orig	2026-03-13 23:05:27.737938407 +0000
++++ src/libslic3r/MeshBoolean.cpp
+@@ -10,6 +10,8 @@
+ 
+ #undef PI
+ 
++#include <boost/mpl/if.hpp>
++
+ // Include igl first. It defines "L" macro which then clashes with our localization
+ #include <igl/copyleft/cgal/mesh_boolean.h> // IWYU pragma: keep
+ #include <igl/MeshBooleanType.h>
diff --git a/prusaslicer/patches/patch-src_libslic3r_SLA_SupportIslands_VoronoiDiagramCGAL.cpp b/prusaslicer/patches/patch-src_libslic3r_SLA_SupportIslands_VoronoiDiagramCGAL.cpp
new file mode 100644
index 0000000000..0d4a9a5c38
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_SLA_SupportIslands_VoronoiDiagramCGAL.cpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Fix build with latest CGAL/boost.
+
+--- src/libslic3r/SLA/SupportIslands/VoronoiDiagramCGAL.cpp.orig	2026-03-13 23:33:14.225710102 +0000
++++ src/libslic3r/SLA/SupportIslands/VoronoiDiagramCGAL.cpp
+@@ -2,6 +2,8 @@
+ 
+ #include <iostream>
+ 
++#include <boost/mpl/if.hpp>
++
+ // includes for defining the Voronoi diagram adaptor
+ #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+ #include <CGAL/Delaunay_triangulation_2.h>
+@@ -291,4 +293,4 @@ Polygons Slic3r::sla::create_voronoi_cel
+     // Point_2 p;
+     // Locate_result lr = vd.locate(p); // Could locate face of VD - potentionaly could iterate input points
+     return cells;
+-}
+\ No newline at end of file
++}
diff --git a/prusaslicer/patches/patch-src_libslic3r_Triangulation.cpp b/prusaslicer/patches/patch-src_libslic3r_Triangulation.cpp
new file mode 100644
index 0000000000..b9a1ce6a32
--- /dev/null
+++ b/prusaslicer/patches/patch-src_libslic3r_Triangulation.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix build with latest CGAL/boost.
+
+--- src/libslic3r/Triangulation.cpp.orig	2026-03-13 23:34:05.018315614 +0000
++++ src/libslic3r/Triangulation.cpp
+@@ -4,6 +4,8 @@
+ ///|/
+ #include "Triangulation.hpp"
+ 
++#include <boost/mpl/if.hpp>
++
+ #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+ #include <CGAL/Constrained_Delaunay_triangulation_2.h>
+ #include <CGAL/Triangulation_vertex_base_with_info_2.h>


Home | Main Index | Thread Index | Old Index