Date: Tue, 2 Apr 2024 07:59:17 GMT
From: Yuri Victorovich <yuri@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: d1127d06572f - main - misc/{,py-}openvdb: update 10.0.1 =?utf-8?Q?=E2=86=92?= 11.0.0
Message-ID: <202404020759.4327xHXs011848@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1127d06572f3e66c87ba3be845f4b48dc4191fc commit d1127d06572f3e66c87ba3be845f4b48dc4191fc Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-04-02 06:36:32 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-04-02 07:59:08 +0000 misc/{,py-}openvdb: update 10.0.1 → 11.0.0 --- cad/PrusaSlicer/Makefile | 1 + graphics/blender/Makefile | 2 +- graphics/openimageio/Makefile | 2 +- graphics/openvkl/Makefile | 2 +- math/curv/Makefile | 2 +- misc/openvdb/Makefile | 7 +- misc/openvdb/distinfo | 6 +- misc/openvdb/files/patch-cmake_FindIlmBase.cmake | 143 ----------------------- misc/openvdb/pkg-plist | 17 ++- misc/py-openvdb/Makefile | 22 ++-- misc/py-openvdb/distinfo | 6 +- misc/py-openvdb/files/example.py | 33 ++++++ science/opensph/Makefile | 6 +- 13 files changed, 77 insertions(+), 172 deletions(-) diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 69134e102637..f0248716a9e2 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,6 +1,7 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= cad DIST_SUBDIR= PrusaSlicer diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 8a2577e5e206..919f1dc89af7 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,6 +1,6 @@ PORTNAME= blender DISTVERSION= 3.6.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 2da92211d421..61970bccf156 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -5,7 +5,7 @@ DISTVERSION= 2.4.13.0 # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz diff --git a/graphics/openvkl/Makefile b/graphics/openvkl/Makefile index 436f5cef033b..5791751b26f0 100644 --- a/graphics/openvkl/Makefile +++ b/graphics/openvkl/Makefile @@ -1,7 +1,7 @@ PORTNAME= openvkl DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics devel MAINTAINER= yuri@FreeBSD.org diff --git a/math/curv/Makefile b/math/curv/Makefile index 3fbf84acdf38..6df8cab01e01 100644 --- a/math/curv/Makefile +++ b/math/curv/Makefile @@ -1,6 +1,6 @@ PORTNAME= curv DISTVERSION= 0.5 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= math lang graphics MAINTAINER= yuri@FreeBSD.org diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile index 395ac217ff00..1efb2a77dee2 100644 --- a/misc/openvdb/Makefile +++ b/misc/openvdb/Makefile @@ -1,7 +1,6 @@ PORTNAME= openvdb DISTVERSIONPREFIX= v -DISTVERSION= 10.0.1 -PORTREVISION= 12 +DISTVERSION= 11.0.0 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org @@ -41,10 +40,6 @@ TOOLS_LIB_DEPENDS= libglfw.so:graphics/glfw \ TOOLS_USES= gl xorg TOOLS_USE= GL=gl,glu XORG=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm -xpost-patch: # extra fix for OneTBB - @cd ${WRKSRC}/openvdb/openvdb && \ - ${MKDIR} thread - # DOCS is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/899 #DOCS_CMAKE_BOOL= OPENVDB_BUILD_DOCS #DOCS_BUILD_DEPENDS= doxygen:devel/doxygen diff --git a/misc/openvdb/distinfo b/misc/openvdb/distinfo index d62d5a19384c..0194bfb98993 100644 --- a/misc/openvdb/distinfo +++ b/misc/openvdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669923457 -SHA256 (AcademySoftwareFoundation-openvdb-v10.0.1_GH0.tar.gz) = 887a3391fbd96b20c77914f4fb3ab4b33d26e5fc479aa036d395def5523c622f -SIZE (AcademySoftwareFoundation-openvdb-v10.0.1_GH0.tar.gz) = 3461352 +TIMESTAMP = 1712016698 +SHA256 (AcademySoftwareFoundation-openvdb-v11.0.0_GH0.tar.gz) = 6314ff1db057ea90050763e7b7d7ed86d8224fcd42a82cdbb9c515e001b96c74 +SIZE (AcademySoftwareFoundation-openvdb-v11.0.0_GH0.tar.gz) = 4620858 diff --git a/misc/openvdb/files/patch-cmake_FindIlmBase.cmake b/misc/openvdb/files/patch-cmake_FindIlmBase.cmake deleted file mode 100644 index a2a4d179b946..000000000000 --- a/misc/openvdb/files/patch-cmake_FindIlmBase.cmake +++ /dev/null @@ -1,143 +0,0 @@ ---- cmake/FindIlmBase.cmake.orig 2021-06-11 21:38:41 UTC -+++ cmake/FindIlmBase.cmake -@@ -10,7 +10,7 @@ Find IlmBase include dirs and libraries - - Use this module by invoking find_package with the form:: - -- find_package(IlmBase -+ find_package(Imath - [version] [EXACT] # Minimum or EXACT version - [REQUIRED] # Fail with error if IlmBase is not found - [COMPONENTS <libs>...] # IlmBase libraries by their canonical name -@@ -36,11 +36,11 @@ Result Variables - - This will define the following variables: - --``IlmBase_FOUND`` -- True if the system has the IlmBase library. -+``Imath_FOUND`` -+ True if the system has the Imath library. - ``IlmBase_VERSION`` - The version of the IlmBase library which was found. --``IlmBase_INCLUDE_DIRS`` -+``S`` - Include directories needed to use IlmBase. - ``IlmBase_RELEASE_LIBRARIES`` - Libraries needed to link to the release version of IlmBase. -@@ -65,7 +65,7 @@ Cache Variables - - The following cache variables may also be set: - --``IlmBase_INCLUDE_DIR`` -+```` - The directory containing ``IlmBase/config-auto.h``. - ``IlmBase_{COMPONENT}_LIBRARY`` - Individual component libraries for IlmBase. may include target_link_libraries() debug/optimized keywords. -@@ -102,7 +102,7 @@ include(GNUInstallDirs) - - - mark_as_advanced( -- IlmBase_INCLUDE_DIR -+ - IlmBase_LIBRARY - ) - -@@ -112,10 +112,6 @@ if(DISABLE_CMAKE_SEARCH_PATHS) - endif() - - set(_ILMBASE_COMPONENT_LIST -- Half -- Iex -- IexMath -- IlmThread - Imath - ) - -@@ -177,15 +173,15 @@ list(APPEND _ILMBASE_INCLUDE_SEARCH_DIRS - ) - - # Look for a standard IlmBase header file. --find_path(IlmBase_INCLUDE_DIR IlmBaseConfig.h -+find_path( IlmBaseConfig.h - ${_FIND_ILMBASE_ADDITIONAL_OPTIONS} - PATHS ${_ILMBASE_INCLUDE_SEARCH_DIRS} - PATH_SUFFIXES ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR include/OpenEXR OpenEXR - ) - --if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h") -+if(EXISTS "${}/IlmBaseConfig.h") - # Get the ILMBASE version information from the config header -- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h" -+ file(STRINGS "${}/IlmBaseConfig.h" - _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR " - ) - string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" -@@ -193,7 +189,7 @@ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h") - ) - string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR) - -- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h" -+ file(STRINGS "${}/IlmBaseConfig.h" - _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR " - ) - string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" -@@ -324,16 +320,16 @@ endforeach() - # ------------------------------------------------------------------------ - - include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(IlmBase -- FOUND_VAR IlmBase_FOUND -+find_package_handle_standard_args(Imath -+ FOUND_VAR Imath_FOUND - REQUIRED_VARS -- IlmBase_INCLUDE_DIR -- IlmBase_LIB_COMPONENTS -- VERSION_VAR IlmBase_VERSION -+# IlmBase_INCLUDE_DIR -+ Imath_LIB_COMPONENTS -+ VERSION_VAR Imath_VERSION - HANDLE_COMPONENTS - ) - --if(NOT IlmBase_FOUND) -+if(NOT Imath_FOUND) - if(IlmBase_FIND_REQUIRED) - message(FATAL_ERROR "Unable to find IlmBase") - endif() -@@ -348,8 +344,8 @@ set(IlmBase_DEBUG_LIBRARIES "") - set(IlmBase_DEBUG_LIBRARY_DIRS "") - foreach(LIB ${IlmBase_LIB_COMPONENTS_RELEASE}) - get_filename_component(_ILM_LIBDIR ${LIB} DIRECTORY) -- list(APPEND IlmBase_RELEASE_LIBRARIES ${LIB}) -- list(APPEND IlmBase_RELEASE_LIBRARY_DIRS ${_ILM_LIBDIR}) -+ list(APPEND Imath_RELEASE_LIBRARIES ${LIB}) -+ list(APPEND Imath_RELEASE_LIBRARY_DIRS ${_ILM_LIBDIR}) - endforeach() - - foreach(LIB ${IlmBase_LIB_COMPONENTS_DEBUG}) -@@ -377,12 +373,12 @@ set(IlmBase_LIBRARY_DIRS ${IlmBase_RELEASE_LIBRARY_DIR - - set(_IlmBase_Parent_Dir "") - get_filename_component(_IlmBase_Parent_Dir -- ${IlmBase_INCLUDE_DIR}/../ ABSOLUTE) -+ ${}/../ ABSOLUTE) - --set(IlmBase_INCLUDE_DIRS) --list(APPEND IlmBase_INCLUDE_DIRS -+set(S) -+list(APPEND S - ${_IlmBase_Parent_Dir} -- ${IlmBase_INCLUDE_DIR} -+ ${} - ) - unset(_IlmBase_Parent_Dir) - -@@ -419,7 +415,7 @@ foreach(COMPONENT ${IlmBase_FIND_COMPONENTS}) - set_target_properties(IlmBase::${COMPONENT} PROPERTIES - INTERFACE_COMPILE_OPTIONS "${PC_IlmBase_CFLAGS_OTHER}" - INTERFACE_COMPILE_DEFINITIONS "${IlmBase_${COMPONENT}_DEFINITIONS}" -- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}") -+ INTERFACE_INCLUDE_DIRECTORIES "${S}") - - # Standard location - set_target_properties(IlmBase::${COMPONENT} PROPERTIES diff --git a/misc/openvdb/pkg-plist b/misc/openvdb/pkg-plist index aa709464ed6f..7fea0e0bbed7 100644 --- a/misc/openvdb/pkg-plist +++ b/misc/openvdb/pkg-plist @@ -25,7 +25,6 @@ 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 @@ -68,9 +67,20 @@ include/openvdb/points/PointScatter.h include/openvdb/points/PointStatistics.h include/openvdb/points/PointTransfer.h include/openvdb/points/StreamCompression.h +include/openvdb/points/impl/PointAttributeImpl.h +include/openvdb/points/impl/PointConversionImpl.h +include/openvdb/points/impl/PointCountImpl.h +include/openvdb/points/impl/PointDeleteImpl.h +include/openvdb/points/impl/PointGroupImpl.h +include/openvdb/points/impl/PointMaskImpl.h +include/openvdb/points/impl/PointMoveImpl.h include/openvdb/points/impl/PointRasterizeFrustumImpl.h include/openvdb/points/impl/PointRasterizeSDFImpl.h include/openvdb/points/impl/PointRasterizeTrilinearImpl.h +include/openvdb/points/impl/PointReplicateImpl.h +include/openvdb/points/impl/PointSampleImpl.h +include/openvdb/points/impl/PointScatterImpl.h +include/openvdb/points/impl/PointStatisticsImpl.h include/openvdb/thread/Threading.h include/openvdb/tools/Activate.h include/openvdb/tools/ChangeBackground.h @@ -148,7 +158,6 @@ 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 @@ -159,5 +168,5 @@ lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake lib/cmake/OpenVDB/OpenVDBUtils.cmake lib/libopenvdb.so -lib/libopenvdb.so.10.0 -lib/libopenvdb.so.10.0.1 +lib/libopenvdb.so.11.0 +lib/libopenvdb.so.11.0.0 diff --git a/misc/py-openvdb/Makefile b/misc/py-openvdb/Makefile index 9db78f6bc7ac..c48bd7a0b801 100644 --- a/misc/py-openvdb/Makefile +++ b/misc/py-openvdb/Makefile @@ -1,7 +1,6 @@ PORTNAME= openvdb DISTVERSIONPREFIX= v -DISTVERSION= 10.0.1 -PORTREVISION= 2 +DISTVERSION= 11.0.0 CATEGORIES= misc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,16 +11,16 @@ WWW= https://www.openvdb.org/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/../../../LICENSE -BUILD_DEPENDS= ${PYNUMPY} -LIB_DEPENDS= ${PY_BOOST} \ - libboost_iostreams.so:devel/boost-libs \ +BUILD_DEPENDS= pybind11>0:devel/pybind11 \ + ${PYNUMPY} +LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/onetbb RUN_DEPENDS= ${PYNUMPY} USES= cmake compiler:c++17-lang localbase:ldflags python USE_LDCONFIG= yes -USE_PYTHON= flavors +USE_PYTHON= flavors pytest USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation @@ -32,7 +31,14 @@ CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} WRKSRC_SUBDIR= openvdb/openvdb/python -PLIST_FILES= include/openvdb/python/pyopenvdb.h \ - ${PYTHON_SITELIBDIR}/pyopenvdb.so +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + +PLIST_FILES= ${PYTHON_SITELIBDIR}/pyopenvdb${PYTHON_EXT_SUFFIX}.so + +do-test: # run an example, since the supplied test appears to be only for Windows + @cd ${WRKSRC} && \ + ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example.py && \ + [ -f ${WRKSRC}/mygrids.vdb ] && \ + ${ECHO} "Test has succeeded." .include <bsd.port.mk> diff --git a/misc/py-openvdb/distinfo b/misc/py-openvdb/distinfo index 371452773ec2..a13ad98f22cf 100644 --- a/misc/py-openvdb/distinfo +++ b/misc/py-openvdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687582442 -SHA256 (AcademySoftwareFoundation-openvdb-v10.0.1_GH0.tar.gz) = 887a3391fbd96b20c77914f4fb3ab4b33d26e5fc479aa036d395def5523c622f -SIZE (AcademySoftwareFoundation-openvdb-v10.0.1_GH0.tar.gz) = 3461352 +TIMESTAMP = 1712017184 +SHA256 (AcademySoftwareFoundation-openvdb-v11.0.0_GH0.tar.gz) = 6314ff1db057ea90050763e7b7d7ed86d8224fcd42a82cdbb9c515e001b96c74 +SIZE (AcademySoftwareFoundation-openvdb-v11.0.0_GH0.tar.gz) = 4620858 diff --git a/misc/py-openvdb/files/example.py b/misc/py-openvdb/files/example.py new file mode 100644 index 000000000000..7535f81dfb90 --- /dev/null +++ b/misc/py-openvdb/files/example.py @@ -0,0 +1,33 @@ +# example from https://www.openvdb.org/documentation/doxygen/python.html + +import pyopenvdb as vdb + +# A grid comprises a sparse tree representation of voxel data, +# user-supplied metadata and a voxel space to world space transform, +# which defaults to the identity transform. +# A FloatGrid stores one single-precision floating point value per voxel. +# Other grid types include BoolGrid and Vec3SGrid. The module-level +# attribute pyopenvdb.GridTypes gives the complete list. +cube = vdb.FloatGrid() +cube.fill(min=(100, 100, 100), max=(199, 199, 199), value=1.0) + +# Name the grid "cube". +cube.name = 'cube' + +# Populate another FloatGrid with a sparse, narrow-band level set +# representation of a sphere with radius 50 voxels, located at +# (1.5, 2, 3) in index space. +sphere = vdb.createLevelSetSphere(radius=50, center=(1.5, 2, 3)) + +# Associate some metadata with the grid. +sphere['radius'] = 50.0 + +# Associate a scaling transform with the grid that sets the voxel size +# to 0.5 units in world space. +sphere.transform = vdb.createLinearTransform(voxelSize=0.5) + +# Name the grid "sphere". +sphere.name = 'sphere' + +# Write both grids to a VDB file. +vdb.write('mygrids.vdb', grids=[cube, sphere]) diff --git a/science/opensph/Makefile b/science/opensph/Makefile index 3e3d17663730..f6c30980ade8 100644 --- a/science/opensph/Makefile +++ b/science/opensph/Makefile @@ -1,5 +1,6 @@ PORTNAME= OpenSPH DISTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -14,7 +15,7 @@ ONLY_FOR_ARCHS_REASON= unconditional use of -msse4.1 and inclusion of immintrin. TEST_DEPENDS= catch>0:devel/catch -USES= compiler:c++14-lang qmake qt:5 +USES= compiler:c++17-lang qmake qt:5 USE_GITLAB= yes USE_WX= 3.2 @@ -61,6 +62,9 @@ VDB_LIB_DEPENDS= libImath.so:math/Imath \ libopenvdb.so:misc/openvdb \ libtbb.so:devel/onetbb +post-patch: # workaround for https://gitlab.com/sevecekp/sph/-/issues/48 + @${FIND} ${WRKSRC} -name "*.pro" | ${XARGS} ${REINPLACE_CMD} -e 's|c++14|c++17|' + do-test: @${REINPLACE_CMD} -e 's|Path(.*|Path("${TEST_WRKSRC}");|' ${WRKSRC}/test/utils/Config.h @${MKDIR} ${TEST_WRKSRC}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404020759.4327xHXs011848>