mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

graphics/zeno: Update 2023.11.16 → 2024.10.1

Browse Source 
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
This commit is contained in:
Martin Filla 2024-11-20 21:20:35 +03:00 committed by Vladimir Druzenko
parent e0ea6bfc37
commit 7be75c9ecc
15 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/zeno/Makefile
View File

@ -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

6
graphics/zeno/distinfo
View File

@ -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

8
graphics/zeno/files/patch-ui_zenodesign_layertreeitemdelegate.cpp
View File

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

10
graphics/zeno/files/patch-ui_zenoedit_launch_serialize.cpp Normal file
View File

@ -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 <QSet>
+#include <set>
using namespace JsonHelper;

4
graphics/zeno/files/patch-ui_zenoedit_launch_viewdecode.cpp
View File

@ -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 <zenomodel/include/graphsmanagment.h>
@@ -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);
}

4
graphics/zeno/files/patch-ui_zenoedit_launch_ztcpserver.cpp
View File

@ -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 <cstdio>
#include <cstring>
#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();
}

10
graphics/zeno/files/patch-ui_zenoedit_nodesys_zenonode.cpp
View File

@ -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 <zenomodel/include/command.h>
#include <zenomodel/include/nodeparammodel.h>
@ -8,9 +8,3 @@
ZenoNode::ZenoNode(const NodeUtilParam &params, QGraphicsItem *parent)
@@ -2079,4 +2080,4 @@ void ZenoNode::onCustomNameChanged()
m_pCategoryItem->setText(text);
ZGraphicsLayout::updateHierarchy(m_pCategoryItem);
}
}
+}

4
graphics/zeno/files/patch-ui_zenoedit_recordmain.cpp
View File

@ -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 <zeno/utils/log.h>
@ -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

4
graphics/zeno/files/patch-ui_zenoedit_util_apphelper.cpp
View File

@ -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 <zeno/core/Session.h>
#include <zeno/extra/GlobalComm.h>
#include "viewport/zoptixviewport.h"

5
graphics/zeno/files/patch-ui_zenoedit_util_apphelper.h
View File

@ -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 <zenomodel/include/igraphsmodel.h>

8
graphics/zeno/files/patch-ui_zenoedit_viewportinteraction_nodesync.cpp
View File

@ -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 <zenomodel/include/uihelper.h>
@@ -205,4 +206,4 @@ std::string NodeSyncMgr::getPrimSockName(NodeLocation&
return getPrimSockName(node_type.toStdString());
}
}
+}

8
graphics/zeno/files/patch-ui_zenoedit_zenoapplication.cpp
View File

@ -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;
}

4
graphics/zeno/files/patch-ui_zenoedit_zenomainwindow.cpp
View File

@ -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()
{

12
graphics/zeno/files/patch-zenovis_src_Scene.cpp
View File

@ -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 <zenovis/opengl/buffer.h>
#include <zenovis/opengl/common.h>
#include <zenovis/opengl/scope.h>
+#ifdef ZENO_ENABLE_OPTIX
#include "../xinxinoptix/xinxinoptixapi.h"
+#endif
#include <cstdlib>
#include <map>

14
graphics/zeno/files/patch-zenovis_src_optx_RenderEngineOptx.cpp
View File

@ -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 <limits>
#include <memory>
-#ifdef ZENO_ENABLE_OPTIX
#include "../../xinxinoptix/xinxinoptixapi.h"
#include "../../xinxinoptix/SDK/sutil/sutil.h"
#include <zeno/types/PrimitiveObject.h>