-
Notifications
You must be signed in to change notification settings - Fork 2.5k
vtk: update to 9.2.2 #40423
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
vtk: update to 9.2.2 #40423
Conversation
|
Failing build for x86_64-musl (possibly?) can be fixed with this patch: --- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
@@ -26,7 +26,11 @@
#define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
#endif
#else
+#ifdef __GLIBC__
#include <sys/unistd.h>
+#else
+#include <unistd.h>
+#endif
#endif
#ifdef SEACAS_HAVE_MPI
@@ -35,9 +39,6 @@
#include <cstdio>
#include <sys/stat.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
namespace {
bool internal_access(const std::string &name, int mode);I see that the patch fixing build with GCC 12 has been removed, meaning that vtk has to be tested against GCC 12 once again. |
|
Thanks for the x86_64-musl patch! The gcc12 patch is no longer needed. |
|
|
|
Tested a few VTK Python examples and confirmed that freecad works as well. I don't otherwise use VTK but all seems OK. Anything more needed here? |
Could you use https://github.com/sandialabs/seacas/pull/348.patch? |
I meant including the header, download the patch from that link, don't modify it and put it to the right directory. |
|
Upstream patch does not apply to the version vendored with vtk-9.2.2. |
We definitely want to use system dependencies, can we fix it by adding json-c++ to makedepends? |
Certainly. Also fmt-devel and eigen are already present in the repository, so they are used in my case, too. diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index dfabbb649a..147718c690 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -6,21 +6,21 @@ build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=OFF
+ -DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
- -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
- -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
- -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
- gl2ps-devel proj-devel python3-devel"
+ gl2ps-devel proj-devel python3-devel json-c++ fmt-devel"
short_desc="System for 3D computer graphics, image processing, and visualization"
maintainer="Piraty <[email protected]>"
license="BSD-3-Clause" |
c281640 to
17e7450
Compare
|
Bump. I just changed the hardcoded references to the vtk version, otherwise this is the same as before, and I think it's ready. |
Testing the changes