[hdf5] Update to 1.12.2

ports/hdf5/hdf5_config.patch

@@ -18,14 +18,14 @@ index 4d02c9c..8c10d2d 100644
  #-----------------------------------------------------------------------------
  if (NOT TARGET "@HDF5_PACKAGE@")
 -  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
--    include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+-    include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
 +  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT)
 +    find_dependency(ZLIB)
    endif ()
 -  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
--    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZ_PACKAGE_NAME@/@SZ_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+-    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
 +  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
 +    find_dependency(szip)
    endif ()
-   include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
+   include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
  endif ()

ports/hdf5/portfile.cmake

@@ -3,15 +3,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  HDFGroup/hdf5
-    REF hdf5-1_12_1
-    SHA512 8a736b6a66bf4ec904a0e0dd9e8e0e791d8a04c996c5ea6b73b7d6f8145c4bfa4ed5c6e4f11740ceb1d1226a333c8242968e604dbdac2b7b561a1bd265423434
+    REF hdf5-1_12_2
+    SHA512 8f110e035a9bd5b07687b30fb944ed72e5b6a6e0ea74ee650250f40f0d4ff81e304366a76129a50a2d37c7f4c59a57356d0d9eed18db6cb90e924c62273d17a4
     HEAD_REF develop
     PATCHES
         hdf5_config.patch
         szip.patch
         pkgconfig-requires.patch
         pkgconfig-link-order.patch
-        fix-parallel.patch # Remove this patch in the next update, see https://github.com/HDFGroup/hdf5/pull/860
 )
 
 set(ALLOW_UNSUPPORTED OFF)
@@ -48,7 +47,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 file(REMOVE "${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake")#Outdated; does not find debug szip
 
-if(FEATURES MATCHES "tools" AND VCPKG_CRT_LINKAGE STREQUAL "static")
+if("tools" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL "static")
     list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON)
 endif()
 
@@ -66,7 +65,7 @@ vcpkg_cmake_configure(
         -DBUILD_TESTING=OFF
         -DHDF5_BUILD_EXAMPLES=OFF
         -DHDF5_INSTALL_DATA_DIR=share/hdf5/data
-        -DHDF5_INSTALL_CMAKE_DIR=share
+        -DHDF5_INSTALL_CMAKE_DIR=share/hdf5
         -DHDF_PACKAGE_NAMESPACE:STRING=hdf5::
         -DHDF5_MSVC_NAMING_CONVENTION=OFF
         -DSZIP_USE_EXTERNAL=ON
@@ -99,7 +98,7 @@ string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]]
 )
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents})
 
-if(FEATURES MATCHES "tools")
+if("tools" IN_LIST FEATURES)
     set(HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug
         h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import
     )
@@ -116,6 +115,12 @@ if(FEATURES MATCHES "tools")
         endif()
     endforeach()
 
+    if("parallel" IN_LIST FEATURES)
+        list(APPEND HDF5_TOOLS h5perf)
+    else()
+        list(APPEND HDF5_TOOLS h5perf_serial)
+    endif()
+
     vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN)
 endif()
 

ports/hdf5/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "hdf5",
-  "version": "1.12.1",
-  "port-version": 5,
+  "version": "1.12.2",
   "description": "HDF5 is a data model, library, and file format for storing and managing data",
   "homepage": "https://www.hdfgroup.org/downloads/hdf5/",
   "license": "BSD-3-Clause",

versions/baseline.json

@@ -2753,8 +2753,8 @@
       "port-version": 0
     },
     "hdf5": {
-      "baseline": "1.12.1",
-      "port-version": 5
+      "baseline": "1.12.2",
+      "port-version": 0
     },
     "healpix": {
       "baseline": "1.12.10",

versions/h-/hdf5.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4abe78968a986c1793207ae653eb686926f3c141",
+      "version": "1.12.2",
+      "port-version": 0
+    },
     {
       "git-tree": "c6491dde27884b1326e6f74f3862c1ae63a122ca",
       "version": "1.12.1",