* update vtk to 9.4.1-2

This commit is contained in:
Alexander Baldeck 2025-03-10 10:15:42 +01:00
parent 5a414cf125
commit a1235ca151
4 changed files with 262 additions and 261 deletions

View File

@ -1,135 +1,131 @@
pkgbase = vtk
pkgdesc = Software system for 3D computer graphics, image processing, and visualization
pkgver = 9.3.1
pkgrel = 10
pkgver = 9.4.1
pkgrel = 2
url = https://www.vtk.org
arch = x86_64
arch = powerpc64le
arch = powerpc64
arch = riscv64
license = BSD-3-Clause
makedepends = adios2
makedepends = boost
makedepends = cgns
makedepends = cli11
makedepends = cmake
makedepends = doxygen
makedepends = eigen
makedepends = expat
makedepends = fast_float
makedepends = ffmpeg
makedepends = fmt
makedepends = python
makedepends = python-matplotlib
makedepends = python-mpi4py
makedepends = qt5-base
makedepends = qt5-declarative
makedepends = qt5-tools
makedepends = tk
makedepends = libx11
makedepends = freetype2
makedepends = gdal
makedepends = git
makedepends = gl2ps
makedepends = glew
makedepends = gnuplot
makedepends = libxcursor
makedepends = hdf5
makedepends = jsoncpp
makedepends = netcdf
makedepends = sqlite
makedepends = adios2
makedepends = cgns
makedepends = gdal
makedepends = gl2ps
makedepends = proj
makedepends = alembic
makedepends = ffmpeg
makedepends = imath
makedepends = libharu
makedepends = libjpeg-turbo
makedepends = liblas
makedepends = libogg
makedepends = libpng
makedepends = libtheora
makedepends = libxml2
makedepends = libxt
makedepends = lz4
makedepends = mariadb-libs
makedepends = netcdf
makedepends = opencascade
makedepends = openmpi
makedepends = openvdb
makedepends = openvr
makedepends = openxr
makedepends = pdal
makedepends = postgresql-libs
makedepends = proj
makedepends = python-matplotlib
makedepends = python-mpi4py
makedepends = qt6-base
makedepends = qt6-tools
makedepends = qt6-declarative
makedepends = rapidjson
makedepends = sqlite
makedepends = tk
makedepends = unixodbc
makedepends = fontconfig
makedepends = boost
makedepends = cli11
makedepends = eigen
makedepends = fast_float
makedepends = nlohmann-json
makedepends = utf8cpp
makedepends = verdict
makedepends = wget
makedepends = xz
makedepends = zfp
makedepends = zlib
depends = double-conversion
depends = gcc-libs
depends = glibc
depends = libtiff
depends = onetbb
depends = double-conversion
depends = verdict
depends = fmt
depends = libarchive
depends = lz4
depends = pugixml
optdepends = adios2
optdepends = cgns
optdepends = ffmpeg
optdepends = fmt
optdepends = gdal
optdepends = gl2ps
optdepends = glew
optdepends = gnuplot: plotting tools
depends = xz
depends = zlib
depends = libjpeg-turbo
depends = libpng
depends = libtiff
depends = expat
depends = jsoncpp
depends = libxml2
optdepends = graphviz: drawing tools
optdepends = hdf5
optdepends = libglvnd: OpenGL rendering
optdepends = java-runtime=11: java bindings
optdepends = jsoncpp
optdepends = libarchive
optdepends = libharu
optdepends = liblas
optdepends = lz4
optdepends = mariadb-libs
optdepends = netcdf
optdepends = openimagedenoise
optdepends = openmpi: OpenMPI support
optdepends = openvdb
optdepends = openvr
optdepends = openxr
optdepends = ospray
optdepends = pdal
optdepends = postgresql-libs
optdepends = proj
optdepends = python: python bindings
optdepends = python-matplotlib: for Matplotlib rendering
optdepends = python-mpi4py: OpenMPI python support
optdepends = qt5-declarative: QML plugin
optdepends = sqlite
optdepends = tk: tcl bindings
optdepends = unixodbc
optdepends = verdict
optdepends = libx11: rendering
optdepends = libxcursor: rendering
optdepends = fontconfig: rendering fonts with fontconfig support
optdepends = freetype2: rendering fonts
optdepends = gl2ps: rendering to PostScript, PDF, and SVG
optdepends = anari-sdk: ANARI rendering module
optdepends = openvr: rendering for virtual reality
optdepends = openxr: rendering for virtual and augmented reality
optdepends = openimagedenoise: rendering with raytracing support
optdepends = ospray: rendering with raytracing support
optdepends = openmpi: OpenMPI support
optdepends = adios2: IO module
optdepends = alembic: IO module
optdepends = cgns: IO module
optdepends = ffmpeg: IO module
optdepends = gdal: IO module
optdepends = hdf5: IO module
optdepends = imath: IO module
optdepends = libharu: IO module
optdepends = liblas: IO module
optdepends = libogg: IO module
optdepends = libtheora: IO module
optdepends = mariadb-libs: IO module
optdepends = netcdf: IO module
optdepends = opencascade: IO module
optdepends = openvdb: IO module
optdepends = pdal: IO module
optdepends = postgresql-libs: IO module
optdepends = proj: IO module
optdepends = sqlite: IO module
optdepends = unixodbc: IO module
optdepends = fast_float: for building downstream projects
optdepends = nlohmann-json: for building downstream projects
optdepends = openmp: OpenMP support for downstream projects built with Clang
options = staticlibs
source = https://www.vtk.org/files/release/9.3/VTK-9.3.1.tar.gz
source = https://www.vtk.org/files/release/9.4/VTK-9.4.1.tar.gz
source = vtk-occt.patch
source = ospray-3.patch
source = https://github.com/Kitware/VTK/commit/761aa1d15970fcb6aadb7d6152737fa9b2d4b0d0.patch
source = fmt-11.patch
source = vtk-9.3.0-core-octree_node.txx.patch
source = vtk-9.3.0-java.patch
source = vtk-9.3.0-ThirdParty-gcc15.patch
source = vtk-9.3.0-ThrustPatches.patch
source = vtk-9.3.1-xdmf3-32bit.patch
sha256sums = 8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
source = netcdf-4.9.3.patch
sha256sums = c253b0c8d002aaf98871c6d0cb76afc4936c301b72358a08d5f3f72ef8bc4529
sha256sums = df958eabc7dc4f5b33383ce0fb0f90a3ba202c1c2a24d3b5b9e7cfb1fb38b011
sha256sums = faf3fd2eea2f73a07f5dcbd67920161a07ae554e008ad1e4099153fec2882278
sha256sums = 46de5cee71d696d9632472e27ed369ec49f0e276c3e4bb0a397397d928553864
sha256sums = 8161d4e184a3f2d075be26605c0d38f04314a8e26146ab5b1c33f87dabc2b0d2
sha256sums = e2e031166c067ed684a74e9352c79e3da4f82e0ee3cc5afc06618991d2e6bfc5
sha256sums = 0580019789ea11926c00d43e03f8d1d6de60597108da35a1b4444f1d521e3105
sha256sums = 3d890233010ec9b5e46ce63bc80170069651ec6c419998aec99ec2e85848a28d
sha256sums = 40bc697f07c5ce95d3bb9e92cde843b0040fe0c217a9dd4d406632f7db11ed39
sha256sums = c11bdad0be6ea3995bb9c7bee557fc92749b4a9babf22a9e1f55cb138e76094a
sha256sums = c6345d09c219b5ca2efa6e7419f404a22715adb4d2ca1fd6ba34affd77cea23e
sha256sums = 87535578bbb0023ede506fd64afae95cdf4fb698c543f9735e6267730634afbc
makedepends_x86_64 = anari-sdk
makedepends_x86_64 = openimagedenoise
makedepends_x86_64 = ospray
makedepends_x86_64 = java-environment=11
makedepends_x86_64 = java-environment=17
makedepends_powerpc64le = openmp
makedepends_powerpc64le = java-environment=11
makedepends_powerpc64le = java-environment=17
makedepends_powerpc64 = openmp
makedepends_powerpc64 = java-environment
makedepends_powerpc64 = java-environment=17
makedepends_riscv64 = openmp
makedepends_riscv64 = java-environment=17
pkgname = vtk

