mixxxdj · ywwg · Apr 19, 2022 · Mar 21, 2022 · Mar 21, 2022 · Mar 21, 2022
diff --git a/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md b/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md
@@ -24,7 +24,7 @@ Repro code when
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Failure logs** 
+**Failure logs**
 -(please attached failure logs)
 
 **Additional context**

diff --git a/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/.github/ISSUE_TEMPLATE/report-package-build-failure.md
@@ -15,7 +15,7 @@ assignees: ''
 Steps to reproduce the behavior:
 `./vcpkg install xxxx`
 
-**Failure logs** 
+**Failure logs**
 -Cut and paste the appropriate build messages from the console output.
 -Please attach any additional failure logs mentioned in the console output.
 

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,15 +1,15 @@
 **Describe the pull request**
 
-- #### What does your PR fix?  
+- #### What does your PR fix?
   Fixes #...
 
-- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)?  
+- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)?
   <all / linux, windows, ...>, <Yes/No>
 
-- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)?  
+- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)?
   `Your answer`
 
-- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?  
+- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?
   <Yes / I am still working on this PR>
 
 **If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/**
diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md
@@ -13,6 +13,16 @@ vcpkg_cmake_get_vars(<out-var>)
 a path to a generated CMake file, with the detected `CMAKE_*` variables
 re-exported as `VCPKG_DETECTED_CMAKE_*`.
 
+Additionally sets, for `RELEASE` and `DEBUG`:
+- VCPKG_COMBINED_CXX_FLAGS_<config>
+- VCPKG_COMBINED_C_FLAGS_<config>
+- VCPKG_COMBINED_SHARED_LINKER_FLAGS_<config>
+- VCPKG_COMBINED_STATIC_LINKER_FLAGS_<config>
+- VCPKG_COMBINED_EXE_LINKER_FLAGS_<config>
+
+Most users should use these pre-combined flags instead of attempting
+to read the `VCPKG_DETECTED_*` flags directly.
+
 ## Notes
 Avoid usage in portfiles.
 

diff --git a/docs/users/android.md b/docs/users/android.md
@@ -30,10 +30,7 @@ export ANDROID_NDK_HOME=/home/your-account/Android/android-ndk-r21b
 export VCPKG_ROOT=/path/to/vcpkg
 ````
 
-## Create the android triplets
-
-
-### Android ABI and corresponding vcpkg triplets
+## vcpkg triplets and their corresponding android ABI
 
 There are four different Android ABI, each of which maps to 
 a vcpkg triplet. The following table outlines the mapping from vcpkg architectures to android architectures
@@ -45,41 +42,6 @@ a vcpkg triplet. The following table outlines the mapping from vcpkg architectur
 |x64-android                | x86_64               |
 |x86-android                | x86                  |
 
-### Create the android triplets
-You can copy-paste the script below to populate them, and adjust them to your needs if required.
-
-````bash
-cd $VCPKG_ROOT
-
-echo "
-set(VCPKG_TARGET_ARCHITECTURE arm)
-set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_CMAKE_SYSTEM_NAME Android)
-" > triplets/community/arm-android.cmake
-
-echo "
-set(VCPKG_TARGET_ARCHITECTURE arm64)
-set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_CMAKE_SYSTEM_NAME Android)
-" > triplets/community/arm64-android.cmake
-
-echo "
-set(VCPKG_TARGET_ARCHITECTURE x86)
-set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_CMAKE_SYSTEM_NAME Android)
-" > triplets/community/x86-android.cmake
-
-echo "
-set(VCPKG_TARGET_ARCHITECTURE x64)
-set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_CMAKE_SYSTEM_NAME Android)
-" > triplets/community/x64-android.cmake
-````
-
 ## Install libraries for Android using vcpkg
 
 Example for jsoncpp:

diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fredrik-johansson/arb

diff --git a/ports/arb/vcpkg.json b/ports/arb/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "arb",
   "version": "2.21.1",
+  "port-version": 1,
   "description": "a C library for arbitrary-precision interval arithmetic",
   "homepage": "https://github.com/fredrik-johansson/arb",
+  "license": "LGPL-2.1",
   "dependencies": [
     "flint",
     {

diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Taywee/args
-    REF 6.2.7
-    SHA512 a6491b2680979feb2f09e7ffb4f3c939b75057b6b4b90136b6cb72eaf5a462d3079dfb5836744e53bf4946bd575d4449f87129d6e50045732d7fba11c2be57dd
+    REF 6.3.0
+    SHA512 7d554719781d5a096883e37cd5c1706782d06c2c4d7a9598142aec7f2e38d63438e82960b60a705baeb2aa5d31143c83fa6c0d1331a36b16f564a5ea56ad451d
     HEAD_REF master
 )
 
@@ -22,5 +22,3 @@ vcpkg_fixup_pkgconfig()
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_copy_pdbs()
diff --git a/ports/args/vcpkg.json b/ports/args/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "args",
-  "version": "6.2.7",
+  "version": "6.3.0",
   "description": "A simple header-only C++ argument parser library.",
   "homepage": "https://github.com/Taywee/args",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/argtable3/portfile.cmake b/ports/argtable3/portfile.cmake
@@ -1,32 +1,29 @@
-vcpkg_download_distfile(ARCHIVE
-   URLS "https://github.com/argtable/argtable3/releases/download/v3.2.1.52f24e5/argtable-v3.2.1.52f24e5.tar.gz"
-   FILENAME "argtable-v3.2.1.52f24e5.tar.gz"
-   SHA512 cec77d56048b38bb7af8553cb660e745972bbd90378eeea4e928579af78190c8a41fdb29c972263e18955e3a497e09c42f705f7c4d548c3c523c5cb104c97a10
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    REPO argtable/argtable3
+    REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support
+    SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc
+    HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DARGTABLE3_ENABLE_CONAN=OFF
         -DARGTABLE3_ENABLE_TESTS=OFF
+        -DARGTABLE3_ENABLE_EXAMPLES=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT})
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
+elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}")
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/argtable3/vcpkg.json b/ports/argtable3/vcpkg.json
@@ -1,6 +1,18 @@
 {
   "name": "argtable3",
-  "version-string": "3.2.1",
+  "version": "3.2.1",
+  "port-version": 2,
   "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options",
-  "homepage": "www.argtable.org"
+  "homepage": "https://www.argtable.org/",
+  "license": "BSD-2-Clause-FreeBSD",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
@@ -44,7 +44,7 @@ endif()
 set(filename "${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp")
 if(EXISTS "${filename}")
     file(READ "${filename}" contents)
-    string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\\n]*\n" "\n" contents "${contents}")
+    string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\n]*\n" "\n" contents "${contents}")
     file(WRITE "${filename}" "${contents}")
 endif()
 

diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "armadillo",
   "version": "10.6.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
   "homepage": "http://arma.sourceforge.net",
   "dependencies": [

diff --git a/ports/ashes/fix-cast.patch b/ports/ashes/fix-cast.patch
diff --git a/ports/ashes/portfile.cmake b/ports/ashes/portfile.cmake
@@ -1,27 +1,36 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO DragonJoker/Ashes
-	REF 0f4e6d0ea308eb60ae32274acc9a4d345a4977ff
-	SHA512 0ce74780786d018e7a447c4e49d3cd83ad53b238a79fc484025e2034cd49a64253363cd592d2da367befa7cd5443b90eb1c5dae54b22756f7b4a0cdecb93c588
-    PATCHES
-        fix-cast.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DragonJoker/Ashes
+    REF f39ca2db24a9d7a2d586c85c78bb6eacd8d63b49
+    HEAD_REF master
+    SHA512 a45d443797ffe31305acca154640530c6ed767af9982d857b6e59841add3b0a373723f5f7b590512c1b0dd4064dfbae8aa8445fec59a3c3c2b8a3c002b180609
 )
-vcpkg_configure_cmake(
-	SOURCE_PATH ${SOURCE_PATH}
-	PREFER_NINJA
-	OPTIONS
-		-DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR}
-		-DPROJECTS_USE_PRECOMPILED_HEADERS=OFF
-		-DVCPKG_PACKAGE_BUILD=ON
-		-DASHES_BUILD_TEMPLATES=OFF
-		-DASHES_BUILD_TESTS=OFF
-		-DASHES_BUILD_INFO=OFF
-		-DASHES_BUILD_SAMPLES=OFF
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH CMAKE_SOURCE_PATH
+    REPO DragonJoker/CMakeUtils
+    REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1
+    HEAD_REF master
+    SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/CMake")
+file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR}
+        -DVCPKG_PACKAGE_BUILD=ON
+        -DASHES_BUILD_TEMPLATES=OFF
+        -DASHES_BUILD_TESTS=OFF
+        -DASHES_BUILD_INFO=OFF
+        -DASHES_BUILD_SAMPLES=OFF
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ashes)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ashes)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/ashes/vcpkg.json b/ports/ashes/vcpkg.json
@@ -1,13 +1,21 @@
 {
   "name": "ashes",
-  "version-date": "2021-06-18",
-  "port-version": 1,
+  "version-date": "2022-04-03",
   "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.",
   "homepage": "https://github.com/DragonJoker/Ashes",
+  "license": "MIT",
   "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static",
   "dependencies": [
     "opengl",
     "spirv-cross",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "vulkan-headers"
   ]
 }
diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tradias/asio-grpc
-    REF v1.4.0
-    SHA512 2888c4abd5a531983a647a51971fd09eeb3e9f5bc7d2f95aa10f455d2d0f852367a8b039c867730c604be5e248cb0aacaf55fd0b23d05322c23d94dee719a7ad
+    REF v1.5.1
+    SHA512 528a790a7414db1b03b20d4d82d510a08cba9fc3c99501955c60c28ce4d768202a4339241b9e99f0199deb379345dc75934f991bad735eda0b32eb6cb3cef587
     HEAD_REF master
 )
 

diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "asio-grpc",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Asynchronous gRPC with Asio/unified executors",
   "homepage": "https://github.com/Tradias/asio-grpc",
   "license": "Apache-2.0",

diff --git a/ports/aws-sdk-cpp/fix-config.patch b/ports/aws-sdk-cpp/fix-config.patch