pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/cad/openscad
Module Name: pkgsrc
Committed By: mef
Date: Sun Feb 2 00:41:13 UTC 2025
Modified Files:
pkgsrc/cad/openscad: distinfo
Added Files:
pkgsrc/cad/openscad/patches: patch-src_cgalutils-polyhedron.cc
patch-src_cgalutils-tess.cc patch-src_openscad.cc
Log Message:
(cad/openscad) Fix cgal-5.6.2 issue, the patches are provided by Paul Ripke.
wip/openscad log says:
* bb1ea61645 [2024-08-10 15:40:50 +1000] openscad: Patch needed for latest boost version @Paul Ripke
* 5283dc31e4 [2024-02-19 09:00:18 +1100] openscad: Import from cad/openscad and patch for cgal-5+ @Paul Ripke
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/cad/openscad/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/cad/openscad/patches/patch-src_cgalutils-polyhedron.cc \
pkgsrc/cad/openscad/patches/patch-src_cgalutils-tess.cc \
pkgsrc/cad/openscad/patches/patch-src_openscad.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/cad/openscad/distinfo
diff -u pkgsrc/cad/openscad/distinfo:1.15 pkgsrc/cad/openscad/distinfo:1.16
--- pkgsrc/cad/openscad/distinfo:1.15 Sun Apr 28 08:09:07 2024
+++ pkgsrc/cad/openscad/distinfo Sun Feb 2 00:41:12 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2024/04/28 08:09:07 mef Exp $
+$NetBSD: distinfo,v 1.16 2025/02/02 00:41:12 mef Exp $
BLAKE2s (openscad-2021.01.tar.gz) = dc3d5a762d8b334fcdefc41d3c15a3b01023ce93ed4b2bae2f9d13c5100c7918
SHA512 (openscad-2021.01.tar.gz) = 2dac2d9c2fdbb720bc2e56f66849a75abe10ee646f918c53dadf33d57a30f3c605a536483bd97410d715309064ac99330ce15657440e4d66b426635dfab6a32b
@@ -7,5 +7,8 @@ SHA1 (patch-features_qscintilla2-priv.pr
SHA1 (patch-openscad.pro) = 55e97368d2fdd77c8a4773699cfffdaccd65d63f
SHA1 (patch-scripts_translation-update.sh) = 24929df617e450558934e46b1711f241945da7eb
SHA1 (patch-src_FileModule.cc) = c3e2d7a711fe28eb701bc84a6413daa8bd8dfff6
+SHA1 (patch-src_cgalutils-polyhedron.cc) = b775822c0cb921a196a7dd4356f19e8f30631bbf
+SHA1 (patch-src_cgalutils-tess.cc) = b6571d63159e222fbcbfc89bc05984264304bfb7
SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038
+SHA1 (patch-src_openscad.cc) = ec2898bf5236ee5be2150cc74f1615c4dd0c2ae0
SHA1 (patch-src_scintillaeditor.h) = 47d2cde8d7349a23770c549e5df9b219678825e9
Added files:
Index: pkgsrc/cad/openscad/patches/patch-src_cgalutils-polyhedron.cc
diff -u /dev/null pkgsrc/cad/openscad/patches/patch-src_cgalutils-polyhedron.cc:1.1
--- /dev/null Sun Feb 2 00:41:13 2025
+++ pkgsrc/cad/openscad/patches/patch-src_cgalutils-polyhedron.cc Sun Feb 2 00:41:13 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_cgalutils-polyhedron.cc,v 1.1 2025/02/02 00:41:13 mef Exp $
+
+Upstream patch for cgal 5.3
+https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b
+
+--- src/cgalutils-polyhedron.cc.orig 2021-01-31 17:41:09.000000000 +0000
++++ src/cgalutils-polyhedron.cc
+@@ -337,19 +337,6 @@ namespace CGALUtils {
+ }
+ };
+
+- template <typename Polyhedron>
+- std::string printPolyhedron(const Polyhedron &p) {
+- std::ostringstream sstream;
+- sstream.precision(20);
+-
+- Polyhedron_writer writer;
+- generic_print_polyhedron(sstream, p, writer);
+-
+- return sstream.str();
+- }
+-
+- template std::string printPolyhedron(const CGAL_Polyhedron &p);
+-
+ }; // namespace CGALUtils
+
+ #endif /* ENABLE_CGAL */
Index: pkgsrc/cad/openscad/patches/patch-src_cgalutils-tess.cc
diff -u /dev/null pkgsrc/cad/openscad/patches/patch-src_cgalutils-tess.cc:1.1
--- /dev/null Sun Feb 2 00:41:13 2025
+++ pkgsrc/cad/openscad/patches/patch-src_cgalutils-tess.cc Sun Feb 2 00:41:13 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_cgalutils-tess.cc,v 1.1 2025/02/02 00:41:13 mef Exp $
+
+Upstream patch for cgal 5.4
+https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b
+
+--- src/cgalutils-tess.cc.orig 2021-01-31 17:41:09.000000000 +0000
++++ src/cgalutils-tess.cc
+@@ -6,10 +6,12 @@
+ #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 < 1050401000
+ #include <CGAL/Triangulation_2_projection_traits_3.h>
++typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ #else
+- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
++#include <CGAL/Projection_traits_3.h>
++typedef CGAL::Filtered_projection_traits_3<K> Projection;
+ #endif
+ #include <CGAL/Triangulation_face_base_with_info_2.h>
+ #pragma pop_macro("NDEBUG")
+@@ -19,7 +21,6 @@ struct FaceInfo {
+ bool in_domain() { return nesting_level%2 == 1; }
+ };
+
+-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
+ typedef CGAL::Triangulation_data_structure_2<
+ CGAL::Triangulation_vertex_base_2<Projection>,
Index: pkgsrc/cad/openscad/patches/patch-src_openscad.cc
diff -u /dev/null pkgsrc/cad/openscad/patches/patch-src_openscad.cc:1.1
--- /dev/null Sun Feb 2 00:41:13 2025
+++ pkgsrc/cad/openscad/patches/patch-src_openscad.cc Sun Feb 2 00:41:13 2025
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_openscad.cc,v 1.1 2025/02/02 00:41:13 mef Exp $
+
+Compile fix from upstream, fixing ::join ambiguity
+https://github.com/openscad/openscad/commit/9b79576c1ee9d57d0f4a5de5c1365bb87c548f36
+
+--- src/openscad.cc.orig 2021-01-31 17:41:09.000000000 +0000
++++ src/openscad.cc
+@@ -65,7 +65,6 @@
+ #include <chrono>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/algorithm/string/split.hpp>
+-#include <boost/algorithm/string/join.hpp>
+ #include <boost/range/adaptor/transformed.hpp>
+ #include <boost/program_options.hpp>
+ #include <boost/filesystem.hpp>
+@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::
+ }
+
+ if (exit_if_not_found) {
+- LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n")));
++ LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n")));
+
+ exit(1);
+ } else {
+@@ -885,7 +884,7 @@ struct CommaSeparatedVector
+ };
+
+ template <class Seq, typename ToString>
+-std::string join(const Seq &seq, const std::string &sep, const ToString &toString)
++std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString)
+ {
+ return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep);
+ }
+@@ -947,7 +946,7 @@ int main(int argc, char **argv)
+ ("P,P", po::value<string>(), "customizer parameter set")
+ #ifdef ENABLE_EXPERIMENTAL
+ ("enable", po::value<vector<string>>(), ("enable experimental features: " +
+- join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
++ str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
+ [](const Feature *feature) {
+ return feature->get_name();
+ }) +
+@@ -964,11 +963,11 @@ int main(int argc, char **argv)
+ ("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png")
+ ("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png")
+ ("animate", po::value<unsigned>(), "export N animated frames")
+- ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str())
++ ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
+ ("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png")
+ ("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png")
+ ("colorscheme", po::value<string>(), ("=colorscheme: " +
+- join(ColorMap::inst()->colorSchemeNames(), " | ",
++ str_join(ColorMap::inst()->colorSchemeNames(), " | ",
+ [](const std::string& colorScheme) {
+ return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme;
+ }) +
Home |
Main Index |
Thread Index |
Old Index