View File

@ -7,143 +7,151 @@
# Contributor: Andrzej Giniewicz <gginiu at gmail dot com>
# Contributor: Thomas Dziedzic <gostrc at gmail>
# May need bootstrapping on upgrades due to circular vtk <-> opencascade dependency
pkgname=vtk
pkgver=9.3.1
pkgrel=10
# May need bootstrapping on upgrades due to circular vtk <-> opencascade dependency
pkgver=9.4.1
pkgrel=2
pkgdesc="Software system for 3D computer graphics, image processing, and visualization"
arch=(x86_64 powerpc64le powerpc64 riscv64) #FIXME: powerpc
#FIXME: powerpc fails to build
arch=(x86_64 powerpc64le powerpc64 riscv64)
url="https://www.vtk.org"
license=(BSD-3-Clause)
depends=(
double-conversion
gcc-libs
glibc
libtiff
onetbb
pugixml
gcc-libs # used by >400 libs
glibc # used by >400 libs
onetbb # used by 57 direct libs, 388 total libs
double-conversion # libvtkCommonCore.so (1 direct lib, 372 total libs)
verdict # libvtkFiltersVerdict.so (1 direct lib, 192 total libs)
fmt # libvtkFiltersGeneral.so etc. (5 direct libs, 189 total libs)
libarchive # libvtkCommonArchive.so (1 direct lib, 2 total libs)
# dependencies of libvtkCommonDataModel.so and libvtkIOCore.so
lz4 # 1 direct lib, 172 total libs
pugixml # 4 direct libs, 351 total libs
xz # 1 direct lib, 172 total libs
zlib # 5 direct libs, 204 total libs
# dependencies of libvtkIOImage.so
libjpeg-turbo # 1 direct lib, 97 total libs
libpng # 1 direct lib, 97 total libs
libtiff # 1 direct lib, 97 total libs
# common data libraries
expat # 1 direct lib, 101 total libs
jsoncpp # 7 direct libs, 26 total libs
libxml2 # 3 direct libs, 13 total libs
)
makedepends=(
adios2
boost
cgns
cli11
# build system
cmake
doxygen
eigen
expat
fast_float
ffmpeg
fmt
freetype2
gdal
git
gl2ps
glew
gnuplot
hdf5
jsoncpp
libharu
libjpeg-turbo
liblas
libogg
libpng
libtheora
libxml2
libxt
lz4
mariadb-libs
netcdf
opencascade
openmpi
openvdb
openvr
openxr
pdal
postgresql-libs
proj
# bindings
python
python-matplotlib
python-mpi4py
qt6-base
qt6-tools
qt6-declarative
rapidjson
sqlite
tk
unixodbc
# graphical toolkits
qt5-base # libvtkGUISupportQt.so etc. (5 direct libs, 6 total libs)
qt5-declarative # libvtkGUISupportQtQuick.so (1 direct lib, 1 total lib)
qt5-tools
tk # libvtkRenderingTk.so (1 direct lib, 1 total lib)
# direct dependencies of "some" VTK libs/modules
libx11 # libvtkglad.so, libvtkRenderingUI.so, libvtkRenderingTk.so, libvtkRenderingOpenGL2.so (4 direct libs, 58 total libs)
freetype2 # libvtkRenderingFreeType.so, libvtkRenderingFreeTypeFontConfig.so (2 direct libs, 55 total libs)
libxcursor # libvtkRenderingOpenGL2.so (1 direct lib, 51 total lib)
hdf5 # 16 direct libs, 39 total libs
netcdf # libvtkIOParallelNetCDF.so, libvtkIONetCDF.so, libvtkexodusII.so, libvtkIOMINC.so, libvtkioss.so (5 direct libs, 14 total libs)
sqlite # libvtkIOSQL.so (1 direct lib, 10 total libs)
adios2 # libvtkfides.so, libvtkIOADIOS2.so (2 direct libs, 5 total libs)
cgns # libvtkIOCGNSReader.so, libvtkioss.so (2 direct libs, 5 total libs)
gdal # libvtkGeovisGDAL.so, libvtkIOGDAL.so (2 direct libs, 4 total libs)
gl2ps # libvtkRenderingGL2PSOpenGL2.so, libvtkIOExportGL2PS.so (2 direct libs, 4 total libs)
proj # libvtkGeovisCore.so, libvtkIOCesium3DTiles.so (2 direct libs, 4 total libs)
alembic # libvtkIOAlembic.so (1 direct lib, 2 total libs)
ffmpeg # libvtkIOFFMPEG.so (1 direct lib, 2 total libs)
imath # libvtkIOOpenVDB.so (1 direct lib, 2 total libs)
libharu # libvtkIOExportPDF.so (1 direct lib, 2 total libs)
liblas # libvtkIOLAS.so (1 direct lib, 2 total libs)
libogg # libvtkIOOggTheora.so (1 direct lib, 2 total libs)
libtheora # libvtkIOOggTheora.so (1 direct lib, 2 total libs)
mariadb-libs # libvtkIOMySQL.so (1 direct lib, 2 total libs)
opencascade # libvtkIOOCCT.so (1 direct lib, 2 total libs)
openvdb # libvtkIOOpenVDB.so (1 direct lib, 2 total libs)
openvr # libvtkRenderingOpenVR.so (1 direct lib, 2 total libs)
openxr # libvtkRenderingOpenXR.so (1 direct lib, 2 total libs)
pdal # libvtkIOPDAL.so (1 direct lib, 2 total libs)
postgresql-libs # libvtkIOPostgreSQL.so (1 direct lib, 2 total libs)
unixodbc # libvtkIOODBC.so (1 direct lib, 2 total libs)
fontconfig # libvtkRenderingFreeTypeFontConfig.so (1 direct lib, 1 total lib)
# header-only libraries (all except two are only private or test dependencies
# in all modules that use them)
boost
cli11
eigen
fast_float # interface dependency of the VTK::CommonCore module
nlohmann-json # interface dependency of the VTK::CommonCore module
utf8cpp
verdict
wget
xz
zfp
zlib
)
makedepends_powerpc=('java-environment=11')
makedepends_powerpc64=(openmp 'java-environment')
makedepends_powerpc64le=(openmp 'java-environment=11')
makedepends_riscv64=(openmp)
makedepends_x86_64=(openimagedenoise ospray 'java-environment=11')
makedepends_powerpc64=(openmp 'java-environment=17')
makedepends_powerpc64le=(openmp 'java-environment=17')
makedepends_riscv64=(openmp 'java-environment=17')
makedepends_x86_64=(anari-sdk openimagedenoise ospray 'java-environment=17')
# pegtl: https://gitlab.kitware.com/vtk/vtk/-/issues/18151
# exprtk, ioss: not packaged
optdepends=(
adios2
cgns
ffmpeg
fmt
gdal
gl2ps
glew
'gnuplot: plotting tools'
# additional tools not listed in makedepends
'graphviz: drawing tools'
hdf5
'libglvnd: OpenGL rendering' # checked at runtime rather than compile-time
# bindings
'java-runtime=11: java bindings'
jsoncpp
libarchive
libharu
liblas
lz4
mariadb-libs
netcdf
openimagedenoise
'openmpi: OpenMPI support'
openvdb
openvr
openxr
ospray
pdal
postgresql-libs
proj
'python: python bindings'
'python-matplotlib: for Matplotlib rendering'
'python-mpi4py: OpenMPI python support'
# graphical toolkits
'qt5-declarative: QML plugin'
sqlite
'tk: tcl bindings'
unixodbc
verdict
# direct dependencies of "some" VTK libs/modules
'libx11: rendering'
'libxcursor: rendering'
'fontconfig: rendering fonts with fontconfig support'
'freetype2: rendering fonts'
'gl2ps: rendering to PostScript, PDF, and SVG'
'anari-sdk: ANARI rendering module'
'openvr: rendering for virtual reality'
'openxr: rendering for virtual and augmented reality'
'openimagedenoise: rendering with raytracing support'
'ospray: rendering with raytracing support'
'openmpi: OpenMPI support'
'adios2: IO module'
'alembic: IO module'
'cgns: IO module'
'ffmpeg: IO module'
'gdal: IO module'
'hdf5: IO module'
'imath: IO module'
'libharu: IO module'
'liblas: IO module'
'libogg: IO module'
'libtheora: IO module'
'mariadb-libs: IO module'
'netcdf: IO module'
'opencascade: IO module'
'openvdb: IO module'
'pdal: IO module'
'postgresql-libs: IO module'
'proj: IO module'
'sqlite: IO module'
'unixodbc: IO module'
# building downstream projects
'fast_float: for building downstream projects'
'nlohmann-json: for building downstream projects'
'openmp: OpenMP support for downstream projects built with Clang'
)
options=(staticlibs)
[ "${CARCH}" == 'powerpc' ] && options+=(!debug !lto)
source=(${url}/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz
vtk-occt.patch
ospray-3.patch
https://github.com/Kitware/VTK/commit/761aa1d15970fcb6aadb7d6152737fa9b2d4b0d0.patch
fmt-11.patch
vtk-9.3.0-core-octree_node.txx.patch
vtk-9.3.0-java.patch
vtk-9.3.0-ThirdParty-gcc15.patch
vtk-9.3.0-ThrustPatches.patch
vtk-9.3.1-xdmf3-32bit.patch)
sha256sums=('8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8'
vtk-occt.patch
fmt-11.patch
netcdf-4.9.3.patch)
sha256sums=('c253b0c8d002aaf98871c6d0cb76afc4936c301b72358a08d5f3f72ef8bc4529'
'df958eabc7dc4f5b33383ce0fb0f90a3ba202c1c2a24d3b5b9e7cfb1fb38b011'
'faf3fd2eea2f73a07f5dcbd67920161a07ae554e008ad1e4099153fec2882278'
'46de5cee71d696d9632472e27ed369ec49f0e276c3e4bb0a397397d928553864'
'8161d4e184a3f2d075be26605c0d38f04314a8e26146ab5b1c33f87dabc2b0d2'
'e2e031166c067ed684a74e9352c79e3da4f82e0ee3cc5afc06618991d2e6bfc5'
'0580019789ea11926c00d43e03f8d1d6de60597108da35a1b4444f1d521e3105'
'3d890233010ec9b5e46ce63bc80170069651ec6c419998aec99ec2e85848a28d'
'40bc697f07c5ce95d3bb9e92cde843b0040fe0c217a9dd4d406632f7db11ed39'
'c11bdad0be6ea3995bb9c7bee557fc92749b4a9babf22a9e1f55cb138e76094a')
'c6345d09c219b5ca2efa6e7419f404a22715adb4d2ca1fd6ba34affd77cea23e'
'87535578bbb0023ede506fd64afae95cdf4fb698c543f9735e6267730634afbc')
prepare() {
cd ${pkgname^^}-${pkgver}
@ -151,19 +159,8 @@ prepare() {
sed -i "s|3.9.0|${_fast_float_version}|" ThirdParty/fast_float/CMakeLists.txt
patch -Np1 -i "$srcdir"/vtk-occt.patch
patch -Np1 -i ../ospray-3.patch # Fix build with ospray 3.0
patch -Np1 -i "$srcdir"/761aa1d15970fcb6aadb7d6152737fa9b2d4b0d0.patch # Fix OCCT 7.8.0
patch -p1 -i ../fmt-11.patch # Fix build with fmt 11
# fix 32bit builds
case "${CARCH}" in
powerpc) patch -R -Np1 -i "$srcdir"/vtk-9.3.1-xdmf3-32bit.patch
esac
patch -Np1 -i "$srcdir"/vtk-9.3.0-core-octree_node.txx.patch
patch -Np1 -i "$srcdir"/vtk-9.3.0-java.patch
patch -Np1 -i "$srcdir"/vtk-9.3.0-ThirdParty-gcc15.patch
patch -Np1 -i "$srcdir"/vtk-9.3.0-ThrustPatches.patch
patch -Np1 -i "$srcdir"/fmt-11.patch
patch -Np1 -i "$srcdir"/netcdf-4.9.3.patch
}
build() {
@ -172,55 +169,57 @@ build() {
# To set tcl lib path
local _tkver=$(echo 'puts $tcl_version' | tclsh)
_cmake_options=()
case "${CARCH}" in
powerpc) _cmake_options+=(
-DVTKOSPRAY_ENABLE_DENOISER=OFF
-DVTKm_ENABLE_OPENMP=OFF
-DVTK_ENABLE_OSPRAY=OFF
-DVTKm_ENABLE_OPENMP=OFF
-DVTK_ENABLE_OSPRAY=OFF
-DVTK_SMP_ENABLE_OPENMP=OFF
-DVTK_WRAP_JAVA=OFF
)
-DVTK_MODULE_ENABLE_VTK_RenderingAnari:STRING=NO
)
export CFLAGS+=' -fpermissive'
export CXXFLAGS+=' -fpermissive'
;;
;;
riscv64) _cmake_options+=(
-DVTKOSPRAY_ENABLE_DENOISER=OFF
-DVTKm_ENABLE_OPENMP=OFF
-DVTK_ENABLE_OSPRAY=OFF
-DVTKm_ENABLE_OPENMP=OFF
-DVTK_ENABLE_OSPRAY=OFF
-DVTK_SMP_ENABLE_OPENMP=ON
-DVTK_WRAP_JAVA=OFF
)
;;
-DVTK_MODULE_ENABLE_VTK_RenderingAnari:STRING=NO
)
;;
x86_64) _cmake_options+=(
-DVTKOSPRAY_ENABLE_DENOISER=ON
-DVTKm_ENABLE_OPENMP=ON
-DVTK_SMP_ENABLE_OPENMP=ON
-DVTK_WRAP_JAVA=ON
)
;;
)
;;
powerpc64) _cmake_options+=(
-DVTKOSPRAY_ENABLE_DENOISER=OFF
-DVTKOSPRAY_ENABLE_DENOISER=OFF
-DVTKm_ENABLE_OPENMP=ON
-DVTK_ENABLE_OSPRAY=OFF
-DVTK_SMP_ENABLE_OPENMP=ON
-DVTK_WRAP_JAVA=OFF
-DVTK_MODULE_ENABLE_VTK_IOPDAL=NO
-DVTK_MODULE_ENABLE_VTK_RenderingAnari:STRING=NO
)
CFLAGS='-O2 -pipe'
CXXFLAGS='-O2 -pipe'
;;
*) _cmake_options+=(
-DVTKOSPRAY_ENABLE_DENOISER=OFF
-DVTKOSPRAY_ENABLE_DENOISER=OFF
-DVTKm_ENABLE_OPENMP=ON
-DVTK_ENABLE_OSPRAY=OFF
-DVTK_SMP_ENABLE_OPENMP=ON
-DVTK_WRAP_JAVA=ON
-DVTK_MODULE_ENABLE_VTK_RenderingAnari:STRING=NO
) ;;
esac
cmake -B build -S ${pkgname^^}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects" \
@ -233,11 +232,14 @@ build() {
-DVTK_BUILD_ALL_MODULES=ON \
-DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \
-DVTK_LEGACY_REMOVE=ON \
-DVTK_SMP_ENABLE_OPENMP=ON \
-DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
-DVTK_PYTHON_VERSION=3 \
-DVTK_QT_VERSION=5 \
-DVTK_USE_MPI=ON \
-DVTK_USE_TK=ON \
-DVTK_VERSIONED_INSTALL=OFF \
-DVTK_WRAP_JAVA=ON \
-DVTK_WRAP_PYTHON=ON \
-DVTKm_ENABLE_HDF5_IO=ON \
-DVTKm_ENABLE_MPI=ON \
@ -245,6 +247,7 @@ build() {
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF \
-DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy=NO \
-DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS=NO \
-DVTK_MODULE_ENABLE_VTK_RenderingZSpace=NO \

View File

@ -1,44 +1,22 @@
diff -ru VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
--- VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C 2024-09-08 10:39:43.785130427 +0200
+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C 2024-09-08 10:42:08.072087946 +0200
diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
+++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
@@ -12,6 +12,7 @@
#include <cstddef> // for nullptr
#include <cstdint>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <map> // for _Rb_tree_iterator, etc
#include <ostream> // for basic_ostream, etc
#include <set>
diff -ru VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
--- VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C 2024-09-08 10:39:43.788463820 +0200
+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C 2024-09-08 10:57:28.625305675 +0200
@@ -15,6 +15,7 @@
#include <Ioss_StructuredBlock.h>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <cstddef> // for size_t
#include <numeric>
diff -ru VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_Utils.C VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.C
--- VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_Utils.C 2024-09-08 10:39:43.791797211 +0200
+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.C 2024-09-08 10:47:06.456187726 +0200
@@ -21,6 +21,7 @@
#include VTK_FMT(fmt/chrono.h)
#include <iostream>
#include <string>
#include <vector>
diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
+++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
@@ -19,6 +19,7 @@
#include VTK_FMT(fmt/core.h)
#include VTK_FMT(fmt/format.h)
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <fstream>
#include <map>
#include <sstream>
#include <string>
diff -ru VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
--- VTK-9.3.1.orig/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C 2024-09-08 10:39:43.791797211 +0200
+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C 2024-09-08 10:51:18.889659250 +0200
@@ -9,6 +9,7 @@
#include <cstddef> // for size_t
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <string> // for string
#include <vector> // for vector

24
vtk/netcdf-4.9.3.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ru VTK-9.4.1.orig/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c VTK-9.4.1/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c
--- VTK-9.4.1.orig/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c 2025-02-10 13:35:17.671934279 +0100
+++ VTK-9.4.1/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c 2025-02-10 13:36:10.298911583 +0100
@@ -243,7 +243,7 @@
vals[0] = 0; /* fill value */
/* create attribute to cause variable to fill with zeros per routine spec
*/
- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) {
+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) {
snprintf(errmsg, MAX_ERR_LENGTH,
"ERROR: failed to create property name fill attribute in file id %d", exoid);
ex_err_fn(exoid, __func__, errmsg, status);
diff -ru VTK-9.4.1.orig/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c VTK-9.4.1/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c
--- VTK-9.4.1.orig/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c 2025-02-10 13:35:17.671934279 +0100
+++ VTK-9.4.1/ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c 2025-02-10 13:36:10.298911583 +0100
@@ -172,7 +172,7 @@
/* create attribute to cause variable to fill with zeros per routine spec
*/
- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) {
+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) {
snprintf(errmsg, MAX_ERR_LENGTH,
"ERROR: failed to create property name fill attribute in file id %d", exoid);
ex_err_fn(exoid, __func__, errmsg, status);