diff --git a/ports/opensubdiv/fix-notfind-header.patch b/ports/opensubdiv/fix-notfind-header.patch new file mode 100644 index 00000000000000..3396fca7e6e94a --- /dev/null +++ b/ports/opensubdiv/fix-notfind-header.patch @@ -0,0 +1,31 @@ +diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp +index c98db9f..5a4bc98 100644 +--- a/opensubdiv/osd/tbbEvaluator.cpp ++++ b/opensubdiv/osd/tbbEvaluator.cpp +@@ -25,7 +25,10 @@ + #include "../osd/tbbEvaluator.h" + #include "../osd/tbbKernel.h" + ++#if defined(TBB_INTERFACE_VERSION_MAJOR) && (TBB_INTERFACE_VERSION_MAJOR < 12) ++// This is deprecated functionality. + #include ++#endif + + namespace OpenSubdiv { + namespace OPENSUBDIV_VERSION { +@@ -215,11 +218,15 @@ TbbEvaluator::Synchronize(void *) { + /* static */ + void + TbbEvaluator::SetNumThreads(int numThreads) { ++#if defined(TBB_INTERFACE_VERSION_MAJOR) && (TBB_INTERFACE_VERSION_MAJOR < 12) ++ // This is deprecated functionality. We preserve the existing behavior ++ // for consistency (when using older versions of tbb). + if (numThreads == -1) { + tbb::task_scheduler_init init; + } else { + tbb::task_scheduler_init init(numThreads); + } ++#endif + } + + } // end namespace Osd diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index 2d7606c52d226d..5b7138a086bb9f 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( fix-build-type.patch fix-dependencies.patch fix-feature-cuda.patch + fix-notfind-header.patch ) if(VCPKG_TARGET_IS_LINUX) diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index d5bcb8f9aa0037..56e4a23eb36521 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opensubdiv", "version-semver": "3.5.0", - "port-version": 1, + "port-version": 2, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8ca4c22c264538..ca8eca7f88602c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6526,7 +6526,7 @@ }, "opensubdiv": { "baseline": "3.5.0", - "port-version": 1 + "port-version": 2 }, "opentelemetry-cpp": { "baseline": "1.14.2", diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json index b5b28391bcf231..063fb4a781536b 100644 --- a/versions/o-/opensubdiv.json +++ b/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d12fbded4ab0667d082362ae4b6f57506926c9b", + "version-semver": "3.5.0", + "port-version": 2 + }, { "git-tree": "8cc627798709caed394f31456098644f359f0936", "version-semver": "3.5.0",