Skip to content

Commit

Permalink
[hdf5] Update HDF5 to 1.12 (microsoft#11747)
Browse files Browse the repository at this point in the history
* [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download

* [hdf5] bump control

* [hdf5] fix szip and typo about linkage

* [hdf5] add missing package namespace.... they somehow missed to set it?

* [hdf5] retry without "

* [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows

* fix typo

* remove ws

Co-authored-by: NancyLi1013 <[email protected]>

* linebreak first patch

Co-authored-by: NancyLi1013 <[email protected]>

* ws change

Co-authored-by: NancyLi1013 <[email protected]>

* [field3d] update copying installation

* [hdf5] use official github repo

* clean baseline

Co-authored-by: NancyLi1013 <[email protected]>
Co-authored-by: Jack·Boos·Yu <[email protected]>
  • Loading branch information
3 people authored Jun 23, 2020
1 parent 6f33316 commit 23eadea
Show file tree
Hide file tree
Showing 11 changed files with 85 additions and 1,856 deletions.
4 changes: 2 additions & 2 deletions ports/field3d/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: field3d
Version: 1.7.2
Version: 1.7.3
Homepage: https://github.com/imageworks/Field3D
Description: An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.
Build-Depends: hdf5, boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format
Build-Depends: hdf5[core], boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format
Supports: !(windows|arm|uwp)
14 changes: 14 additions & 0 deletions ports/field3d/hdf5.api.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e608b3ec..5ff2c3c31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,8 @@
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )

PROJECT ( field3d )
-
+add_definitions(-UH5_USE_112_API_DEFAULT)
+add_definitions(-DH5_USE_110_API_DEFAULT)
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )

FIND_PACKAGE (Doxygen)
16 changes: 8 additions & 8 deletions ports/field3d/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
include(vcpkg_common_functions)

if (VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "Windows is currently not supported.")
elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm")
if (TRIPLET_SYSTEM_ARCH MATCHES "arm")
message(FATAL_ERROR "ARM is currently not supported.")
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Error: UWP builds are currently not supported.")
Expand All @@ -11,16 +8,19 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO imageworks/Field3D
REF v1.7.2
SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
REF v1.7.3
SHA512 de3f10ff120420925de67064b2169f2a30c9180e308acc9090d70567b45be5423f4b1f7eb32bb376c887cea1364803cf7b2db66c2bc49f8a39a1037bbf0e5f39
HEAD_REF master
PATCHES
fix-build_error.patch
hdf5.api.patch # Switches the HDF5 default API for this port to 1.10
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
"-DINSTALL_DOCS:BOOL=OFF"
)

vcpkg_install_cmake()
Expand All @@ -31,5 +31,5 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/field3d)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/field3d/COPYING ${CURRENT_PACKAGES_DIR}/share/field3d/copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/hdf5/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: hdf5
Version: 1.10.5-12
Version: 1.12.0
Homepage: https://www.hdfgroup.org/downloads/hdf5/
Description: HDF5 is a data model, library, and file format for storing and managing data
Default-Features: szip, zlib
Expand Down
15 changes: 0 additions & 15 deletions ports/hdf5/export-private.patch

This file was deleted.

Loading

0 comments on commit 23eadea

Please sign in to comment.