From c4e4436f94dd0c1c8d970c9db94ffe6337591ea2 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 24 Jan 2023 09:45:10 +0100 Subject: [PATCH] [h3] Update to 4.1.0 (#29101) * Update h3 to 4.1.0 * Update CI baseline Co-authored-by: chausner --- ports/h3/portfile.cmake | 6 ++++-- ports/h3/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/h-/h3.json | 5 +++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/h3/portfile.cmake b/ports/h3/portfile.cmake index f691fe780e..132328a1ed 100644 --- a/ports/h3/portfile.cmake +++ b/ports/h3/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uber/h3 - REF 26a6409156ba8539b2b332f799486572f1f8bab2 #v3.6.3 - SHA512 ee3450a5720951254fcdd9bb3acc4b33ed4a58c214e1ed8a091791674b57f0a48de76f0483b31b0b2ad9c316af6a5fcb0c3b72428b8f6380d6b6f717aaed73d7 + REF v4.1.0 + SHA512 4f640cbe8061acdacf71e517c0f90f0f89b06bbdb265cb53f2b96c9fa91ba5488f726e9d9f0547615fb9355a7fe602fad237015d0d71aaf2551066690c0b5942 HEAD_REF master ) @@ -12,8 +12,10 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_BENCHMARKS=OFF + -DBUILD_FUZZERS=OFF -DBUILD_FILTERS=OFF -DBUILD_GENERATORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/h3/vcpkg.json b/ports/h3/vcpkg.json index 183a69dfe5..20b0db76a6 100644 --- a/ports/h3/vcpkg.json +++ b/ports/h3/vcpkg.json @@ -1,9 +1,9 @@ { "name": "h3", - "version-semver": "3.7.2", - "port-version": 1, + "version-semver": "4.1.0", "description": "A Hexagonal Hierarchical Geospatial Indexing System", "homepage": "https://github.com/uber/h3", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 4ca83ce154..9529d0f34e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2897,8 +2897,8 @@ "port-version": 1 }, "h3": { - "baseline": "3.7.2", - "port-version": 1 + "baseline": "4.1.0", + "port-version": 0 }, "h5py-lzf": { "baseline": "2019-12-04", diff --git a/versions/h-/h3.json b/versions/h-/h3.json index 7fe6fd9f18..03d7f75b69 100644 --- a/versions/h-/h3.json +++ b/versions/h-/h3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2f9a794393b62e7f09579ff4b6387f97b5806cd", + "version-semver": "4.1.0", + "port-version": 0 + }, { "git-tree": "582bd670eb802209ca1dddca0067252e0736ea03", "version-semver": "3.7.2",