Merge remote-tracking branch 'origin/master' into update-macos

# Conflicts:
#	ports/awlib/portfile.cmake
#	versions/a-/awlib.json

ports/awlib/fix-macos-15-build.patch → ports/awlib/fix-mac-build.patch

@@ -1,5 +1,5 @@
 diff --git a/io/include/aw/io/mmap_file.h b/io/include/aw/io/mmap_file.h
-index 9846973..65e82aa 100644
+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;
@@ -31,7 +31,7 @@ index 9846973..65e82aa 100644
  	}
 
 diff --git a/types/include/aw/types/byte_buffer.h b/types/include/aw/types/byte_buffer.h
-index 82f4693..b38c46a 100644
+index 82f46934..b38c46a9 100644
 --- a/types/include/aw/types/byte_buffer.h
 +++ b/types/include/aw/types/byte_buffer.h
 @@ -8,6 +8,7 @@

ports/awlib/portfile.cmake

@@ -5,7 +5,7 @@ vcpkg_from_github(
     SHA512 bfb4668abc3db176744bb674a20bf770c6406db522a14191069b8d833414285ca784f042c3ad50404f7f8bc76afe69627dfcf540080e12316abbbfe420955526
     HEAD_REF master
     PATCHES
-        fix-macos-15-build.patch
+        fix-mac-build.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -22,7 +22,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME "${PORT}" CONFIG_PATH "lib/cmake/${PORT}")
+vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH lib/cmake/${PORT})
 
 vcpkg_fixup_pkgconfig()
 

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"

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."

ports/eabase/fix_cmake_install.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89c6703..ab8e553 100644
+index 652f07f..264aaf5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -4,6 +4,9 @@
@@ -12,64 +12,50 @@ index 89c6703..ab8e553 100644
  #-------------------------------------------------------------------------------------------
  # Options
  #-------------------------------------------------------------------------------------------
-@@ -22,13 +25,51 @@ endif()
- add_definitions(-D_CHAR16T)
-
- if (NOT EABASE_BUILD_TESTS)
--	#-------------------------------------------------------------------------------------------
--	# Header only library 
--	#-------------------------------------------------------------------------------------------
--	add_library(EABase INTERFACE) 
+@@ -24,14 +27,38 @@ add_definitions(-D_CHAR16T)
+ #-------------------------------------------------------------------------------------------
+ # Header only library 
+ #-------------------------------------------------------------------------------------------
+-add_library(EABase INTERFACE) 
 -
