From 0454876a68abf2490604b41cd1e4d9c8676ce49d Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Wed, 13 Dec 2023 16:19:47 +0300 Subject: graphics/opensubdiv: update to 3.6.0 release (+) Release notes: https://graphics.pixar.com/opensubdiv/docs/release_notes.html#release-3-6-0-sep-2023 --- graphics/opensubdiv/Makefile | 3 +- graphics/opensubdiv/distinfo | 6 ++-- .../files/patch-documentation_CMakeLists.txt | 11 -------- .../patch-opensubdiv_osd_tbbEvaluator.cpp | 28 ------------------- graphics/opensubdiv/pkg-plist | 2 ++ 5 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 graphics/opensubdiv/files/patch-documentation_CMakeLists.txt delete mode 100644 graphics/opensubdiv/files/patch-opensubdiv_osd_tbbEvaluator.cpp diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index 8538dd4..aebb02b 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -1,7 +1,6 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v -DISTVERSION= 3_5_0 -PORTREVISION= 7 +DISTVERSION= 3_6_0 CATEGORIES?= graphics MAINTAINER= FreeBSD@Shaneware.biz diff --git a/graphics/opensubdiv/distinfo b/graphics/opensubdiv/distinfo index 1fe4346..76d7819 100644 --- a/graphics/opensubdiv/distinfo +++ b/graphics/opensubdiv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665071456 -SHA256 (PixarAnimationStudios-OpenSubdiv-v3_5_0_GH0.tar.gz) = 8f5044f453b94162755131f77c08069004f25306fd6dc2192b6d49889efb8095 -SIZE (PixarAnimationStudios-OpenSubdiv-v3_5_0_GH0.tar.gz) = 40740801 +TIMESTAMP = 1700673075 +SHA256 (PixarAnimationStudios-OpenSubdiv-v3_6_0_GH0.tar.gz) = bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879 +SIZE (PixarAnimationStudios-OpenSubdiv-v3_6_0_GH0.tar.gz) = 40746688 diff --git a/graphics/opensubdiv/files/patch-documentation_CMakeLists.txt b/graphics/opensubdiv/files/patch-documentation_CMakeLists.txt deleted file mode 100644 index 422c75b..0000000 --- a/graphics/opensubdiv/files/patch-documentation_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- work/OpenSubdiv-3_2_0/documentation/CMakeLists.txt.orig 2017-07-07 01:16:15 UTC -+++ documentation/CMakeLists.txt -@@ -254,7 +254,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUN - -E copy "${infile}" "${outfile}" - ) - -- add_custom_target( ${src} DEPENDS "${outfile}") -+ #add_custom_target( ${src} DEPENDS "${outfile}") - - list(APPEND HTML_TARGETS ${src}) - diff --git a/graphics/opensubdiv/files/patch-opensubdiv_osd_tbbEvaluator.cpp b/graphics/opensubdiv/files/patch-opensubdiv_osd_tbbEvaluator.cpp deleted file mode 100644 index c8b44e2..0000000 --- a/graphics/opensubdiv/files/patch-opensubdiv_osd_tbbEvaluator.cpp +++ /dev/null @@ -1,28 +0,0 @@ ---- opensubdiv/osd/tbbEvaluator.cpp.orig 2021-12-17 16:59:23 UTC -+++ opensubdiv/osd/tbbEvaluator.cpp -@@ -25,7 +25,8 @@ - #include "../osd/tbbEvaluator.h" - #include "../osd/tbbKernel.h" - --#include -+#define TBB_PREVIEW_GLOBAL_CONTROL true -+#include - - 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 -+ ); - } - } - diff --git a/graphics/opensubdiv/pkg-plist b/graphics/opensubdiv/pkg-plist index 9fb8e05..a3d40d7 100644 --- a/graphics/opensubdiv/pkg-plist +++ b/graphics/opensubdiv/pkg-plist @@ -63,6 +63,8 @@ include/opensubdiv/osd/nonCopyable.h @comment include/opensubdiv/osd/ompKernel.h %%OPENCL%%include/opensubdiv/osd/opencl.h include/opensubdiv/osd/opengl.h +include/opensubdiv/osd/patchBasis.h +include/opensubdiv/osd/patchBasisTypes.h %%TBB%%include/opensubdiv/osd/tbbEvaluator.h %%TBB%%include/opensubdiv/osd/tbbKernel.h include/opensubdiv/osd/types.h -- 2.43.0