Merge updates from develop

.gitattributes

@@ -204,7 +204,7 @@ java/src/hdf/hdf5lib/H5.java -text
 java/src/hdf/hdf5lib/HDF5Constants.java -text
 java/src/hdf/hdf5lib/HDFArray.java -text
 java/src/hdf/hdf5lib/HDFNativeData.java -text
-java/src/hdf/hdf5lib/callbacks/Callbacks.java -text
+java/src/hdf/hdf5lib/callbacks/H5Callbacks.java -text
 java/src/hdf/hdf5lib/callbacks/H5A_iterate_cb.java -text
 java/src/hdf/hdf5lib/callbacks/H5A_iterate_t.java -text
 java/src/hdf/hdf5lib/callbacks/H5D_append_cb.java -text

.github/workflows/netcdf.yml

@@ -52,6 +52,7 @@ jobs:
             -DHDF5_BUILD_DOC:BOOL=OFF \
             -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON \
             -DZLIB_USE_LOCALCONTENT:BOOL=OFF \
+            -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON \
             -DH5_NO_DEPRECATED_SYMBOLS:BOOL=OFF \
             -DBUILD_TESTING:BOOL=OFF \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \

CMakeFilters.cmake

@@ -85,6 +85,7 @@ endif ()
 if(NOT DEFINED ZLIBNG_PACKAGE_NAME)
   set(ZLIBNG_PACKAGE_NAME "zlib-ng")
 endif ()
+option (HDF5_ENABLE_ZLIB_SUPPORT "Enable Zlib Filters" OFF)
 if (HDF5_ENABLE_ZLIB_SUPPORT)
   if (NOT H5_ZLIB_HEADER)
     if (NOT ZLIB_USE_EXTERNAL)
@@ -160,6 +161,7 @@ set(H5_SZIP_FOUND FALSE)
 if(NOT DEFINED LIBAEC_PACKAGE_NAME)
   set(LIBAEC_PACKAGE_NAME "libaec")
 endif ()
+option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON)
   if (NOT SZIP_USE_EXTERNAL)

doxygen/dox/FileFormatSpec.dox

@@ -1,23 +1,7 @@
-/** \page FMT3 HDF5 File Format Specification Version 3.0
+\ref FMT3
 
-\htmlinclude H5.format.html
+\ref FMT2
 
-*/
+\ref FMT11
 
-/** \page FMT2 HDF5 File Format Specification Version 2.0
-
-\htmlinclude H5.format.2.0.html
-
-*/
-
-/** \page FMT11 HDF5 File Format Specification Version 1.1
-
-\htmlinclude H5.format.1.1.html
-
-*/
-
-/** \page FMT1 HDF5 File Format Specification Version 1.0
-
-\htmlinclude H5.format.1.0.html
-
-*/
+\ref FMT1