rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

[WIP] More work on DeepFilterNet (HDF5)

This commit is contained in:
j1nx 2022-12-24 19:14:57 +01:00
parent 88b6abef4a
commit b754888751
13 changed files with 904 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildroot-external/Config.in
View File

@ -13,6 +13,7 @@ menu "Additional drivers, libraries and/or applications"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fxdiv/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/gemmlowp/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/growdisk-service/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/hdf5/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/hostname-service/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kaldi/Config.in"
menu "KDE Framework and Plasma"

1
buildroot-external/package/deepfilternet-ladspa/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_DEEPFILTERNET_LADSPA
bool "deepfilternet-ladspa"
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
select BR2_PACKAGE_HOST_CARGO
select BR2_PACKAGE_HDF5
help
DeepFilterNet LADSPA Plugin

2
buildroot-external/package/deepfilternet-ladspa/deepfilternet-ladspa.mk
View File

@ -7,7 +7,7 @@
DEEPFILTERNET_LADSPA_VERSION = 27b5f07be6caba1abec7907fcca89ba906732800
DEEPFILTERNET_LADSPA_SITE = $(call github,Rikorose,DeepFilterNet,$(DEEPFILTERNET_LADSPA_VERSION))
DEEPFILTERNET_LADSPA_DEPENDENCIES = host-rustc host-pkgconf
DEEPFILTERNET_LADSPA_DEPENDENCIES = host-rustc host-pkgconf hdf5
DEEPFILTERNET_LADSPA_CARGO_ENV = PKG_CONFIG_ALLOW_CROSS=1

396
buildroot-external/package/hdf5-hosttools/0001-Lower-cmake-requirement-to-3.16.patch Normal file
View File

