From 0349f5c30b0d331a9a63974e59cbbfd5c00192d6 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 17 May 2022 17:12:59 +0800
Subject: [PATCH 01/42] [libuv] update to <1.44.1>

---
 ports/libuv/portfile.cmake | 4 ++--
 ports/libuv/vcpkg.json     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 8b927ae8041d68..3e51715d3bcb59 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF v1.43.0
-    SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3
+    REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
+    SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
     HEAD_REF v1.x
 )
 
diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json
index 5b11cc1fdc57e3..2d863086d1ba0a 100644
--- a/ports/libuv/vcpkg.json
+++ b/ports/libuv/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "libuv",
-  "version-semver": "1.43.0",
+  "version-semver": "1.44.1",
   "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.",
   "homepage": "https://github.com/libuv/libuv",
+  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

From fadca38e6096c5f4ca5fb7ba7f1218eddbd07c86 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 17 May 2022 17:13:29 +0800
Subject: [PATCH 02/42] update version

---
 versions/baseline.json | 2 +-
 versions/l-/libuv.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 0e2150a62d0fb7..5fe7c7de4d403c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4149,7 +4149,7 @@
       "port-version": 11
     },
     "libuv": {
-      "baseline": "1.43.0",
+      "baseline": "1.44.1",
       "port-version": 0
     },
     "libuvc": {
diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index fd88da0a514714..9bc98b81d3b0b7 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "566dd5dcd08ccf33b18041bf621a0a5eb423118f",
+      "version-semver": "1.44.1",
+      "port-version": 0
+    },
     {
       "git-tree": "fa2d73ef2b9197ea47572bc783826b650ed04f0f",
       "version-semver": "1.43.0",

From 50ddf4b1efe374424aed74e1f62964187ed3bd7c Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 18 May 2022 09:54:35 +0800
Subject: [PATCH 03/42] fix ci error

---
 ports/libuv/fix-ci-error.patch | 12 ++++++++++++
 ports/libuv/portfile.cmake     |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 ports/libuv/fix-ci-error.patch

diff --git a/ports/libuv/fix-ci-error.patch b/ports/libuv/fix-ci-error.patch
new file mode 100644
index 00000000000000..a4705b2b3d9dda
--- /dev/null
+++ b/ports/libuv/fix-ci-error.patch
@@ -0,0 +1,12 @@
+diff --git a/src/unix/core.c b/src/unix/core.c
+index def5b8f..c1bd47a 100644
+--- a/src/unix/core.c
++++ b/src/unix/core.c
+@@ -21,6 +21,7 @@
+ #include "uv.h"
+ #include "internal.h"
+ 
++#define _GNU_SOURCE
+ #include <stddef.h> /* NULL */
+ #include <stdio.h> /* printf */
+ #include <stdlib.h>
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 3e51715d3bcb59..dab02608aab631 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
     SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
     HEAD_REF v1.x
+    PATCHES
+        fix-ci-error.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

From 943545a1654a395d0e22ebabc54591270f9db165 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 18 May 2022 09:55:05 +0800
Subject: [PATCH 04/42] update version

---
 versions/l-/libuv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 9bc98b81d3b0b7..71078be9591e9f 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "566dd5dcd08ccf33b18041bf621a0a5eb423118f",
+      "git-tree": "59b005fc3f86c4a2d7eabab8a5d6499fa4f6a7ee",
       "version-semver": "1.44.1",
       "port-version": 0
     },

From c85ebd4e4a15f152f924019361120523b21b8bad Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 18 May 2022 14:00:28 +0800
Subject: [PATCH 05/42] fix-ci-error

---
 ports/libuv/fix-ci-error.patch | 12 ------------
 ports/libuv/portfile.cmake     |  6 ++----
 ports/libuv/vcpkg.json         |  3 +--
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 ports/libuv/fix-ci-error.patch

diff --git a/ports/libuv/fix-ci-error.patch b/ports/libuv/fix-ci-error.patch
deleted file mode 100644
index a4705b2b3d9dda..00000000000000
--- a/ports/libuv/fix-ci-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/unix/core.c b/src/unix/core.c
-index def5b8f..c1bd47a 100644
---- a/src/unix/core.c
-+++ b/src/unix/core.c
-@@ -21,6 +21,7 @@
- #include "uv.h"
- #include "internal.h"
- 
-+#define _GNU_SOURCE
- #include <stddef.h> /* NULL */
- #include <stdio.h> /* printf */
- #include <stdlib.h>
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index dab02608aab631..8b927ae8041d68 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
-    SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
+    REF v1.43.0
+    SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3
     HEAD_REF v1.x
-    PATCHES
-        fix-ci-error.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json
index 2d863086d1ba0a..5b11cc1fdc57e3 100644
--- a/ports/libuv/vcpkg.json
+++ b/ports/libuv/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "libuv",
-  "version-semver": "1.44.1",
+  "version-semver": "1.43.0",
   "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.",
   "homepage": "https://github.com/libuv/libuv",
-  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

From eb7e6be455eaa6751cc8cb645eca26daf17248b4 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 18 May 2022 14:03:28 +0800
Subject: [PATCH 06/42] [libuv] update to <1.44.1>

---
 ports/libuv/portfile.cmake | 6 ++++--
 ports/libuv/vcpkg.json     | 3 ++-
 versions/baseline.json     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 8b927ae8041d68..dab02608aab631 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF v1.43.0
-    SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3
+    REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
+    SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
     HEAD_REF v1.x
+    PATCHES
+        fix-ci-error.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json
index 5b11cc1fdc57e3..2d863086d1ba0a 100644
--- a/ports/libuv/vcpkg.json
+++ b/ports/libuv/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "libuv",
-  "version-semver": "1.43.0",
+  "version-semver": "1.44.1",
   "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.",
   "homepage": "https://github.com/libuv/libuv",
+  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5fe7c7de4d403c..0e2150a62d0fb7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4149,7 +4149,7 @@
       "port-version": 11
     },
     "libuv": {
-      "baseline": "1.44.1",
+      "baseline": "1.43.0",
       "port-version": 0
     },
     "libuvc": {

From e08f6ffd16d2221eea9717bcd1e09031af938564 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 18 May 2022 14:03:47 +0800
Subject: [PATCH 07/42] update version

---
 versions/baseline.json | 2 +-
 versions/l-/libuv.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 0e2150a62d0fb7..5fe7c7de4d403c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4149,7 +4149,7 @@
       "port-version": 11
     },
     "libuv": {
-      "baseline": "1.43.0",
+      "baseline": "1.44.1",
       "port-version": 0
     },
     "libuvc": {
diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 71078be9591e9f..9f4492e6709fb5 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "59b005fc3f86c4a2d7eabab8a5d6499fa4f6a7ee",
+      "git-tree": "7562f9e3de7d5809cfab7f3da6c82795628b3d07",
       "version-semver": "1.44.1",
       "port-version": 0
     },

From 095183b0781b519b5da51c276e69014c12eedbe1 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 18 May 2022 14:05:36 +0800
Subject: [PATCH 08/42] add patch

---
 ports/libuv/fix-ci-error.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 ports/libuv/fix-ci-error.patch

diff --git a/ports/libuv/fix-ci-error.patch b/ports/libuv/fix-ci-error.patch
new file mode 100644
index 00000000000000..a4705b2b3d9dda
--- /dev/null
+++ b/ports/libuv/fix-ci-error.patch
@@ -0,0 +1,12 @@
+diff --git a/src/unix/core.c b/src/unix/core.c
+index def5b8f..c1bd47a 100644
+--- a/src/unix/core.c
++++ b/src/unix/core.c
+@@ -21,6 +21,7 @@
+ #include "uv.h"
+ #include "internal.h"
+ 
++#define _GNU_SOURCE
+ #include <stddef.h> /* NULL */
+ #include <stdio.h> /* printf */
+ #include <stdlib.h>

