[blake3] update to 1.5.0 (microsoft#34065)

* [blake3] update to 1.5.0 * [blake3] update to 1.5.0 * fix deps
SokaDance · Sep 29, 2023 · c10a2b5 · c10a2b5
1 parent 0105850
commit c10a2b5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/ports/blake3/fix-windows-arm-build-error.patch b/ports/blake3/fix-windows-arm-build-error.patch
@@ -0,0 +1,13 @@
+diff --git a/c/blake3_dispatch.c b/c/blake3_dispatch.c
+index af6c3da..dce85b4 100644
+--- a/c/blake3_dispatch.c
++++ b/c/blake3_dispatch.c
+@@ -31,7 +31,7 @@
+ #define ATOMIC_INT _Atomic int
+ #define ATOMIC_LOAD(x) x
+ #define ATOMIC_STORE(x, y) x = y
+-#elif defined(_MSC_VER)
++#elif defined(IS_X86) and defined(_MSC_VER)
+ #define ATOMIC_INT LONG
+ #define ATOMIC_LOAD(x) InterlockedOr(&x, 0)
+ #define ATOMIC_STORE(x, y) InterlockedExchange(&x, y)
diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake
@@ -2,8 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BLAKE3-team/BLAKE3
     REF "${VERSION}"
-    SHA512 e2a3a4811a0a8c88492efb74123dcbe26176fd307e1ba527b67001ae076970a36fd26282d4cd728c875ab228827962564a00ff0c3a8d99e2f12a29bbf431c547
+    SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0
     HEAD_REF main
+    PATCHES
+        fix-windows-arm-build-error.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "blake3",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "BLAKE3 cryptographic hash function.",
   "homepage": "https://github.com/BLAKE3-team/BLAKE3",
   "license": "CC0-1.0 OR Apache-2.0",

diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3d62ef88b0bacbb197e9bb921b8b7d0fea336f1d",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a198a87b5478bee28b2e4d35ed9787cf3950faef",
       "version": "1.4.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -617,7 +617,7 @@
       "port-version": 0
     },
     "blake3": {
-      "baseline": "1.4.0",
+      "baseline": "1.5.0",
       "port-version": 0
     },
     "blas": {