@ -0,0 +1,396 @@
From b3751543f5e98c203c32151bd7f67820c23b701f Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Sat, 24 Dec 2022 14:43:49 +0100
Subject: [PATCH 1/1] Lower cmake requirement to 3.16
---
CMakeLists.txt | 2 +-
c++/CMakeLists.txt | 2 +-
examples/CMakeLists.txt | 2 +-
hl/CMakeLists.txt | 2 +-
hl/c++/CMakeLists.txt | 2 +-
hl/c++/examples/CMakeLists.txt | 2 +-
hl/c++/src/CMakeLists.txt | 2 +-
hl/examples/CMakeLists.txt | 2 +-
hl/fortran/CMakeLists.txt | 2 +-
hl/fortran/examples/CMakeLists.txt | 2 +-
hl/fortran/src/CMakeLists.txt | 2 +-
hl/src/CMakeLists.txt | 2 +-
hl/tools/CMakeLists.txt | 2 +-
hl/tools/gif2h5/CMakeLists.txt | 2 +-
hl/tools/h5watch/CMakeLists.txt | 2 +-
src/CMakeLists.txt | 2 +-
tools/CMakeLists.txt | 2 +-
tools/lib/CMakeLists.txt | 2 +-
tools/src/CMakeLists.txt | 2 +-
tools/src/h5copy/CMakeLists.txt | 2 +-
tools/src/h5diff/CMakeLists.txt | 2 +-
tools/src/h5dump/CMakeLists.txt | 2 +-
tools/src/h5format_convert/CMakeLists.txt | 2 +-
tools/src/h5import/CMakeLists.txt | 2 +-
tools/src/h5jam/CMakeLists.txt | 2 +-
tools/src/h5ls/CMakeLists.txt | 2 +-
tools/src/h5perf/CMakeLists.txt | 2 +-
tools/src/h5repack/CMakeLists.txt | 2 +-
tools/src/h5stat/CMakeLists.txt | 2 +-
tools/src/misc/CMakeLists.txt | 2 +-
utils/CMakeLists.txt | 2 +-
utils/mirror_vfd/CMakeLists.txt | 2 +-
utils/subfiling_vfd/CMakeLists.txt | 2 +-
utils/tools/CMakeLists.txt | 2 +-
utils/tools/h5dwalk/CMakeLists.txt | 2 +-
35 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c85965fa0..b2b4643ea1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5 C)
if (POLICY CMP0074)
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index 2c0275bc58..fec84315e9 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_CPP CXX)
add_subdirectory (src)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 10c6ede725..bb7a3ed3fa 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_EXAMPLES C)
#-----------------------------------------------------------------------------
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index a777b72f54..a86f6560e6 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL C)
#-----------------------------------------------------------------------------
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt
index 07e7777b2c..35525a2523 100644
--- a/hl/c++/CMakeLists.txt
+++ b/hl/c++/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_CPP CXX)
#-----------------------------------------------------------------------------
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index dfc5818ed6..ded3eff4c7 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_CPP_EXAMPLES CXX)
# --------------------------------------------------------------------
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 3949624a98..64d20862bc 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_CPP_SRC CXX)
#-----------------------------------------------------------------------------
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index c58d4ddff1..d8f89bc9c9 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_EXAMPLES C)
#-----------------------------------------------------------------------------
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index ad6faa4f52..5cef204872 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_F90 C Fortran)
#-----------------------------------------------------------------------------
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index 293bc2b096..8701e557be 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_F90_EXAMPLES C Fortran)
set (examples
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 3eae810073..c1e05877ff 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_F90_SRC C Fortran)
#-----------------------------------------------------------------------------
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index 837af4812f..1ad764a01e 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_SRC C)
#-----------------------------------------------------------------------------
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index a369d9efa1..38c509c336 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_TOOLS C)
#-----------------------------------------------------------------------------
diff --git a/hl/tools/gif2h5/CMakeLists.txt b/hl/tools/gif2h5/CMakeLists.txt
index 3a9c708c74..d3f7039672 100644
--- a/hl/tools/gif2h5/CMakeLists.txt
+++ b/hl/tools/gif2h5/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_TOOLS_GIF2H5 C)
#-----------------------------------------------------------------------------
diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt
index fc4c3a0d7a..1fcedaf5c4 100644
--- a/hl/tools/h5watch/CMakeLists.txt
+++ b/hl/tools/h5watch/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_TOOLS_H5WATCH C)
#-----------------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 355881d72f..559f245c6c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_SRC C)
#-----------------------------------------------------------------------------
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 55f2c2a576..7f4b9fd9da 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS C)
add_subdirectory (lib)
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 7d139ee68c..4733f5cd45 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_LIB C)
#-----------------------------------------------------------------------------
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
index 33f9ba3b95..4c174ad8b3 100644
--- a/tools/src/CMakeLists.txt
+++ b/tools/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC C)
#-- Add the h5diff and test executables
diff --git a/tools/src/h5copy/CMakeLists.txt b/tools/src/h5copy/CMakeLists.txt
index 64acf7ef50..3014943ddb 100644
--- a/tools/src/h5copy/CMakeLists.txt
+++ b/tools/src/h5copy/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5COPY C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt
index 44921cbdd5..84e0750ac6 100644
--- a/tools/src/h5diff/CMakeLists.txt
+++ b/tools/src/h5diff/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5DIFF C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt
index df521a9bb0..0274ae9944 100644
--- a/tools/src/h5dump/CMakeLists.txt
+++ b/tools/src/h5dump/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5DUMP C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5format_convert/CMakeLists.txt b/tools/src/h5format_convert/CMakeLists.txt
index c4e412b7d6..e040379ad7 100644
--- a/tools/src/h5format_convert/CMakeLists.txt
+++ b/tools/src/h5format_convert/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5FC C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5import/CMakeLists.txt b/tools/src/h5import/CMakeLists.txt
index 472a894841..19268f439a 100644
--- a/tools/src/h5import/CMakeLists.txt
+++ b/tools/src/h5import/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5IMPORT C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5jam/CMakeLists.txt b/tools/src/h5jam/CMakeLists.txt
index b037f809b1..71a9cde3f6 100644
--- a/tools/src/h5jam/CMakeLists.txt
+++ b/tools/src/h5jam/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5JAM C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt
index 8805448dc7..5f0075ce64 100644
--- a/tools/src/h5ls/CMakeLists.txt
+++ b/tools/src/h5ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5LS C)
#-----------------------------------------------------------------------------
diff --git a/tools/src/h5perf/CMakeLists.txt b/tools/src/h5perf/CMakeLists.txt
index 6531ccdbae..5a34facabc 100644
--- a/tools/src/h5perf/CMakeLists.txt
+++ b/tools/src/h5perf/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5PERF C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5repack/CMakeLists.txt b/tools/src/h5repack/CMakeLists.txt
index 637d24f5c3..c06ab34257 100644
--- a/tools/src/h5repack/CMakeLists.txt
+++ b/tools/src/h5repack/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5REPACK C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5stat/CMakeLists.txt b/tools/src/h5stat/CMakeLists.txt
index 662f935214..fb7368a10c 100644
--- a/tools/src/h5stat/CMakeLists.txt
+++ b/tools/src/h5stat/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5STAT C)
# --------------------------------------------------------------------
diff --git a/tools/src/misc/CMakeLists.txt b/tools/src/misc/CMakeLists.txt
index 054c888e54..c64ff21c17 100644
--- a/tools/src/misc/CMakeLists.txt
+++ b/tools/src/misc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_MISC C)
# --------------------------------------------------------------------
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 718f88e190..ab4c5cfd14 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS C)
if (BUILD_TESTING)
diff --git a/utils/mirror_vfd/CMakeLists.txt b/utils/mirror_vfd/CMakeLists.txt
index 51d4694657..198155608f 100644
--- a/utils/mirror_vfd/CMakeLists.txt
+++ b/utils/mirror_vfd/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_MIRRORVFD C)
#-----------------------------------------------------------------------------
diff --git a/utils/subfiling_vfd/CMakeLists.txt b/utils/subfiling_vfd/CMakeLists.txt
index 3acdc6bc24..db8d009074 100644
--- a/utils/subfiling_vfd/CMakeLists.txt
+++ b/utils/subfiling_vfd/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_SUBFILINGVFD C)
configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh @ONLY)
diff --git a/utils/tools/CMakeLists.txt b/utils/tools/CMakeLists.txt
index 2be2287c41..5bfef689e0 100644
--- a/utils/tools/CMakeLists.txt
+++ b/utils/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_TOOLS C)
diff --git a/utils/tools/h5dwalk/CMakeLists.txt b/utils/tools/h5dwalk/CMakeLists.txt
index 8c8ed6210f..c154c7b06c 100644
--- a/utils/tools/h5dwalk/CMakeLists.txt
+++ b/utils/tools/h5dwalk/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_TOOLS_H5DWALK C)
# --------------------------------------------------------------------
--
2.34.1

