From nobody Wed May 29 20:27:16 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VqLXN5nZFz5LFD6; Wed, 29 May 2024 20:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqLXN4mTgz56L1; Wed, 29 May 2024 20:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717014436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rIXiGpDlopO3/Dzry2J9kwH42iTAxdWY6QAkI/wuuRc=; b=MQnyk14ZRdAnhmgvlMxL9mAT3R3QiuYEkCOUJVfnpNGTmnImjh9lmyk7pW16osMeCBnYlT ojz5ebhwYt4ZRk675SePdu1+XR+oAy7UzcBjg5zr8yBezUC6hsQiVjsxL69qWCcnJKxL/o EhXCUNh+o/y0cDQbe7HIU/XrjG5GXphdLfUV3K8oPjAyrORFYhJFxLNn/epqNKytOLoqBY csTDKaqy1r2G2enPY5zXYw4kvCQyjB7VJa0JKXdWpgxXvy3ZzL8vd4V8/XEhmCy2DhYN0O 3H/xB00vcl/nSr9ylXEQIS2gM6eZKhQRqjNeMxhyIpW9AbgHJ+gi5AGjHpXfNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717014436; a=rsa-sha256; cv=none; b=l37R3HweZNTX7rRCy3px7YR3Tvd99O2hx0ZC2DeQwU/7QdOU/ZnhiJDqj7ATreylbrw4Y7 XjTAG+HSLO/cAQHNP0v1KIkUb09ejwYWERlVnJzOOyM18a79jSzfg3aav+PqhWWXFeyAEh G6K2M3JEgY1R7Ltz7jhXwiArzd3YD7oYxq5EOmAn/sOrVPZ4Hp8rpp+tbt+B4VRzNrStyU gv95QkTN6jYUI/9VnQ4BHvo/B99oSavkHOFLFnRaUF9u//BLlsm9I8nMlHTh2LFxexoxwN pu1obGPLkOqnKaRQOcR8OSb352uFs2enJe2NBMOZAnV0ScqJlhKLR/dtGjoiHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717014436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rIXiGpDlopO3/Dzry2J9kwH42iTAxdWY6QAkI/wuuRc=; b=vBIqXXi4gY+TcjjpmhyFGGHiaP/Yrzn9GlchZI7hkdcD0G+6S3xtrgCYVlVTMs+xUNBo7+ Fw2/LfrNXDvhjsHBqOwBhHrunn63GcqHvtx4Xxa5KwGsxwARNMaarDYkUpick5KVEw0bVI YmYGQNUVR4GlTX9rTQ4p0aRHsHtvX1VczrjbCC6vfi7sOwifhnCbzUtON8zf9aSlEAiex3 LVB1zepwlu2DguVYh7Kebw02PkkiwlODmU9kxbctT6ffZE6HxpY//fhtQlDTmH1gI5LmSE cJVbbDbPZMUkjqhaRg+Y0PYdQEfImsmLEWkfkxTrSCeZocp+vEZqBZJPFCPPSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqLXN4NgTz198n; Wed, 29 May 2024 20:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44TKRGsG090518; Wed, 29 May 2024 20:27:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TKRGoR090515; Wed, 29 May 2024 20:27:16 GMT (envelope-from git) Date: Wed, 29 May 2024 20:27:16 GMT Message-Id: <202405292027.44TKRGoR090515@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 77a3d7607880 - main - graphics/opensubdiv: update to 3.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77a3d7607880649771f880868334f895ebb43650 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=77a3d7607880649771f880868334f895ebb43650 commit 77a3d7607880649771f880868334f895ebb43650 Author: Shane AuthorDate: 2024-05-29 20:14:55 +0000 Commit: Vladimir Druzenko CommitDate: 2024-05-29 20:26:13 +0000 graphics/opensubdiv: update to 3.6.0 Changelogs: https://graphics.pixar.com/opensubdiv/docs/release_notes.html#release-3-5-1-july-2023 https://graphics.pixar.com/opensubdiv/docs/release_notes.html#release-3-6-0-sep-2023 PR: 275821 Tested by: fluffy, vvd --- graphics/opensubdiv/Makefile | 10 +++----- graphics/opensubdiv/distinfo | 6 ++--- .../files/patch-documentation_CMakeLists.txt | 11 --------- .../files/patch-opensubdiv_osd_tbbEvaluator.cpp | 28 ---------------------- graphics/opensubdiv/pkg-plist | 12 ++++++++++ 5 files changed, 18 insertions(+), 49 deletions(-) diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index dd51cf960f13..ce5302b8356f 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -1,7 +1,6 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v -DISTVERSION= 3_5_0 -PORTREVISION= 8 +DISTVERSION= 3_6_0 CATEGORIES?= graphics MAINTAINER= FreeBSD@Shaneware.biz @@ -13,7 +12,7 @@ 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 @@ -21,11 +20,10 @@ 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 @@ -34,8 +32,6 @@ DOCS_BUILD_DEPENDS= rst2html.py:textproc/py-docutils \ 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 --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 @@ -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 @@ -102,11 +104,21 @@ lib/libosdGPU.so.%%LIBVERS%% %%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