Attachment 247116 Details for Bug 275821 – maintainer update graphics/opensubdiv

[patch] maintainer update graphics/opensubdiv

opensubdiv.patch (text/plain), 5.33 KB, created by Shane on 2023-12-18 09:20:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2023-12-18 09:20:51 UTC

Size: 5.33 KB

patch

obsolete

>diff -Nru graphics/opensubdiv.orig/Makefile graphics/opensubdiv/Makefile
>--- graphics/opensubdiv.orig/Makefile	2023-12-18 19:29:23.342379000 +1030
>+++ graphics/opensubdiv/Makefile	2023-12-18 19:29:17.975712000 +1030
>@@ -1,7 +1,6 @@
> PORTNAME=	opensubdiv
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	3_5_0
>-PORTREVISION=	7
>+DISTVERSION=	3_6_0
> CATEGORIES?=	graphics
> 
> MAINTAINER=	FreeBSD@Shaneware.biz
>@@ -13,7 +12,7 @@
> 
> BUILD_DEPENDS=	glfw>3.0.0:graphics/glfw
> 
>-USES=		cmake gl
>+USES=		cmake gl localbase
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	PixarAnimationStudios
>@@ -21,11 +20,10 @@
> 
> USE_GL=		egl gl glu glew
> USE_LDCONFIG=	yes
>-CMAKE_ON=	NO_CLEW NO_CUDA NO_DX
>+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
>@@ -34,8 +32,6 @@
> 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
>diff -Nru graphics/opensubdiv.orig/distinfo graphics/opensubdiv/distinfo
>--- graphics/opensubdiv.orig/distinfo	2023-12-18 19:29:23.323770000 +1030
>+++ graphics/opensubdiv/distinfo	2023-12-18 18:41:54.904749000 +1030
>@@ -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 = 1702887114
>+SHA256 (PixarAnimationStudios-OpenSubdiv-v3_6_0_GH0.tar.gz) = bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879
>+SIZE (PixarAnimationStudios-OpenSubdiv-v3_6_0_GH0.tar.gz) = 40746688
>diff -Nru graphics/opensubdiv.orig/files/patch-documentation_CMakeLists.txt graphics/opensubdiv/files/patch-documentation_CMakeLists.txt
>--- graphics/opensubdiv.orig/files/patch-documentation_CMakeLists.txt	2023-12-18 19:29:23.517381000 +1030
>+++ graphics/opensubdiv/files/patch-documentation_CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
>@@ -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 -Nru graphics/opensubdiv.orig/files/patch-opensubdiv_osd_tbbEvaluator.cpp graphics/opensubdiv/files/patch-opensubdiv_osd_tbbEvaluator.cpp
>--- graphics/opensubdiv.orig/files/patch-opensubdiv_osd_tbbEvaluator.cpp	2023-12-18 19:29:23.486229000 +1030
>+++ graphics/opensubdiv/files/patch-opensubdiv_osd_tbbEvaluator.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -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 <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
>-+            );
>-     }
>- }
>- 
>diff -Nru graphics/opensubdiv.orig/pkg-plist graphics/opensubdiv/pkg-plist
>--- graphics/opensubdiv.orig/pkg-plist	2023-12-18 19:29:23.384133000 +1030
>+++ graphics/opensubdiv/pkg-plist	2023-12-18 19:02:19.770742000 +1030
>@@ -63,6 +63,8 @@
> @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
>@@ -102,11 +104,21 @@
> %%EXAMPLES%%%%EXAMPLESDIR%%/glShareTopology
> %%EXAMPLES%%%%EXAMPLESDIR%%/glStencilViewer
> %%EXAMPLES%%%%EXAMPLESDIR%%/glViewer
>+%%TEST%%tests/opensubdiv/bfr_evaluate
> %%TEST%%tests/opensubdiv/far_perf
> @comment %%TEST%%tests/opensubdiv/far_regression
> @comment %%TEST%%tests/opensubdiv/hbr_baseline
> @comment %%TEST%%tests/opensubdiv/hbr_regression
> @comment %%TEST%%tests/opensubdiv/osd_regression
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_1
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_2
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_3
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_4
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_1_5
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_2_1
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_2_2
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_3_1
>+%%TUTORIALS%%%%DATADIR%%/tutorials/bfr_tutorial_3_2
> %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_1_1
> %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_1_2
> %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_2_1

Actions: View | Diff

Attachments on bug 275821: 247116