Attachment #247116 for bug #275821

View | Details | Raw Unified | Return to bug 275821
Collapse All | Expand All




PORTNAME=	opensubdiv
DISTVERSIONPREFIX=	v
DISTVERSION=	3_6_0
PORTREVISION=	7
CATEGORIES?=	graphics

MAINTAINER=	FreeBSD@Shaneware.biz


BUILD_DEPENDS=	glfw>3.0.0:graphics/glfw

USES=		cmake gl localbase

USE_GITHUB=	yes
GH_ACCOUNT=	PixarAnimationStudios


USE_GL=		egl gl glu glew
USE_LDCONFIG=	yes
CMAKE_ON=	NO_CLEW NO_CUDA NO_DX NO_METAL

OPTIONS_DEFINE=		DOCS EXAMPLES OPENCL OPENMP PTEX TBB TEST TUTORIALS
OPTIONS_DEFAULT=	TBB
#OPTIONS_EXCLUDE=	EXAMPLES
OPTIONS_SUB=		yes

DOCS_CMAKE_BOOL_OFF=	NO_DOC

DOCS_USES=		python:build
DOCS_PORTDOCS=		*

#EXAMPLES_BROKEN=	ld: error: undefined symbol: glXGetCurrentContext
#Examples cannot utilize the latest opencl headers
EXAMPLES_CMAKE_BOOL_OFF=	NO_EXAMPLES
EXAMPLES_USES=		xorg
EXAMPLES_USE=		xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm

Lines 1-3 Link Here

(-)graphics/opensubdiv/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1665071456	1	TIMESTAMP = 1702887114
2	SHA256 (PixarAnimationStudios-OpenSubdiv-v3_5_0_GH0.tar.gz) = 8f5044f453b94162755131f77c08069004f25306fd6dc2192b6d49889efb8095	2	SHA256 (PixarAnimationStudios-OpenSubdiv-v3_6_0_GH0.tar.gz) = bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
3	SIZE (PixarAnimationStudios-OpenSubdiv-v3_5_0_GH0.tar.gz) = 40740801	3	SIZE (PixarAnimationStudios-OpenSubdiv-v3_6_0_GH0.tar.gz) = 40746688

Lines 1-11 Link Here

(-)graphics/opensubdiv/files/patch-documentation_CMakeLists.txt (-11 lines)
1	--- work/OpenSubdiv-3_2_0/documentation/CMakeLists.txt.orig 2017-07-07 01:16:15 UTC
2	+++ documentation/CMakeLists.txt
3	@@ -254,7 +254,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUN
4	-E copy "${infile}" "${outfile}"
5	)
6
7	- add_custom_target( ${src} DEPENDS "${outfile}")
8	+ #add_custom_target( ${src} DEPENDS "${outfile}")
9
10	list(APPEND HTML_TARGETS ${src})
11




--- 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 <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
+            );
     }
 }
 

Lines 63-68 Link Here

(-)graphics/opensubdiv/pkg-plist (+12 lines)
63	@comment include/opensubdiv/osd/ompKernel.h	63	@comment include/opensubdiv/osd/ompKernel.h
64	%%OPENCL%%include/opensubdiv/osd/opencl.h	64	%%OPENCL%%include/opensubdiv/osd/opencl.h
65	include/opensubdiv/osd/opengl.h	65	include/opensubdiv/osd/opengl.h
		66	include/opensubdiv/osd/patchBasis.h
		67	include/opensubdiv/osd/patchBasisTypes.h
66	%%TBB%%include/opensubdiv/osd/tbbEvaluator.h	68	%%TBB%%include/opensubdiv/osd/tbbEvaluator.h
67	%%TBB%%include/opensubdiv/osd/tbbKernel.h	69	%%TBB%%include/opensubdiv/osd/tbbKernel.h
68	include/opensubdiv/osd/types.h	70	include/opensubdiv/osd/types.h
Lines 102-112 Link Here
102	%%EXAMPLES%%%%EXAMPLESDIR%%/glShareTopology	104	%%EXAMPLES%%%%EXAMPLESDIR%%/glShareTopology
103	%%EXAMPLES%%%%EXAMPLESDIR%%/glStencilViewer	105	%%EXAMPLES%%%%EXAMPLESDIR%%/glStencilViewer
104	%%EXAMPLES%%%%EXAMPLESDIR%%/glViewer	106	%%EXAMPLES%%%%EXAMPLESDIR%%/glViewer
		107	%%TEST%%tests/opensubdiv/bfr_evaluate
