From 320161f2e60f6196b8e4de33b9261ad18dbd06ef Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Tue, 20 Sep 2022 09:04:03 -0600 Subject: [PATCH 1/4] Updated release notes. --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 62a518a81e..29071fc929 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release ## 4.9.1 - T.B.D. +* [Enhancement] Add new options to `nc-config`: `--has-multifilters`, `--has-stdfilters`, `--has-quantize`, `--plugindir`. See [Github #2509](https://github.com/Unidata/netcdf-c/pull/2509) for more information. * [Bug Fix] Fix some errors detected in PR 2497. [PR #2497](https://github.com/Unidata/netcdf-c/pull/2497) . See [Github #2503](https://github.com/Unidata/netcdf-c/pull/2503). * [Bug Fix] Split the remote tests into two parts: one for the remotetest server and one for all other external servers. Also add a configure option to enable the latter set. See [Github #2491](https://github.com/Unidata/netcdf-c/pull/2491). * [Bug Fix] Fix blosc plugin errors. See [Github #2461](https://github.com/Unidata/netcdf-c/pull/2461). From ec7cc936fae5693ffd4542f0634246266970e2fa Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Tue, 20 Sep 2022 15:11:23 -0600 Subject: [PATCH 2/4] Adding NC_HAS_BLOSC and NC_HAS_BZ2 to netcdf_meta.h in support of https://github.com/Unidata/netcdf-c/issues/2511 --- configure.ac | 3 ++- include/netcdf_meta.h.in | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e84c17ca8f..ee74eefcb0 100644 --- a/configure.ac +++ b/configure.ac @@ -2055,7 +2055,8 @@ AX_SET_META([NC_HAS_LOGGING],[$enable_logging],[yes]) AX_SET_META([NC_HAS_QUANTIZE],[$enable_quantize],[yes]) AX_SET_META([NC_HAS_SZIP],[$enable_hdf5_szip],[yes]) AX_SET_META([NC_HAS_ZSTD],[$have_zstd],[yes]) - +AX_SET_META([NC_HAS_BLOSC],[$have_blosc],[yes]) +AX_SET_META([NC_HAS_BZ2],[$have_bz2],[yes]) # This is the version of the dispatch table. If the dispatch table is # changed, this should be incremented, so that user-defined format # applications like PIO can determine whether they have an appropriate diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in index 019db6ba98..705cb6a526 100644 --- a/include/netcdf_meta.h.in +++ b/include/netcdf_meta.h.in @@ -67,4 +67,7 @@ #define NC_HAS_ZSTD @NC_HAS_ZSTD@ /*!< Zstd support. */ #define NC_HAS_BENCHMARKS @NC_HAS_BENCHMARKS@ /*!< Benchmarks. */ +#define NC_HAS_BLOSC @NC_HAS_BLOSC@ /*!< Blosc Support. */ +#define NC_HAS_BZ2 @NC_HAS_BZ2@ /*!< bzip2 support */ + #endif From 32b53c94836664f61c2ce312914dcc7e757fc952 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Tue, 20 Sep 2022 15:24:33 -0600 Subject: [PATCH 3/4] Update cmakelists.txt in support of https://github.com/Unidata/netcdf-c/issues/2511 --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab89e410a9..f987eb53d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2544,6 +2544,8 @@ is_enabled(ENABLE_FILTER_TESTING DO_FILTER_TESTS) is_enabled(HAVE_SZ HAS_SZIP) is_enabled(HAVE_SZ HAS_SZLIB_WRITE) is_enabled(HAVE_ZSTD HAS_ZSTD) +is_enabled(HAVE_BLOSC HAS_BLOSC) +is_enabled(HAVE_BZ2 HAS_BZ2) # Generate file from template. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in" From 59bfd82f0e7431e80ed95def9b6b343e884cbc0c Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Tue, 20 Sep 2022 15:27:32 -0600 Subject: [PATCH 4/4] Updated release notes. --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 29071fc929..035877eabc 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release ## 4.9.1 - T.B.D. +* [Enhancement] Add new entries in `netcdf_meta.h`, `NC_HAS_BLOSC` and `NC_HAS_BZ2`. See [Github #2511](https://github.com/Unidata/netcdf-c/issues/2511) and [Github #2512](https://github.com/Unidata/netcdf-c/issues/2512) for more information. * [Enhancement] Add new options to `nc-config`: `--has-multifilters`, `--has-stdfilters`, `--has-quantize`, `--plugindir`. See [Github #2509](https://github.com/Unidata/netcdf-c/pull/2509) for more information. * [Bug Fix] Fix some errors detected in PR 2497. [PR #2497](https://github.com/Unidata/netcdf-c/pull/2497) . See [Github #2503](https://github.com/Unidata/netcdf-c/pull/2503). * [Bug Fix] Split the remote tests into two parts: one for the remotetest server and one for all other external servers. Also add a configure option to enable the latter set. See [Github #2491](https://github.com/Unidata/netcdf-c/pull/2491).