8
buildroot-external/package/hdf5-hosttools/Config.in Normal file
View File

@ -0,0 +1,8 @@
config BR2_PACKAGE_HDF5_HOSTTOOLS
bool "hdf5-hosttools"
help
high-performance library's source code and a
file format specification that implement the
HDF5® data model.
https://github.com/HDFGroup/hdf5

31
buildroot-external/package/hdf5-hosttools/hdf5-hosttools.mk Normal file
View File

@ -0,0 +1,31 @@
################################################################################
#
# hdf5
#
################################################################################
HDF5_VERSION = cfd5059e77e2e411a94a13d2fb033224736be09d
HDF5_SITE = $(call github,HDFGroup,hdf5,$(HDF5_VERSION))
HDF5_SUPPORTS_IN_SOURCE_BUILD = NO
HDF5_INSTALL_STAGING = YES
HDF5_DEPENDENCIES = host-hdf5
HDF5_CONF_OPTS += \
-DHDF5_BUILD_CPP_LIB=ON \
-DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
-C$(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/hdf5/TryRunResults_out.cmake
$(eval $(cmake-package))
HDF5_POST_INSTALL_HOOKS = HDF5_HOST_BIN
define HDF5_HOST_BIN
$(INSTALL) -D -m 755 $(@D)/buildroot-build/bin/H5detect \
$(HOST_DIR)/bin/H5detect
$(INSTALL) -D -m 755 $(@D)/buildroot-build/bin/H5make_libsettings \
$(HOST_DIR)/bin/H5make_libsettings
endef
$(eval $(host-cmake-package))

2
buildroot-external/package/hdf5-hosttools/hdf5-hsottools.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 d13286fa848b1be6630f90e2f429aabac277d729f8ddcfedaf5552553ccf80cb hdf5-cfd5059e77e2e411a94a13d2fb033224736be09d.tar.gz

396
buildroot-external/package/hdf5/0001-Lower-cmake-requirement-to-3.16.patch Normal file
View File

@ -0,0 +1,396 @@
From b3751543f5e98c203c32151bd7f67820c23b701f Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Sat, 24 Dec 2022 14:43:49 +0100
Subject: [PATCH 1/1] Lower cmake requirement to 3.16
---
CMakeLists.txt | 2 +-
c++/CMakeLists.txt | 2 +-
examples/CMakeLists.txt | 2 +-
hl/CMakeLists.txt | 2 +-
hl/c++/CMakeLists.txt | 2 +-
hl/c++/examples/CMakeLists.txt | 2 +-
hl/c++/src/CMakeLists.txt | 2 +-
hl/examples/CMakeLists.txt | 2 +-
hl/fortran/CMakeLists.txt | 2 +-
hl/fortran/examples/CMakeLists.txt | 2 +-
hl/fortran/src/CMakeLists.txt | 2 +-
hl/src/CMakeLists.txt | 2 +-
hl/tools/CMakeLists.txt | 2 +-
hl/tools/gif2h5/CMakeLists.txt | 2 +-
hl/tools/h5watch/CMakeLists.txt | 2 +-
src/CMakeLists.txt | 2 +-
tools/CMakeLists.txt | 2 +-
tools/lib/CMakeLists.txt | 2 +-
tools/src/CMakeLists.txt | 2 +-
tools/src/h5copy/CMakeLists.txt | 2 +-
tools/src/h5diff/CMakeLists.txt | 2 +-
tools/src/h5dump/CMakeLists.txt | 2 +-
tools/src/h5format_convert/CMakeLists.txt | 2 +-
tools/src/h5import/CMakeLists.txt | 2 +-
tools/src/h5jam/CMakeLists.txt | 2 +-
tools/src/h5ls/CMakeLists.txt | 2 +-
tools/src/h5perf/CMakeLists.txt | 2 +-
tools/src/h5repack/CMakeLists.txt | 2 +-
tools/src/h5stat/CMakeLists.txt | 2 +-
tools/src/misc/CMakeLists.txt | 2 +-
utils/CMakeLists.txt | 2 +-
utils/mirror_vfd/CMakeLists.txt | 2 +-
utils/subfiling_vfd/CMakeLists.txt | 2 +-
utils/tools/CMakeLists.txt | 2 +-
utils/tools/h5dwalk/CMakeLists.txt | 2 +-
35 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c85965fa0..b2b4643ea1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5 C)
if (POLICY CMP0074)
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index 2c0275bc58..fec84315e9 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_CPP CXX)
add_subdirectory (src)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 10c6ede725..bb7a3ed3fa 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_EXAMPLES C)
#-----------------------------------------------------------------------------
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index a777b72f54..a86f6560e6 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL C)
#-----------------------------------------------------------------------------
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt
index 07e7777b2c..35525a2523 100644
--- a/hl/c++/CMakeLists.txt
+++ b/hl/c++/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_CPP CXX)
#-----------------------------------------------------------------------------
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index dfc5818ed6..ded3eff4c7 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_CPP_EXAMPLES CXX)
# --------------------------------------------------------------------
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 3949624a98..64d20862bc 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_CPP_SRC CXX)
#-----------------------------------------------------------------------------
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index c58d4ddff1..d8f89bc9c9 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_EXAMPLES C)
#-----------------------------------------------------------------------------
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index ad6faa4f52..5cef204872 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_F90 C Fortran)
#-----------------------------------------------------------------------------
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index 293bc2b096..8701e557be 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_F90_EXAMPLES C Fortran)
set (examples
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 3eae810073..c1e05877ff 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_F90_SRC C Fortran)
#-----------------------------------------------------------------------------
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index 837af4812f..1ad764a01e 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_SRC C)
#-----------------------------------------------------------------------------
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index a369d9efa1..38c509c336 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_TOOLS C)
#-----------------------------------------------------------------------------
diff --git a/hl/tools/gif2h5/CMakeLists.txt b/hl/tools/gif2h5/CMakeLists.txt
index 3a9c708c74..d3f7039672 100644
--- a/hl/tools/gif2h5/CMakeLists.txt
+++ b/hl/tools/gif2h5/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_TOOLS_GIF2H5 C)
#-----------------------------------------------------------------------------
diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt
index fc4c3a0d7a..1fcedaf5c4 100644
--- a/hl/tools/h5watch/CMakeLists.txt
+++ b/hl/tools/h5watch/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_HL_TOOLS_H5WATCH C)
#-----------------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 355881d72f..559f245c6c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_SRC C)
#-----------------------------------------------------------------------------
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 55f2c2a576..7f4b9fd9da 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS C)
add_subdirectory (lib)
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 7d139ee68c..4733f5cd45 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_LIB C)
#-----------------------------------------------------------------------------
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
index 33f9ba3b95..4c174ad8b3 100644
--- a/tools/src/CMakeLists.txt
+++ b/tools/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC C)
#-- Add the h5diff and test executables
diff --git a/tools/src/h5copy/CMakeLists.txt b/tools/src/h5copy/CMakeLists.txt
index 64acf7ef50..3014943ddb 100644
--- a/tools/src/h5copy/CMakeLists.txt
+++ b/tools/src/h5copy/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5COPY C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt
index 44921cbdd5..84e0750ac6 100644
--- a/tools/src/h5diff/CMakeLists.txt
+++ b/tools/src/h5diff/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5DIFF C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt
index df521a9bb0..0274ae9944 100644
--- a/tools/src/h5dump/CMakeLists.txt
+++ b/tools/src/h5dump/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5DUMP C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5format_convert/CMakeLists.txt b/tools/src/h5format_convert/CMakeLists.txt
index c4e412b7d6..e040379ad7 100644
--- a/tools/src/h5format_convert/CMakeLists.txt
+++ b/tools/src/h5format_convert/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5FC C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5import/CMakeLists.txt b/tools/src/h5import/CMakeLists.txt
index 472a894841..19268f439a 100644
--- a/tools/src/h5import/CMakeLists.txt
+++ b/tools/src/h5import/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5IMPORT C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5jam/CMakeLists.txt b/tools/src/h5jam/CMakeLists.txt
index b037f809b1..71a9cde3f6 100644
--- a/tools/src/h5jam/CMakeLists.txt
+++ b/tools/src/h5jam/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5JAM C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt
index 8805448dc7..5f0075ce64 100644
--- a/tools/src/h5ls/CMakeLists.txt
+++ b/tools/src/h5ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5LS C)
#-----------------------------------------------------------------------------
diff --git a/tools/src/h5perf/CMakeLists.txt b/tools/src/h5perf/CMakeLists.txt
index 6531ccdbae..5a34facabc 100644
--- a/tools/src/h5perf/CMakeLists.txt
+++ b/tools/src/h5perf/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5PERF C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5repack/CMakeLists.txt b/tools/src/h5repack/CMakeLists.txt
index 637d24f5c3..c06ab34257 100644
--- a/tools/src/h5repack/CMakeLists.txt
+++ b/tools/src/h5repack/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5REPACK C)
# --------------------------------------------------------------------
diff --git a/tools/src/h5stat/CMakeLists.txt b/tools/src/h5stat/CMakeLists.txt
index 662f935214..fb7368a10c 100644
--- a/tools/src/h5stat/CMakeLists.txt
+++ b/tools/src/h5stat/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_H5STAT C)
# --------------------------------------------------------------------
diff --git a/tools/src/misc/CMakeLists.txt b/tools/src/misc/CMakeLists.txt
index 054c888e54..c64ff21c17 100644
--- a/tools/src/misc/CMakeLists.txt
+++ b/tools/src/misc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_TOOLS_SRC_MISC C)
# --------------------------------------------------------------------
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 718f88e190..ab4c5cfd14 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS C)
if (BUILD_TESTING)
diff --git a/utils/mirror_vfd/CMakeLists.txt b/utils/mirror_vfd/CMakeLists.txt
index 51d4694657..198155608f 100644
--- a/utils/mirror_vfd/CMakeLists.txt
+++ b/utils/mirror_vfd/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_MIRRORVFD C)
#-----------------------------------------------------------------------------
diff --git a/utils/subfiling_vfd/CMakeLists.txt b/utils/subfiling_vfd/CMakeLists.txt
index 3acdc6bc24..db8d009074 100644
--- a/utils/subfiling_vfd/CMakeLists.txt
+++ b/utils/subfiling_vfd/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_SUBFILINGVFD C)
configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh @ONLY)
diff --git a/utils/tools/CMakeLists.txt b/utils/tools/CMakeLists.txt
index 2be2287c41..5bfef689e0 100644
--- a/utils/tools/CMakeLists.txt
+++ b/utils/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_TOOLS C)
diff --git a/utils/tools/h5dwalk/CMakeLists.txt b/utils/tools/h5dwalk/CMakeLists.txt
index 8c8ed6210f..c154c7b06c 100644
--- a/utils/tools/h5dwalk/CMakeLists.txt
+++ b/utils/tools/h5dwalk/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.16)
project (HDF5_UTILS_TOOLS_H5DWALK C)
# --------------------------------------------------------------------
--
2.34.1

