diff --git a/science/ttk/Makefile b/science/ttk/Makefile index fa46ea465c0b..279a40893b09 100644 --- a/science/ttk/Makefile +++ b/science/ttk/Makefile @@ -1,49 +1,49 @@ PORTNAME= ttk DISTVERSION= 1.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Topology ToolKit: Topological data analysis and visualization WWW= https://topology-tool-kit.github.io \ https://github.com/topology-tool-kit/ttk LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} BUILD_DEPENDS= ${LOCALBASE}/include/boost/functional/hash.hpp:devel/boost-libs \ cli11>0:devel/cli11 \ exprtk>0:math/exprtk \ spectra>0:math/spectra \ utf8cpp>0:devel/utf8cpp \ websocketpp>0:devel/websocketpp \ ${PY_DEPENDS} BUILD_DEPENDS+= nlohmann-json>0:devel/nlohmann-json # is required by lib/cmake/paraview-5.11/vtk/VTK-vtk-module-find-packages.cmake:1167 BUILD_DEPENDS+= fast_float>0:math/fast_float # attempt to fix build failures triggered by find_package(fastfloat) from paraview's vtk cmake scripts LIB_DEPENDS= libcgraph.so:graphics/graphviz \ libembree3.so:graphics/embree3 \ libfreetype.so:print/freetype2 \ libjsoncpp.so:devel/jsoncpp \ libqhull_r.so:math/qhull \ libvtkRenderingCore-pv${PARAVIEW_VER}.so:science/paraview \ libzfp.so:devel/zfp RUN_DEPENDS= ${PY_DEPENDS} USES= cmake eigen:3 compiler:c++11-lang gl python sqlite xorg USE_GL= glew USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= topology-tool-kit CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_OFF= TTK_ENABLE_WEBSOCKETPP # fix build with boost-1.87+ until this is fixed post-stage: ${RM} ${STAGEDIR}${PREFIX}/include/Python.h .include <../../science/paraview/Makefile.version> .include diff --git a/science/ttk/files/patch-core_vtk_ttkWRLExporter_ttkWRLExporter.cpp b/science/ttk/files/patch-core_vtk_ttkWRLExporter_ttkWRLExporter.cpp new file mode 100644 index 000000000000..eee1522a3e12 --- /dev/null +++ b/science/ttk/files/patch-core_vtk_ttkWRLExporter_ttkWRLExporter.cpp @@ -0,0 +1,57 @@ +--- core/vtk/ttkWRLExporter/ttkWRLExporter.cpp.orig 2024-09-20 10:44:28 UTC ++++ core/vtk/ttkWRLExporter/ttkWRLExporter.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + // base code includes + #include +@@ -145,7 +146,12 @@ TTKWRLEXPORTER_EXPORT void vtkVRMLExporter::WriteAnAct + fprintf(fp, " solid FALSE\n"); + + if(!pointDataWritten) { ++ ++#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 4, 20250513) ++ this->WritePointData(points, normals, tcoords, colors, false, fp); ++#else + this->WritePointData(points, normals, tcoords, colors, fp); ++#endif + pointDataWritten = 1; + } else { + fprintf(fp, " coord USE VTKcoordinates\n"); +@@ -189,7 +195,11 @@ TTKWRLEXPORTER_EXPORT void vtkVRMLExporter::WriteAnAct + fprintf(fp, " geometry IndexedFaceSet {\n"); + + if(!pointDataWritten) { ++#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 4, 20250513) ++ this->WritePointData(points, normals, tcoords, colors, false, fp); ++#else + this->WritePointData(points, normals, tcoords, colors, fp); ++#endif + pointDataWritten = 1; + } else { + fprintf(fp, " coord USE VTKcoordinates\n"); +@@ -238,7 +248,11 @@ TTKWRLEXPORTER_EXPORT void vtkVRMLExporter::WriteAnAct + fprintf(fp, " geometry IndexedLineSet {\n"); + + if(!pointDataWritten) { ++#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 4, 20250513) ++ this->WritePointData(points, nullptr, nullptr, colors, false, fp); ++#else + this->WritePointData(points, nullptr, nullptr, colors, fp); ++#endif + } else { + fprintf(fp, " coord USE VTKcoordinates\n"); + +@@ -440,6 +454,9 @@ TTKWRLEXPORTER_EXPORT void + vtkDataArray *normals, + vtkDataArray *tcoords, + vtkUnsignedCharArray *colors, ++#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 4, 20250513) ++ bool vtkNotUsed(cellData), ++#endif + FILE *fp) { + + double *p;