From e292139a1b371196a0bb40074c41c8b8d8180da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Sat, 5 Apr 2025 09:32:31 +0200 Subject: [PATCH] [blake3] update to version 1.8.1 (#44799) --- ports/blake3/portfile.cmake | 12 +++++++++++- ports/blake3/vcpkg.json | 15 +++++++++++++-- versions/b-/blake3.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake index 2fe9735471..baa003911a 100644 --- a/ports/blake3/portfile.cmake +++ b/ports/blake3/portfile.cmake @@ -2,14 +2,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE3-team/BLAKE3 REF "${VERSION}" - SHA512 6d4778f9384a168faa5e1437a5b5b95706e4cfdbf102d944f83f8ef5535c64adf54a85feb409e0db1bf231bf6d83fc66bc5a7e53e099183d5b11e4825e012d7e + SHA512 a47ab31ae96d54884f8377e831028e3b503009bf89ac5a4383b83d3fe1cca5c99eefb7486fba9c7f459a7dbbad15754d1354f4e20e7bb0bb63a9e06ee8ce3507 HEAD_REF main PATCHES fix-windows-arm-build-error.patch ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS BLAKE3_FEATURE_OPTIONS + FEATURES + tbb BLAKE3_USE_TBB +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/c" + OPTIONS + ${BLAKE3_FEATURE_OPTIONS} + -DBLAKE3_FETCH_TBB=OFF + -DBLAKE3_EXAMPLES=OFF ) vcpkg_cmake_install() diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json index 80ecc799ae..e23dea7220 100644 --- a/ports/blake3/vcpkg.json +++ b/ports/blake3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blake3", - "version": "1.7.0", + "version": "1.8.1", "description": "BLAKE3 cryptographic hash function.", "homepage": "https://github.com/BLAKE3-team/BLAKE3", "license": "CC0-1.0 OR Apache-2.0", @@ -13,5 +13,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tbb": { + "description": "Enable TBB multi-threading API support", + "dependencies": [ + { + "name": "tbb", + "default-features": false + } + ] + } + } } diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json index 498cbb1221..35eca01d36 100644 --- a/versions/b-/blake3.json +++ b/versions/b-/blake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffbeed13f05feae7a0d28ed51efe781c9a84c0fd", + "version": "1.8.1", + "port-version": 0 + }, { "git-tree": "ff114b5f63e1e75a4db88a9390b5c0bd7f8ccf81", "version": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3ee39ed01a..fbf06e296f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -701,7 +701,7 @@ "port-version": 0 }, "blake3": { - "baseline": "1.7.0", + "baseline": "1.8.1", "port-version": 0 }, "blas": {