From 1f627e6a74b3265c5fd7726baa06265f655284b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?=
 <BurningEnlightenment@users.noreply.github.com>
Date: Tue, 13 Jun 2023 01:45:12 +0200
Subject: [PATCH] [blake3] Add version 1.4.0 (#31919)

---
 ports/blake3/portfile.cmake | 32 +-------------------------------
 ports/blake3/vcpkg.json     |  3 +--
 versions/b-/blake3.json     |  5 +++++
 versions/baseline.json      |  4 ++--
 4 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake
index 23e2bcdd87..2004ba4924 100644
--- a/ports/blake3/portfile.cmake
+++ b/ports/blake3/portfile.cmake
@@ -2,40 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BLAKE3-team/BLAKE3
     REF "${VERSION}"
-    SHA512 3ea57a86af7357582479ed5d762d368ee52421636c72723b08f528f9bf53637bad0058c5aded0b9a1b9479f374f5d3b110677e00c2b1124a47bfcdac800c2836
+    SHA512 e2a3a4811a0a8c88492efb74123dcbe26176fd307e1ba527b67001ae076970a36fd26282d4cd728c875ab228827962564a00ff0c3a8d99e2f12a29bbf431c547
     HEAD_REF main
 )
 
-# these four files are included in the next release
-vcpkg_download_distfile(
-    CMAKELISTS_SOURCE_PATH
-    URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/CMakeLists.txt
-    FILENAME blake3-CMakeLists.txt
-    SHA512 598699b90053fdbe381843f886c213f5e6d03281a9b8c1403726c300e83a9da353879da7170637024663af576e54f74a307049577360ded90d25e11bd852edde
-)
-vcpkg_download_distfile(
-    CMAKECONFIGIN_SOURCE_PATH
-    URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3-config.cmake.in
-    FILENAME blake3-config.cmake.in
-    SHA512 f9bdb41bd4e4930ab31624f484f895fbda57066a4b3e0a38e7ffefab7343779d1c356fbaf6231643fd069f7a176b840f234f74d9f9ee4167cc430d7bfec0f40f
-)
-vcpkg_download_distfile(
-    PKGCONFIGIN_SOURCE_PATH
-    URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/libblake3.pc.in
-    FILENAME libblake3.pc.in
-    SHA512 cfbaea63368e655c3ac3357f791b6332ae0241f3fd4f98e19c48f28e633e25a5b1125d1cc6b4815edfd013a76379dffcf9723852a7b76f2910d19dc77e538fa2
-)
-vcpkg_download_distfile( # we need the dllexport macro (otherwise these files are identical)
-    BLAKE3_H_SOURCE_PATH
-    URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3.h
-    FILENAME blake3.h
-    SHA512 0f9852ff0e527e8fe0d567408c5c100ee3707a1b942ac1fbd78208a68ecfd32814729b5082720278d25d4cf45eb1020fcf3e4199cab0a67a6ca6af4321bcbc3e
-)
-file(COPY_FILE "${CMAKELISTS_SOURCE_PATH}" "${SOURCE_PATH}/c/CMakeLists.txt")
-file(COPY_FILE "${CMAKECONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3-config.cmake.in")
-file(COPY_FILE "${PKGCONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/libblake3.pc.in")
-file(COPY_FILE "${BLAKE3_H_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3.h")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/c"
 )
diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json
index cc5f7d369f..273e8ca6f0 100644
--- a/ports/blake3/vcpkg.json
+++ b/ports/blake3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "blake3",
-  "version": "1.3.3",
-  "port-version": 1,
+  "version": "1.4.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
index 41456f9181..4b6a259b1b 100644
--- a/versions/b-/blake3.json
+++ b/versions/b-/blake3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a198a87b5478bee28b2e4d35ed9787cf3950faef",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "13ac9cc003839e6730587218103f4912e7886311",
       "version": "1.3.3",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7aebd2686b..d246179909 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -585,8 +585,8 @@
       "port-version": 0
     },
     "blake3": {
-      "baseline": "1.3.3",
-      "port-version": 1
+      "baseline": "1.4.0",
+      "port-version": 0
     },
     "blas": {
       "baseline": "2023-03-25",