From 5c2f36ef32a60c7c4bd2ed9e7200f684e26178cc Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 18 May 2022 14:05:57 +0800
Subject: [PATCH 09/42] update version

---
 versions/l-/libuv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 9f4492e6709fb5..71078be9591e9f 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "7562f9e3de7d5809cfab7f3da6c82795628b3d07",
+      "git-tree": "59b005fc3f86c4a2d7eabab8a5d6499fa4f6a7ee",
       "version-semver": "1.44.1",
       "port-version": 0
     },

From 985fcd5be7344a8091df005f3eb0a9399e024913 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 2 Jun 2022 16:13:32 +0800
Subject: [PATCH 10/42] add option

---
 ports/libuv/portfile.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index dab02608aab631..e0da15e1d98b90 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         -DUV_SKIP_HEADERS=ON
+        -D_GNU_SOURCE=ON
 )
 
 vcpkg_cmake_install()

From 53fc9a02bd5fe35db216aa124c5a304d8a27ef7b Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 2 Jun 2022 16:14:03 +0800
Subject: [PATCH 11/42] update version

---
 versions/l-/libuv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 71078be9591e9f..0cf9356c216100 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "59b005fc3f86c4a2d7eabab8a5d6499fa4f6a7ee",
+      "git-tree": "289be2dc95f3eb07beb48edaf9723b3dfe41ef6d",
       "version-semver": "1.44.1",
       "port-version": 0
     },

From b79fd526ba58b107a299dd6e504aac58b8e4e920 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 2 Jun 2022 16:18:46 +0800
Subject: [PATCH 12/42] delete patch

---
 ports/libuv/fix-ci-error.patch | 12 ------------
 ports/libuv/portfile.cmake     |  2 --
 2 files changed, 14 deletions(-)
 delete mode 100644 ports/libuv/fix-ci-error.patch

diff --git a/ports/libuv/fix-ci-error.patch b/ports/libuv/fix-ci-error.patch
deleted file mode 100644
index a4705b2b3d9dda..00000000000000
--- a/ports/libuv/fix-ci-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/unix/core.c b/src/unix/core.c
-index def5b8f..c1bd47a 100644
---- a/src/unix/core.c
-+++ b/src/unix/core.c
-@@ -21,6 +21,7 @@
- #include "uv.h"
- #include "internal.h"
- 
-+#define _GNU_SOURCE
- #include <stddef.h> /* NULL */
- #include <stdio.h> /* printf */
- #include <stdlib.h>
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index e0da15e1d98b90..fa76ad02f6316a 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -4,8 +4,6 @@ vcpkg_from_github(
     REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
     SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
     HEAD_REF v1.x
-    PATCHES
-        fix-ci-error.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

From 55817df9b296c6e216528b966132c5ea9f0ae015 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 2 Jun 2022 16:19:03 +0800
Subject: [PATCH 13/42] update evrsion

---
 versions/l-/libuv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 0cf9356c216100..2c3dca0537d05c 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "289be2dc95f3eb07beb48edaf9723b3dfe41ef6d",
+      "git-tree": "e825a063dec1470102ce7129754b1e5ccc13c81f",
       "version-semver": "1.44.1",
       "port-version": 0
     },

From 6a1932365e40e83c7ee143023d8680346b3a8047 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 2 Jun 2022 16:46:02 +0800
Subject: [PATCH 14/42] fix ci error

---
 ports/libuv/fix-ci-error.patch | 21 +++++++++++++++++++++
 ports/libuv/portfile.cmake     |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 ports/libuv/fix-ci-error.patch

