git: 422d21015a19 - main - misc/openvdb: Backport devel/onetbb compatibility patch

[Yuri Victorovich]

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=422d21015a19a9b8230c7ac43b9b540b629f8efe

commit 422d21015a19a9b8230c7ac43b9b540b629f8efe
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-08-15 09:27:34 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-08-15 09:32:16 +0000

    misc/openvdb: Backport devel/onetbb compatibility patch
    
    PR:             252788
---
 cad/PrusaSlicer/Makefile |  2 ++
 misc/openvdb/Makefile    | 14 +++++++++++---
 misc/openvdb/distinfo    |  4 +++-
 misc/openvdb/pkg-plist   |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
index 9684196c921b..fd332f7e7bae 100644
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@@ -10,6 +10,8 @@ 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 \
diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile
index b733e47c22e8..349c9c590232 100644
--- a/misc/openvdb/Makefile
+++ b/misc/openvdb/Makefile
@@ -1,9 +1,12 @@
 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 at FreeBSD.org
 COMMENT=	Tools for storage and manipulation of sparse volumetric data
 
@@ -13,7 +16,7 @@ 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
@@ -22,7 +25,7 @@ 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
 
@@ -45,6 +48,11 @@ 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
 
+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
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
@@ -64,6 +64,7 @@ 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