From: Brad Smith <brad@comstyle.com>
Subject: UPDATE: OpenSubdiv 3.6.0
To: ports@openbsd.org
Date: Thu, 18 Apr 2024 18:03:20 -0400

Here is an update to OpenSubdiv 3.6.0.


Release 3.6.0 - Sep 2023
==============================

Release 3.6.0 is a significant release with new features, several
configuration improvements, and bug fixes.
For more information on the following, see `Release 3.6 <release_36.html>`__

**Changes**
    - Updated Osd patch drawing shader source to exclude legacy shader constructs to improve compatibility with Vulkan, DX12, etc. (GitHub #1320)
    - Installed Osd patch evaluation headers to allow use from client shaders and compute kernels (GitHub #1321)
    - Updated CMake build to locate TBB using TBB's CMake config in order to support oneTBB (GitHub #1319)
    - Updated CMake FindOpenCL module to support parsing version information from recent OpenCL headers (GitHub #1322)
    - Removed obsolete .travis.yml (GitHub #1324)

**Bug Fixes**
    - Fixed inconsistent warning levels for MSVC builds when using Ninja (GitHub #1318)
    - Fixed documentation build errors when using Ninja (GitHub #1323)
    - Fixed build errors resulting from oneTBB API changes (GitHub #1317)


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/opensubdiv/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile	20 Oct 2023 13:07:59 -0000	1.7
+++ Makefile	18 Apr 2024 20:55:12 -0000
@@ -1,14 +1,13 @@
 COMMENT=	open-source subdivision surface library
 
-V=		3.5.0
+V=		3.6.0
 GH_ACCOUNT=	PixarAnimationStudios
 GH_PROJECT=	OpenSubdiv
 GH_TAGNAME=	v${V:S/./_/g}
 DISTNAME=	${GH_PROJECT:L}-${V}
-REVISION=	0
 
-SHARED_LIBS +=	osdCPU		2.0 # 3.4.4
-SHARED_LIBS +=	osdGPU		2.0 # 3.4.4
+SHARED_LIBS +=	osdCPU		3.0 # 3.4.4
+SHARED_LIBS +=	osdGPU		3.0 # 3.4.4
 
 CATEGORIES=	graphics
 
@@ -30,8 +29,14 @@ BUILD_DEPENDS=	graphics/glfw
 
 LIB_DEPENDS=	devel/tbb
 
-CONFIGURE_ARGS=	-DNO_DOC=ON \
-		-DNO_OMP=ON
+CONFIGURE_ARGS=	-DNO_CLEW=ON \
+		-DNO_CUDA=ON \
+		-DNO_DOC=ON \
+		-DNO_OMP=ON \
+		-DNO_OPENCL=ON \
+		-DNO_PTEX=ON
+
+CXXFLAGS+=	-I${X11BASE}/include
 
 post-install:
 	rm -rf ${PREFIX}/bin/tutorials
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/opensubdiv/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo	10 May 2023 08:48:59 -0000	1.3
+++ distinfo	18 Apr 2024 20:55:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (opensubdiv-3.5.0.tar.gz) = j1BE9FO5QWJ1UTH3fAgGkATyUwb9bcIZK21JiJ77gJU=
-SIZE (opensubdiv-3.5.0.tar.gz) = 40740801
+SHA256 (opensubdiv-3.6.0.tar.gz) = vr/WGrZlek9P8nhF+2ahZ9ADlXg7+9JTJU2HRH7R2Hk=
+SIZE (opensubdiv-3.6.0.tar.gz) = 40746688
Index: patches/patch-opensubdiv_osd_tbbEvaluator_cpp
===================================================================
RCS file: patches/patch-opensubdiv_osd_tbbEvaluator_cpp
diff -N patches/patch-opensubdiv_osd_tbbEvaluator_cpp
--- patches/patch-opensubdiv_osd_tbbEvaluator_cpp	11 Jun 2023 07:47:12 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-Support oneTBB 2021
-
-Index: opensubdiv/osd/tbbEvaluator.cpp
---- opensubdiv/osd/tbbEvaluator.cpp.orig
-+++ 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
-+		);
-     }
- }
- 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/opensubdiv/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST	10 May 2023 08:48:59 -0000	1.3
+++ pkg/PLIST	18 Apr 2024 20:55:12 -0000
@@ -62,8 +62,8 @@ include/opensubdiv/osd/glslPatchShaderSo
 include/opensubdiv/osd/mesh.h
 include/opensubdiv/osd/nonCopyable.h
 include/opensubdiv/osd/opengl.h
-include/opensubdiv/osd/tbbEvaluator.h
-include/opensubdiv/osd/tbbKernel.h
+include/opensubdiv/osd/patchBasis.h
+include/opensubdiv/osd/patchBasisTypes.h
 include/opensubdiv/osd/types.h
 include/opensubdiv/sdc/
 include/opensubdiv/sdc/bilinearScheme.h