Skip to content

Commit

Permalink
misc/{,py-}openvdb: update 10.0.1 → 11.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yurivict committed Apr 2, 2024
1 parent 8f39cf0 commit d1127d0
Show file tree
Hide file tree
Showing 13 changed files with 77 additions and 172 deletions.
1 change: 1 addition & 0 deletions cad/PrusaSlicer/Makefile
@@ -1,6 +1,7 @@
PORTNAME= PrusaSlicer
DISTVERSIONPREFIX=version_
DISTVERSION= 2.7.2
PORTREVISION= 1
CATEGORIES= cad
DIST_SUBDIR= PrusaSlicer

Expand Down
2 changes: 1 addition & 1 deletion 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/ \
Expand Down
2 changes: 1 addition & 1 deletion graphics/openimageio/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion math/curv/Makefile
@@ -1,6 +1,6 @@
PORTNAME= curv
DISTVERSION= 0.5
PORTREVISION= 20
PORTREVISION= 21
CATEGORIES= math lang graphics

MAINTAINER= yuri@FreeBSD.org
Expand Down
7 changes: 1 addition & 6 deletions 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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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
143 changes: 0 additions & 143 deletions misc/openvdb/files/patch-cmake_FindIlmBase.cmake

This file was deleted.

17 changes: 13 additions & 4 deletions misc/openvdb/pkg-plist
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
22 changes: 14 additions & 8 deletions 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}

Expand All @@ -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
Expand All @@ -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>
6 changes: 3 additions & 3 deletions 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
33 changes: 33 additions & 0 deletions 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])
6 changes: 5 additions & 1 deletion science/opensph/Makefile
@@ -1,5 +1,6 @@
PORTNAME= OpenSPH
DISTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= science

MAINTAINER= yuri@FreeBSD.org
Expand All @@ -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

Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit d1127d0

Please sign in to comment.