diff --git a/ports/libuv/fix-ci-error.patch b/ports/libuv/fix-ci-error.patch
new file mode 100644
index 00000000000000..f8aa7ef5bce044
--- /dev/null
+++ b/ports/libuv/fix-ci-error.patch
@@ -0,0 +1,21 @@
+diff --git a/src/unix/core.c b/src/unix/core.c
+index def5b8f..e44298e 100644
+--- a/src/unix/core.c
++++ b/src/unix/core.c
+@@ -1636,6 +1636,7 @@ unsigned int uv_available_parallelism(void) {
+    * glibc it's... complicated... so for consistency try sched_getaffinity()
+    * before falling back to sysconf(_SC_NPROCESSORS_ONLN).
+    */
++#ifdef CPU_COUNT   
+   if (0 == sched_getaffinity(0, sizeof(set), &set))
+     rc = CPU_COUNT(&set);
+   else
+@@ -1645,6 +1646,8 @@ unsigned int uv_available_parallelism(void) {
+     rc = 1;
+ 
+   return (unsigned) rc;
++#endif
++  
+ #elif defined(__MVS__)
+   return 1;  /* TODO(bnoordhuis) Read from CSD_NUMBER_ONLINE_CPUS? */
+ #else  /* __linux__ */
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index fa76ad02f6316a..e0da15e1d98b90 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
     SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
     HEAD_REF v1.x
+    PATCHES
+        fix-ci-error.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

From 08deaab6820c3c913f3d93a78ef80cbe7f420174 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 2 Jun 2022 16:46:22 +0800
Subject: [PATCH 15/42] update version

---
 versions/l-/libuv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 2c3dca0537d05c..3a46ee7382f829 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e825a063dec1470102ce7129754b1e5ccc13c81f",
+      "git-tree": "88e4ee539a186f91028acd45c4a5bb660f21ee0b",
       "version-semver": "1.44.1",
       "port-version": 0
     },

From c1c020fe6f9be73be4c134909748b27db1b0384f Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Mon, 27 Jun 2022 17:24:42 +0800
Subject: [PATCH 16/42] delete patch

---
 ports/libuv/fix-ci-error.patch | 21 ---------------------
 ports/libuv/portfile.cmake     |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 ports/libuv/fix-ci-error.patch

diff --git a/ports/libuv/fix-ci-error.patch b/ports/libuv/fix-ci-error.patch
deleted file mode 100644
index f8aa7ef5bce044..00000000000000
--- a/ports/libuv/fix-ci-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/unix/core.c b/src/unix/core.c
-index def5b8f..e44298e 100644
---- a/src/unix/core.c
-+++ b/src/unix/core.c
-@@ -1636,6 +1636,7 @@ unsigned int uv_available_parallelism(void) {
-    * glibc it's... complicated... so for consistency try sched_getaffinity()
-    * before falling back to sysconf(_SC_NPROCESSORS_ONLN).
-    */
-+#ifdef CPU_COUNT   
-   if (0 == sched_getaffinity(0, sizeof(set), &set))
-     rc = CPU_COUNT(&set);
-   else
-@@ -1645,6 +1646,8 @@ unsigned int uv_available_parallelism(void) {
-     rc = 1;
- 
-   return (unsigned) rc;
-+#endif
-+  
- #elif defined(__MVS__)
-   return 1;  /* TODO(bnoordhuis) Read from CSD_NUMBER_ONLINE_CPUS? */
- #else  /* __linux__ */
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index e0da15e1d98b90..fa76ad02f6316a 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -4,8 +4,6 @@ vcpkg_from_github(
     REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
     SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
     HEAD_REF v1.x
-    PATCHES
-        fix-ci-error.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

From 6a6dfbd7ed724e96c41bb41d7cdcb4f233325ffe Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Mon, 27 Jun 2022 17:25:13 +0800
Subject: [PATCH 17/42] update evrsion

---
 versions/l-/libuv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 3a46ee7382f829..2c3dca0537d05c 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "88e4ee539a186f91028acd45c4a5bb660f21ee0b",
+      "git-tree": "e825a063dec1470102ce7129754b1e5ccc13c81f",
       "version-semver": "1.44.1",
       "port-version": 0
     },

From fc50c5a95517817c967c18db79a9b44eb4aeac3e Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 03:00:15 -0700
Subject: [PATCH 18/42] Use official CMakeLists.txt

---
 ports/libuv/CMakeLists.txt                   | 83 --------------------
 ports/libuv/portfile.cmake                   | 27 +++----
 ports/libuv/unofficial-libuv-config.in.cmake |  7 --
 ports/libuv/vcpkg-cmake-wrapper.cmake        | 16 ----
 4 files changed, 9 insertions(+), 124 deletions(-)
 delete mode 100644 ports/libuv/CMakeLists.txt
 delete mode 100644 ports/libuv/unofficial-libuv-config.in.cmake
 delete mode 100644 ports/libuv/vcpkg-cmake-wrapper.cmake

diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt
deleted file mode 100644
index 7d2c38bdbb307b..00000000000000
--- a/ports/libuv/CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(libuv C)
-
-find_package(Threads REQUIRED)
-
-file(GLOB UV_SOURCES_COMMON src/*.c)
-
-file(GLOB UV_SOURCES_UNIX
-    src/unix/async.c
-    src/unix/core.c
-    src/unix/dl.c
-    src/unix/fs.c
-    src/unix/getaddrinfo.c
-    src/unix/getnameinfo.c
-    src/unix/loop.c
-    src/unix/loop-watcher.c
-    src/unix/pipe.c
-    src/unix/poll.c
-    src/unix/process.c
-    src/unix/signal.c
-    src/unix/stream.c
-    src/unix/tcp.c
-    src/unix/thread.c
-    src/unix/tty.c
-    src/unix/udp.c
-)
-file(GLOB UV_SOURCES_LINUX
-    src/unix/proctitle.c
-    src/unix/linux-core.c
-    src/unix/linux-inotify.c
-    src/unix/linux-syscalls.c
-    src/unix/procfs-exepath.c
-    src/unix/sysinfo-loadavg.c
-    src/unix/sysinfo-memory.c
-    src/unix/epoll.c
-)
-file(GLOB UV_SOURCES_DARWIN
-    src/unix/proctitle.c
-    src/unix/darwin.c
-    src/unix/fsevents.c
-    src/unix/darwin-proctitle.c
-    src/unix/bsd-ifaddrs.c
-    src/unix/kqueue.c
-)
-file(GLOB UV_SOURCES_FREEBSD
-    src/unix/freebsd.c
-    src/unix/posix-hrtime.c
-    src/unix/bsd-proctitle.c
-    src/unix/bsd-ifaddrs.c
-    src/unix/kqueue.c
-)
-file(GLOB UV_SOURCES_WIN src/win/*.c)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN})
-    target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600")
-    target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32)
-elseif(APPLE)
-    add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN})
-elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-    add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD})
-else() # Assume some Linux variant
-    add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX})
-endif()
-
-target_link_libraries(libuv PRIVATE Threads::Threads)
-target_include_directories(libuv PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
-set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED)
-
-if(NOT UV_SKIP_HEADERS)
-    install(
-        DIRECTORY include/
-        DESTINATION include
-    )
-endif()
-
-install(TARGETS libuv
-    EXPORT libuv
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-)
-install(EXPORT libuv FILE unofficial-libuv-targets.cmake NAMESPACE unofficial::libuv:: DESTINATION share/unofficial-libuv)
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index fa76ad02f6316a..838621e12a1b87 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -6,35 +6,26 @@ vcpkg_from_github(
     HEAD_REF v1.x
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS_DEBUG
-        -DUV_SKIP_HEADERS=ON
-        -D_GNU_SOURCE=ON
+    OPTIONS
+        -DQEMU=OFF
+        -DASAN=OFF
+        -DTSAN=OFF
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libuv CONFIG_PATH share/unofficial-libuv)
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-configure_file(
-    "${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake"
-    "${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake"
-    @ONLY
-)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libuv)
 
-file(READ "${CURRENT_PACKAGES_DIR}/include/uv.h" UV_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/uv.h" "defined(USING_UV_SHARED)" "1")
 else()
-    string(REPLACE "defined(USING_UV_SHARED)" "0" UV_H "${UV_H}")
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/uv.h" "defined(USING_UV_SHARED)" "0")
 endif()
-file(WRITE "${CURRENT_PACKAGES_DIR}/include/uv.h" "${UV_H}")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
diff --git a/ports/libuv/unofficial-libuv-config.in.cmake b/ports/libuv/unofficial-libuv-config.in.cmake
deleted file mode 100644
index a591d4cdf23245..00000000000000
--- a/ports/libuv/unofficial-libuv-config.in.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
-    include(CMakeFindDependencyMacro)
-    find_dependency(Threads)
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-targets.cmake)
diff --git a/ports/libuv/vcpkg-cmake-wrapper.cmake b/ports/libuv/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index d95350a6d4c7b9..00000000000000
--- a/ports/libuv/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-_find_package(${ARGS})
-
-if(WIN32)
-    list(APPEND LibUV_LIBRARIES iphlpapi psapi shell32 userenv ws2_32)
-    if(TARGET LibUV::LibUV)
-        set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES iphlpapi psapi shell32 userenv ws2_32)
-    endif()
-endif()
-include(CMakeFindDependencyMacro)
-find_dependency(Threads)
-list(APPEND LibUV_LIBRARIES Threads::Threads)
-if(TARGET LibUV::LibUV)
-    set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads)
-endif()
-
-

From 8a04c19bdf6cd09455875dc01a1cb9fc3751e563 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 03:11:05 -0700
Subject: [PATCH 19/42] Fix build type

---
 ports/libuv/fix-build-type.patch | 47 ++++++++++++++++++++++++++++++++
 ports/libuv/portfile.cmake       |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 ports/libuv/fix-build-type.patch

diff --git a/ports/libuv/fix-build-type.patch b/ports/libuv/fix-build-type.patch
new file mode 100644
index 00000000000000..936ec77d69283f
--- /dev/null
+++ b/ports/libuv/fix-build-type.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac52412..2d7086a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -381,7 +381,7 @@ endif()
+ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD")
+   list(APPEND uv_test_libraries util)
+ endif()
+-
++if (BUILD_SHARED_LIBS)
+ add_library(uv SHARED ${uv_sources})
+ target_compile_definitions(uv
+   INTERFACE
+@@ -401,7 +401,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+   set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX)
+ endif()
+ target_link_libraries(uv ${uv_libraries})
+-
++else()
+ add_library(uv_a STATIC ${uv_sources})
+ target_compile_definitions(uv_a PRIVATE ${uv_defines})
+ target_compile_options(uv_a PRIVATE ${uv_cflags})
+@@ -416,7 +416,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+   set_target_properties(uv_a PROPERTIES LINKER_LANGUAGE CXX)
+ endif()
+ target_link_libraries(uv_a ${uv_libraries})
+-
++endif()
+ if(LIBUV_BUILD_TESTS)
+   # Small hack: use ${uv_test_sources} now to get the runner skeleton,
+   # before the actual tests are added.
+@@ -673,12 +673,15 @@ install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++if (BUILD_SHARED_LIBS)
+ install(TARGETS uv EXPORT libuvConfig
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++else()
+ install(TARGETS uv_a EXPORT libuvConfig
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
+ install(EXPORT libuvConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv)
+ 
+ if(MSVC)
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 838621e12a1b87..5f611bafb40ade 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -4,11 +4,13 @@ vcpkg_from_github(
     REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2  #v1.44.1
     SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea
     HEAD_REF v1.x
+    PATCHES fix-build-type.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DLIBUV_BUILD_TESTS=OFF
         -DQEMU=OFF
         -DASAN=OFF
         -DTSAN=OFF

From a1c15c5a77733fbbf0366de875c4c2db8e8087f1 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 03:20:52 -0700
Subject: [PATCH 20/42] Re-fix, fix pkgconfig

---
 ports/libuv/fix-build-type.patch | 31 ++++++++++++++++++++++++++++---
 ports/libuv/portfile.cmake       |  1 +
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ports/libuv/fix-build-type.patch b/ports/libuv/fix-build-type.patch
index 936ec77d69283f..9977e48d025ff6 100644
--- a/ports/libuv/fix-build-type.patch
+++ b/ports/libuv/fix-build-type.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac52412..2d7086a 100644
+index ac52412..15d5cb2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -381,7 +381,7 @@ endif()
@@ -29,10 +29,35 @@ index ac52412..2d7086a 100644
  if(LIBUV_BUILD_TESTS)
    # Small hack: use ${uv_test_sources} now to get the runner skeleton,
    # before the actual tests are added.
-@@ -673,12 +673,15 @@ install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+@@ -659,26 +659,39 @@ string(REPLACE ";" " " LIBS "${LIBS}")
+ file(STRINGS configure.ac configure_ac REGEX ^AC_INIT)
+ string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" PACKAGE_VERSION "${configure_ac}")
+ set(UV_VERSION_MAJOR "${CMAKE_MATCH_1}")
++if (BUILD_SHARED_LIBS)
+ # The version in the filename is mirroring the behaviour of autotools.
+ set_target_properties(uv PROPERTIES
+   VERSION ${UV_VERSION_MAJOR}.0.0
+   SOVERSION ${UV_VERSION_MAJOR})
++endif()
+ set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+ set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ set(prefix ${CMAKE_INSTALL_PREFIX})
++if (BUILD_SHARED_LIBS)
+ configure_file(libuv.pc.in libuv.pc @ONLY)
++else()
+ configure_file(libuv-static.pc.in libuv-static.pc @ONLY)
++endif()
+ 
+ install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
- install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc
+-install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc
++if (BUILD_SHARED_LIBS)
++install(FILES ${PROJECT_BINARY_DIR}/libuv.pc
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++else()
++install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc
          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++endif()
 +if (BUILD_SHARED_LIBS)
  install(TARGETS uv EXPORT libuvConfig
          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 5f611bafb40ade..3a21c983dd45c0 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -20,6 +20,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libuv)
+vcpkg_fixup_pkgconfig()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/uv.h" "defined(USING_UV_SHARED)" "1")

From 18b3306e4f1a64fbf62a812b608c26fa5133c9f8 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 19:33:44 -0700
Subject: [PATCH 21/42] Fix usocket build

---
 ports/usockets/CMakeLists.txt | 12 +++++++-----
 ports/usockets/vcpkg.json     |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt
index 69a742db13307c..2d838eff93961c 100644
--- a/ports/usockets/CMakeLists.txt
+++ b/ports/usockets/CMakeLists.txt
@@ -12,10 +12,12 @@ else()
     set(NOT_USE_OPENSSL "-DLIBUS_NO_SSL")
 endif()
 
-find_package(unofficial-libuv CONFIG REQUIRED)
-find_path(LIBUV_INCLUDE_DIR uv.h)
-find_library(LIBUV_LIBRARY NAMES libuv)
-include_directories(APPEND "${CMAKE_CURRENT_LIST_DIR}/src")
+find_package(libuv CONFIG REQUIRED)
+if (TARGET uv)
+    set(LIBUV_LIBRARY uv)
+else()
+    set(LIBUV_LIBRARY uv_a)
+endif()
 
 file(GLOB SOURCES src/*.c src/eventing/*.c)
 
@@ -49,7 +51,7 @@ if (${LIBUS_USE_LIBUV})
 endif()
 
 target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL})
-target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBUV_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR})
+target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR} "${CMAKE_CURRENT_LIST_DIR}/src")
 target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS})
 
 install(TARGETS uSockets
diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json
index 9300c6e9467790..1c9683c4dddda1 100644
--- a/ports/usockets/vcpkg.json
+++ b/ports/usockets/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "usockets",
   "version": "0.8.1",
+  "port-version": 1,
   "description": "Miniscule cross-platform eventing, networking & crypto for async applications",
   "homepage": "https://github.com/uNetworking/uSockets",
   "dependencies": [

From be8810c187b70a130b0cf39d9582896c1f73695c Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 19:35:41 -0700
Subject: [PATCH 22/42] Fix uvw build

---
 ports/uvw/CMakeLists.txt | 8 ++++++--
 ports/uvw/vcpkg.json     | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/uvw/CMakeLists.txt b/ports/uvw/CMakeLists.txt
index f359b735103955..d768716f7a4ba0 100644
--- a/ports/uvw/CMakeLists.txt
+++ b/ports/uvw/CMakeLists.txt
@@ -1,10 +1,14 @@
 cmake_minimum_required(VERSION 3.8)
 project(uvw)
 
-find_package(unofficial-libuv CONFIG REQUIRED)
+find_package(libuv CONFIG REQUIRED)
 
 add_library(uvw INTERFACE)
-target_link_libraries(uvw INTERFACE unofficial::libuv::libuv)
+if (TARGET uv)
+    target_link_libraries(uvw INTERFACE uv)
+else()
+    target_link_libraries(uvw INTERFACE uv_a)
+endif()
 
 install(TARGETS uvw
     EXPORT uvw
diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json
index ba7b4673dc3dc0..f9cbcaa07ec1cd 100644
--- a/ports/uvw/vcpkg.json
+++ b/ports/uvw/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "uvw",
   "version": "2.12.1",
+  "port-version": 1,
   "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.",
   "homepage": "https://github.com/skypjack/uvw",
   "license": "MIT",

From 111097837b689535475c316a0aa868c81563513e Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 19:44:01 -0700
Subject: [PATCH 23/42] Fix wpilib build

---
 ports/wpilib/fix-dependency-libuv.patch | 32 +++++++++++++++++++++++++
 ports/wpilib/portfile.cmake             |  1 +
 ports/wpilib/vcpkg.json                 |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 ports/wpilib/fix-dependency-libuv.patch

diff --git a/ports/wpilib/fix-dependency-libuv.patch b/ports/wpilib/fix-dependency-libuv.patch
new file mode 100644
index 00000000000000..e5c0ca8f11ab0a
--- /dev/null
+++ b/ports/wpilib/fix-dependency-libuv.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3930be2..f57a46b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,7 +87,7 @@ else()
+ endif()
+ 
+ if (USE_VCPKG_LIBUV)
+-set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)")
++set (LIBUV_VCPKG_REPLACE "find_package(libuv CONFIG)")
+ endif()
+ 
+ if (USE_VCPKG_EIGEN)
+diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
+index 559c8ed..0fe60e9 100644
+--- a/wpiutil/CMakeLists.txt
++++ b/wpiutil/CMakeLists.txt
+@@ -210,8 +210,12 @@ if (NOT USE_VCPKG_LIBUV)
+         endif()
+     endif()
+ else()
+-    find_package(unofficial-libuv CONFIG REQUIRED)
+-    target_link_libraries(wpiutil unofficial::libuv::libuv)
++    find_package(libuv CONFIG REQUIRED)
++    if (TARGET uv)
++        target_link_libraries(wpiutil uv)
++    else()
++        target_link_libraries(wpiutil uv_a)
++    endif()
+ endif()
+ 
+ if (MSVC)
diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake
index f4b48dc3084015..edd7dc597487c4 100644
--- a/ports/wpilib/portfile.cmake
+++ b/ports/wpilib/portfile.cmake
@@ -3,6 +3,7 @@ vcpkg_from_github(
     REPO wpilibsuite/allwpilib
     REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6
     SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439
+    PATCHES fix-dependency-libuv.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json
index b0e07c291179d9..bd991b1c2721bd 100644
--- a/ports/wpilib/vcpkg.json
+++ b/ports/wpilib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wpilib",
   "version-string": "2020.3.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.",
   "homepage": "https://github.com/wpilibsuite/allwpilib",
   "supports": "!osx",

From cb960f992dccfbf5aac8c7e74cc00a00e38b61ce Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 23:03:05 -0700
Subject: [PATCH 24/42] Fix cmake build

---
 .../cmake/fix-dependency-libuv.patch          | 28 +++++++++++++++++++
 scripts/test_ports/cmake/portfile.cmake       |  1 +
 scripts/test_ports/cmake/vcpkg.json           |  1 +
 3 files changed, 30 insertions(+)
 create mode 100644 scripts/test_ports/cmake/fix-dependency-libuv.patch

diff --git a/scripts/test_ports/cmake/fix-dependency-libuv.patch b/scripts/test_ports/cmake/fix-dependency-libuv.patch
new file mode 100644
index 00000000000000..5402a788780193
--- /dev/null
+++ b/scripts/test_ports/cmake/fix-dependency-libuv.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fdfe456..ef2d329 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -647,16 +647,16 @@ macro (CMAKE_BUILD_UTILITIES)
+   #---------------------------------------------------------------------
+   # Build libuv library.
+   if(CMAKE_USE_SYSTEM_LIBUV)
+-    if(WIN32)
+-      find_package(LibUV 1.38.0)
+-    else()
+-      find_package(LibUV 1.10.0)
+-    endif()
+-    if(NOT LIBUV_FOUND)
++    find_package(libuv CONFIG REQUIRED)
++    if(0)
+       message(FATAL_ERROR
+         "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
+     endif()
+-    set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV)
++    if (TARGET uv)
++    set(CMAKE_LIBUV_LIBRARIES uv)
++    else()
++    set(CMAKE_LIBUV_LIBRARIES uv_a)
++    endif()
+   else()
+     set(CMAKE_LIBUV_LIBRARIES cmlibuv)
+     add_subdirectory(Utilities/cmlibuv)
diff --git a/scripts/test_ports/cmake/portfile.cmake b/scripts/test_ports/cmake/portfile.cmake
index 3e7276e4531c99..87ad4eb6d82083 100644
--- a/scripts/test_ports/cmake/portfile.cmake
+++ b/scripts/test_ports/cmake/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_gitlab(
     SHA512
         4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226 
     HEAD_REF master
+    PATCHES fix-dependency-libuv.patch
 )
 set(OPTIONS)
 if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json
index 89668baefbc692..c3d5295798ae88 100644
--- a/scripts/test_ports/cmake/vcpkg.json
+++ b/scripts/test_ports/cmake/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cmake",
   "version-string": "3.22.2",
+  "port-version": 1,
   "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.",
   "homepage": "https://cmake.org/",
   "license": "BSD-3-Clause",

From ae3b9e8b986cecfb291ff92f6ad564128227592e Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 23:07:44 -0700
Subject: [PATCH 25/42] Fix tensorpipe build

---
 ports/tensorpipe/use-vcpkg.patch | 14 +++++++++-----
 ports/tensorpipe/vcpkg.json      |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/tensorpipe/use-vcpkg.patch b/ports/tensorpipe/use-vcpkg.patch
index b08d2cb107d6ab..b69d01c1870163 100644
--- a/ports/tensorpipe/use-vcpkg.patch
+++ b/ports/tensorpipe/use-vcpkg.patch
@@ -1,19 +1,23 @@
 diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt
-index efcffc2..e167fae 100644
+index efcffc2..dd9bd16 100644
 --- a/tensorpipe/CMakeLists.txt
 +++ b/tensorpipe/CMakeLists.txt
-@@ -119,8 +119,8 @@ list(APPEND TP_PUBLIC_HDRS
+@@ -119,8 +119,12 @@ list(APPEND TP_PUBLIC_HDRS
    transport/uv/utility.h)
  
  # Add uv package
 -find_package(uv REQUIRED)
 -list(APPEND TP_LINK_LIBRARIES uv::uv)
-+find_package(unofficial-libuv CONFIG REQUIRED) 
-+list(APPEND TP_LINK_LIBRARIES unofficial::libuv::libuv)
++find_package(libuv CONFIG REQUIRED) 
++if (TARGET uv)
++list(APPEND TP_LINK_LIBRARIES uv)
++else()
++list(APPEND TP_LINK_LIBRARIES uv_a)
++endif()
  
  ### shm
  
-@@ -184,7 +184,8 @@ configure_file(config.h.in config.h)
+@@ -184,7 +188,8 @@ configure_file(config.h.in config.h)
  # We should keep libnop headers private as they should not be exposed to downstream users,
  # but they're currently transitively included by tensorpipe/transport/connection.h (which
  # is still unclear whether it should be a public or private header).
diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json
index ac5f0d27122bbd..fb8fb8459a51f8 100644
--- a/ports/tensorpipe/vcpkg.json
+++ b/ports/tensorpipe/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tensorpipe",
   "version-date": "2022-03-16",
+  "port-version": 1,
   "description": "A tensor-aware point-to-point communication primitive for machine learning",
   "homepage": "https://github.com/pytorch/tensorpipe",
   "license": "BSD-3-Clause",

From b893e2a5b6ddc61656f6ed39e61cd3a9adbc6535 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 27 Jun 2022 23:12:55 -0700
Subject: [PATCH 26/42] Fix qpid-proton build

---
 ports/qpid-proton/fix-dependencies.patch | 102 +++++++++++------------
 ports/qpid-proton/vcpkg.json             |   2 +-
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/ports/qpid-proton/fix-dependencies.patch b/ports/qpid-proton/fix-dependencies.patch
index 3c679af0bb8e17..2e51fa24472fe4 100644
--- a/ports/qpid-proton/fix-dependencies.patch
+++ b/ports/qpid-proton/fix-dependencies.patch
@@ -1,8 +1,27 @@
 diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
-index 27b40e7..1931b65 100644
+index 27b40e7..20e7755 100644
 --- a/c/CMakeLists.txt
 +++ b/c/CMakeLists.txt
-@@ -727,11 +727,6 @@ install (FILES
+@@ -377,11 +377,15 @@ if (PROACTOR STREQUAL "iocp" OR (NOT PROACTOR AND NOT PROACTOR_OK))
+ endif()
+ 
+ if (PROACTOR STREQUAL "libuv" OR (NOT PROACTOR AND NOT PROACTOR_OK))
+-  find_package(Libuv)
+-  if (Libuv_FOUND)
++  find_package(libuv CONFIG)
++  if (libuv_FOUND)
+     set (PROACTOR_OK libuv)
+     set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common})
+-    set (PROACTOR_LIBS Libuv::Libuv)
++    if (TARGET uv)
++    set (PROACTOR_LIBS uv)
++    else()
++    set (PROACTOR_LIBS uv_a)
++    endif()
+   endif()
+ endif()
+ 
+@@ -727,11 +731,6 @@ install (FILES
    ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfig.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake
    DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton)
@@ -14,37 +33,11 @@ index 27b40e7..1931b65 100644
  
  if (ENABLE_BENCHMARKS)
    add_subdirectory(benchmarks)
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index 03fe80a..fd6a31d 100644
---- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -26,12 +26,15 @@ find_package(Threads)
- include(versions.cmake)
- 
- # Check for JSON-CPP support for connection configuration
--find_package(JsonCpp)
--option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND})
-+option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF)
- if (ENABLE_JSONCPP)
--  include_directories(${JsonCpp_INCLUDE_DIRS})
-+  find_package(jsoncpp CONFIG REQUIRED)
-   set(CONNECT_CONFIG_SRC src/connect_config.cpp)
--  set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY})
-+  if (TARGET jsoncpp_lib)
-+    set(CONNECT_CONFIG_LIBS jsoncpp_lib)
-+  elseif (TARGET jsoncpp_static)
-+    set(CONNECT_CONFIG_LIBS jsoncpp_static)
-+  endif()
- else()
-   set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp)
- endif()
-
+diff --git a/c/src/ProtonConfig.cmake.in b/c/src/ProtonConfig.cmake.in
+index 6bcc3c0..2f03dc4 100644
 --- a/c/src/ProtonConfig.cmake.in
 +++ b/c/src/ProtonConfig.cmake.in
-@@ -20,39 +20,40 @@
- # Name: Proton
- # Description: Qpid Proton C library
- # Version: @PN_VERSION@
+@@ -23,7 +23,8 @@
  # URL: http://qpid.apache.org/proton/
  
  @PACKAGE_INIT@
@@ -54,8 +47,7 @@ index 03fe80a..fd6a31d 100644
    include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargets.cmake")
  else()
    include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargetsStatic.cmake")
- endif()
- 
+@@ -32,24 +33,21 @@ endif()
  set(Proton_VERSION @PN_VERSION@)
  
  # find dependencies, because static libs don't transitively pull them
@@ -63,8 +55,6 @@ index 03fe80a..fd6a31d 100644
 -    set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
 -    set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 +if (1)
-+    #set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
-+    #set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
  
      set(CyrusSASL_FOUND @CyrusSASL_FOUND@)
      if (CyrusSASL_FOUND)
@@ -83,19 +73,38 @@ index 03fe80a..fd6a31d 100644
 +    find_dependency (Threads)
  
 -    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD})
-+    #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD})
  endif()
  
  set (Proton_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@)
- set (Proton_LIBRARIES Proton::qpid-proton)
- set (Proton_FOUND True)
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 03fe80a..89c14ed 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -26,12 +26,15 @@ find_package(Threads)
+ include(versions.cmake)
  
+ # Check for JSON-CPP support for connection configuration
+-find_package(JsonCpp)
+-option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND})
++option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF)
+ if (ENABLE_JSONCPP)
+-  include_directories(${JsonCpp_INCLUDE_DIRS})
++  find_package(jsoncpp CONFIG REQUIRED)
+   set(CONNECT_CONFIG_SRC src/connect_config.cpp)
+-  set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY})
++  if (TARGET jsoncpp_lib)
++    set(CONNECT_CONFIG_LIBS jsoncpp_lib)
++  elseif (TARGET jsoncpp_static)
++    set(CONNECT_CONFIG_LIBS jsoncpp_static)
++  endif()
+ else()
+   set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp)
+ endif()
+diff --git a/cpp/ProtonCppConfig.cmake.in b/cpp/ProtonCppConfig.cmake.in
+index 74ddfaa..2fece73 100644
 --- a/cpp/ProtonCppConfig.cmake.in
 +++ b/cpp/ProtonCppConfig.cmake.in
-@@ -20,19 +20,21 @@
- # Name: Proton
- # Description: Qpid Proton C library
- # Version: @PN_VERSION@
+@@ -23,7 +23,9 @@
  # URL: http://qpid.apache.org/proton/
  
  @PACKAGE_INIT@
@@ -106,12 +115,3 @@ index 03fe80a..fd6a31d 100644
    include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargets.cmake")
  else()
    include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargetsStatic.cmake")
- endif()
- 
- set (ProtonCpp_VERSION @PN_VERSION@)
- 
- set (ProtonCpp_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@)
- set (ProtonCpp_LIBRARIES Proton::cpp)
- set (ProtonCpp_FOUND True)
- 
- check_required_components(ProtonCpp)
diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json
index c57969ea32970b..1de560fe8f70ad 100644
--- a/ports/qpid-proton/vcpkg.json
+++ b/ports/qpid-proton/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qpid-proton",
   "version": "0.37.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Qpid Proton is a high-performance, lightweight messaging library.",
   "homepage": "https://github.com/apache/qpid-proton",
   "license": "Apache-2.0",

From 177720d0fc3dc526ca585955d812bb95e09ed9f0 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 28 Jun 2022 16:04:00 +0800
Subject: [PATCH 27/42] modern portfile

---
 ports/wpilib/portfile.cmake  | 44 +++++++++++++++++-------------------
 ports/wpilib/vcpkg.json      | 12 ++++++++--
 versions/baseline.json       | 12 +++++-----
 versions/l-/libuv.json       |  2 +-
 versions/q-/qpid-proton.json |  5 ++++
 versions/t-/tensorpipe.json  |  5 ++++
 versions/u-/usockets.json    |  5 ++++
 versions/u-/uvw.json         |  5 ++++
 versions/w-/wpilib.json      |  5 ++++
 9 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake
index edd7dc597487c4..d680107fe5fe99 100644
--- a/ports/wpilib/portfile.cmake
+++ b/ports/wpilib/portfile.cmake
@@ -12,10 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     allwpilib WITHOUT_ALLWPILIB
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
       -DWITHOUT_JAVA=ON
       ${FEATURE_OPTIONS}
@@ -23,39 +21,39 @@ vcpkg_configure_cmake(
       -DUSE_VCPKG_EIGEN=ON
       -DFLAT_INSTALL_WPILIB=ON
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
 if ("allwpilib" IN_LIST FEATURES)
-    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen)
+    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/hal/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gen")
 endif()
 
 if ("cameraserver" IN_LIST FEATURES)
-    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 endif()
 
 if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll")
-    file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll")
+    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dll")
+    file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dll")
 
-    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so")
-    file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so")
+    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.so")
+    file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.so")
 
-    file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib")
-    file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib")
+    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dylib")
+    file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dylib")
 endif()
 
-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib")
-file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib")
+file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.lib")
+file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.lib")
 
-file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.a")
-file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.a")
+file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.a")
+file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.a")
 
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json
index bd991b1c2721bd..16a77f20ff2001 100644
--- a/ports/wpilib/vcpkg.json
+++ b/ports/wpilib/vcpkg.json
@@ -1,13 +1,21 @@
 {
   "name": "wpilib",
-  "version-string": "2020.3.2",
+  "version-date": "2020-03-02",
   "port-version": 3,
   "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.",
   "homepage": "https://github.com/wpilibsuite/allwpilib",
   "supports": "!osx",
   "dependencies": [
     "eigen3",
-    "libuv"
+    "libuv",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "allwpilib": {
diff --git a/versions/baseline.json b/versions/baseline.json
index c5ba7c8561cc68..3bca829eeb74e7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5714,7 +5714,7 @@
     },
     "qpid-proton": {
       "baseline": "0.37.0",
-      "port-version": 2
+      "port-version": 3
     },
     "qscintilla": {
       "baseline": "2.12.0",
@@ -6974,7 +6974,7 @@
     },
     "tensorpipe": {
       "baseline": "2022-03-16",
-      "port-version": 0
+      "port-version": 1
     },
     "termcolor": {
       "baseline": "2.1.0",
@@ -7310,7 +7310,7 @@
     },
     "usockets": {
       "baseline": "0.8.1",
-      "port-version": 0
+      "port-version": 1
     },
     "usrsctp": {
       "baseline": "0.9.5.0",
@@ -7346,7 +7346,7 @@
     },
     "uvw": {
       "baseline": "2.12.1",
-      "port-version": 0
+      "port-version": 1
     },
     "uwebsockets": {
       "baseline": "20.11.0",
@@ -7609,8 +7609,8 @@
       "port-version": 1
     },
     "wpilib": {
-      "baseline": "2020.3.2",
-      "port-version": 2
+      "baseline": "2020-03-02",
+      "port-version": 3
     },
     "wren": {
       "baseline": "0.4.0",
diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 2c3dca0537d05c..78f600261a5ca5 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e825a063dec1470102ce7129754b1e5ccc13c81f",
+      "git-tree": "672d03f8eef8ef0cdd250e9e50ae7034def94f7b",
       "version-semver": "1.44.1",
       "port-version": 0
     },
diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json
index 95a109f9dc3d86..5fa95620af7469 100644
--- a/versions/q-/qpid-proton.json
+++ b/versions/q-/qpid-proton.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b88502e017fbd381fac133ac054aa9368927af8e",
+      "version": "0.37.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e019a7a0cb758104296c13689ca86f44db64cfb6",
       "version": "0.37.0",
diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json
index 0dd256c6db6587..4233d9f58e84f0 100644
--- a/versions/t-/tensorpipe.json
+++ b/versions/t-/tensorpipe.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4b982c4ade4582a5728384f2871610b107fe1b9f",
+      "version-date": "2022-03-16",
+      "port-version": 1
+    },
     {
       "git-tree": "f78594bb71084f0ea1b9e0bba9b9804696e4c011",
       "version-date": "2022-03-16",
diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json
index efac4caed8cbef..164372161188d7 100644
--- a/versions/u-/usockets.json
+++ b/versions/u-/usockets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e5701cf799473839b3f179ea2dfcefaec21a744e",
+      "version": "0.8.1",
+      "port-version": 1
+    },
     {
       "git-tree": "de62ce303388342f83a490f69bdb92ec41ecc0f2",
       "version": "0.8.1",
diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json
index 4d3cc82eb89a74..e0201c68a22651 100644
--- a/versions/u-/uvw.json
+++ b/versions/u-/uvw.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "609b48de110aa8763d8f4a674ac3aa7c5821382f",
+      "version": "2.12.1",
+      "port-version": 1
+    },
     {
       "git-tree": "eac81a2d74241ded58a1c503d91f226f86ca09c6",
       "version": "2.12.1",
diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json
index 2b2c63cfe10921..a345ad2bd94260 100644
--- a/versions/w-/wpilib.json
+++ b/versions/w-/wpilib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ab5cb05ce0d7f2c8cd90f79c5d26d3660caf2475",
+      "version-date": "2020-03-02",
+      "port-version": 3
+    },
     {
       "git-tree": "cf10ef63982d54978a85c868d37462ce21643188",
       "version-string": "2020.3.2",

From 9db56a4103f3934817f92206a13df2fe5d381006 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 28 Jun 2022 16:04:35 +0800
Subject: [PATCH 28/42] update version

---
 versions/w-/wpilib.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json
index a345ad2bd94260..f02073035258f9 100644
--- a/versions/w-/wpilib.json
+++ b/versions/w-/wpilib.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ab5cb05ce0d7f2c8cd90f79c5d26d3660caf2475",
+      "git-tree": "fe08014f42cf7e21bae48755a16c92797c9024f3",
       "version-date": "2020-03-02",
       "port-version": 3
     },

From 348b3deedc8baf34e056dbe61d7338510f4daa9a Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 28 Jun 2022 16:25:56 +0800
Subject: [PATCH 29/42] Add licese

---
 ports/usockets/vcpkg.json | 1 +
 ports/wpilib/vcpkg.json   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json
index 1c9683c4dddda1..ab920957b08b5b 100644
--- a/ports/usockets/vcpkg.json
+++ b/ports/usockets/vcpkg.json
@@ -4,6 +4,7 @@
   "port-version": 1,
   "description": "Miniscule cross-platform eventing, networking & crypto for async applications",
   "homepage": "https://github.com/uNetworking/uSockets",
+  "license": "Apache-2.0",
   "dependencies": [
     "libuv",
     {
diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json
index 16a77f20ff2001..c928da52447643 100644
--- a/ports/wpilib/vcpkg.json
+++ b/ports/wpilib/vcpkg.json
@@ -4,6 +4,7 @@
   "port-version": 3,
   "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.",
   "homepage": "https://github.com/wpilibsuite/allwpilib",
+  "license": null,
   "supports": "!osx",
   "dependencies": [
     "eigen3",

From 1ded7ce29944f355738690ae1a8cdc8c7b1e6854 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 28 Jun 2022 16:26:22 +0800
Subject: [PATCH 30/42] update version

---
 versions/u-/usockets.json | 2 +-
 versions/w-/wpilib.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json
index 164372161188d7..916714dec5909a 100644
--- a/versions/u-/usockets.json
+++ b/versions/u-/usockets.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e5701cf799473839b3f179ea2dfcefaec21a744e",
+      "git-tree": "2af011819c62a105970d7bbffb158504b9246df6",
       "version": "0.8.1",
       "port-version": 1
     },
diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json
index f02073035258f9..b4a4397f39ff9b 100644
--- a/versions/w-/wpilib.json
+++ b/versions/w-/wpilib.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "fe08014f42cf7e21bae48755a16c92797c9024f3",
+      "git-tree": "1593dcc61c40d6205be6d47e3623dc6bb3ddbad3",
       "version-date": "2020-03-02",
       "port-version": 3
     },

From f3df9a45ab5d661f797b7354845da582dc1c206a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Tue, 28 Jun 2022 17:02:17 +0800
Subject: [PATCH 31/42] Update ports/usockets/CMakeLists.txt

---
 ports/usockets/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt
index 2d838eff93961c..990176f30906d3 100644
--- a/ports/usockets/CMakeLists.txt
+++ b/ports/usockets/CMakeLists.txt
@@ -51,7 +51,7 @@ if (${LIBUS_USE_LIBUV})
 endif()
 
 target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL})
-target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR} "${CMAKE_CURRENT_LIST_DIR}/src")
+target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src")
 target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS})
 
 install(TARGETS uSockets

From abd4a5364354eda30c4d108458153da2fe3eb47e Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 28 Jun 2022 17:03:39 +0800
Subject: [PATCH 32/42] update version

---
 versions/u-/usockets.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json
index 916714dec5909a..b50ca1ffd7c72d 100644
--- a/versions/u-/usockets.json
+++ b/versions/u-/usockets.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "2af011819c62a105970d7bbffb158504b9246df6",
+      "git-tree": "bf42304e17879df7e100c97d4487adaeaadfd87e",
       "version": "0.8.1",
       "port-version": 1
     },

From ea8497c53deb95787e2b10773b44aad0cb69e219 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 01:27:41 -0700
Subject: [PATCH 33/42] Add usage

---
 ports/libuv/portfile.cmake | 1 +
 ports/libuv/usage          | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 ports/libuv/usage

diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 3a21c983dd45c0..5cc5a247b0c6cd 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -30,5 +30,6 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
diff --git a/ports/libuv/usage b/ports/libuv/usage
new file mode 100644
index 00000000000000..b93ab285523e98
--- /dev/null
+++ b/ports/libuv/usage
@@ -0,0 +1,4 @@
+libuv provides CMake targets:
+
+    find_package(libuv CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:uv_a>,uv_a,uv>)

From 76c202f5264690417faef64117d3c7f9fd18d3fd Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 01:36:22 -0700
Subject: [PATCH 34/42] Apply suggestion

---
 ports/qpid-proton/fix-dependencies.patch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/qpid-proton/fix-dependencies.patch b/ports/qpid-proton/fix-dependencies.patch
index 2e51fa24472fe4..893f6b5cfab7e4 100644
--- a/ports/qpid-proton/fix-dependencies.patch
+++ b/ports/qpid-proton/fix-dependencies.patch
@@ -1,5 +1,5 @@
 diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
-index 27b40e7..20e7755 100644
+index 27b40e7..a3a5d38 100644
 --- a/c/CMakeLists.txt
 +++ b/c/CMakeLists.txt
 @@ -377,11 +377,15 @@ if (PROACTOR STREQUAL "iocp" OR (NOT PROACTOR AND NOT PROACTOR_OK))
@@ -7,9 +7,8 @@ index 27b40e7..20e7755 100644
  
  if (PROACTOR STREQUAL "libuv" OR (NOT PROACTOR AND NOT PROACTOR_OK))
 -  find_package(Libuv)
--  if (Libuv_FOUND)
-+  find_package(libuv CONFIG)
-+  if (libuv_FOUND)
++  find_package(libuv NAMES libuv CONFIG)
+   if (Libuv_FOUND)
      set (PROACTOR_OK libuv)
      set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common})
 -    set (PROACTOR_LIBS Libuv::Libuv)

From c25a997eff2cc29dc502b840b0921c14f95ee1b9 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 01:37:02 -0700
Subject: [PATCH 35/42] version

---
 versions/l-/libuv.json       | 2 +-
 versions/q-/qpid-proton.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 78f600261a5ca5..4fe57a4798e76d 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "672d03f8eef8ef0cdd250e9e50ae7034def94f7b",
+      "git-tree": "4560e3046488c518b6573a14d7ad063a02f52db9",
       "version-semver": "1.44.1",
       "port-version": 0
     },
diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json
index 5fa95620af7469..68e6fc10b8fa0f 100644
--- a/versions/q-/qpid-proton.json
+++ b/versions/q-/qpid-proton.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b88502e017fbd381fac133ac054aa9368927af8e",
+      "git-tree": "1c34961737e713b5efaf80a8cb9c1f752cba4e6c",
       "version": "0.37.0",
       "port-version": 3
     },

From 21f0d66d7e8e0dc7a06fdf61118947081d2eb2d5 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 02:11:26 -0700
Subject: [PATCH 36/42] Disable to build examples

---
 ports/qpid-proton/portfile.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake
index 3e29c19ee1fbb6..686c1c089acada 100644
--- a/ports/qpid-proton/portfile.cmake
+++ b/ports/qpid-proton/portfile.cmake
@@ -32,6 +32,7 @@ vcpkg_cmake_configure(
         -DENABLE_WARNING_ERROR=OFF
         -DENABLE_BENCHMARKS=OFF
         -DENABLE_FUZZ_TESTING=OFF
+        -DBUILD_EXAMPLES=OFF
         -DBUILD_TESTING=OFF
         -DCMAKE_INSTALL_RPATH=${rpath}
         -DPython_EXECUTABLE=${PYTHON3}

From 9f1d9062a94550ed88ca2e0e25537991370553c7 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 02:11:36 -0700
Subject: [PATCH 37/42] version

---
 versions/q-/qpid-proton.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json
index 68e6fc10b8fa0f..c0e5fcbde33244 100644
--- a/versions/q-/qpid-proton.json
+++ b/versions/q-/qpid-proton.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "1c34961737e713b5efaf80a8cb9c1f752cba4e6c",
+      "git-tree": "0d341e54d45be81f3f0d1d0e6ab6b10b76b12160",
       "version": "0.37.0",
       "port-version": 3
     },

From 3836985186b84763a08779bc9ad34cf0a4764d93 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 08:06:54 -0700
Subject: [PATCH 38/42] typo

---
 ports/qpid-proton/fix-dependencies.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/qpid-proton/fix-dependencies.patch b/ports/qpid-proton/fix-dependencies.patch
index 893f6b5cfab7e4..749f5a7fe59b3a 100644
--- a/ports/qpid-proton/fix-dependencies.patch
+++ b/ports/qpid-proton/fix-dependencies.patch
@@ -7,7 +7,7 @@ index 27b40e7..a3a5d38 100644
  
  if (PROACTOR STREQUAL "libuv" OR (NOT PROACTOR AND NOT PROACTOR_OK))
 -  find_package(Libuv)
-+  find_package(libuv NAMES libuv CONFIG)
++  find_package(libuv NAMES Libuv CONFIG)
    if (Libuv_FOUND)
      set (PROACTOR_OK libuv)
      set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common})

From aaadada8c1882c17ab5a6ce15791b78e3be8becb Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 08:07:07 -0700
Subject: [PATCH 39/42] version

---
 versions/q-/qpid-proton.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json
index c0e5fcbde33244..01cfae1ee5b862 100644
--- a/versions/q-/qpid-proton.json
+++ b/versions/q-/qpid-proton.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "0d341e54d45be81f3f0d1d0e6ab6b10b76b12160",
+      "git-tree": "e8969c9da1d3707a2d4246fa682fed36f1a9593b",
       "version": "0.37.0",
       "port-version": 3
     },

From f5366cfc9e1f20aa39cc764160f7d720d47cbc95 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 08:27:17 -0700
Subject: [PATCH 40/42] Fix find_package

---
 ports/qpid-proton/fix-dependencies.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/qpid-proton/fix-dependencies.patch b/ports/qpid-proton/fix-dependencies.patch
index 749f5a7fe59b3a..6828a30150f01b 100644
--- a/ports/qpid-proton/fix-dependencies.patch
+++ b/ports/qpid-proton/fix-dependencies.patch
@@ -7,7 +7,7 @@ index 27b40e7..a3a5d38 100644
  
  if (PROACTOR STREQUAL "libuv" OR (NOT PROACTOR AND NOT PROACTOR_OK))
 -  find_package(Libuv)
-+  find_package(libuv NAMES Libuv CONFIG)
++  find_package(Libuv NAMES libuv CONFIG)
    if (Libuv_FOUND)
      set (PROACTOR_OK libuv)
      set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common})

From bb1728caffaad7b7668310b06de12a54dd6a0323 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 6 Jul 2022 08:27:26 -0700
Subject: [PATCH 41/42] version

---
 versions/q-/qpid-proton.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json
index 01cfae1ee5b862..3a79b51b021f59 100644
--- a/versions/q-/qpid-proton.json
+++ b/versions/q-/qpid-proton.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e8969c9da1d3707a2d4246fa682fed36f1a9593b",
+      "git-tree": "32527f3a05b41a04ad42ab2e0827dfee69b18ec0",
       "version": "0.37.0",
       "port-version": 3
     },

From 7d8b2d08e401ef769c87c07c26e156de823d75e3 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 7 Jul 2022 19:12:49 +0800
Subject: [PATCH 42/42] Update version

---
 scripts/test_ports/cmake/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json
index c3d5295798ae88..e5de5713252e53 100644
--- a/scripts/test_ports/cmake/vcpkg.json
+++ b/scripts/test_ports/cmake/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cmake",
-  "version-string": "3.22.2",
+  "version": "3.22.2",
   "port-version": 1,
   "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.",
   "homepage": "https://cmake.org/",