opensubdiv: Upgrade to release 3.4.4

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Tue Oct 19 11:30:55 2021 +1100
Changeset:	6eafd68c008e51bff996bf24e2543d2c4340b5ea

Modified Files:
	opensubdiv/Makefile
	opensubdiv/PLIST
	opensubdiv/buildlink3.mk
	opensubdiv/distinfo
Added Files:
	opensubdiv/patches/patch-opensubdiv_osd_tbbEvaluator.cpp

Log Message:
opensubdiv: Upgrade to release 3.4.4

Add upstream patch to support TBB 2021.
Tested via graphics/blender.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6eafd68c008e51bff996bf24e2543d2c4340b5ea

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 opensubdiv/Makefile                                |  4 ++-
 opensubdiv/PLIST                                   |  8 +++---
 opensubdiv/buildlink3.mk                           |  2 +-
 opensubdiv/distinfo                                |  7 +++--
 .../patches/patch-opensubdiv_osd_tbbEvaluator.cpp  | 33 ++++++++++++++++++++++
 5 files changed, 45 insertions(+), 9 deletions(-)

diffs:
diff --git a/opensubdiv/Makefile b/opensubdiv/Makefile
index cbbdb2ffb7..7fd009882f 100644
--- a/opensubdiv/Makefile
+++ b/opensubdiv/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	OpenSubdiv
-DISTNAME=	OpenSubdiv-3.1.0.RC2
+DISTNAME=	OpenSubdiv-3.4.4
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=PixarAnimationStudios/}
@@ -26,4 +26,6 @@ TEST_TARGET=	test
 
 .include "options.mk"
 
+.include "../../parallel/threadingbuildingblocks/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/opensubdiv/PLIST b/opensubdiv/PLIST
index 34115fc623..e93dc49dd8 100644
--- a/opensubdiv/PLIST
+++ b/opensubdiv/PLIST
@@ -50,9 +50,9 @@ ${PLIST.opengl}include/opensubdiv/osd/glXFBEvaluator.h
 ${PLIST.opengl}include/opensubdiv/osd/glslPatchShaderSource.h
 include/opensubdiv/osd/mesh.h
 include/opensubdiv/osd/nonCopyable.h
-include/opensubdiv/osd/ompEvaluator.h
-include/opensubdiv/osd/ompKernel.h
 include/opensubdiv/osd/opengl.h
+include/opensubdiv/osd/tbbEvaluator.h
+include/opensubdiv/osd/tbbKernel.h
 include/opensubdiv/osd/types.h
 include/opensubdiv/sdc/bilinearScheme.h
 include/opensubdiv/sdc/catmarkScheme.h
@@ -73,10 +73,10 @@ include/opensubdiv/vtr/stackBuffer.h
 include/opensubdiv/vtr/types.h
 lib/libosdCPU.a
 lib/libosdCPU.so
-lib/libosdCPU.so.3.1.0.RC2
+lib/libosdCPU.so.3.4.4
 ${PLIST.opengl}lib/libosdGPU.a
 ${PLIST.opengl}lib/libosdGPU.so
-${PLIST.opengl}lib/libosdGPU.so.3.1.0.RC2
+${PLIST.opengl}lib/libosdGPU.so.3.4.4
 ${PLIST.doc}share/doc/opensubdiv/additional_resources.html
 ${PLIST.doc}share/doc/opensubdiv/api_overview.html
 ${PLIST.doc}share/doc/opensubdiv/cmake_build.html
diff --git a/opensubdiv/buildlink3.mk b/opensubdiv/buildlink3.mk
index 7f0282b5b1..aaed7ac985 100644
--- a/opensubdiv/buildlink3.mk
+++ b/opensubdiv/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	opensubdiv
 .if !defined(OPENSUBDIV_BUILDLINK3_MK)
 OPENSUBDIV_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.opensubdiv+=	opensubdiv>=3.1.0.rc2
+BUILDLINK_API_DEPENDS.opensubdiv+=	opensubdiv>=3.4.4
 BUILDLINK_PKGSRCDIR.opensubdiv?=	../../wip/opensubdiv
 .endif	# OPENSUBDIV_BUILDLINK3_MK
 
diff --git a/opensubdiv/distinfo b/opensubdiv/distinfo
index a82e05da6b..89256bd857 100644
--- a/opensubdiv/distinfo
+++ b/opensubdiv/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
-RMD160 (OpenSubdiv-3.1.0.RC2.tar.gz) = 44e371f5258225ca1c4ab31aaeb49fb7364e5ae5
-SHA512 (OpenSubdiv-3.1.0.RC2.tar.gz) = 5b226639abef68ee6b0f22fc2fea9aa5aa371bb5db64d673eb4105a1e551f5931efed081d05755fe79afd2ebcbc3391137d31b0abe251ea33c2797e89b7d9d9a
-Size (OpenSubdiv-3.1.0.RC2.tar.gz) = 15855857 bytes
+RMD160 (OpenSubdiv-3.4.4.tar.gz) = 0ab59390bfc25c87ec16e60e2ef7e6cabbcf546b
+SHA512 (OpenSubdiv-3.4.4.tar.gz) = fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
+Size (OpenSubdiv-3.4.4.tar.gz) = 39228037 bytes
+SHA1 (patch-opensubdiv_osd_tbbEvaluator.cpp) = fb2601b15e9d1acd98228c88a6adc29513b20495
diff --git a/opensubdiv/patches/patch-opensubdiv_osd_tbbEvaluator.cpp b/opensubdiv/patches/patch-opensubdiv_osd_tbbEvaluator.cpp
new file mode 100644
index 0000000000..f6b5d414e8
--- /dev/null
+++ b/opensubdiv/patches/patch-opensubdiv_osd_tbbEvaluator.cpp
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Patch to support TBB 2021 from:
+https://github.com/PixarAnimationStudios/OpenSubdiv/pull/1234
+
+--- opensubdiv/osd/tbbEvaluator.cpp.orig	2021-02-06 01:24:39.000000000 +0000
++++ opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,8 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#define TBB_PREVIEW_GLOBAL_CONTROL true
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +216,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+