HyperWinX/vcpkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[hdf5] Update to 2.0.0 [ffmpeg, vtk] ffmpeg 8 fallout (#48320)

Browse Source
This commit is contained in:
Kai Pastor
2026-01-21 01:29:38 -08:00
committed by GitHub
parent e05ecb1e80
commit b2f275e280
25 changed files with 497 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/ffmpeg/portfile.cmake
+4
View File
@@ -421,12 +421,16 @@ else()
set(WITH_OPENMPT OFF)
endif()
set(WITH_OPENSSL OFF)
set(WITH_SCHANNEL OFF)
if("openssl" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-openssl")
set(WITH_OPENSSL ON)
else()
set(OPTIONS "${OPTIONS} --disable-openssl")
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
string(APPEND OPTIONS " --enable-schannel")
set(WITH_SCHANNEL ON)
endif()
endif()
ports/ffmpeg/vcpkg-cmake-wrapper.cmake
+13
View File
@@ -321,6 +321,19 @@ if(@WITH_RUBBERBAND@)
endif()
endif()
if(@WITH_OPENSSL@)
find_package(OpenSSL REQUIRED)
list(APPEND FFMPEG_LIBRARIES $<LINK_ONLY:OpenSSL::SSL>)
if(vcpkg_no_avformat_target AND TARGET FFmpeg::avformat)
target_link_libraries(FFmpeg::avformat INTERFACE $<LINK_ONLY:OpenSSL::SSL>)
endif()
elseif(@WITH_SCHANNEL@)
list(APPEND FFMPEG_LIBRARIES secur32 ncrypt crypt32)
if(vcpkg_no_avformat_target AND TARGET FFmpeg::avformat)
target_link_libraries(FFmpeg::avformat INTERFACE secur32 ncrypt crypt32)
endif()
endif()
endif()
unset(z_vcpkg_using_vcpkg_find_ffmpeg)
ports/ffmpeg/vcpkg.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "8.0.1",
"port-version": 1,
"port-version": 2,
"description": [
"A library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
@@ -534,7 +534,7 @@
]
},
"openssl": {
"description": "Needed for https support if gnutls, libtls or mbedtls is not used",
"description": "Use OpenSSL for TLS support",
"dependencies": [
{
"name": "ffmpeg",
ports/hdf5/default-plugin-dir.diff
+15
View File
@@ -0,0 +1,15 @@
diff --git a/src/H5pubconf.h.in b/src/H5pubconf.h.in
index 82fc2f5..73ef147 100644
--- a/src/H5pubconf.h.in
+++ b/src/H5pubconf.h.in
@@ -27,7 +27,9 @@
#cmakedefine H5_HAVE_VISUAL_STUDIO @H5_HAVE_VISUAL_STUDIO@
/* Define the default plugins path to compile */
-#cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@"
+#ifndef H5_DEFAULT_PLUGINDIR
+#define H5_DEFAULT_PLUGINDIR ""
+#endif
/* Define if your system is IBM ppc64le and cannot convert some long double
values correctly. */
ports/hdf5/hdf5_config.patch
-22
View File
@@ -1,22 +0,0 @@
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index 1a3fb7bbf2..79081ce040 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -120,12 +114,17 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@)
# Don't include targets if this file is being picked up by another
# project which has already built hdf5 as a subproject
#-----------------------------------------------------------------------------
+include(CMakeFindDependencyMacro)
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@@HDF_PACKAGE_EXT@-targets.cmake)
+ elseif (${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@/@LIBAEC_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+ elseif (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
+ find_dependency(libaec)
endif ()
include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
endif ()
ports/hdf5/libaec-config.diff
+30
View File
@@ -0,0 +1,30 @@
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 548a306..680ab84 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -211,12 +211,6 @@ endif ()
if (HDF5_ENABLE_SZIP_SUPPORT)
cmake_dependent_option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON HDF5_ENABLE_SZIP_SUPPORT OFF)
if (NOT SZIP_USE_EXTERNAL) # This checks if szip should be found on the system or built from an external source
- if (HDF5_USE_LIBAEC_STATIC)
- set (LIBAEC_SEARCH_TYPE "static")
- else ()
- set (LIBAEC_SEARCH_TYPE "shared")
- endif ()
- set (libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC})
set (SZIP_FOUND FALSE)
# Search pure Config mode, there is not a FindSZIP module available
find_package (${LIBAEC_PACKAGE_NAME} NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} OPTIONAL_COMPONENTS ${LIBAEC_SEARCH_TYPE})
diff --git a/config/install/hdf5-config.cmake.in b/config/install/hdf5-config.cmake.in
index 6b82510..d1bc1b6 100644
--- a/config/install/hdf5-config.cmake.in
+++ b/config/install/hdf5-config.cmake.in
@@ -133,7 +133,7 @@ endif ()
if (${HDF5_PACKAGE_NAME}_PROVIDES_SZIP_SUPPORT)
if (NOT @SZIP_USE_EXTERNAL@)
- find_package (LIBAEC NAMES @LIBAEC_PACKAGE_NAME@ CONFIG OPTIONAL_COMPONENTS @LIBAEC_SEARCH_TYPE@)
+ find_package (@LIBAEC_PACKAGE_NAME@ CONFIG)
endif ()
endif ()
ports/hdf5/pkgconfig.patch
+23 -50
View File
@@ -1,8 +1,8 @@
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 5f2e1ea34..7258e4669 100644
index b276769..548a306 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -126,7 +126,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
@@ -161,7 +161,7 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
endif ()
set (H5_ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
set (H5_ZLIB_INCLUDE_DIRS ${H5_ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
@@ -11,61 +11,34 @@ index 5f2e1ea34..7258e4669 100644
# The FindZLIB.cmake module does not set an OUTPUT_NAME
# on the target. The target returned is: ZLIB::ZLIB
get_filename_component (libname ${ZLIB_LIBRARIES} NAME_WLE)
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 3be3e6a6a..177a51e87 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -483,7 +483,7 @@ macro (HDF_DIR_PATHS package_prefix)
endif ()
#set the default debug suffix for all library targets
- if(NOT CMAKE_DEBUG_POSTFIX)
+ if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
if (WIN32)
set (CMAKE_DEBUG_POSTFIX "_D")
else ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bf8e1f82..fe212a092 100644
index bbdf92a..c36d5c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1195,22 +1195,36 @@ if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
set (PKGCONFIG_LIBNAME "${PKGCONFIG_LIBNAME}${CMAKE_DEBUG_POSTFIX}")
endif ()
-#foreach (libs ${LINK_LIBS})
-# set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libs}")
-#endforeach ()
+foreach (libs ${LINK_LIBS})
+ set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libs}")
+endforeach ()
# The settings for the compression libs depends on if they have pkconfig support
# Assuming they don't
foreach (libs ${LINK_COMP_LIBS})
# set (_PKG_CONFIG_REQUIRES_PRIVATE "${_PKG_CONFIG_REQUIRES_PRIVATE} -l${libs}")
+ if(libs STREQUAL "ZLIB::ZLIB")
+ string(APPEND _PKG_CONFIG_REQUIRES_PRIVATE " zlib")
+ elseif(libs STREQUAL "libaec::sz")
+ string(APPEND _PKG_CONFIG_LIBS_PRIVATE " ${libaec_LIBRARY}")
+ elseif(libs STREQUAL "libaec::aec")
+ string(APPEND _PKG_CONFIG_LIBS_PRIVATE " ${SZIP_LIBRARY}")
+ else()
get_target_property (libname ${libs} OUTPUT_NAME)
set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libname}")
+ endif()
@@ -1450,9 +1450,26 @@ foreach (lib ${LINK_LIBS})
endif ()
endforeach ()
+if(UNIX AND H5_HAVE_PARALLEL)
+ foreach(_lib IN LISTS ${MPI_C_LIBRARIES})
+ string(REPLACE " -l${_lib} " " " _PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ")
+ endforeach()
+ string(APPEND _PKG_CONFIG_REQUIRES_PRIVATE " ompi-c")
+endif()
#if (BUILD_STATIC_LIBS)
# set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${PKGCONFIG_LIBNAME}")
#endif ()
-if (BUILD_SHARED_LIBS)
+if (1)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${PKGCONFIG_LIBNAME}")
endif ()
+
# The settings for the compression libs depends on if they have pkconfig support
# Assuming they don't
foreach (libs ${LINK_COMP_LIBS})
+ if(libs STREQUAL ZLIB::ZLIB)
+ string(APPEND _PKG_CONFIG_REQUIRES_PRIVATE " zlib")
+ continue()
+ elseif(libs STREQUAL "libaec::sz")
+ string(APPEND _PKG_CONFIG_LIBS_PRIVATE " ${libaec_LIBRARY}")
+ continue()
+ elseif(libs STREQUAL "libaec::aec")
+ string(APPEND _PKG_CONFIG_LIBS_PRIVATE " ${SZIP_LIBRARY}")
+ continue()
+ endif()
get_target_property (libname ${libs} OUTPUT_NAME)
set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libname}")
endforeach ()
ports/hdf5/portfile.cmake
+56 -72
View File
@@ -5,53 +5,52 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO HDFGroup/hdf5
REF "${hdf5_ref}"
SHA512 f3907abb530c4818cd9c0eb78b43073f3133260baa008ed52478e50e6bf9f1520365882acba21e0206e72c37c3e564d450def4edc3d2eef46275a41a2ad3f34b
SHA512 609e129f78c6777a0e64694de8ec638326a616ff9cbd916f310dc6f78435ef67194c5ab59faedda09c85c045c15ebe2ec4ce04fa905d5f74801600e067c27fcc
HEAD_REF develop
PATCHES
hdf5_config.patch
default-plugin-dir.diff # avoid absolute path
libaec-config.diff
pkgconfig.patch
win-compile-flags.diff
)
set(ALLOW_UNSUPPORTED OFF)
if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES)
message(WARNING "Feature 'Parallel' and 'cpp' are mutually exclusive, enabling option ALLOW_UNSUPPORTED automatically to enable them both.")
set(ALLOW_UNSUPPORTED ON)
endif()
if ("threadsafe" IN_LIST FEATURES AND
("parallel" IN_LIST FEATURES
OR "fortran" IN_LIST FEATURES
OR "cpp" IN_LIST FEATURES)
)
message(WARNING "Feture 'threadsafe' and other features are mutually exclusive, enabling feature ALLOW_UNSUPPORTED automatically to enable them both.")
set(ALLOW_UNSUPPORTED ON)
endif()
if ("fortran" IN_LIST FEATURES)
message(WARNING "Feature 'fortran' is not yet officially supported within VCPKG. Build will most likly fail if ninja 1.10 and a Fortran compiler are not available.")
endif()
set(HDF5_ALLOW_UNSUPPORTED OFF)
set(unsupported_with_parallel cpp)
set(unsupported_with_threadsafe parallel fortran cpp hl)
foreach(feature IN ITEMS parallel threadsafe)
if(NOT feature IN_LIST FEATURES)
continue()
endif()
foreach(other IN LISTS unsupported_with_${feature})
if(other IN_LIST FEATURES)
message(WARNING "Features '${feature}' and '${other}' are mutually exclusive. Implicitly enabling option HDF5_ALLOW_UNSUPPORTED to unlock the build with both.")
set(HDF5_ALLOW_UNSUPPORTED ON)
endif()
endforeach()
endforeach()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
parallel HDF5_ENABLE_PARALLEL
tools HDF5_BUILD_TOOLS
tools HDF5_BUILD_HL_GIF_TOOLS
cpp HDF5_BUILD_CPP_LIB
fortran HDF5_BUILD_FORTRAN
hl HDF5_BUILD_HL_LIB
map HDF5_ENABLE_MAP_API
mirror HDF5_ENABLE_MIRROR_VFD
parallel HDF5_ENABLE_PARALLEL
szip HDF5_ENABLE_SZIP_SUPPORT
szip HDF5_ENABLE_SZIP_ENCODING
zlib HDF5_ENABLE_Z_LIB_SUPPORT
fortran HDF5_BUILD_FORTRAN
threadsafe HDF5_ENABLE_THREADSAFE
utils HDF5_BUILD_UTILS
map HDF5_ENABLE_MAP_API
tools HDF5_BUILD_TOOLS
tools HDF5_BUILD_UTILS
zlib HDF5_ENABLE_ZLIB_SUPPORT
)
if("tools" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL "static")
if(VCPKG_CRT_LINKAGE STREQUAL "static")
list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
list(APPEND FEATURE_OPTIONS -DONLY_SHARED_LIBS=ON)
list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_LIBS=OFF)
endif()
vcpkg_cmake_configure(
@@ -66,20 +65,12 @@ vcpkg_cmake_configure(
-DHDF5_INSTALL_CMAKE_DIR=share/hdf5
-DHDF_PACKAGE_NAMESPACE:STRING=hdf5::
-DHDF5_MSVC_NAMING_CONVENTION=OFF
-DALLOW_UNSUPPORTED=${ALLOW_UNSUPPORTED}
OPTIONS_RELEASE
-DCMAKE_DEBUG_POSTFIX= # For lib name in pkgconfig files
-DHDF5_ALLOW_UNSUPPORTED=${HDF5_ALLOW_UNSUPPORTED}
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup()
set(debug_suffix debug)
if(VCPKG_TARGET_IS_WINDOWS)
set(debug_suffix D)
endif()
vcpkg_fixup_pkgconfig()
file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
@@ -106,53 +97,46 @@ endif()
set(HDF5_TOOLS "")
if("tools" IN_LIST FEATURES)
list(APPEND HDF5_TOOLS h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug
h5format_convert h5jam h5unjam h5mkgrp h5repack h5repart h5watch h5import h5delete
h5perf_serial
list(APPEND HDF5_TOOLS
h5perf_serial
h5clear h5copy
h5debug h5delete h5diff h5dump
h5format_convert
h5import
h5jam
h5ls
h5mkgrp
h5repack h5repart
h5stat
h5unjam
)
if("parallel" IN_LIST FEATURES)
list(APPEND HDF5_TOOLS ph5diff)
if ("hl" IN_LIST FEATURES)
list(APPEND HDF5_TOOLS h5watch)
endif()
if(NOT VCPKG_TARGET_IS_WINDOWS)
list(APPEND HDF5_TOOLS h5cc h5hlcc)
if("cpp" IN_LIST FEATURES)
list(APPEND HDF5_TOOLS h5c++ h5hlc++)
endif()
if ("mirror" IN_LIST FEATURES)
list(APPEND HDF5_TOOLS mirror_server mirror_server_stop)
endif()
if("parallel" IN_LIST FEATURES)
list(APPEND HDF5_TOOLS h5perf )
if(NOT VCPKG_TARGET_IS_WINDOWS)
list(APPEND HDF5_TOOLS h5pcc)
endif()
list(APPEND HDF5_TOOLS ph5diff h5perf)
endif()
endif()
if ("utils" IN_LIST FEATURES)
list(APPEND HDF5_TOOLS mirror_server mirror_server_stop)
endif()
if(HDF5_TOOLS)
vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN)
foreach(tool h5cc h5pcc h5hlcc)
if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${tool}")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/${tool}" "${CURRENT_INSTALLED_DIR}" "$(dirname \"$0\")/../.." IGNORE_UNCHANGED)
endif()
endforeach()
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/h5fuse.sh")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/h5fuse.sh" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/h5fuse.sh")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/h5fuse.sh")
endif()
foreach(script IN ITEMS h5cc h5c++ h5hlcc h5hlc++ h5pcc h5fuse.sh)
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${script}")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${script}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}" "${CURRENT_INSTALLED_DIR}" "$(dirname \"$0\")/../.." IGNORE_UNCHANGED)
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}")
endif()
endif()
endforeach()
vcpkg_clean_executables_in_bin(FILE_NAMES none)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
# Clean up
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
@@ -165,4 +149,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/H5public.h" "#define H5public_H" "#define H5public_H\n#ifndef H5_BUILT_AS_DYNAMIC_LIB\n#define H5_BUILT_AS_DYNAMIC_LIB\n#endif\n")
endif()
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
ports/hdf5/vcpkg-cmake-wrapper.cmake
+18 -16
View File
@@ -1,16 +1,18 @@
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW)
if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND "HDF5" IN_LIST ARGS)
# The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set(HDF5_USE_STATIC_LIBRARIES ON)
add_compile_definitions(H5_BUILT_AS_STATIC_LIB)
else()
set(HDF5_USE_STATIC_LIBRARIES OFF)
add_compile_definitions(H5_BUILT_AS_DYNAMIC_LIB)
endif()
endif()
cmake_policy(POP)
endif()
_find_package(${ARGS})
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW)
if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND "HDF5" IN_LIST ARGS)
# The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set(HDF5_USE_STATIC_LIBRARIES ON)
add_compile_definitions(H5_BUILT_AS_STATIC_LIB)
else()
set(HDF5_USE_STATIC_LIBRARIES OFF)
add_compile_definitions(H5_BUILT_AS_DYNAMIC_LIB)
endif()
endif()
cmake_policy(POP)
endif()
_find_package(${ARGS})
# HDF5_ENABLE_PARALLEL is used by several ports.
set (HDF5_ENABLE_PARALLEL "${HDF5_PROVIDES_PARALLEL}")
ports/hdf5/vcpkg.json
+8 -4
View File
@@ -1,6 +1,6 @@
{
"name": "hdf5",
"version": "1.14.6",
"version": "2.0.0",
"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",
@@ -26,9 +26,16 @@
"fortran": {
"description": "Build with fortran"
},
"hl": {
"description": "Build HIGH Level HDF5 Library"
},
"map": {
"description": "Build the map API"
},
"mirror": {
"description": "Build the Mirror Virtual File Driver",
"supports": "!windows | mingw"
},
"parallel": {
"description": "parallel support for HDF5",
"supports": "!staticcrt",
@@ -55,9 +62,6 @@
"tools": {
"description": "Build hdf tools"
},
"utils": {
"description": "Build HDF5 Utils"
},
"zlib": {
"description": "Build with zlib",
"dependencies": [
ports/hdf5/win-compile-flags.diff
+11
View File
@@ -0,0 +1,11 @@
diff --git a/config/flags/HDFMsvcFlags.cmake b/config/flags/HDFMsvcFlags.cmake
index db520fe..9ab9bde 100644
--- a/config/flags/HDFMsvcFlags.cmake
+++ b/config/flags/HDFMsvcFlags.cmake
@@ -25,5 +25,5 @@ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 19.28)
endif ()
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" AND ${HDF_CFG_NAME} MATCHES "Debug")
- set (WIN_COMPILE_FLAGS "${WIN_COMPILE_FLAGS} /Gy")
+ list (APPEND WIN_COMPILE_FLAGS "/Gy")
endif ()
ports/itk/vcpkg.json
+3 -1
View File
@@ -1,6 +1,7 @@
{
"name": "itk",
"version": "5.4.4",
"port-version": 1,
"description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.",
"homepage": "https://github.com/InsightSoftwareConsortium/ITK",
"license": "Apache-2.0",
@@ -13,7 +14,8 @@
"name": "hdf5",
"default-features": false,
"features": [
"cpp"
"cpp",
"hl"
]
},
"libjpeg-turbo",
ports/netcdf-c/backport-d7895f6.diff
+237
View File
@@ -0,0 +1,237 @@
diff --git a/libhdf5/H5FDhttp.c b/libhdf5/H5FDhttp.c
index 917c73a..23e96a1 100644
--- a/libhdf5/H5FDhttp.c
+++ b/libhdf5/H5FDhttp.c
@@ -45,18 +45,6 @@
#include <unistd.h>
#endif
-/*
-Define a simple #ifdef test for the version of H5FD_class_t we are using
-*/
-
-#if H5_VERS_MAJOR == 1
-#if H5_VERS_MINOR < 10
-#define H5FDCLASS1 1
-#endif
-#else
-#error "Cannot determine version of H5FD_class_t"
-#endif
-
#ifdef H5_HAVE_WIN32_API
/* The following two defines must be before any windows headers are included */
#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
@@ -145,33 +133,24 @@ static herr_t H5FD_http_read(H5FD_t *lf, H5FD_mem_t type, hid_t fapl_id, haddr_t
size_t size, void *buf);
static herr_t H5FD_http_write(H5FD_t *lf, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
size_t size, const void *buf);
+static herr_t H5FD_http_term(void);
/* The H5FD_class_t structure has different versions */
-#ifdef H5FDCLASS1
-static haddr_t H5FD_http_get_eof(const H5FD_t *_file);
-static herr_t H5FD_http_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-static herr_t H5FD_http_lock(H5FD_t *_file, unsigned char* old, unsigned lock_type, hbool_t last);
-static herr_t H5FD_http_unlock(H5FD_t *file, unsigned char *oid, hbool_t last);
-#else
-static herr_t H5FD_http_term(void);
static haddr_t H5FD_http_get_eof(const H5FD_t *_file, H5FD_mem_t type);
static herr_t H5FD_http_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
static herr_t H5FD_http_lock(H5FD_t *_file, hbool_t rw);
static herr_t H5FD_http_unlock(H5FD_t *_file);
-#endif
/* Beware, not same as H5FD_HTTP_g */
static const H5FD_class_t H5FD_http_g = {
-#if H5_VERSION_GE(1,13,2)
+#if H5FD_CLASS_VERSION > 0
H5FD_CLASS_VERSION, /* struct version */
H5_VFD_HTTP, /* value */
#endif
"http", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
-#ifndef H5FDCLASS1
H5FD_http_term, /* terminate */
-#endif
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@@ -195,7 +174,7 @@ static const H5FD_class_t H5FD_http_g = {
H5FD_http_get_handle, /* get_handle */
H5FD_http_read, /* read */
H5FD_http_write, /* write */
-#if H5_VERSION_GE(1,13,2)
+#if H5FD_CLASS_VERSION > 0
NULL, /* read_vector */
NULL, /* write_vector */
NULL, /* read_selection */
@@ -205,7 +184,7 @@ static const H5FD_class_t H5FD_http_g = {
NULL, /* truncate */
H5FD_http_lock, /* lock */
H5FD_http_unlock, /* unlock */
-#if H5_VERSION_GE(1,13,2)
+#if H5FD_CLASS_VERSION > 0
NULL, /* del */
NULL, /* ctl */
#endif
@@ -277,13 +256,11 @@ H5FD_http_finalize(void)
*
*---------------------------------------------------------------------------
*/
-#ifndef H5FDCLASS1
static herr_t
H5FD_http_term(void)
{
return 0;
} /* end H5FD_http_term() */
-#endif
/*-------------------------------------------------------------------------
@@ -497,7 +474,7 @@ H5FD_http_query(const H5FD_t *_f, unsigned long /*OUT*/ *flags)
*flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
*flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
*flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
-#ifndef H5FDCLASS1
+#if H5FD_CLASS_VERSION > 0
*flags |= H5FD_FEAT_DEFAULT_VFD_COMPATIBLE; /* VFD creates a file which can be opened with the default VFD */
#endif
}
@@ -630,19 +607,10 @@ H5FD_http_set_eoa(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, haddr_t addr)
*/
static haddr_t
-#ifdef H5FDCLASS1
-H5FD_http_get_eof(const H5FD_t *_file)
-#else
-H5FD_http_get_eof(const H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type)
-#endif
+H5FD_http_get_eof(const H5FD_t *_file, H5FD_mem_t type)
{
const H5FD_http_t *file = (const H5FD_http_t *)_file;
-#ifndef H5FDCLASS1
- /* Quiet the compiler */
- type = type;
-#endif
-
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -830,18 +798,9 @@ H5FD_http_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl
*-------------------------------------------------------------------------
*/
static herr_t
-#ifdef H5FDCLASS1
-H5FD_http_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
-#else
-H5FD_http_flush(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t closing)
-#endif
+H5FD_http_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
{
-#ifndef H5FDCLASS1
- /* Quiet the compiler */
- dxpl_id = dxpl_id;
-#endif
-
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -865,23 +824,11 @@ H5FD_http_flush(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t closing)
*-------------------------------------------------------------------------
*/
static herr_t
-#ifdef H5FDCLASS1
-H5FD_http_lock(H5FD_t *_file, unsigned char* old, unsigned lock_type, hbool_t last)
-#else
H5FD_http_lock(H5FD_t *_file, hbool_t rw)
-#endif
{
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
-#ifdef H5FDCLASS1
- /* Quiet the compiler */
- lock_type = lock_type;
- last = last;
-#else
- rw = rw;
-#endif
-
return 0;
} /* end H5FD_http_lock() */
@@ -901,21 +848,11 @@ H5FD_http_lock(H5FD_t *_file, hbool_t rw)
*-------------------------------------------------------------------------
*/
static herr_t
-#ifdef H5FDCLASS1
-H5FD_http_unlock(H5FD_t *file, /*UNUSED*/unsigned char *oid, /*UNUSED*/ hbool_t last)
-#else
-H5FD_http_unlock(H5FD_t *_file)
-#endif
+H5FD_http_unlock(H5FD_t *file)
{
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
- /* Quiet the compiler */
-#ifdef H5FDCLASS1
- oid = oid;
- last = last;
-#endif
-
return 0;
} /* end H5FD_http_unlock() */
diff --git a/libhdf5/H5FDhttp.h b/libhdf5/H5FDhttp.h
index 376609e..5fd0c9e 100644
--- a/libhdf5/H5FDhttp.h
+++ b/libhdf5/H5FDhttp.h
@@ -29,10 +29,26 @@
#include "H5Ipublic.h"
-#if H5_VERSION_GE(1,13,2)
+/**
+The big issue to be addressed: H5FD_CLASS_VERSION defined?
+Apparently this first occurs in HDF5 version 1.13.2.
+This affects the H5FD_class_t structure.
+*/
+#if H5_VERSION_GE(1, 13, 2)
+# ifndef H5FD_CLASS_VERSION
+/* If not defined then fake it */
+# define H5FD_CLASS_VERSION 0x00
+# endif
+#endif
+
+/* Class Version field changes. */
+#if H5FD_CLASS_VERSION > 0
+/* see https://support.hdfgroup.org/documentation/hdf5-docs/registered_virtual_file_drivers_vfds.html */
#define H5_VFD_HTTP ((H5FD_class_value_t)(514))
-#define H5FD_HTTP (H5FDperform_init(H5FD_http_init))
+#define H5FD_HTTP (H5FD_http_init())
#else
+#define H5_VFD_HTTP ((H5FD_class_value_t)(514))
+//#define H5FD_HTTP (H5FDperform_init(H5FD_http_init))
#define H5FD_HTTP (H5FD_http_init())
#endif
@@ -40,15 +56,9 @@
extern "C" {
#endif
-#if 0
-H5_DLL hid_t H5FD_http_init(void);
-H5_DLL hid_t H5FD_http_finalize(void);
-H5_DLL herr_t H5Pset_fapl_http(hid_t fapl_id);
-#else
EXTERNL hid_t H5FD_http_init(void);
EXTERNL hid_t H5FD_http_finalize(void);
EXTERNL herr_t H5Pset_fapl_http(hid_t fapl_id);
-#endif
#ifdef __cplusplus
}
ports/netcdf-c/portfile.cmake
+1
View File
@@ -11,6 +11,7 @@ vcpkg_from_github(
mremap.diff
plugin-install-dir.diff
fstat.patch
backport-d7895f6.diff # cf. https://github.com/Unidata/netcdf-c/pull/3237
)
file(GLOB_RECURSE modules "${SOURCE_PATH}/cmake/modules/Find*.cmake")
set(vendored_bzip2 blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c bzlib.h bzlib_private.h)
ports/netcdf-c/vcpkg.json
+2 -1
View File
@@ -1,7 +1,7 @@
{
"name": "netcdf-c",
"version": "4.9.3",
"port-version": 1,
"port-version": 2,
"description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.",
"homepage": "https://github.com/Unidata/netcdf-c",
"license": null,
@@ -77,6 +77,7 @@
"name": "hdf5",
"default-features": false,
"features": [
"hl",
"zlib"
]
}
ports/vtk/ffmpeg-8.diff
+37
View File
@@ -0,0 +1,37 @@
diff --git a/IO/FFMPEG/vtkFFMPEGVideoSource.cxx b/IO/FFMPEG/vtkFFMPEGVideoSource.cxx
index f2366e71..93c67d26 100644
--- a/IO/FFMPEG/vtkFFMPEGVideoSource.cxx
+++ b/IO/FFMPEG/vtkFFMPEGVideoSource.cxx
@@ -72,12 +72,18 @@ public:
}
if (this->VideoDecodeContext)
{
+#if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR < 60
avcodec_close(this->VideoDecodeContext);
+#endif
+ avcodec_free_context(&this->VideoDecodeContext);
this->VideoDecodeContext = nullptr;
}
if (this->AudioDecodeContext)
{
+#if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR < 60
avcodec_close(this->AudioDecodeContext);
+#endif
+ avcodec_free_context(&this->AudioDecodeContext);
this->AudioDecodeContext = nullptr;
}
if (this->FormatContext)
diff --git a/IO/FFMPEG/vtkFFMPEGWriter.cxx b/IO/FFMPEG/vtkFFMPEGWriter.cxx
index 2cb8083f..0d024643 100644
--- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
+++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx
@@ -363,7 +363,9 @@ void vtkFFMPEGWriterInternal::End()
if (this->avCodecContext)
{
+#if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR < 60
avcodec_close(this->avCodecContext);
+#endif
avcodec_free_context(&this->avCodecContext);
this->avCodecContext = nullptr;
}
ports/vtk/portfile.cmake
+1
View File
@@ -15,6 +15,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
ffmpeg.diff
ffmpeg-8.diff # c2bd786 + b8da15a + 492a5cd
FindLZMA.patch
FindLZ4.patch
libproj.patch
ports/vtk/vcpkg.json
+2 -1
View File
@@ -1,7 +1,7 @@
{
"name": "vtk",
"version-semver": "9.3.0-pv5.12.1",
"port-version": 14,
"port-version": 15,
"description": "Software system for 3D computer graphics, image processing, and visualization",
"homepage": "https://github.com/Kitware/VTK",
"license": null,
@@ -25,6 +25,7 @@
"name": "hdf5",
"default-features": false,
"features": [
"hl",
"zlib"
]
},
scripts/ci.feature.baseline.txt
+4 -5
View File
@@ -271,7 +271,7 @@ llvm[target-aarch64,target-all,target-amdgpu,target-arc,target-arm,target-avr,ta
opencascade[freeimage,freetype,rapidjson,samples,tbb,vtk]=no-separate-feature-test
opencv[ade,aravis,calib3d,contrib,cuda,cudnn,dc1394,directml,dnn,dnn-cuda,dshow,eigen,ffmpeg,freetype,fs,gapi,gdcm,gstreamer,gtk,halide,hdf,highgui,intrinsics,ipp,jpeg,jpegxl,msmf,nonfree,opencl,openexr,opengl,openjpeg,openmp,openvino,ovis,png,python,qt,quality,quirc,rgbd,sfm,tbb,text,thread,tiff,vtk,vulkan,webp,win32ui,world]=no-separate-feature-test
qtbase[doubleconversion,gui,sql,thread] = no-separate-feature-test # covered in many combinations
vtk[atlmfc,cgns,cuda,debugleaks,fontconfig,gdal,geojson,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,proj,python,qt,seacas,sql,tbb,utf8,vtkm] = no-separate-feature-test
vtk[atlmfc,cgns,cuda,debugleaks,fontconfig,gdal,geojson,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,proj,qt,seacas,sql,tbb,utf8,vtkm] = no-separate-feature-test
# cascade
3fd:x64-uwp = cascade
@@ -1364,16 +1364,16 @@ vtk[openvr]:arm64-osx = cascade
vtk[openvr]:x64-windows-static = cascade
vtk[openvr](arm64 & windows) = cascade # openvr[core] only supports !(arm | uwp | osx | android)
vtk[paraview](android) = cascade
vtk[python](osx) = cascade
vtk[python](uwp) = cascade # hdf5[core] only supports !uwp, opengl[core] only supports !uwp & !xbox, python3[core] only supports !uwp & !mingw
vtk[qt](uwp) = cascade # dbus[core] only supports !uwp & !staticcrt & !android & !ios, harfbuzz[core] only supports !uwp, hdf5[core] only supports !uwp, libpq[core] only supports !uwp, opengl[core] only supports !uwp & !xbox, qtbase[core] only supports !uwp
vtk[seacas](uwp) = cascade # hdf5[core] only supports !uwp, opengl[core] only supports !uwp & !xbox
vtk[vtkm](arm64 & windows) = cascade # vtk-m[core] only supports !x86 & !uwp & !(arm & windows)
vtk(uwp) = cascade # hdf5[core] only supports !uwp
# vtk-*
vtk-dicom(uwp) = cascade
# cuda[core] only supports (windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)
vtk-m[cuda](arm64 & windows) = cascade
vtk-m[cuda](osx) = cascade
vtk(uwp) = cascade # hdf5[core] only supports !uwp
vulkan[tools](osx) = cascade
vulkan-sdk-components[tools]( osx | staticcrt) = cascade
wampcc:x64-uwp = cascade
@@ -1594,10 +1594,9 @@ vlpp[tools](linux) = feature-fails # See https://github.com/microsoft/vcpkg/issu
vlpp[tools](osx) = feature-fails # error: use of undeclared identifier 'PATH_MAX'
vsgqt(android) = fail # https://github.com/vsg-dev/vsgQt/pull/53
vtk[all](!windows & !android & !osx) = feature-fails # Wait for fix: https://github.com/microsoft/vcpkg/pull/29260
vtk[core,all,atlmfc,cgns,cuda,debugleaks,fontconfig,gdal,geojson,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,paraview,proj,qt,seacas,sql,tbb,utf8,vtkm]:x64-windows-static-md = combination-fails
vtk[core,all,atlmfc,cgns,cuda,debugleaks,fontconfig,gdal,geojson,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,paraview,proj,python,qt,seacas,sql,tbb,utf8,vtkm]:x64-windows-static-md=combination-fails
vtk[core,python,paraview]:x64-linux = options # paraview's transitive gfortran linkage breaks python
vtk[openmp](osx) = feature-fails
vtk[python]:x64-windows-static-md = feature-fails # vtk[*] dbg: defaultlib 'MSVCRT' conflicts with use of other libs due to python
vtk-m[cuda](windows & !arm64) = feature-fails
vtk-m[omp](osx) = feature-fails # no openmp on default osx toolchain
vtk-m[omp](windows) = feature-fails # needs openmp 4.0, msvc has openmp 2.0
versions/baseline.json
+5 -5
View File
@@ -2950,7 +2950,7 @@
},
"ffmpeg": {
"baseline": "8.0.1",
"port-version": 1
"port-version": 2
},
"ffmpeg-bin2c": {
"baseline": "8.0.1",
@@ -3749,7 +3749,7 @@
"port-version": 0
},
"hdf5": {
"baseline": "1.14.6",
"baseline": "2.0.0",
"port-version": 0
},
"hdr-histogram": {
@@ -4042,7 +4042,7 @@
},
"itk": {
"baseline": "5.4.4",
"port-version": 0
"port-version": 1
},
"itlib": {
"baseline": "1.12.0",
@@ -6846,7 +6846,7 @@
},
"netcdf-c": {
"baseline": "4.9.3",
"port-version": 1
"port-version": 2
},
"netcdf-cxx4": {
"baseline": "4.3.1",
@@ -10466,7 +10466,7 @@
},
"vtk": {
"baseline": "9.3.0-pv5.12.1",
"port-version": 14
"port-version": 15
},
"vtk-compile-tools": {
"baseline": "9.3.0-pv5.12.1",
versions/f-/ffmpeg.json
+5
View File
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9c05f44e0620c7727bf47629cc031001dbae9bd4",
"version": "8.0.1",
"port-version": 2
},
{
"git-tree": "623bc25a61ec9c63c4621dd8c2e9c8596cd3b307",
"version": "8.0.1",
versions/h-/hdf5.json
+5
View File
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "845765296bdbade8cd8bd015220aa0599d17f696",
"version": "2.0.0",
"port-version": 0
},
{
"git-tree": "8c7f28f3ebaba66307216beaff56b8aa73dc7767",
"version": "1.14.6",
versions/i-/itk.json
+5
View File
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6f4c545b0b029479641c8638b3ff331eb725d6d9",
"version": "5.4.4",
"port-version": 1
},
{
"git-tree": "786e8e21cd7685b239e5c454ffc0cef289f7a91a",
"version": "5.4.4",
versions/n-/netcdf-c.json
+5
View File
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9ba4f966238415db77982c8fb15f45d35cfa520",
"version": "4.9.3",
"port-version": 2
},
{
"git-tree": "0fd6a067130f0a04db840ae71558abf93ce2e1be",
"version": "4.9.3",
versions/v-/vtk.json
+5
View File
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f43aef42d15eb58999113bc644364720ca24fe46",
"version-semver": "9.3.0-pv5.12.1",
"port-version": 15
},
{
"git-tree": "86f81ec3d5ff811d205139756a3fb47b22c032a9",
"version-semver": "9.3.0-pv5.12.1",