From b8c7aa0d4c47081fb18d4c4b9b61a42f7ae4ecd3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 3 Nov 2024 20:47:11 -0500
Subject: [PATCH] OpenSubdiv: update to 3.6.0

---
 common/shlibs                             |  4 ++--
 srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 -----------------------
 srcpkgs/OpenSubdiv/template               |  6 ++---
 3 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch

diff --git a/common/shlibs b/common/shlibs
index b19d9213bef..a5039fcdee0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3980,8 +3980,8 @@ librdkafka.so.1 librdkafka-1.4.4_3
 librdkafka++.so.1 librdkafka-1.4.4_3
 libraft.so.0 raft-0.18.2_1
 libmdnsd.so.1 libmdnsd-0.9_1
-libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1
-libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1
+libosdGPU.so.3.6.0 OpenSubdiv-3.6.0_1
+libosdCPU.so.3.6.0 OpenSubdiv-3.6.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.11 libcbor-0.11.0_1
diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
deleted file mode 100644
index 5a812c84b21..00000000000
--- a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
-index c98db9f..8dec0e1 100644
---- a/opensubdiv/osd/tbbEvaluator.cpp
-+++ b/opensubdiv/osd/tbbEvaluator.cpp
-@@ -25,7 +25,7 @@
- #include "../osd/tbbEvaluator.h"
- #include "../osd/tbbKernel.h"
- 
--#include <tbb/task_scheduler_init.h>
-+#include <tbb/global_control.h>
- 
- namespace OpenSubdiv {
- namespace OPENSUBDIV_VERSION {
-@@ -215,10 +215,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
-+		);
-     }
- }
- 
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 76d950301cd..7db0f87a638 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
-version=3.4.3
-revision=4
+version=3.6.0
+revision=1
 build_style=cmake
 # TODO: CUDA/OpenCL support
 # NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="http://graphics.pixar.com/opensubdiv/docs/intro.html"
 distfiles="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${version//./_}.tar.gz"
-checksum=7b22eb27d636ab0c1e03722c7a5a5bd4f11664ee65c9b48f341a6d0ce7f36745
+checksum=bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenSubdiv"