Index: head/graphics/blender/Makefile =================================================================== --- head/graphics/blender/Makefile (revision 530254) +++ head/graphics/blender/Makefile (revision 530255) @@ -1,188 +1,188 @@ # Created by: Jimmy Olgeni # $FreeBSD$ PORTNAME= blender DISTVERSION= 2.82 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ http://public.planetmirror.com/pub/blender/source/ MAINTAINER= FreeBSD@Shaneware.biz COMMENT= 3D modeling/rendering/animation package LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libboost_regex.so:devel/boost-libs RUN_DEPENDS= ${PYNUMPY} # libboost_regex.so just acts as a placeholder; several boost # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. USES= cmake compiler:c++14-lang gl jpeg python:3.7 shebangfix \ tar:xz xorg USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew INSTALLS_ICONS= yes CMAKE_OFF= WITH_IMAGE_OPENJPEG WITH_PYTHON_INSTALL \ WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \ WITH_CYCLES_LOGGING SHEBANG_FILES= release/bin/blender-thumbnailer.py \ release/scripts/modules/bl_i18n_utils/merge_po.py \ release/scripts/modules/bl_i18n_utils/utils_rtl.py \ release/scripts/modules/blend_render_info.py CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -Wno-float-conversion CFLAGS_i386= -march=i586 CXXFLAGS_i386= -march=i586 # Use LLVM linker where available .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) LDFLAGS+= -fuse-ld=lld .endif # version without trailing update letters VERDIR= ${DISTVERSION:C/[abcdef]//g} PLIST_SUB+= VER=${VERDIR} LLVM_VER= 90 OPTIONS_SUB= yes .include "${.CURDIR}/Makefile.options" ALEMBIC_CMAKE_BOOL= WITH_ALEMBIC ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic # note that this needs to be set to match alembics hdf5 option ALEMBIC_HDF5_REQUIRES= ALEMBIC ALEMBIC_HDF5_CMAKE_BOOL= WITH_ALEMBIC_HDF5 ALEMBIC_HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 AVI_CMAKE_BOOL= WITH_CODEC_AVI BULLET_CMAKE_BOOL= WITH_BULLET CAMERATRACK_CMAKE_BOOL= WITH_LIBMV CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind CAMERATRACK_ONLY_FOR_ARCHS= i386 amd64 CAMERATRACK_ONLY_FOR_ARCHS_REASON= libunwind only supports x86/amd64 CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON COLLADA_CMAKE_BOOL= WITH_OPENCOLLADA COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada \ libpcre.so:devel/pcre COLLADA_USE= GNOME=libxml2 COLLADA_USES= gnome COMPOSITOR_CMAKE_BOOL= WITH_COMPOSITOR CYCLES_IMPLIES= OPENIMAGEIO CYCLES_CMAKE_BOOL= WITH_CYCLES CYCLESEMBR_IMPLIES= CYCLES CYCLESEMBR_CMAKE_BOOL= WITH_CYCLES_EMBREE CYCLESEMBR_LIB_DEPENDS= libembree3.so:graphics/embree CYCLESEMBR_ONLY_FOR_ARCHS= amd64 CYCLESEMBR_ONLY_FOR_ARCHS_REASON= embree only supports amd64 CYCLESOSL_IMPLIES= CYCLES CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR} FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FFTW3_CMAKE_BOOL= WITH_FFTW3 FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 FRAMESERVER_CMAKE_BOOL= WITH_IMAGE_FRAMESERVER FREESTYLE_CMAKE_BOOL= WITH_FREESTYLE HDR_CMAKE_BOOL= WITH_IMAGE_HDR HEADLESS_PREVENTS= MENU XINPUT XF86VMODE HEADLESS_PREVENTS_MSG= X11 options can't be used in headless mode HEADLESS_CMAKE_BOOL= WITH_HEADLESS INPUT_NDOF_CMAKE_BOOL= WITH_INPUT_NDOF JACK_CMAKE_BOOL= WITH_JACK JACK_LIB_DEPENDS= libjack.so:audio/jack LZO_CMAKE_BOOL= WITH_LZO LZMA_CMAKE_BOOL= WITH_LZMA MENU_USES= desktop-file-utils MOD_BOOLEAN_CMAKE_BOOL= WITH_MOD_BOOLEAN MOD_FLUID_CMAKE_BOOL= WITH_MOD_FLUID MOD_OCEANSIM_IMPLIES= FFTW3 MOD_OCEANSIM_CMAKE_BOOL= WITH_MOD_OCEANSIM MOD_REMESH_CMAKE_BOOL= WITH_MOD_REMESH MOD_SMOKE_CMAKE_BOOL= WITH_MOD_SMOKE NLS_CMAKE_BOOL= WITH_INTERNATIONAL # Use iconv:wchar_t to force the usage of iconv from ports. # libboost_locale.so uses libiconv_open, while we only provide # iconv_open in 10.x+ NLS_USES= gettext iconv:lib,wchar_t OPENAL_CMAKE_BOOL= WITH_OPENAL OPENAL_USES= openal:al,alut OPENCOLORIO_CMAKE_BOOL= WITH_OPENCOLORIO OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ libyaml-cpp03.so:devel/yaml-cpp03 \ libtinyxml.so:textproc/tinyxml OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ libHalf.so:graphics/ilmbase OPENIMAGEIO_IMPLIES= OPENEXR TIFF OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio OPENIMAGEDN_CMAKE_BOOL= WITH_OPENIMAGEDENOISE OPENIMAGEDN_LIB_DEPENDS= libOpenImageDenoise.so:graphics/oidn OPENIMAGEDN_ONLY_FOR_ARCHS= amd64 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON= oidn only supports amd64 # openmp usually works on amd64 OPENMP_CMAKE_BOOL= WITH_OPENMP OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC OPENVDB_LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/tbb RAYOPTIMIZATION_CMAKE_BOOL= WITH_RAYOPTIMIZATION SDL_CMAKE_BOOL= WITH_SDL SDL_USE= SDL=sdl2 SDL_USES= sdl SNDFILE_CMAKE_BOOL= WITH_CODEC_SNDFILE SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile TBB_CMAKE_BOOL= WITH_TBB TBB_LIB_DEPENDS= libtbb.so:devel/tbb TIFF_CMAKE_BOOL= WITH_IMAGE_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff XINPUT_CMAKE_BOOL= WITH_X11_XINPUT XINPUT_USE= XORG=xi XF86VMODE_CMAKE_BOOL= WITH_X11_XF86VMODE XF86VMODE_USE= XORG=xi,xxf86vm .if defined(WITH_DEBUG) CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON .endif post-patch-OPENCOLORIO-on: @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \ ${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake post-build: @(cd ${WRKSRC}/doc/manpage && \ ${PYTHON_CMD} blender.1.py \ ${INSTALL_WRKSRC}/bin/blender \ ${INSTALL_WRKSRC}/bin/${PORTNAME}.1) post-install: ${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install-DRACO-on: # move draco pylib into site-packages ${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/ ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/ ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so @${RM} -R ${STAGEDIR}/${PREFIX}/share/blender/${VERDIR}/python post-install-MENU-on: @-update-desktop-database -q .include Index: head/graphics/openimageio/Makefile =================================================================== --- head/graphics/openimageio/Makefile (revision 530254) +++ head/graphics/openimageio/Makefile (revision 530255) @@ -1,128 +1,128 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= openimageio DISTVERSIONPREFIX= Release- DISTVERSION= 2.1.11.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz COMMENT?= OpenImageIO graphics library LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libheif.so:graphics/libheif \ libImath.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ libpng.so:graphics/png \ libsquish.so:graphics/squish \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp \ libhdf5.so:science/hdf5 USES= cmake jpeg compiler:c++11-lib iconv:wchar_t USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio # fbm also installs bin/idiff CONFLICTS= fbm-[0-9]* CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ STOP_ON_WARNING USE_OPENSSL OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \ OPENCV OPENJPEG RAW TBB TEST TOOLS VDB OPTIONS_DEFAULT= DICOM FREETYPE GIF OCIO OPENJPEG TOOLS OPTIONS_SUB= yes DOCS_CMAKE_BOOL= INSTALL_DOCS DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} DICOM_DESC= DICOM/MEDICOM support DICOM_CMAKE_BOOL= USE_DICOM DICOM_LIB_DEPENDS= libdcmimage.so:graphics/dcmtk FFMPEG_DESC= Use FFmpeg to support extra file types FFMPEG_CMAKE_BOOL= USE_FFMPEG FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FREETYPE_CMAKE_BOOL= USE_FREETYPE FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_RUN_DEPENDS= ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf GIF_CMAKE_BOOL= USE_GIF GIF_LIB_DEPENDS= libgif.so:graphics/giflib IMAGEVIEWER_DESC= Build image viewer (requires Qt) IMAGEVIEWER_USES= gl qt:5 IMAGEVIEWER_IMPLIES= TOOLS IMAGEVIEWER_CMAKE_BOOL= USE_QT USE_OPENGL IMAGEVIEWER_USE= GL=gl,glu,glew \ QT=buildtools,core,gui,opengl,qmake_build,widgets OCIO_DESC= Color management support OCIO_CMAKE_BOOL= USE_OCIO OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio OPENCV_CMAKE_BOOL= USE_OPENCV OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CMAKE_BOOL= USE_OPENJPEG OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg RAW_CMAKE_BOOL= USE_LIBRAW RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw TBB_DESC= Intel tbb support TBB_CMAKE_BOOL= USE_TBB TBB_LIB_DEPENDS= libtbb.so:devel/tbb TEST_CMAKE_BOOL= OIIO_BUILD_TESTS TOOLS_DESC= Build CLI tools TOOLS_CMAKE_BOOL= OIIO_BUILD_TOOLS VDB_DESC= OpenVDB support VDB_CMAKE_BOOL= USE_OPENVDB VDB_LIB_DEPENDS= libopenvdb.so:misc/openvdb # DISTVERSION has an extra digit which isn't in the lib name # for LIBVERS we want the first three digits PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/} .include .if ${SLAVE_PORT} == yes BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} LIB_DEPENDS+= libOpenImageIO.so:graphics/openimageio PLIST= ${PKGDIR}/pkg-plist-pybind USES+= python USE_PYTHON= flavors CMAKE_ON+= USE_PYTHON CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER} \ -DPYBIND11_INCLUDE_DIR:STRING="${PYTHONPREFIX_INCLUDEDIR}" do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} .else # SLAVE_PORT == no USE_LDCONFIG= yes CMAKE_OFF+= USE_PYTHON post-install: ${LN} -sf libOpenImageIO.so.2.1 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2 ${LN} -sf libOpenImageIO_Util.so.2.1 \ ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2 do-test-TEST-on: @cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test .endif .include Index: head/math/curv/Makefile =================================================================== --- head/math/curv/Makefile (revision 530254) +++ head/math/curv/Makefile (revision 530255) @@ -1,42 +1,42 @@ # $FreeBSD$ PORTNAME= curv DISTVERSION= 0.4-417 DISTVERSIONSUFFIX= -gf6f8d011 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math lang graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Language for making art using mathematics LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glm>0:math/glm LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libdouble-conversion.so:devel/double-conversion \ libglfw.so:graphics/glfw \ libHalf.so:graphics/ilmbase \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/tbb USES= cmake compiler:c++14-lang gl localbase:ldflags xorg USE_GITHUB= yes GH_ACCOUNT= curv3d GH_TUPLE= ocornut:imgui:e0cab56:imgui/extern/imgui \ Tessil:ordered-map:3c14151:om/extern/ordered-map \ AmokHuginnsson:replxx:9da16bb:replxx/extern/replxx USE_GL= gl USE_XORG= x11 PLIST_FILES= bin/curv \ lib/curv/lib/blend.curv \ lib/curv/lib/noise.curv \ lib/curv/lib/web_colour.curv \ lib/curv/std.curv \ share/gtksourceview-3.0/language-specs/curv.lang post-install: @${RM} ${STAGEDIR}${PREFIX}/lib/curv/lib/README .include Index: head/misc/openvdb/Makefile =================================================================== --- head/misc/openvdb/Makefile (revision 530254) +++ head/misc/openvdb/Makefile (revision 530255) @@ -1,51 +1,51 @@ # $FreeBSD$ PORTNAME= openvdb DISTVERSIONPREFIX= v -DISTVERSION= 6.1.0 -PORTREVISION= 8 +DISTVERSION= 7.0.0 CATEGORIES= misc 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 \ libHalf.so:graphics/ilmbase \ libtbb.so:devel/tbb USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation USE_LDCONFIG= yes +CMAKE_ARGS= -DCONCURRENT_MALLOC="Tbbmalloc" CMAKE_OFF= OPENVDB_CORE_STATIC -OPTIONS_DEFINE= PYTHON TOOLS DOCS # TOOLS should be a subpackage +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 \ libIlmImf.so:graphics/openexr TOOLS_USES= gl xorg -TOOLS_USE= GL=gl,glu XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm +TOOLS_USE= GL=gl,glu XORG=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm DOCS_CMAKE_BOOL= OPENVDB_BUILD_DOCS DOCS_BUILD_DEPENDS= doxygen:devel/doxygen PORTDOCS= * .include Index: head/misc/openvdb/distinfo =================================================================== --- head/misc/openvdb/distinfo (revision 530254) +++ head/misc/openvdb/distinfo (revision 530255) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557552105 -SHA256 (AcademySoftwareFoundation-openvdb-v6.1.0_GH0.tar.gz) = d8803214c245cf0ca14a2c30cd215b183147c03c888c59fc642f213f98b4d68f -SIZE (AcademySoftwareFoundation-openvdb-v6.1.0_GH0.tar.gz) = 1864024 +TIMESTAMP = 1585783763 +SHA256 (AcademySoftwareFoundation-openvdb-v7.0.0_GH0.tar.gz) = 97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d +SIZE (AcademySoftwareFoundation-openvdb-v7.0.0_GH0.tar.gz) = 1872744 Index: head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc =================================================================== --- head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc (revision 530254) +++ head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc (nonexistent) @@ -1,26 +0,0 @@ ---- openvdb/python/pyOpenVDBModule.cc.orig 2019-05-07 20:58:35 UTC -+++ openvdb/python/pyOpenVDBModule.cc -@@ -320,7 +320,11 @@ struct PointIndexConverter - /// @return nullptr if the given Python object is not convertible to the PointIndex. - static void* convertible(PyObject* obj) - { -+#if PY_MAJOR_VERSION >= 3 -+ if (!PyLong_Check(obj)) return nullptr; // not a Python integer -+#else - if (!PyInt_Check(obj)) return nullptr; // not a Python integer -+#endif - return obj; - } - -@@ -337,7 +341,11 @@ struct PointIndexConverter - // Extract the PointIndex from the python integer - PointIndexT* index = static_cast(storage); - -+#if PY_MAJOR_VERSION >= 3 -+ *index = static_cast(PyLong_AsLong(obj)); -+#else - *index = static_cast(PyInt_AsLong(obj)); -+#endif - } - - /// Register both the PointIndex-to-integer and the integer-to-PointIndex converters. Property changes on: head/misc/openvdb/files/patch-openvdb_python_pyOpenVDBModule.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/misc/openvdb/files/patch-CMakeLists.txt =================================================================== --- head/misc/openvdb/files/patch-CMakeLists.txt (revision 530254) +++ head/misc/openvdb/files/patch-CMakeLists.txt (revision 530255) @@ -1,20 +1,23 @@ ---- CMakeLists.txt.orig 2019-05-07 20:58:35 UTC +--- CMakeLists.txt.orig 2019-12-06 20:11:33 UTC +++ CMakeLists.txt -@@ -177,7 +177,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) +@@ -198,7 +198,7 @@ mark_as_advanced( + + # @note Blosc version is currently treated as exception which must be adhered + # to. The minimum version must be at least 1.5. Previous versions are incompatible. +-set(MINIMUM_BLOSC_VERSION 1.5) ++set(MINIMUM_BLOSC_VERSION 1.15) + # @note ABI always enforced so the correct deprecation messages are available. + # OPENVDB_USE_DEPRECATED_ABI should be used to circumvent this + set(MINIMUM_OPENVDB_ABI_VERSION 4) +@@ -215,9 +215,9 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) + set(MINIMUM_ILMBASE_VERSION 2.2) + set(MINIMUM_OPENEXR_VERSION 2.2) set(MINIMUM_ZLIB_VERSION 1.2.7) - set(MINIMUM_TBB_VERSION 4.4) +- set(MINIMUM_TBB_VERSION 2017.0) ++ #set(MINIMUM_TBB_VERSION 2019.0) # bogus check: https://github.com/AcademySoftwareFoundation/openvdb/issues/688 - set(MINIMUM_PYTHON_VERSION 2.7) + set(MINIMUM_PYTHON_VERSION ${FREEBSD_PYTHON_VER}) - set(MINIMUM_NUMPY_VERSION 1.9.2) + set(MINIMUM_NUMPY_VERSION 1.12.1) set(MINIMUM_CPPUNIT_VERSION 1.10) -@@ -271,7 +271,7 @@ if(OPENVDB_BUILD_DOCS) - COMMENT "Generating API documentation with Doxygen" VERBATIM - ) - -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION docs) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION share/doc/openvdb) - endif() - - # Early exit if there's nothing to build Index: head/misc/openvdb/files/patch-cmake_FindTBB.cmake =================================================================== --- head/misc/openvdb/files/patch-cmake_FindTBB.cmake (nonexistent) +++ head/misc/openvdb/files/patch-cmake_FindTBB.cmake (revision 530255) @@ -0,0 +1,10 @@ +--- cmake/FindTBB.cmake.orig 2020-04-01 23:48:32 UTC ++++ cmake/FindTBB.cmake +@@ -96,7 +96,6 @@ endif() + set(_TBB_COMPONENT_LIST + tbb + tbbmalloc +- tbbmalloc_proxy + ) + + if(TBB_FIND_COMPONENTS) Property changes on: head/misc/openvdb/files/patch-cmake_FindTBB.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/openvdb/files/patch-doc_CMakeLists.txt =================================================================== --- head/misc/openvdb/files/patch-doc_CMakeLists.txt (nonexistent) +++ head/misc/openvdb/files/patch-doc_CMakeLists.txt (revision 530255) @@ -0,0 +1,10 @@ +--- doc/CMakeLists.txt.orig 2019-12-06 20:11:33 UTC ++++ doc/CMakeLists.txt +@@ -64,5 +64,5 @@ add_custom_target(doc ALL + ) + + # Suppress "Installing..." messages for all but one of the hundreds of generated files. +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION doc/html) +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION doc MESSAGE_NEVER) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION share/doc/openvdb) ++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION share/doc/openvdb MESSAGE_NEVER) Property changes on: head/misc/openvdb/files/patch-doc_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/openvdb/files/patch-openvdb_CMakeLists.txt =================================================================== --- head/misc/openvdb/files/patch-openvdb_CMakeLists.txt (nonexistent) +++ head/misc/openvdb/files/patch-openvdb_CMakeLists.txt (revision 530255) @@ -0,0 +1,15 @@ +--- openvdb/CMakeLists.txt.orig 2020-04-01 23:48:56 UTC ++++ openvdb/CMakeLists.txt +@@ -127,10 +127,10 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") + message(WARNING "Unable to find Jemalloc, attempting to fall back to TBB malloc. + It is recommended to use Jemalloc for optimum performance." + ) +- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc tbbmalloc_proxy) ++ find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) + endif() + elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") +- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc tbbmalloc_proxy) ++ find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) + endif() + + # Set deps. Note that the order here is important. If we're building against Property changes on: head/misc/openvdb/files/patch-openvdb_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc =================================================================== --- head/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc (revision 530254) +++ head/misc/openvdb/files/patch-openvdb_points_AttributeSet.cc (revision 530255) @@ -1,10 +1,10 @@ ---- openvdb/points/AttributeSet.cc.orig 2019-09-16 16:50:50 UTC +--- openvdb/points/AttributeSet.cc.orig 2019-12-06 20:11:33 UTC +++ openvdb/points/AttributeSet.cc -@@ -34,6 +34,7 @@ +@@ -7,6 +7,7 @@ #include "AttributeGroup.h" #include // std::equal +#include // CHAR_BIT #include namespace openvdb { Index: head/misc/openvdb/files/patch-openvdb_python_CMakeLists.txt =================================================================== --- head/misc/openvdb/files/patch-openvdb_python_CMakeLists.txt (nonexistent) +++ head/misc/openvdb/files/patch-openvdb_python_CMakeLists.txt (revision 530255) @@ -0,0 +1,14 @@ +--- openvdb/python/CMakeLists.txt.orig 2019-12-06 20:11:33 UTC ++++ openvdb/python/CMakeLists.txt +@@ -104,9 +104,9 @@ elseif(${CMAKE_VERSION} VERSION_LESS 3.14) + else() + # CMake >= 3.14 + if(USE_NUMPY) +- find_package(Python QUIET REQUIRED COMPONENTS Interpreter Development NumPy) ++ find_package(Python ${FREEBSD_PYTHON_VER} EXACT QUIET REQUIRED COMPONENTS Interpreter Development NumPy) + else() +- find_package(Python QUIET REQUIRED COMPONENTS Interpreter Development) ++ find_package(Python ${FREEBSD_PYTHON_VER} EXACT QUIET REQUIRED COMPONENTS Interpreter Development) + endif() + + OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_EXECUTABLE}) Property changes on: head/misc/openvdb/files/patch-openvdb_python_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/openvdb/pkg-plist =================================================================== --- head/misc/openvdb/pkg-plist (revision 530254) +++ head/misc/openvdb/pkg-plist (revision 530255) @@ -1,145 +1,148 @@ bin/vdb_print %%TOOLS%%bin/vdb_lod %%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/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/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/tools/ChangeBackground.h include/openvdb/tools/Clip.h include/openvdb/tools/Composite.h include/openvdb/tools/Dense.h include/openvdb/tools/DenseSparseTools.h include/openvdb/tools/Diagnostics.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/MeshToVolume.h include/openvdb/tools/Morphology.h include/openvdb/tools/MultiResGrid.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/FindCppUnit.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.6.1 -lib/libopenvdb.so.6.1.0 +lib/libopenvdb.so.7.0 +lib/libopenvdb.so.7.0.0 %%PYTHON%%%%PYTHON_LIBDIR%%/pyopenvdb.so