hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Guard for define in netcdf 4.9.0 and later. (#37853)

Browse source 
* Guard for define in netcdf 4.9.0 and later.

This code is already available in ParaView 5.11.0 so no patching
needed there.

* Add latest needed version (even if not in spack).

---------

Co-authored-by: Dan Lipsa <dan.lipsa@khq.kitware.com>
This commit is contained in:
Dan Lipsa 2023-06-07 15:20:27 -04:00 committed by GitHub
parent 74921788a8
commit 79656655ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/paraview/exodusII-netcdf4.9.0.patch Normal file
View file

@ -0,0 +1,14 @@
*** a/VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2023-03-16 16:57:14.172102586 -0400
--- b/VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2023-03-16 11:20:28.230116660 -0400
***************
*** 1770,1776 ****
--- 1770,1778 ----
*/
/* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
+ #ifndef NC_SZIP_NN
const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
+ #endif
/* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
const int SZIP_PIXELS_PER_BLOCK =
file->compression_level == 0 ? 32 : file->compression_level;

2
var/spack/repos/builtin/packages/paraview/package.py
View file

@ -295,6 +295,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10113
patch("adios2-remove-deprecated-functions.patch", when="@5.10: ^adios2@2.9:")
patch("exodusII-netcdf4.9.0.patch", when="@:5.10.2")
generator("ninja", "make", default="ninja")
# https://gitlab.kitware.com/paraview/paraview/-/issues/21223
conflicts("generator=ninja", when="%xl")