25
buildroot-external/package/hdf5/0002-Use-H5detect-from-the-host.patch Normal file
View File

@ -0,0 +1,25 @@
From a815421bdd6fbe901a427a63e23d94d4ce1270b9 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Sat, 24 Dec 2022 19:04:55 +0100
Subject: [PATCH 1/1] Use H5detect from the host
---
bin/batch/knl_H5detect.sl.in.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/batch/knl_H5detect.sl.in.cmake b/bin/batch/knl_H5detect.sl.in.cmake
index 39a3ef3f62..e5b2da55fe 100644
--- a/bin/batch/knl_H5detect.sl.in.cmake
+++ b/bin/batch/knl_H5detect.sl.in.cmake
@@ -13,7 +13,7 @@
PROGNAME=H5detect
OUTPUT=H5Tinit.c
-CMD="@HDF5_BINARY_DIR@/bin/${PROGNAME} @HDF5_GENERATED_SOURCE_DIR@/${OUTPUT}"
+CMD="@HOST_DIR@/bin/${PROGNAME} @HDF5_GENERATED_SOURCE_DIR@/${OUTPUT}"
echo "Run $CMD"
srun -n 1 $CMD
echo "Done running $CMD"
--
2.34.1

8
buildroot-external/package/hdf5/Config.in Normal file
View File

