Merge branch 'master' into clangcltriplets

microsoft · Jan 31, 2025 · 5ca5406 · 5ca5406
2 parents 3e749a0 + d504de0
commit 5ca5406
Show file tree

Hide file tree

Showing 232 changed files with 3,121 additions and 1,457 deletions.
diff --git a/ports/aricpp/portfile.cmake b/ports/aricpp/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO daniele77/aricpp
-    REF v1.1.3
-    SHA512 5b4c2829177f338f46f5d48baee8d3dd35bdce11780ed1b4b20ddb738573d12227982574877be8f9a8cea355e202cac97eb85a16fd582d2e348a9404b34467fd
+    REF v1.2.1
+    SHA512 7070d2a4e69e9490445002244b532e2fb519bd0642e8d1f4a6e267b9d957274db7c370038c225349c4997b1e2e5c549b0a4fa19c1db30c4ea184de37ca8b9b4b 
     HEAD_REF master
 )
 

diff --git a/ports/aricpp/vcpkg.json b/ports/aricpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aricpp",
-  "version-semver": "1.1.3",
+  "version-semver": "1.2.1",
   "description": "Asterisk ARI interface bindings for modern C++",
   "homepage": "https://github.com/daniele77/aricpp",
   "license": "BSL-1.0",

diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO asmjit/asmjit
-    REF ffac9f36fb045dd2c6a81e1b5b9ccc115e5ef924 # commited on 2024-06-28
-    SHA512 3a594bdea7095f66356f8c21e03a4db2535811988726c25a29e66721cb703dc9dceddeb5f8a6c7daeafba3fbf6dd07e71375446d8dfb182f57c14bce28192774
+    REF e1b20711cc40c29ec4918b54e328ace96470f6e5 # commited on 2025-01-22
+    SHA512 5d40840ce203bcef86d81b3538be7a4443dbcba52735cf9c90bc9c974d3c7e1ab75ff0fd7e2c72533d73884cce93808e63aa2228c2b7c5376aee4437070714a2
     HEAD_REF master
 )
 

diff --git a/ports/asmjit/vcpkg.json b/ports/asmjit/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "asmjit",
-  "version-date": "2024-06-28",
+  "version-date": "2025-01-22",
   "description": "AsmJit is a lightweight library for machine code generation written in C++ language",
   "homepage": "https://asmjit.com/",
   "documentation": "https://asmjit.com/doc/",

