Merge pull request microsoft#209 from acolombier/chore/update-vcpkg

Update vcpkg

Author: JoergAtGithub

.github/pull_request_template.md

@@ -6,26 +6,28 @@
 
 - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
 - [ ] SHA512s are updated for each updated download.
-- [ ] The "supports" clause reflects platforms that may be fixed by this new version.
-- [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.
-- [ ] Any patches that are no longer applied are deleted from the port's directory.
+- [ ] The "supports" clause reflects platforms that may be fixed by this new version, or no changes were necessary.
+- [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) and [CI feature baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.feature.baseline.txt) entries are removed from that file, or no entries needed to be changed.
+- [ ] All patch files in the port are applied and succeed.
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
-- [ ] Only one version is added to each modified port's versions file.
+- [ ] Exactly one version is added in each modified versions file.
 
 END OF PORT UPDATE CHECKLIST (delete this line) -->
 
 <!-- If this PR adds a new port, please uncomment and fill out this checklist:
 
 - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
-- [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
-- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
+- [ ] The packaged project shows strong association with the chosen port name. Check this box if at least one of the following criteria is met:
+    - [ ] The project is in Repology: https://repology.org/<PORT NAME>/versions
+    - [ ] The project is amongst the first web search results for "<PORT NAME>" or "<PORT NAME> C++". Include a screenshot of the search engine results in the PR.
+    - [ ] The port name follows the 'GitHubOrg-GitHubRepo' form or equivalent `Owner-Project` form.
+- [ ] Optional dependencies of the build are all controlled by the port. A dependency is controlled if it is declared an unconditional dependency in `vcpkg.json`, or explicitly disabled through patches or build system arguments such as [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) or [VCPKG_LOCK_FIND_PACKAGE](https://learn.microsoft.com/vcpkg/users/buildsystems/cmake-integration#vcpkg_lock_find_package_pkg)
 - [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
 - [ ] The license declaration in `vcpkg.json` matches what upstream says.
 - [ ] The installed as the "copyright" file matches what upstream says.
 - [ ] The source code of the component installed comes from an authoritative source.
-- [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context.
+- [ ] The generated "usage text" is brief and accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. Don't add a usage file if the automatically generated usage is correct.
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
-- [ ] Only one version is in the new port's versions file.
-- [ ] Only one version is added to each modified port's versions file.
+- [ ] Exactly one version is added in each modified versions file.
 
 END OF NEW PORT CHECKLIST (delete this line) -->

.github/workflows/build.yml

@@ -173,6 +173,7 @@ jobs:
             libxi-dev \
             libxkbcommon-dev \
             libxkbcommon-x11-dev \
+            libxrandr-dev \
             libxrender-dev \
             linux-libc-dev \
             nasm \

ports/7zip/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ip7z/7zip
     REF "${upstream_version}"
-    SHA512 eb5ed600f82aca52f6dc8d2be3e4da4380670308dff2bcbfc96255d9d23bb5ca35dea073bd97070f0a1891b2f329d88a06b304f48e30f4ad89256c7664e9c1ea
+    SHA512 5f4922efd94e12776e531f77053981978a0d9f8c6da50f51bdb750a54436b07ddccafa6a1180fd234a7fcaf4d2a5b0ab7c2a9267da2ea8e68407bf432ff0f76c
     HEAD_REF main
     PATCHES
         sort-asm.diff

ports/7zip/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "7zip",
-  "version": "25.1",
-  "port-version": 1,
+  "version": "26.0",
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",

ports/abcmake/portfile.cmake

@@ -0,0 +1,18 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO an-dr/abcmake
+    REF "v6.4.0"
+    SHA512 85724b25e158f41f0aa0e5f01ea0530a46f6b4397606b1af115c8aec1c29d317aaaf40a6161795687d713b6f00f66b13a1ab3982f351a139dc79a7d4ac42b7da
+)
+
+set(VCPKG_BUILD_TYPE release) # CMake support file only port
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/abcmake/usage

@@ -0,0 +1,4 @@
+abcmake provides CMake configs:
+
+    find_package(abcmake CONFIG REQUIRED)
+    add_main_component(${PROJECT_NAME})

ports/abcmake/vcpkg.json

@@ -0,0 +1,13 @@
+{
+  "name": "abcmake",
+  "version": "6.4.0",
+  "description": "Simple, component-first CMake helper for small & medium C/C++ projects",
+  "homepage": "https://github.com/an-dr/abcmake",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}

ports/ada-idna/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ada-url/idna
     REF "${VERSION}"
-    SHA512 e9887102e10b5963518ef4dc62b2538b941201e099eb80ee1c3a6742a370a7bbf600005363f665ffdc438b09ced9a30158b33c93032fc7d491ea54f158190db6
+    SHA512 d161ca25d37746b6127ff7dadf6a6475e73802575fd75362f46259512f7f2c9a73154ad6faf9411fd73fbdf46e6e7c49fccfdeec5883d069025789742137db55
     HEAD_REF main
     PATCHES
         install.patch

ports/ada-idna/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ada-idna",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "C++ library implementing the to_ascii and to_unicode functions from the Unicode Technical Standard.",
   "homepage": "https://github.com/ada-url/idna",
   "license": "Apache-2.0 AND MIT",

ports/ada-url/no-cpm.patch

@@ -1,20 +1,20 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b55e39..23ce61f 100644
+index d525b59..116095b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,7 +22,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake)
+@@ -26,7 +26,6 @@ option(ADA_USE_SIMDUTF "Whether to use SIMDUTF for IDNA" OFF)
  # errors due to CPM, so this is here to support disabling all the testing
  # and tooling for ada if one only wishes to use the ada library.
- if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS)
+ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS OR ADA_USE_SIMDUTF)
 -  include(cmake/CPM.cmake)
    # CPM requires git as an implicit dependency
    # We use googletest in the tests
    if(ADA_TESTING)
 diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt
-index 397b428..4b49928 100644
+index 5e7ffe0..f60a2d5 100644
 --- a/tools/cli/CMakeLists.txt
 +++ b/tools/cli/CMakeLists.txt
-@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS)
+@@ -37,12 +37,8 @@ if(MSVC AND BUILD_SHARED_LIBS)
          "$<TARGET_FILE:ada>"      # <--this is in-file
          "$<TARGET_FILE_DIR:adaparse>")                 # <--this is out-file path
  endif()