@ -0,0 +1,8 @@
config BR2_PACKAGE_HDF5
bool "hdf5"
help
high-performance library's source code and a
file format specification that implement the
HDF5® data model.
https://github.com/HDFGroup/hdf5

14
buildroot-external/package/hdf5/TryRunResults.cmake Normal file
View File

@ -0,0 +1,14 @@
set( TEST_LFS_WORKS_RUN "0" CACHE STRING "Result from TRY_RUN" FORCE)
set( TEST_LFS_WORKS_RUN__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
set( H5_LDOUBLE_TO_LONG_SPECIAL_RUN "1" CACHE STRING "Result from TRY_RUN" FORCE)
set( H5_LDOUBLE_TO_LONG_SPECIAL_RUN__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
set( H5_LONG_TO_LDOUBLE_SPECIAL_RUN "1" CACHE STRING "Result from TRY_RUN" FORCE)
set( H5_LONG_TO_LDOUBLE_SPECIAL_RUN__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
set( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN "0" CACHE STRING "Result from TRY_RUN" FORCE)
set( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
set( H5_LLONG_TO_LDOUBLE_CORRECT_RUN "0" CACHE STRING "Result from TRY_RUN" FORCE)
set( H5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
set( H5_DISABLE_SOME_LDOUBLE_CONV_RUN "PLEASE_FILL_OUT-FAILED_TO_RUN" CACHE STRING "Result from TRY_RUN" FORCE)
set( H5_DISABLE_SOME_LDOUBLE_CONV_RUN__TRYRUN_OUTPUT "PLEASE_FILL_OUT-NOTFOUND" CACHE STRING "Output from TRY_RUN" FORCE)
set( H5_DISABLE_SOME_LDOUBLE_CONV_RUN "1" CACHE STRING "Result from TRY_RUN" FORCE)
set( H5_DISABLE_SOME_LDOUBLE_CONV_RUN__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)

2
buildroot-external/package/hdf5/hdf5.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 d13286fa848b1be6630f90e2f429aabac277d729f8ddcfedaf5552553ccf80cb hdf5-cfd5059e77e2e411a94a13d2fb033224736be09d.tar.gz

19
buildroot-external/package/hdf5/hdf5.mk Normal file
View File

@ -0,0 +1,19 @@
################################################################################
#
# hdf5
#
################################################################################
HDF5_VERSION = cfd5059e77e2e411a94a13d2fb033224736be09d
HDF5_SITE = $(call github,HDFGroup,hdf5,$(HDF5_VERSION))
HDF5_SUPPORTS_IN_SOURCE_BUILD = NO
HDF5_INSTALL_STAGING = YES
HDF5_DEPENDENCIES = hdf5-hosttools
HDF5_CONF_OPTS += \
-DHDF5_BUILD_CPP_LIB=ON \
-DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
-C$(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/hdf5/TryRunResults_out.cmake
$(eval $(cmake-package))