From ef3b1428ca654750053b1f942677fde65196b55a Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 10 Jun 2023 14:12:41 +0200
Subject: [PATCH 1/3] [vcpkg-ci-msys2] Add clangarm64 support

UCRT binaries for ARM64, built with clang.
---
 scripts/test_ports/vcpkg-ci-msys2/portfile.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake
index 222727ca95ffd7..bc1fb58e705193 100644
--- a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake
+++ b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake
@@ -3,6 +3,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 set(msys_repo_url    "https://mirror.msys2.org/msys/x86_64")
 set(mingw64_repo_url "https://mirror.msys2.org/mingw/mingw64")
 set(mingw32_repo_url "https://mirror.msys2.org/mingw/mingw32")
+set(clangarm64_repo_url "https://mirror.msys2.org/mingw/clangarm64")
 
 # Ignore these updates (e.g. for known problems)
 vcpkg_list(SET ignored_packages
@@ -165,6 +166,8 @@ function(analyze_package_list list_var script)
             set(repo "mingw64")
         elseif(name MATCHES "^mingw-w64-i686")
             set(repo "mingw32")
+        elseif(name MATCHES "^mingw-w64-clang-aarch64")
+            set(repo "clangarm64")
         endif()
 
         file(GLOB files "${${repo}_repo_files}/${name}-*/desc")
@@ -305,7 +308,7 @@ endfunction()
 
 message(STATUS "*** Downloading current msys2 package lists")
 string(TIMESTAMP stamp "%Y-%m-%d" UTC)
-foreach(repo IN ITEMS msys mingw32 mingw64)
+foreach(repo IN ITEMS msys mingw32 mingw64 clangarm64)
     string(REPLACE "/" "-" local_file "msys2-${stamp}-${repo}.files")
     set(archive "${DOWNLOADS}/${local_file}")
     vcpkg_download_distfile(repo_files_archive

From 6a9132bff88558e40bae836c5233b0832562aad9 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 10 Jun 2023 14:15:23 +0200
Subject: [PATCH 2/3] [vcpkg_find_acquire_program(PKGCONFIG)] Switch to
 pkgconf, add arm64

---
 ...cpkg_find_acquire_program(PKGCONFIG).cmake | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake
index 0ba1a611d90448..559d3dc6f73539 100644
--- a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake
@@ -17,19 +17,25 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD")
     set(version_command --version)
 elseif(CMAKE_HOST_WIN32)
     if(NOT EXISTS "${PKGCONFIG}")
-        set(VERSION 0.29.2-3)
-        set(program_version git-9.0.0.6373.5be8fcd83-1)
-        vcpkg_acquire_msys(
-            PKGCONFIG_ROOT
-            NO_DEFAULT_PACKAGES
-            DIRECT_PACKAGES
-                "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst"
-                0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4
-                "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst"
-                c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810
-        )
+        set(program_version 1.8.0)
+        if("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "ARM64")
+            vcpkg_acquire_msys(PKGCONFIG_ROOT
+                NO_DEFAULT_PACKAGES
+                DIRECT_PACKAGES
+                    "https://mirror.msys2.org/mingw/clangarm64/mingw-w64-clang-aarch64-pkgconf-1~1.8.0-2-any.pkg.tar.zst"
+                    f682bbeb4588a169a26d3c9c1ce258c0022954fa11a64e05cd803bcbb8c4e2442022c0c6bc7e54d3324359c80ea67904187d4cb3b682914f5f14a03251daae7c
+            )
+            set("${program}" "${PKGCONFIG_ROOT}/clangarm64/bin/pkg-config.exe" CACHE INTERNAL "")
+        else()
+            vcpkg_acquire_msys(PKGCONFIG_ROOT
+                NO_DEFAULT_PACKAGES
+                DIRECT_PACKAGES
+                    "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-pkgconf-1~1.8.0-2-any.pkg.tar.zst"
+                    e5217d9c55ede4c15706b4873761cc6e987eabc1308120a3e8406571ae2993907f3776f2b2bba18d7aaec80ef97227696058cedc1b67a773530dc1e6077b95e6
+            )
+            set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "")
+        endif()
     endif()
-    set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "")
     set("${program}" "${${program}}" PARENT_SCOPE)
     return()
 else()

From d44f1de41d6c7c0bfb24ffee7724b81b9c6e04b4 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sun, 11 Jun 2023 10:34:46 +0200
Subject: [PATCH 3/3] CI