--	#-------------------------------------------------------------------------------------------
--	# Include dirs
--	#-------------------------------------------------------------------------------------------
--	target_include_directories(EABase INTERFACE include/Common)
-+    #-------------------------------------------------------------------------------------------
-+    # Header only library 
-+    #-------------------------------------------------------------------------------------------
-+    add_library(EABase INTERFACE)
-+    add_library(EABase::EABase ALIAS EABase)
-+
-+    #-------------------------------------------------------------------------------------------
-+    # Include dirs
-+    #-------------------------------------------------------------------------------------------
-+    target_include_directories(EABase INTERFACE
-+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/Common>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-+    )
-+
-+    # create and install an export set for eabase target as EABase::EABase
-+    set(EABase_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EABase")
-+
-+    configure_package_config_file(
-+        EABaseConfig.cmake.in
-+        ${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake
-+        INSTALL_DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
-+    )
-+
-+    # create and install an export set for Terra target as Terra
-+    install(
-+        TARGETS EABase EXPORT EABaseTargets
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    )
-+
-+
-+    install(EXPORT EABaseTargets DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION})
-+
-+    write_basic_package_version_file(
-+      "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
-+      VERSION 2.09.12
-+      COMPATIBILITY SameMajorVersion
-+    )
-+
-+    install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+    install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+
-+    install(
-+        FILES
-+            "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake"
-+            "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
-+        DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
-+    )
- endif()
++add_library(EABase INTERFACE)
++add_library(EABase::EABase ALIAS EABase)
+ #-------------------------------------------------------------------------------------------
+ # Include dirs
+ #-------------------------------------------------------------------------------------------
+-target_include_directories(EABase INTERFACE include/Common)
+-
+-#-------------------------------------------------------------------------------------------
+-# Installation
+-#-------------------------------------------------------------------------------------------
+-install(DIRECTORY include/Common/EABase DESTINATION include)
++target_include_directories(EABase INTERFACE
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/Common>
++    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++)
++# create and install an export set for eabase target as EABase::EABase
++set(EABase_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EABase")
++configure_package_config_file(
++    EABaseConfig.cmake.in
++    ${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake
++    INSTALL_DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
++)
++# create and install an export set for Terra target as Terra
++install(
++    TARGETS EABase EXPORT EABaseTargets
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
++install(EXPORT EABaseTargets DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION})
++write_basic_package_version_file(
++  "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
++  VERSION 2.09.12
++  COMPATIBILITY SameMajorVersion
++)
++install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
++install(
++    FILES
++        "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake"
++        "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
++    DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
++)

ports/eabase/portfile.cmake

@@ -1,29 +1,29 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO electronicarts/EABase
-    REF d1be0a1d0fc01a9bf8f3f2cea75018df0d2410ee
-    SHA512 84a11bea06aecbf9a659d92b1ac904b99b2b82023650f4f376b5e68a744f631c5dbdd53d25f746ffb01b428415ac86e4fb8ba758db844acf80560fabe4d77733
-    HEAD_REF master
-    PATCHES
-    fix_cmake_install.patch
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/EABaseConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-    -DEABASE_BUILD_TESTS:BOOL=OFF
-)
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EABase)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
-
-vcpkg_copy_pdbs()
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO electronicarts/EABase
+    REF 123363eb82e132c0181ac53e43226d8ee76dea12
+    SHA512 8df5279d1b303047e832b8b0ddb6cdf51cca753efaeb2a36f7fa5ebc015c2f37cc6a68184b919deb45f09dfd89f9f8f79f18c487817d231f1b049102ceae610f
+    HEAD_REF master
+    PATCHES
+    fix_cmake_install.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/EABaseConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+    -DEABASE_BUILD_TESTS:BOOL=OFF
+)
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EABase)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/eabase/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "eabase",
-  "version-string": "2.09.12",
-  "port-version": 3,
+  "version-date": "2024-08-18",
   "description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.",
   "homepage": "https://github.com/electronicarts/EABase",
   "dependencies": [

ports/fbthrift/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/fbthrift
     REF "v${VERSION}"
-    SHA512 73d2a296c591a7b58a1b6acf0976ee60df7dc7bee8e044342a59f74e139fdf51195e7656fb195ebbe9ac42d3910ed6f827624c2f4c2b7b7c0309e8a3791ddf61
+    SHA512 36b0c2f7f36675ae3c4f79ca0c22fb4fdd729473d4c10d29484cf968759085aa66e10719eb79185cfc22028f230cdcf700d140cf178de420b9ef645860e0aba7
     HEAD_REF main
     PATCHES
         fix-deps.patch

ports/fbthrift/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fbthrift",
-  "version-string": "2025.01.20.00",
+  "version-string": "2025.01.27.00",
   "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
   "homepage": "https://github.com/facebook/fbthrift",
   "license": "Apache-2.0",

ports/fizz/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
     REF "v${VERSION}"
-    SHA512 1d31758cfd3a09f9dad5774481d9dbe2aadd21a8277ea23c7304adb3cb56f4c26401ea238814431255510a538e7604f7349b57ebcde72f4ce45d0ac57dca3538
+    SHA512 102367c7eecb328dbefda664c55584dffd53e67eb4e784b104c30ac8597d567fe26aec2f9d5fe60d41bebc08dcaa93a653afc36663dece6ad610ff38e76c4d2e
     HEAD_REF main
     PATCHES
         fix-build.patch

ports/fizz/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fizz",
-  "version-string": "2025.01.20.00",
+  "version-string": "2025.01.27.00",
   "description": "a TLS 1.3 implementation by Facebook",
   "homepage": "https://github.com/facebookincubator/fizz",
   "license": "BSD-3-Clause",

ports/folly/portfile.cmake

@@ -9,7 +9,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
     REF "v${VERSION}"
-    SHA512 36e513eab062e7e7c2ebd1691507bac801995b8334d263fd06d6d30a88446782dae5ad66c20f549608522f302748208e67762ce12cdb6577433e323142556f25
+    SHA512 3174e218512c6e702c38690fc7cc34657f5bdda62866c3b5c948fbe81cae7835fa626d587703b6d4a0ade92bcd1a9721f4125609e945b439e9ef87ef7804dfcf
     HEAD_REF main
     PATCHES
         fix-windows-minmax.patch

ports/folly/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "folly",
-  "version-string": "2025.01.20.00",
+  "version-string": "2025.01.27.00",
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",