From 7be75c9ecc19bd535a4dffad828005b58f45f7c5 Mon Sep 17 00:00:00 2001 From: Martin Filla Date: Wed, 20 Nov 2024 21:20:35 +0300 Subject: [PATCH] =?UTF-8?q?graphics/zeno:=20Update=202023.11.16=20?= =?UTF-8?q?=E2=86=92=202024.10.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use GCC for build: /wrkdirs/usr/ports/graphics/zeno/work/zeno-2024.10.1/zeno/src/nodes/neo/PrimUnmerge.cpp:237:35: error: capturing a structured binding is not yet supported in OpenMP 237 | arr[i] = attr[val[i]]; | ^ Upstream issue: https://github.com/zenustech/zeno/issues/2022 LLVM issue: https://github.com/llvm/llvm-project/issues/33025 Changelog: https://github.com/zenustech/zeno/releases/tag/2024.10.1 PR: 282753 --- graphics/zeno/Makefile | 4 +++- graphics/zeno/distinfo | 6 +++--- .../patch-ui_zenodesign_layertreeitemdelegate.cpp | 8 +------- .../files/patch-ui_zenoedit_launch_serialize.cpp | 10 ++++++++++ .../files/patch-ui_zenoedit_launch_viewdecode.cpp | 4 ++-- .../files/patch-ui_zenoedit_launch_ztcpserver.cpp | 4 ++-- .../files/patch-ui_zenoedit_nodesys_zenonode.cpp | 10 ++-------- .../zeno/files/patch-ui_zenoedit_recordmain.cpp | 4 ++-- .../files/patch-ui_zenoedit_util_apphelper.cpp | 4 ++-- .../zeno/files/patch-ui_zenoedit_util_apphelper.h | 5 ++--- ...ch-ui_zenoedit_viewportinteraction_nodesync.cpp | 8 +------- .../files/patch-ui_zenoedit_zenoapplication.cpp | 8 ++++---- .../files/patch-ui_zenoedit_zenomainwindow.cpp | 4 ++-- graphics/zeno/files/patch-zenovis_src_Scene.cpp | 12 ------------ .../patch-zenovis_src_optx_RenderEngineOptx.cpp | 14 -------------- 15 files changed, 36 insertions(+), 69 deletions(-) create mode 100644 graphics/zeno/files/patch-ui_zenoedit_launch_serialize.cpp delete mode 100644 graphics/zeno/files/patch-zenovis_src_Scene.cpp delete mode 100644 graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp diff --git a/graphics/zeno/Makefile b/graphics/zeno/Makefile index 98636c75988b..acf4baa103c3 100644 --- a/graphics/zeno/Makefile +++ b/graphics/zeno/Makefile @@ -1,5 +1,5 @@ PORTNAME= zeno -DISTVERSION= 2023.11.16 +DISTVERSION= 2024.10.1 CATEGORIES= graphics MAINTAINER= freebsd@sysctl.cz @@ -13,9 +13,11 @@ BUILD_DEPENDS= openmpi>0:net/openmpi \ cgal>=5.0.2:math/cgal \ onetbb>0:devel/onetbb \ openvdb>0:misc/openvdb +LIB_DEPENDS= libcryptopp.so:security/cryptopp USES= cmake compiler:c++17-lang eigen:3 localbase:ldflags qt:5 USE_GITHUB= yes +USE_GCC= yes GH_ACCOUNT= zenustech USE_LDCONFIG= yes USE_QT= core gui network opengl svg widgets buildtools:build qmake:build diff --git a/graphics/zeno/distinfo b/graphics/zeno/distinfo index 09c74176f292..9c65acf14c09 100644 --- a/graphics/zeno/distinfo +++ b/graphics/zeno/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713709608 -SHA256 (zenustech-zeno-2023.11.16_GH0.tar.gz) = ab6cf15c4daaf5afdf98fe5f25b9d9ceabee665c2fd0450227d22c5060e4696e -SIZE (zenustech-zeno-2023.11.16_GH0.tar.gz) = 87281411 +TIMESTAMP = 1731578367 +SHA256 (zenustech-zeno-2024.10.1_GH0.tar.gz) = ae44fd0ac2aabf225718ffa4d10a057b4ad088534f81df19682b77701dfca139 +SIZE (zenustech-zeno-2024.10.1_GH0.tar.gz) = 101700063 diff --git a/graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp b/graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp index 13e5093b48d5..abac42f18071 100644 --- a/graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp +++ b/graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp @@ -1,4 +1,4 @@ ---- ui/zenodesign/layertreeitemdelegate.cpp.orig 2023-11-22 19:17:26 UTC +--- ui/zenodesign/layertreeitemdelegate.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenodesign/layertreeitemdelegate.cpp @@ -1,7 +1,7 @@ #include "framework.h" @@ -9,9 +9,3 @@ LayerTreeitemDelegate::LayerTreeitemDelegate(QWidget* parent) : QStyledItemDelegate(parent), m_treeview(nullptr) -@@ -211,4 +211,4 @@ QSize LayerTreeitemDelegate::sizeHint(const QStyleOpti - void LayerTreeitemDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const - { - QStyledItemDelegate::initStyleOption(option, index); - } -+} diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_serialize.cpp b/graphics/zeno/files/patch-ui_zenoedit_launch_serialize.cpp new file mode 100644 index 000000000000..48343b98a9d8 --- /dev/null +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_serialize.cpp @@ -0,0 +1,10 @@ +--- ui/zenoedit/launch/serialize.cpp.orig 2024-11-14 08:58:59 UTC ++++ ui/zenoedit/launch/serialize.cpp +@@ -8,6 +8,7 @@ + #include "variantptr.h" + #include "settings/zsettings.h" + #include ++#include + + using namespace JsonHelper; + diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp b/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp index e06da93187c3..fd0978021855 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp @@ -1,4 +1,4 @@ ---- ui/zenoedit/launch/viewdecode.cpp.orig 2024-04-23 11:14:37 UTC +--- ui/zenoedit/launch/viewdecode.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/launch/viewdecode.cpp @@ -1,4 +1,4 @@ -#ifdef ZENO_MULTIPROCESS @@ -6,7 +6,7 @@ #include "viewdecode.h" #include "zenoapplication.h" #include -@@ -335,4 +335,4 @@ void viewDecodeAppend(const char *buf, size_t n) +@@ -370,4 +370,4 @@ void viewDecodeAppend(const char *buf, size_t n) zeno::log_debug("viewDecodeAppend n={}", n); viewDecodeData.append(buf, n); } diff --git a/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp b/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp index 5da73615e8b9..ae2ccffc48c4 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp @@ -1,4 +1,4 @@ ---- ui/zenoedit/launch/ztcpserver.cpp.orig 2024-04-23 11:08:52 UTC +--- ui/zenoedit/launch/ztcpserver.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/launch/ztcpserver.cpp @@ -1,4 +1,4 @@ -#if defined(ZENO_MULTIPROCESS) && defined(ZENO_IPC_USE_TCP) @@ -6,7 +6,7 @@ #include #include #include "ztcpserver.h" -@@ -443,4 +443,4 @@ void ZTcpServer::onProcFinished(int exitCode, QProcess +@@ -446,4 +446,4 @@ void ZTcpServer::onProcFinished(int exitCode, QProcess emit runFinished(); } diff --git a/graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp b/graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp index ef623b2b81d6..e777302dfa90 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp @@ -1,6 +1,6 @@ ---- ui/zenoedit/nodesys/zenonode.cpp.orig 2024-04-26 16:28:26 UTC +--- ui/zenoedit/nodesys/zenonode.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/nodesys/zenonode.cpp -@@ -35,6 +35,7 @@ +@@ -34,6 +34,7 @@ #include "settings/zenosettingsmanager.h" #include #include @@ -8,9 +8,3 @@ ZenoNode::ZenoNode(const NodeUtilParam ¶ms, QGraphicsItem *parent) -@@ -2079,4 +2080,4 @@ void ZenoNode::onCustomNameChanged() - m_pCategoryItem->setText(text); - ZGraphicsLayout::updateHierarchy(m_pCategoryItem); - } - } -+} diff --git a/graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp b/graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp index 9c0d47f63196..4ae1a1eb7582 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp @@ -1,4 +1,4 @@ ---- ui/zenoedit/recordmain.cpp.orig 2024-04-26 16:42:36 UTC +--- ui/zenoedit/recordmain.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/recordmain.cpp @@ -15,6 +15,7 @@ #include @@ -7,4 +7,4 @@ +#include "zenoapplication.h" - //--record true --zsg "C:\zeno\framenum.zsg" --cachePath "C:\tmp" --sframe 0 --frame 10 --sample 1 --optix 1 --path "C:\recordpath" --pixel 4500x3500 --aov 0 --needDenoise 0 + //--record true --zsg "C:\zeno-master\render_param.zsg" --cachePath "C:\tmp" --sframe 0 --frame 10 --sample 1 --optix 0 --path "C:\recordpath" --pixel 4500x3500 --aov 0 --needDenoise 0 diff --git a/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp index b3dfdf838076..0d1483086934 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp @@ -1,6 +1,6 @@ ---- ui/zenoedit/util/apphelper.cpp.orig 2023-11-22 19:17:26 UTC +--- ui/zenoedit/util/apphelper.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/util/apphelper.cpp -@@ -11,7 +11,11 @@ +@@ -14,7 +14,11 @@ #include #include #include "viewport/zoptixviewport.h" diff --git a/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h index 2f05b940fa3c..345abe4d06ca 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h +++ b/graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h @@ -1,7 +1,6 @@ ---- ui/zenoedit/util/apphelper.h.orig 2024-07-27 11:22:11 UTC +--- ui/zenoedit/util/apphelper.h.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/util/apphelper.h -@@ -1,19 +1,18 @@ - #ifndef __ZENOEDIT_HELPER__ +@@ -2,18 +2,17 @@ #define __ZENOEDIT_HELPER__ #include diff --git a/graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp b/graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp index 03c3e0756796..eee9f8e4f0ee 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp @@ -1,13 +1,7 @@ ---- ui/zenoedit/viewportinteraction/nodesync.cpp.orig 2024-04-26 16:47:28 UTC +--- ui/zenoedit/viewportinteraction/nodesync.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/viewportinteraction/nodesync.cpp @@ -1,3 +1,4 @@ +#include "zenoapplication.h" #include "nodesync.h" #include -@@ -205,4 +206,4 @@ std::string NodeSyncMgr::getPrimSockName(NodeLocation& - return getPrimSockName(node_type.toStdString()); - } - - } -+} diff --git a/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp b/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp index 78db1c85294b..6baf22722bb2 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp @@ -1,6 +1,6 @@ ---- ui/zenoedit/zenoapplication.cpp.orig 2024-04-23 10:56:09 UTC +--- ui/zenoedit/zenoapplication.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/zenoapplication.cpp -@@ -13,9 +13,9 @@ +@@ -13,9 +13,9 @@ ZenoApplication::ZenoApplication(int &argc, char **arg ZenoApplication::ZenoApplication(int &argc, char **argv) : QApplication(argc, argv) @@ -12,7 +12,7 @@ , m_bUIApp(true) { initMetaTypes(); -@@ -173,7 +173,7 @@ QStandardItemModel* ZenoApplication::logModel() const +@@ -175,7 +175,7 @@ QStandardItemModel* ZenoApplication::logModel() const return graphsManagment()->logModel(); } @@ -21,7 +21,7 @@ ZTcpServer* ZenoApplication::getServer() { if (!m_server) { -@@ -182,7 +182,7 @@ ZTcpServer* ZenoApplication::getServer() +@@ -184,7 +184,7 @@ ZTcpServer* ZenoApplication::getServer() } return m_server; } diff --git a/graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp b/graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp index 28655e79d20e..74587c14370c 100644 --- a/graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp +++ b/graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp @@ -1,6 +1,6 @@ ---- ui/zenoedit/zenomainwindow.cpp.orig 2024-04-22 13:07:02 UTC +--- ui/zenoedit/zenomainwindow.cpp.orig 2024-09-30 13:46:54 UTC +++ ui/zenoedit/zenomainwindow.cpp -@@ -1467,7 +1467,7 @@ void ZenoMainWindow::onZenovisFrameUpdate(bool bGLView +@@ -1479,7 +1479,7 @@ void ZenoMainWindow::onCheckUpdate() void ZenoMainWindow::onCheckUpdate() { diff --git a/graphics/zeno/files/patch-zenovis_src_Scene.cpp b/graphics/zeno/files/patch-zenovis_src_Scene.cpp deleted file mode 100644 index b5f0794c8bf9..000000000000 --- a/graphics/zeno/files/patch-zenovis_src_Scene.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- zenovis/src/Scene.cpp.orig 2024-04-22 12:39:31 UTC -+++ zenovis/src/Scene.cpp -@@ -12,7 +12,9 @@ - #include - #include - #include -+#ifdef ZENO_ENABLE_OPTIX - #include "../xinxinoptix/xinxinoptixapi.h" -+#endif - #include - #include - diff --git a/graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp b/graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp deleted file mode 100644 index 49761eabee9a..000000000000 --- a/graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- zenovis/src/optx/RenderEngineOptx.cpp.orig 2024-04-22 12:40:25 UTC -+++ zenovis/src/optx/RenderEngineOptx.cpp -@@ -1,10 +1,10 @@ -+#ifdef ZENO_ENABLE_OPTIX - #include "optixPathTracer.h" - #include "vec_math.h" - #include "xinxinoptixapi.h" - #include "zeno/utils/vec.h" - #include - #include --#ifdef ZENO_ENABLE_OPTIX - #include "../../xinxinoptix/xinxinoptixapi.h" - #include "../../xinxinoptix/SDK/sutil/sutil.h" - #include