diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 9684196c921b..fd332f7e7bae 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,38 +1,40 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.3.0 PORTREVISION= 11 CATEGORIES= cad MAINTAINER= teodorsigaev@gmail.com COMMENT= Slicing application for 3D printers LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= pending update to OneTBB-compatible version, see bug#255363 + LIB_DEPENDS= libtbb.so:devel/tbb \ libboost_log.so:devel/boost-libs \ libImath.so:math/Imath \ libnlopt.so:math/nlopt \ libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libopenvdb.so:misc/openvdb \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libdbus-1.so:devel/dbus \ libpng.so:graphics/png BUILD_DEPENDS= cereal>=1.3.0.10:devel/cereal \ cgal>=5.0.2:math/cgal USES= cmake desktop-file-utils eigen:3 gettext gl iconv pkgconfig CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DSLIC3R_GTK=3 \ -DSLIC3R_FHS=1 USE_GITHUB= yes GH_ACCOUNT= prusa3d USE_WX= 3.1 USE_GL= gl glu glew PORTDATA= * .include diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile index b733e47c22e8..349c9c590232 100644 --- a/misc/openvdb/Makefile +++ b/misc/openvdb/Makefile @@ -1,54 +1,62 @@ PORTNAME= openvdb DISTVERSIONPREFIX= v DISTVERSION= 8.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch:-p1 # backport of change TBB -> OneTBB + MAINTAINER= yuri@FreeBSD.org COMMENT= Tools for storage and manipulation of sparse volumetric data LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libboost_system.so:devel/boost-libs \ libImath.so:math/Imath \ - libtbb.so:devel/tbb + libtbb.so:devel/onetbb TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lang localbase:ldflags pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation -CMAKE_ARGS= -DCONCURRENT_MALLOC="Tbbmalloc" +CMAKE_ARGS= -DCONCURRENT_MALLOC="Tbbmalloc" -DTbb_INCLUDE_DIR=${LOCALBASE}/include CMAKE_OFF= OPENVDB_CORE_STATIC CMAKE_TESTING_ON= OPENVDB_BUILD_UNITTESTS # one test fails: https://github.com/AcademySoftwareFoundation/openvdb/issues/1103 OPTIONS_DEFINE= PYTHON TOOLS #DOCS # TOOLS and PYTHON should be made into subpackages OPTIONS_DEFAULT= PYTHON TOOLS OPTIONS_SUB= yes PYTHON_USES= python PYTHON_CMAKE_BOOL= OPENVDB_BUILD_PYTHON_MODULE PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DUSE_NUMPY:BOOL=ON PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} TOOLS_DESC= Build CLI tools TOOLS_CMAKE_BOOL= OPENVDB_BUILD_BINARIES OPENVDB_BUILD_VDB_LOD \ OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW TOOLS_LIB_DEPENDS= libglfw.so:graphics/glfw \ libOpenEXR.so:graphics/openexr TOOLS_USES= gl xorg TOOLS_USE= GL=gl,glu XORG=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm +post-patch: # extra fix for OneTBB + @cd ${WRKSRC}/openvdb/openvdb && \ + ${MKDIR} thread && \ + ${MV} util/Threading.h thread/ + # DOCS is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/899 #DOCS_CMAKE_BOOL= OPENVDB_BUILD_DOCS #DOCS_BUILD_DEPENDS= doxygen:devel/doxygen #PORTDOCS= * .include diff --git a/misc/openvdb/distinfo b/misc/openvdb/distinfo index b7b8201c7ba3..5c70c0e4ff93 100644 --- a/misc/openvdb/distinfo +++ b/misc/openvdb/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1623521505 +TIMESTAMP = 1628995152 SHA256 (AcademySoftwareFoundation-openvdb-v8.1.0_GH0.tar.gz) = 3e09d47331429be7409a3a3c27fdd3c297f96d31d2153febe194e664a99d6183 SIZE (AcademySoftwareFoundation-openvdb-v8.1.0_GH0.tar.gz) = 2619432 +SHA256 (e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch) = 9c39e12741df0fa293e8281c2567d59a8093786625580c62c6509aa4d17a5a7f +SIZE (e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch) = 76933 diff --git a/misc/openvdb/pkg-plist b/misc/openvdb/pkg-plist index 5e633ee09bfb..c264e0880272 100644 --- a/misc/openvdb/pkg-plist +++ b/misc/openvdb/pkg-plist @@ -1,155 +1,156 @@ %%TOOLS%%bin/vdb_lod %%TOOLS%%bin/vdb_print %%TOOLS%%bin/vdb_render %%TOOLS%%bin/vdb_view include/openvdb/Exceptions.h include/openvdb/Grid.h include/openvdb/MetaMap.h include/openvdb/Metadata.h include/openvdb/Platform.h include/openvdb/PlatformConfig.h include/openvdb/TypeList.h include/openvdb/Types.h include/openvdb/io/Archive.h include/openvdb/io/Compression.h include/openvdb/io/DelayedLoadMetadata.h include/openvdb/io/File.h include/openvdb/io/GridDescriptor.h include/openvdb/io/Queue.h include/openvdb/io/Stream.h include/openvdb/io/TempFile.h include/openvdb/io/io.h include/openvdb/math/BBox.h include/openvdb/math/ConjGradient.h include/openvdb/math/Coord.h include/openvdb/math/DDA.h include/openvdb/math/FiniteDifference.h include/openvdb/math/Half.h include/openvdb/math/HalfLimits.h include/openvdb/math/LegacyFrustum.h include/openvdb/math/Maps.h include/openvdb/math/Mat.h include/openvdb/math/Mat3.h include/openvdb/math/Mat4.h include/openvdb/math/Math.h include/openvdb/math/Operators.h include/openvdb/math/Proximity.h include/openvdb/math/QuantizedUnitVec.h include/openvdb/math/Quat.h include/openvdb/math/Ray.h include/openvdb/math/Stats.h include/openvdb/math/Stencils.h include/openvdb/math/Transform.h include/openvdb/math/Tuple.h include/openvdb/math/Vec2.h include/openvdb/math/Vec3.h include/openvdb/math/Vec4.h include/openvdb/openvdb.h include/openvdb/points/AttributeArray.h include/openvdb/points/AttributeArrayString.h include/openvdb/points/AttributeGroup.h include/openvdb/points/AttributeSet.h include/openvdb/points/IndexFilter.h include/openvdb/points/IndexIterator.h include/openvdb/points/PointAdvect.h include/openvdb/points/PointAttribute.h include/openvdb/points/PointConversion.h include/openvdb/points/PointCount.h include/openvdb/points/PointDataGrid.h include/openvdb/points/PointDelete.h include/openvdb/points/PointGroup.h include/openvdb/points/PointMask.h include/openvdb/points/PointMove.h include/openvdb/points/PointSample.h include/openvdb/points/PointScatter.h include/openvdb/points/StreamCompression.h %%PYTHON%%include/openvdb/python/pyopenvdb.h +include/openvdb/thread/Threading.h include/openvdb/tools/Activate.h include/openvdb/tools/ChangeBackground.h include/openvdb/tools/Clip.h include/openvdb/tools/Composite.h include/openvdb/tools/Count.h include/openvdb/tools/Dense.h include/openvdb/tools/DenseSparseTools.h include/openvdb/tools/Diagnostics.h include/openvdb/tools/FastSweeping.h include/openvdb/tools/Filter.h include/openvdb/tools/FindActiveValues.h include/openvdb/tools/GridOperators.h include/openvdb/tools/GridTransformer.h include/openvdb/tools/Interpolation.h include/openvdb/tools/LevelSetAdvect.h include/openvdb/tools/LevelSetFilter.h include/openvdb/tools/LevelSetFracture.h include/openvdb/tools/LevelSetMeasure.h include/openvdb/tools/LevelSetMorph.h include/openvdb/tools/LevelSetPlatonic.h include/openvdb/tools/LevelSetRebuild.h include/openvdb/tools/LevelSetSphere.h include/openvdb/tools/LevelSetTracker.h include/openvdb/tools/LevelSetUtil.h include/openvdb/tools/Mask.h include/openvdb/tools/Merge.h include/openvdb/tools/MeshToVolume.h include/openvdb/tools/Morphology.h include/openvdb/tools/MultiResGrid.h include/openvdb/tools/NodeVisitor.h include/openvdb/tools/ParticleAtlas.h include/openvdb/tools/ParticlesToLevelSet.h include/openvdb/tools/PointAdvect.h include/openvdb/tools/PointIndexGrid.h include/openvdb/tools/PointPartitioner.h include/openvdb/tools/PointScatter.h include/openvdb/tools/PointsToMask.h include/openvdb/tools/PoissonSolver.h include/openvdb/tools/PotentialFlow.h include/openvdb/tools/Prune.h include/openvdb/tools/RayIntersector.h include/openvdb/tools/RayTracer.h include/openvdb/tools/SignedFloodFill.h include/openvdb/tools/Statistics.h include/openvdb/tools/TopologyToLevelSet.h include/openvdb/tools/ValueTransformer.h include/openvdb/tools/VectorTransformer.h include/openvdb/tools/VelocityFields.h include/openvdb/tools/VolumeAdvect.h include/openvdb/tools/VolumeToMesh.h include/openvdb/tools/VolumeToSpheres.h include/openvdb/tree/InternalNode.h include/openvdb/tree/Iterator.h include/openvdb/tree/LeafBuffer.h include/openvdb/tree/LeafManager.h include/openvdb/tree/LeafNode.h include/openvdb/tree/LeafNodeBool.h include/openvdb/tree/LeafNodeMask.h include/openvdb/tree/NodeManager.h include/openvdb/tree/NodeUnion.h include/openvdb/tree/RootNode.h include/openvdb/tree/Tree.h include/openvdb/tree/TreeIterator.h include/openvdb/tree/ValueAccessor.h include/openvdb/util/CpuTimer.h include/openvdb/util/Formats.h include/openvdb/util/MapsUtil.h include/openvdb/util/Name.h include/openvdb/util/NodeMasks.h include/openvdb/util/NullInterrupter.h include/openvdb/util/PagedArray.h include/openvdb/util/Util.h include/openvdb/util/logging.h include/openvdb/version.h lib/cmake/OpenVDB/FindBlosc.cmake lib/cmake/OpenVDB/FindIlmBase.cmake lib/cmake/OpenVDB/FindJemalloc.cmake lib/cmake/OpenVDB/FindLog4cplus.cmake lib/cmake/OpenVDB/FindOpenEXR.cmake lib/cmake/OpenVDB/FindOpenVDB.cmake lib/cmake/OpenVDB/FindTBB.cmake lib/cmake/OpenVDB/OpenVDBGLFW3Setup.cmake lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake lib/cmake/OpenVDB/OpenVDBUtils.cmake lib/libopenvdb.so lib/libopenvdb.so.8.1 lib/libopenvdb.so.8.1.0 %%PYTHON%%%%PYTHON_LIBDIR%%/pyopenvdb.so