105	%%TEST%%tests/opensubdiv/far_perf	108	%%TEST%%tests/opensubdiv/far_perf
106	@comment %%TEST%%tests/opensubdiv/far_regression	109	@comment %%TEST%%tests/opensubdiv/far_regression
107	@comment %%TEST%%tests/opensubdiv/hbr_baseline	110	@comment %%TEST%%tests/opensubdiv/hbr_baseline
108	@comment %%TEST%%tests/opensubdiv/hbr_regression	111	@comment %%TEST%%tests/opensubdiv/hbr_regression
109	@comment %%TEST%%tests/opensubdiv/osd_regression	112	@comment %%TEST%%tests/opensubdiv/osd_regression
		113	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_1
		114	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_2
		115	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_3
		116	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_4
		117	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_5
		118	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_2_1
		119	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_2_2
		120	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_3_1
		121	%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_3_2
110	%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_1_1	122	%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_1_1
111	%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_1_2	123	%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_1_2
112	%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_2_1	124	%%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_2_1

Return to bug 275821

Lines 1-7 Link Here

(-)graphics/opensubdiv/Makefile (-7 / +3 lines)
1	PORTNAME= opensubdiv	1	PORTNAME= opensubdiv
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3_5_0	3	DISTVERSION= 3_6_0
4	PORTREVISION= 7
5	CATEGORIES?= graphics	4	CATEGORIES?= graphics
6		5
7	MAINTAINER= FreeBSD@Shaneware.biz	6	MAINTAINER= FreeBSD@Shaneware.biz
Lines 13-19 Link Here
13		12
14	BUILD_DEPENDS= glfw>3.0.0:graphics/glfw	13	BUILD_DEPENDS= glfw>3.0.0:graphics/glfw
15		14
16	USES= cmake gl	15	USES= cmake gl localbase
17		16
18	USE_GITHUB= yes	17	USE_GITHUB= yes
19	GH_ACCOUNT= PixarAnimationStudios	18	GH_ACCOUNT= PixarAnimationStudios
Lines 21-31 Link Here
21		20
22	USE_GL= egl gl glu glew	21	USE_GL= egl gl glu glew
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
24	CMAKE_ON= NO_CLEW NO_CUDA NO_DX	23	CMAKE_ON= NO_CLEW NO_CUDA NO_DX NO_METAL
25		24
26	OPTIONS_DEFINE= DOCS EXAMPLES OPENCL OPENMP PTEX TBB TEST TUTORIALS	25	OPTIONS_DEFINE= DOCS EXAMPLES OPENCL OPENMP PTEX TBB TEST TUTORIALS
27	OPTIONS_DEFAULT= TBB	26	OPTIONS_DEFAULT= TBB
28	#OPTIONS_EXCLUDE= EXAMPLES
29	OPTIONS_SUB= yes	27	OPTIONS_SUB= yes
30		28
31	DOCS_CMAKE_BOOL_OFF= NO_DOC	29	DOCS_CMAKE_BOOL_OFF= NO_DOC
Lines 34-41 Link Here
34	DOCS_USES= python:build	32	DOCS_USES= python:build
35	DOCS_PORTDOCS= *	33	DOCS_PORTDOCS= *
36		34
37	#EXAMPLES_BROKEN= ld: error: undefined symbol: glXGetCurrentContext
38	#Examples cannot utilize the latest opencl headers
39	EXAMPLES_CMAKE_BOOL_OFF= NO_EXAMPLES	35	EXAMPLES_CMAKE_BOOL_OFF= NO_EXAMPLES
40	EXAMPLES_USES= xorg	36	EXAMPLES_USES= xorg
41	EXAMPLES_USE= xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm	37	EXAMPLES_USE= xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm

Lines 1-28 Link Here

(-)graphics/opensubdiv/files/patch-opensubdiv_osd_tbbEvaluator.cpp (-28 lines)
1	--- opensubdiv/osd/tbbEvaluator.cpp.orig 2021-12-17 16:59:23 UTC
2	+++ opensubdiv/osd/tbbEvaluator.cpp
3	@@ -25,7 +25,8 @@
4	#include "../osd/tbbEvaluator.h"
5	#include "../osd/tbbKernel.h"
6
7	-#include <tbb/task_scheduler_init.h>
8	+#define TBB_PREVIEW_GLOBAL_CONTROL true
9	+#include <tbb/global_control.h>
10
11	namespace OpenSubdiv {
12	namespace OPENSUBDIV_VERSION {
13	@@ -215,10 +216,11 @@ TbbEvaluator::Synchronize(void *) {
14	/* static */
15	void
16	TbbEvaluator::SetNumThreads(int numThreads) {
17	- if (numThreads == -1) {
18	- tbb::task_scheduler_init init;
19	- } else {
20	- tbb::task_scheduler_init init(numThreads);
21	+ if (numThreads != -1) {
22	+ tbb::global_control tbb_global_control(
23	+ tbb::global_control::max_allowed_parallelism,
24	+ numThreads
25	+ );
26	}
27	}
28