diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4e1652fc..008084fa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.14.1" %} +{% set version = "1.14.2" %} {% set maj_min_ver = ".".join(version.split(".")[:2]) %} {% set build = 0 %} @@ -36,8 +36,8 @@ package: version: {{ version }} source: - url: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{{ maj_min_ver }}/hdf5-{{ version }}/src/hdf5-{{ version }}-2.tar.gz - sha256: cbe93f275d5231df28ced9549253793e40cd2b555e3d288df09d7b89a9967b07 + url: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{{ maj_min_ver }}/hdf5-{{ version }}/src/hdf5-{{ version }}.tar.gz + sha256: 1c342e634008284a8c2794c8e7608e2eaf26d01d445fb3dfd7f33cb2fb51ac53 patches: # Atomicity tests seem to fail for openmpi # This seems to be a known bug @@ -50,9 +50,6 @@ source: # Enable cross-compiling on osx - patches/osx_cross_configure.patch # [osx and build_platform != target_platform] - patches/osx_cross_makefile.patch # [osx and build_platform != target_platform] - # gfortran 13 compatibility - # https://github.com/HDFGroup/hdf5/pull/2957 - - patches/2957.patch build: number: {{ build }} diff --git a/recipe/patches/2957.patch b/recipe/patches/2957.patch deleted file mode 100644 index 3ec0716f..00000000 --- a/recipe/patches/2957.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 49edfce92c14c45c99e450de9927fee95a85cd72 Mon Sep 17 00:00:00 2001 -From: Scot Breitenfeld -Date: Mon, 15 May 2023 09:31:59 -0500 -Subject: [PATCH] addresses gfortran issue - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109861 - ---- - fortran/src/H5Aff.F90 | 2 +- - fortran/src/H5Pff.F90 | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90 -index 2f1e6d0ef14..fab86bd34a3 100644 ---- a/fortran/src/H5Aff.F90 -+++ b/fortran/src/H5Aff.F90 -@@ -2086,7 +2086,7 @@ SUBROUTINE h5aread_async_f(attr_id, mem_type_id, buf, es_id, hdferr, file, func, - IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: attr_id - INTEGER(HID_T), INTENT(IN) :: mem_type_id -- TYPE(C_PTR) , INTENT(OUT) :: buf -+ TYPE(C_PTR) , INTENT(INOUT) :: buf - INTEGER(HID_T), INTENT(IN) :: es_id - INTEGER , INTENT(OUT) :: hdferr - TYPE(C_PTR), OPTIONAL :: file -diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90 -index 49917dd6411..098a6c31717 100644 ---- a/fortran/src/H5Pff.F90 -+++ b/fortran/src/H5Pff.F90 -@@ -4825,7 +4825,7 @@ SUBROUTINE h5pget_ptr(prp_id, name, value, hdferr) - IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: prp_id - CHARACTER(LEN=*), INTENT(IN) :: name -- TYPE(C_PTR), INTENT(OUT) :: value -+ TYPE(C_PTR), INTENT(INOUT) :: value - INTEGER, INTENT(OUT) :: hdferr - INTEGER :: name_len - -@@ -5090,19 +5090,19 @@ END SUBROUTINE h5pset_file_image_f - !! - SUBROUTINE h5pget_file_image_f(fapl_id, buf_ptr, buf_len_ptr, hdferr) - IMPLICIT NONE -- INTEGER(HID_T) , INTENT(IN) :: fapl_id -- TYPE(C_PTR) , INTENT(OUT), DIMENSION(*) :: buf_ptr -- INTEGER(SIZE_T), INTENT(OUT) :: buf_len_ptr -- INTEGER , INTENT(OUT) :: hdferr -+ INTEGER(HID_T) , INTENT(IN) :: fapl_id -+ TYPE(C_PTR) , INTENT(INOUT), DIMENSION(*) :: buf_ptr -+ INTEGER(SIZE_T), INTENT(OUT) :: buf_len_ptr -+ INTEGER , INTENT(OUT) :: hdferr - - INTERFACE - INTEGER FUNCTION h5pget_file_image_c(fapl_id, buf_ptr, buf_len_ptr) & - BIND(C, NAME='h5pget_file_image_c') - IMPORT :: c_ptr - IMPORT :: HID_T, SIZE_T -- INTEGER(HID_T), INTENT(IN) :: fapl_id -- TYPE(C_PTR), DIMENSION(*), INTENT(OUT) :: buf_ptr -- INTEGER(SIZE_T), INTENT(OUT) :: buf_len_ptr -+ INTEGER(HID_T) :: fapl_id -+ TYPE(C_PTR), DIMENSION(*) :: buf_ptr -+ INTEGER(SIZE_T) :: buf_len_ptr - END FUNCTION h5pget_file_image_c - END INTERFACE - diff --git a/recipe/patches/libaec-on-windows.patch b/recipe/patches/libaec-on-windows.patch deleted file mode 100644 index 886fd91d..00000000 --- a/recipe/patches/libaec-on-windows.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/CMakeFilters.cmake -+++ b/src/CMakeFilters.cmake -@@ -59,9 +59,9 @@ - find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) - if (NOT ZLIB_FOUND) - find_package (ZLIB) # Legacy find -- if (ZLIB_FOUND) -- set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES}) -- endif () -+ endif () -+ if (ZLIB_FOUND) -+ set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES}) - endif () - endif () - if (ZLIB_FOUND) -@@ -116,9 +116,9 @@ - find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) - if (NOT SZIP_FOUND) - find_package (SZIP) # Legacy find -- if (SZIP_FOUND) -- set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES}) -- endif () -+ endif () -+ if (SZIP_FOUND) -+ set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES}) - endif () - endif () - endif ()