aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2022-06-22 14:36:13 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2022-06-22 14:39:46 +0000
commit4eed11387fbfb134d1e20aa9b429a573e627d4e0 (patch)
tree1f39f5a8741daabecd53a84f6d6cb8e81883f753
parent3f82c85d911ca0bfd8e687a4b644fdb3a5edea06 (diff)
downloadports-4eed11387fbfb134d1e20aa9b429a573e627d4e0.tar.gz
ports-4eed11387fbfb134d1e20aa9b429a573e627d4e0.zip
math/vtk9: fix build after d1e8146547 (netcdf 4.9.0)
NC_SZIP_NN is not #define'd in netcdf.h, so it cannot be the target of an assignment anymore. Fortunately NC_SZIP_NN is now defined to the same value (32) as it was set to by vtk9 before (and it was declared const int before), so just hide the old const int if NC_SZIP_NN is already defined. No functional change, no bumps.
-rw-r--r--math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c
new file mode 100644
index 000000000000..e52da58e3878
--- /dev/null
+++ b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c
@@ -0,0 +1,12 @@
+--- ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.orig 2022-06-22 15:58:58.543731000 +0200
++++ ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-22 16:00:28.263448000 +0200
+@@ -1770,7 +1770,9 @@
+ */
+
+ /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
++#if !defined(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;