diff --git a/ports/awlib/fix-mac-build.patch b/ports/awlib/fix-mac-build.patch
@@ -0,0 +1,44 @@
+diff --git a/io/include/aw/io/mmap_file.h b/io/include/aw/io/mmap_file.h
+index 98469732..65e82aac 100644
+--- a/io/include/aw/io/mmap_file.h
++++ b/io/include/aw/io/mmap_file.h
+@@ -83,18 +83,18 @@ using win32::file_mapping;
+ inline file_mode get_file_mode(map_perms perms)
+ {
+ 	using mp = map_perms;
+-	switch (perms) {
+-	case mp::none:
+-	case mp::none|mp::exec:
++	switch (static_cast<unsigned>(perms)) {
++	case static_cast<unsigned>(mp::none):
++	case static_cast<unsigned>(mp::none|mp::exec):
+ 		return file_mode::none;
+-	case mp::read:
+-	case mp::read|mp::exec:
++	case static_cast<unsigned>(mp::read):
++	case static_cast<unsigned>(mp::read|mp::exec):
+ 		return file_mode::read;
+-	case mp::write:
++	case static_cast<unsigned>(mp::write):
+ 		return file_mode::write;
+-	case mp::write|mp::exec:
+-	case mp::rdwr:
+-	case mp::rdwr|mp::exec:
++	case static_cast<unsigned>(mp::write|mp::exec):
++	case static_cast<unsigned>(mp::rdwr):
++	case static_cast<unsigned>(mp::rdwr|mp::exec):
+ 		return file_mode::read|file_mode::write;
+ 	}
+
+diff --git a/types/include/aw/types/byte_buffer.h b/types/include/aw/types/byte_buffer.h
+index 82f46934..b38c46a9 100644
+--- a/types/include/aw/types/byte_buffer.h
++++ b/types/include/aw/types/byte_buffer.h
+@@ -8,6 +8,7 @@
+  */
+ #ifndef aw_types_byte_buffer_h
+ #define aw_types_byte_buffer_h
++#include <cstdlib>
+ #include <memory>
+ namespace aw {
+ /**
diff --git a/ports/awlib/portfile.cmake b/ports/awlib/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF ${VERSION}
     SHA512 bfb4668abc3db176744bb674a20bf770c6406db522a14191069b8d833414285ca784f042c3ad50404f7f8bc76afe69627dfcf540080e12316abbbfe420955526
     HEAD_REF master
+    PATCHES
+        fix-mac-build.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/awlib/vcpkg.json b/ports/awlib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "awlib",
   "version-date": "2024-04-06",
+  "port-version": 1,
   "description": "Cross-platform utility library",
   "homepage": "https://github.com/absurdworlds/awlib",
   "license": "LGPL-3.0-or-later",

diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO blend2d/blend2d
-  REF 9a86b2700917ced827c008c3dd488108afb3490c # commited on 2024-07-08
-  SHA512 741404d4c7044e8d338ad5b02e6b6e00b7e40f9c9cf03c53de4607447b552f559747d4a96d53c7b6311abb6348f4bf8a4abd6d726c51be8c1b7e65e540c4f128
+  REF 7eb92c2946fb35c23c09dbdc6e98d835679d7f82 # commited on 2024-11-23
+  SHA512 e34cbd4cf294eaa5a180437ae60d0d38665ace5b464b4c89d85b9cf77fbe1e5488bc0bcfa29e4d66b3d24a97da96ce1c25f15b2e36b9455ccef9874c7bb847b0
   HEAD_REF master
 )
 

diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "blend2d",
-  "version-date": "2024-07-08",
+  "version-date": "2024-11-23",
   "description": "2D Vector Graphics Engine Powered by a JIT Compiler",
   "homepage": "https://github.com/blend2d/blend2d",
   "documentation": "https://blend2d.com/doc/index.html",

diff --git a/ports/ceres/0001_cmakelists_fixes.patch b/ports/ceres/0001_cmakelists_fixes.patch
@@ -2,63 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 8e49c19e..f8c61d92 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -292,27 +292,28 @@ if (SUITESPARSE)
-   # built with SuiteSparse support.
-
-   # Check for SuiteSparse and dependencies.
--  find_package(SuiteSparse 4.5.6 COMPONENTS CHOLMOD SPQR
--    OPTIONAL_COMPONENTS Partition)
--  if (SuiteSparse_FOUND)
--    set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})")
-+  find_package(SuiteSparse REQUIRED CONFIG)
-+  if (SUITESPARSE_FOUND)
-+    set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION} CONFIG)")
-     # By default, if all of SuiteSparse's dependencies are found, Ceres is
-     # built with SuiteSparse support.
-     message("-- Found SuiteSparse ${SuiteSparse_VERSION}, "
-             "building with SuiteSparse.")
--
--    if (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
--      install(FILES ${Ceres_SOURCE_DIR}/cmake/FindSuiteSparse.cmake
--                    ${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake
--              DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
--    endif (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
--  else (SuiteSparse_FOUND)
-+    add_library(SuiteSparse::CONFIG ALIAS SuiteSparse::suitesparseconfig)
-+    add_library(SuiteSparse::AMD ALIAS SuiteSparse::amd)
-+    add_library(SuiteSparse::CAMD ALIAS SuiteSparse::camd)
-+    add_library(SuiteSparse::CCOLAMD ALIAS SuiteSparse::ccolamd)
-+    add_library(SuiteSparse::COLAMD ALIAS SuiteSparse::colamd)
-+    add_library(SuiteSparse::CHOLMOD ALIAS SuiteSparse::cholmod)
-+    add_library(SuiteSparse::SPQR ALIAS SuiteSparse::spqr)
-+    add_library(METIS::METIS ALIAS metis)
-+  else (SUITESPARSE_FOUND)
-     # Disable use of SuiteSparse if it cannot be found and continue.
-     message("-- Did not find all SuiteSparse dependencies, disabling "
-       "SuiteSparse support.")
-     update_cache_variable(SUITESPARSE OFF)
-     list(APPEND CERES_COMPILE_OPTIONS CERES_NO_SUITESPARSE)
--  endif (SuiteSparse_FOUND)
-+  endif (SUITESPARSE_FOUND)
- else (SUITESPARSE)
-   message("-- Building without SuiteSparse.")
-   list(APPEND CERES_COMPILE_OPTIONS CERES_NO_SUITESPARSE)
-@@ -395,9 +396,12 @@ endif()
- # GFlags.
- if (GFLAGS)
-   # Don't search with REQUIRED as we can continue without gflags.
--  find_package(gflags 2.2.0)
-+  find_package(gflags CONFIG REQUIRED)
-   if (gflags_FOUND)
--    if (TARGET gflags)
-+    if (TARGET gflags::gflags)
-+      if(NOT TARGET gflags)
-+        add_library(gflags ALIAS gflags::gflags)
-+      endif()
-       message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}")
-     else()
-       message("-- Detected version of gflags: ${gflags_VERSION} does not define "
-@@ -430,28 +434,7 @@ if (MINIGLOG)
+@@ -430,28 +430,7 @@ if (MINIGLOG)
    mark_as_advanced(FORCE GLOG_INCLUDE_DIR
                           GLOG_LIBRARY)
  else (MINIGLOG)
@@ -88,7 +32,7 @@ index 8e49c19e..f8c61d92 100644
  endif (MINIGLOG)
 
  if (NOT SCHUR_SPECIALIZATIONS)
-@@ -466,7 +449,7 @@ endif (NOT CUSTOM_BLAS)
+@@ -466,7 +445,7 @@ endif (NOT CUSTOM_BLAS)
 
  if (BUILD_BENCHMARKS)
    # Version 1.3 was first to provide import targets

diff --git a/ports/ceres/0003_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch
@@ -2,16 +2,28 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in
 index ceb7e269..5dee7e3c 100644
 --- a/cmake/CeresConfig.cmake.in
 +++ b/cmake/CeresConfig.cmake.in
-@@ -195,7 +195,7 @@ set(CERES_EIGEN_VERSION @Eigen3_VERSION@)
+@@ -178,7 +178,10 @@
+ include(CMakeFindDependencyMacro)
+ # Optional dependencies
+ @METIS_DEPENDENCY@
+-@SuiteSparse_DEPENDENCY@
++if (@SUITESPARSE@)
++  find_dependency(CHOLMOD)
++  find_dependency(SPQR)
++endif()
+ @CUDAToolkit_DEPENDENCY@
+ @Threads_DEPENDENCY@
+
+@@ -195,7 +198,7 @@
  # Search quietly to control the timing of the error message if not found. The
  # search should be for an exact match, but for usability reasons do a soft
  # match and reject with an explanation below.
 -find_package(Eigen3 ${CERES_EIGEN_VERSION} QUIET)
-+find_package(Eigen3 CONFIG ${CERES_EIGEN_VERSION} QUIET)
++find_dependency(Eigen3 CONFIG ${CERES_EIGEN_VERSION} QUIET)
  if (Eigen3_FOUND)
    if (NOT Eigen3_VERSION VERSION_EQUAL CERES_EIGEN_VERSION)
      # CMake's VERSION check in FIND_PACKAGE() will accept any version >= the
-@@ -217,55 +217,8 @@ else (Eigen3_FOUND)
+@@ -217,55 +220,7 @@
  endif (Eigen3_FOUND)
 
  # glog (and maybe gflags).
@@ -64,7 +76,6 @@ index ceb7e269..5dee7e3c 100644
 -    endif()
 -  endif()
 -endif(CERES_USES_MINIGLOG)
-+include(CMakeFindDependencyMacro)
 +find_dependency(glog NO_MODULE)
 
  # Import exported Ceres targets, if they have not already been imported.

diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ceres",
   "version": "2.2.0",
+  "port-version": 1,
   "description": "non-linear optimization package",
   "homepage": "https://github.com/ceres-solver/ceres-solver",
   "license": "Apache-2.0",
@@ -49,9 +50,12 @@
           ]
         },
         {
-          "name": "suitesparse",
-          "default-features": false
-        }
+          "name": "suitesparse-cholmod",
+          "features": [
+            "matrixops"
+          ]
+        },
+        "suitesparse-spqr"
       ]
     },
     "tools": {

diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "colmap",
   "version": "3.11.1",
+  "port-version": 1,
   "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
   "homepage": "https://colmap.github.io/",
   "license": "BSD-3-Clause",

diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO yhirose/cpp-httplib
     REF "v${VERSION}"
-    SHA512 d9eb70dfd8ebde658852d1a8cf9f96419ca11cad889b54672aa4812c0b5db0c3f1fddf63f536aec19fc4a849f41ed22461581a18f0733d3f906e45dd096bafd8
+    SHA512 f4bcac52eac856acf6ae3e358f6a92b5f40c3afbf5f999172f0c93f1bc1d4b6414023f69dd078e1ea30e0f9f08a70501e441d4b087482049cd0d08823aac095d
     HEAD_REF master
     PATCHES
         fix-find-brotli.patch

diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cpp-httplib",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "description": "A single file C++11 header-only HTTP/HTTPS server and client library",
   "homepage": "https://github.com/yhirose/cpp-httplib",
   "license": "MIT",

diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake
@@ -36,13 +36,15 @@ if(NOT EXISTS "${SOURCE_PATH}/third_party/lss/lss/BUILD.gn" AND (VCPKG_TARGET_IS
 endif()
 
 function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
-    unset(_LIBRARY_DEB CACHE)
-    find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES}
-        PATHS "${CURRENT_INSTALLED_DIR}/debug/lib"
-        NO_DEFAULT_PATH)
-
-    if(_LIBRARY_DEB MATCHES "-NOTFOUND" AND NOT VCPKG_BUILD_TYPE)
-        message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        unset(_LIBRARY_DEB CACHE)
+        find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES}
+          PATHS "${CURRENT_INSTALLED_DIR}/debug/lib"
+          NO_DEFAULT_PATH)
+
+        if(_LIBRARY_DEB MATCHES "-NOTFOUND")
+            message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}")
+        endif()
     endif()
 
     unset(_LIBRARY_REL CACHE)
@@ -54,6 +56,10 @@ function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
         message(FATAL_ERROR "Could not find library with names: ${LIBRARY_NAMES}")
     endif()
 
+    if(VCPKG_BUILD_TYPE STREQUAL "release")
+        set(_LIBRARY_DEB ${_LIBRARY_REL})
+    endif()
+
     set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include")
 
     file(REMOVE "${OUTPUT_FILE}")
@@ -131,13 +137,12 @@ install_headers("${SOURCE_PATH}/util")
 install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base")
 install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build")
 
-if(NOT VCPKG_BUILD_TYPE)
-  file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
-  file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
-endif()
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
+
 if(VCPKG_TARGET_IS_OSX)
-    if(NOT VCPKG_BUILD_TYPE)
-      file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
     endif()
     file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
 endif()
@@ -146,6 +151,14 @@ vcpkg_copy_tools(
     TOOL_NAMES crashpad_handler
     SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools")
 
+if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+    file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/crashpad_handler" FILE_PERMISSIONS
+      OWNER_READ OWNER_WRITE OWNER_EXECUTE
+      GROUP_READ GROUP_EXECUTE
+      WORLD_READ WORLD_EXECUTE
+    )
+endif()
+
 # remove empty directories
 file(REMOVE_RECURSE
     "${PACKAGES_INCLUDE_DIR}/util/net/testdata"

diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "crashpad",
   "version-date": "2024-04-11",
-  "port-version": 5,
+  "port-version": 6,
   "description": [
     "Crashpad is a crash-reporting system.",
     "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."