diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index dd51cf960f13..ce5302b8356f 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -1,85 +1,81 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v -DISTVERSION= 3_5_0 -PORTREVISION= 8 +DISTVERSION= 3_6_0 CATEGORIES?= graphics MAINTAINER= FreeBSD@Shaneware.biz COMMENT= High performance subdivision surface libraries WWW= https://graphics.pixar.com/opensubdiv LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= glfw>3.0.0:graphics/glfw -USES= cmake gl +USES= cmake gl localbase USE_GITHUB= yes GH_ACCOUNT= PixarAnimationStudios GH_PROJECT= OpenSubdiv 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 DOCS_BUILD_DEPENDS= rst2html.py:textproc/py-docutils \ doxygen>=1.8.4:devel/doxygen 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 EXAMPLES_LIB_DEPENDS= libglfw.so:graphics/glfw OPENCL_CMAKE_BOOL_OFF= NO_OPENCL OPENCL_CFLAGS= -pthread OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_PREVENTS= EXAMPLES OPENMP_CMAKE_BOOL_OFF= NO_OMP PTEX_DESC= ptex support PTEX_CMAKE_BOOL_OFF= NO_PTEX PTEX_CMAKE_ON= -DPTEX_LOCATION:STRING=${LOCALBASE} \ -DPTEX_INCLUDE_DIR:STRING=${LOCALBASE}/include/ptex PTEX_LIB_DEPENDS= libPtex.so:graphics/ptex TBB_DESC= Intel threading building blocks TBB_CMAKE_BOOL_OFF= NO_TBB TBB_LIB_DEPENDS= libtbb.so:devel/onetbb TEST_CMAKE_BOOL_OFF= NO_REGRESSION NO_TESTS NO_GL_TESTS TEST_LIB_DEPENDS= libglfw.so:graphics/glfw TEST_USES= xorg TEST_USE= xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm # the tutorials and tests include use of deprecated parts of the library # using clang 10 on 32 bit fails to build all tutorials and tests # currently 12.1 still works - 11.4 and current fail # CMake files and pkg-plist are patched to prevent failing builds TUTORIALS_DESC= Install tutorial programs TUTORIALS_CMAKE_BOOL_OFF= NO_TUTORIALS PLIST_SUB+= LIBVERS=${PORTVERSION} post-patch: ${FIND} ${WRKSRC}/tutorials -name CMakeLists.txt -exec \ ${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}/tutorials|{CMAKE_INSTALL_PREFIX}/${DATADIR_REL}/tutorials|g' {} + ${FIND} ${WRKSRC}/examples -name CMakeLists.txt -exec \ ${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/${EXAMPLESDIR_REL}|g' {} + ${FIND} ${WRKSRC}/regression -name CMakeLists.txt -exec \ ${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/tests/${PORTNAME}|g' {} + .include diff --git a/graphics/opensubdiv/distinfo b/graphics/opensubdiv/distinfo index 1fe4346efc27..7238a1c832e0 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 = 1702887114 +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 422c75bcc330..000000000000 --- 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 c8b44e2c7c65..000000000000 --- 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 9fb8e05a77b1..35210bb87985 100644 --- a/graphics/opensubdiv/pkg-plist +++ b/graphics/opensubdiv/pkg-plist @@ -1,125 +1,137 @@ include/opensubdiv/bfr/irregularPatchType.h include/opensubdiv/bfr/limits.h include/opensubdiv/bfr/parameterization.h include/opensubdiv/bfr/refinerSurfaceFactory.h include/opensubdiv/bfr/surface.h include/opensubdiv/bfr/surfaceData.h include/opensubdiv/bfr/surfaceFactory.h include/opensubdiv/bfr/surfaceFactoryCache.h include/opensubdiv/bfr/surfaceFactoryMeshAdapter.h include/opensubdiv/bfr/tessellation.h include/opensubdiv/bfr/vertexDescriptor.h include/opensubdiv/far/error.h include/opensubdiv/far/patchDescriptor.h include/opensubdiv/far/patchMap.h include/opensubdiv/far/patchParam.h include/opensubdiv/far/patchTable.h include/opensubdiv/far/patchTableFactory.h include/opensubdiv/far/primvarRefiner.h include/opensubdiv/far/ptexIndices.h include/opensubdiv/far/stencilTable.h include/opensubdiv/far/stencilTableFactory.h include/opensubdiv/far/topologyDescriptor.h include/opensubdiv/far/topologyLevel.h include/opensubdiv/far/topologyRefiner.h include/opensubdiv/far/topologyRefinerFactory.h include/opensubdiv/far/types.h include/opensubdiv/hbr/allocator.h include/opensubdiv/hbr/bilinear.h include/opensubdiv/hbr/catmark.h include/opensubdiv/hbr/cornerEdit.h include/opensubdiv/hbr/creaseEdit.h include/opensubdiv/hbr/face.h include/opensubdiv/hbr/faceEdit.h include/opensubdiv/hbr/fvarData.h include/opensubdiv/hbr/fvarEdit.h include/opensubdiv/hbr/halfedge.h include/opensubdiv/hbr/hierarchicalEdit.h include/opensubdiv/hbr/holeEdit.h include/opensubdiv/hbr/loop.h include/opensubdiv/hbr/mesh.h include/opensubdiv/hbr/subdivision.h include/opensubdiv/hbr/vertex.h include/opensubdiv/hbr/vertexEdit.h include/opensubdiv/osd/bufferDescriptor.h %%OPENCL%%include/opensubdiv/osd/clEvaluator.h %%OPENCL%%include/opensubdiv/osd/clGLVertexBuffer.h %%OPENCL%%include/opensubdiv/osd/clPatchTable.h %%OPENCL%%include/opensubdiv/osd/clVertexBuffer.h include/opensubdiv/osd/cpuEvaluator.h include/opensubdiv/osd/cpuGLVertexBuffer.h include/opensubdiv/osd/cpuPatchTable.h include/opensubdiv/osd/cpuVertexBuffer.h include/opensubdiv/osd/glComputeEvaluator.h include/opensubdiv/osd/glLegacyGregoryPatchTable.h include/opensubdiv/osd/glMesh.h include/opensubdiv/osd/glPatchTable.h include/opensubdiv/osd/glVertexBuffer.h include/opensubdiv/osd/glXFBEvaluator.h include/opensubdiv/osd/glslPatchShaderSource.h include/opensubdiv/osd/mesh.h include/opensubdiv/osd/nonCopyable.h @comment include/opensubdiv/osd/ompEvaluator.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 include/opensubdiv/sdc/bilinearScheme.h include/opensubdiv/sdc/catmarkScheme.h include/opensubdiv/sdc/crease.h include/opensubdiv/sdc/loopScheme.h include/opensubdiv/sdc/options.h include/opensubdiv/sdc/scheme.h include/opensubdiv/sdc/types.h include/opensubdiv/version.h include/opensubdiv/vtr/array.h include/opensubdiv/vtr/componentInterfaces.h include/opensubdiv/vtr/fvarLevel.h include/opensubdiv/vtr/fvarRefinement.h include/opensubdiv/vtr/level.h include/opensubdiv/vtr/refinement.h include/opensubdiv/vtr/sparseSelector.h include/opensubdiv/vtr/stackBuffer.h include/opensubdiv/vtr/types.h lib/cmake/OpenSubdiv/OpenSubdivConfig.cmake lib/cmake/OpenSubdiv/OpenSubdivConfigVersion.cmake lib/cmake/OpenSubdiv/OpenSubdivTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenSubdiv/OpenSubdivTargets.cmake lib/libosdCPU.a lib/libosdCPU.so lib/libosdCPU.so.%%LIBVERS%% lib/libosdGPU.a lib/libosdGPU.so lib/libosdGPU.so.%%LIBVERS%% @comment %%EXAMPLES%%%%EXAMPLESDIR%%/farViewer %%EXAMPLES%%%%EXAMPLESDIR%%/glEvalLimit %%EXAMPLES%%%%EXAMPLESDIR%%/glFVarViewer %%EXAMPLES%%%%EXAMPLESDIR%%/glImaging %%EXAMPLES%%%%EXAMPLESDIR%%/glPaintTest %%EXAMPLES%%%%PTEX%%%%EXAMPLESDIR%%/glPtexViewer %%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 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_2_2 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_2_3 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_3_1 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_4_1 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_4_2 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_4_3 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_1 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_2 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_5_3 @comment %%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_0 @comment %%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_1 @comment %%TUTORIALS%%%%DATADIR%%/tutorials/hbr_tutorial_2 %%TUTORIALS%%%%DATADIR%%/tutorials/osd_tutorial_0