diff --git a/ports/chromium-base/vcpkg.json b/ports/chromium-base/vcpkg.json index a96735ba3a4..d84ea24e0f5 100644 --- a/ports/chromium-base/vcpkg.json +++ b/ports/chromium-base/vcpkg.json @@ -1,8 +1,15 @@ { "name": "chromium-base", - "version-string": "86.0.4199.1", - "port-version": 3, + "version": "86.0.4199.1", + "port-version": 4, "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", "homepage": "https://chromium.googlesource.com/chromium/src", - "supports": "x64 & (osx | windows | linux) & !uwp" + "license": "BSD-3-Clause", + "supports": "x64 & (osx | windows | linux) & !uwp", + "dependencies": [ + { + "name": "vcpkg-tool-gn", + "host": true + } + ] } diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 1764fc99ac0..6c8eb1f35f0 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/crashpad/crashpad - REF 9a31d3f8e9815774026a753a1ff6155347cd549f + REF 68aba08c48bb428b7b159b3371163f86e8d5a126 ) +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() @@ -24,7 +27,7 @@ endfunction() checkout_in_path( "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium" "https://chromium.googlesource.com/chromium/mini_chromium" - "c426ff98e1d9e9d59777fe8b883a5c0ceeca9ca3" + "5654edb4225bcad13901155c819febb5748e502b" ) function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES) @@ -119,6 +122,9 @@ file(REMOVE_RECURSE configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/util/mach/__pycache__") + vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index d244f598736..c506e340940 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,14 +1,18 @@ { "name": "crashpad", - "version-date": "2020-03-18", - "port-version": 2, + "version-date": "2022-04-16", "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." ], "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md", - "supports": "x64 & (osx | windows)", + "license": "Apache-2.0", + "supports": "osx | windows", "dependencies": [ + { + "name": "vcpkg-tool-gn", + "host": true + }, "zlib" ] } diff --git a/ports/skia/add-missing-tuple.patch b/ports/skia/add-missing-tuple.patch deleted file mode 100644 index e33d44e3aef..00000000000 --- a/ports/skia/add-missing-tuple.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/private/SkPathRef.h b/include/private/SkPathRef.h -index 7afe4f9..502f83e 100644 ---- a/include/private/SkPathRef.h -+++ b/include/private/SkPathRef.h -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - class SkRBuffer; - class SkWBuffer; diff --git a/ports/skia/dawn_use_vcpkg_spirv.patch b/ports/skia/dawn_use_vcpkg_spirv.patch new file mode 100644 index 00000000000..02e25148c75 --- /dev/null +++ b/ports/skia/dawn_use_vcpkg_spirv.patch @@ -0,0 +1,13 @@ +diff --git a/src/dawn_native/BUILD.gn b/src/dawn_native/BUILD.gn +index f73bfe24..e37792a0 100644 +--- a/src/dawn_native/BUILD.gn ++++ b/src/dawn_native/BUILD.gn +@@ -145,7 +145,7 @@ source_set("dawn_native_sources") { + ":dawn_native_headers", + ":dawn_native_utils_gen", + "${dawn_root}/src/common", +- "${dawn_root}/third_party/gn/spirv_cross:spirv_cross", ++ "//third_party/spirv-cross:spirv_cross", + "${dawn_spirv_tools_dir}:spvtools_opt", + "${dawn_spirv_tools_dir}:spvtools_val", + "${dawn_tint_dir}/src:libtint", diff --git a/ports/skia/fontconfig.gn b/ports/skia/fontconfig.gn new file mode 100644 index 00000000000..ae4fe7b46bf --- /dev/null +++ b/ports/skia/fontconfig.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + + system("fontconfig") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } + } diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index e7cf8d1557b..6c68b7fc94e 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -1,10 +1,17 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - URL https://skia.googlesource.com/skia.git - REF fb0b35fed5580d49392df7ce9374551b348fffbf - PATCHES add-missing-tuple.patch + URL https://github.com/google/skia + REF 3aa7f602018816ab3f009f1b8d359ccde752e1de + PATCHES + "use_vcpkg_fontconfig.patch" ) +# Replace hardcoded python paths +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + +vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python" "command = \"$shell '${PYTHON3}'") + function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() @@ -19,10 +26,27 @@ function(checkout_in_path PATH URL REF) file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") endfunction() +function(checkout_in_path_with_patch PATH URL REF PATCH) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + PATCHES "${PATCH}" + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + set(EXTERNALS "${SOURCE_PATH}/third_party/externals") file(MAKE_DIRECTORY "${EXTERNALS}") # these following aren't available in vcpkg +# to update, visit the DEPS file in Skia's root directory +# define SKIA_USE_MIRROR in a triplet to use the mirrors checkout_in_path("${EXTERNALS}/sfntly" "https://github.com/googlefonts/sfntly" "b55ff303ea2f9e26702b514cf6a3196a2e3e2974" @@ -33,7 +57,7 @@ checkout_in_path("${EXTERNALS}/dng_sdk" ) checkout_in_path("${EXTERNALS}/libgifcodec" "https://skia.googlesource.com/libgifcodec" - "d06d2a6d42baf6c0c91cacc28df2542a911d05fe" + "fd59fa92a0c86788dcdd84d091e1ce81eda06a77" ) checkout_in_path("${EXTERNALS}/piex" "https://android.googlesource.com/platform/external/piex" @@ -94,38 +118,165 @@ set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") replace_skia_dep(expat "/include" "libexpat,libexpatd,libexpatdMD" "libexpat,libexpatMD" "") replace_skia_dep(freetype2 "/include" "freetype,freetyped" "freetype" "") -replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz-icu" "harfbuzz-icu" "") +replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz;harfbuzz-subset" "harfbuzz;harfbuzz-subset" "") replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0") replace_skia_dep(libjpeg-turbo "/include" "jpeg,jpegd;turbojpeg,turbojpegd" "jpeg;turbojpeg" "") replace_skia_dep(libpng "/include" "libpng16,libpng16d" "libpng16" "") -replace_skia_dep(libwebp "/include" "webp;webpdemux;webpdecoder;webpmux" "webp;webpdemux;webpdecoder;webpmux" "") +replace_skia_dep(libwebp "/include" + "webp,webpd;webpdemux,webpdemuxd;webpdecoder,webpdecoderd;webpmux,webpmuxd" + "webp;webpdemux;webpdecoder;webpmux" "") replace_skia_dep(zlib "/include" "z,zlib,zlibd" "z,zlib" "") +if(CMAKE_HOST_UNIX) + replace_skia_dep(fontconfig "/include" "fontconfig" "fontconfig" "") + endif() set(OPTIONS "\ skia_use_lua=false \ skia_enable_tools=false \ -skia_enable_spirv_validation=false") - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(OPTIONS "${OPTIONS} target_cpu=\"arm64\"") -endif() +skia_enable_spirv_validation=false \ +target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"") # used for passing feature-specific definitions to the config file -set(SKIA_PUBLIC_DEFINITIONS "") +set(SKIA_PUBLIC_DEFINITIONS + SK_SUPPORT_PDF + SK_HAS_JPEG_LIBRARY + SK_USE_LIBGIFCODEC + SK_HAS_PNG_LIBRARY + SK_HAS_WEBP_LIBRARY + SK_XML) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OPTIONS "${OPTIONS} is_component_build=true") + string(APPEND OPTIONS " is_component_build=true") + if(CMAKE_HOST_WIN32) + set(SKIA_PUBLIC_DEFINITIONS SKIA_DLL) + endif() else() - set(OPTIONS "${OPTIONS} is_component_build=false") + string(APPEND OPTIONS " is_component_build=false") endif() -if("metal" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} skia_use_metal=true") - list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) +if(CMAKE_HOST_APPLE) + if("metal" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_metal=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) + endif() +endif() + +if("vulkan" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_vulkan=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_VULKAN) + endif() + +if(CMAKE_HOST_WIN32) + if("direct3d" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_direct3d=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DIRECT3D) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "6a67891418a3f08be63f92726e049dc788e46f5b" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "82becc8a8a92e509d3d8d635889da0a3c17d0606" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "cb96abbf7affd986016f17dd09f9f971138a922b" + ) + + checkout_in_path("${EXTERNALS}/d3d12allocator" + "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git" + "169895d529dfce00390a20e69c2f516066fe7a3b" + ) + endif() +endif() + +if("dawn" IN_LIST FEATURES) + + if (VCPKG_TARGET_IS_LINUX) + message(WARNING +[[ +dawn support requires the following libraries from the system package manager: + + libx11-xcb-dev mesa-common-dev + +They can be installed on Debian based systems via + + apt-get install libx11-xcb-dev mesa-common-dev +]] + ) + endif() + + set(OPTIONS "${OPTIONS} skia_use_dawn=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DAWN) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "6a67891418a3f08be63f92726e049dc788e46f5b" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "82becc8a8a92e509d3d8d635889da0a3c17d0606" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "cb96abbf7affd986016f17dd09f9f971138a922b" + ) + + checkout_in_path("${EXTERNALS}/tint" + "https://dawn.googlesource.com/tint" + "b612c505939bf86c80a55c193b93c41ed0f252a1" + ) + + checkout_in_path("${EXTERNALS}/jinja2" + "https://chromium.googlesource.com/chromium/src/third_party/jinja2" + "ee69aa00ee8536f61db6a451f3858745cf587de6" + ) + + checkout_in_path("${EXTERNALS}/markupsafe" + "https://chromium.googlesource.com/chromium/src/third_party/markupsafe" + "0944e71f4b2cb9a871bcbe353f95e889b64a611a" + ) + +## Remove + checkout_in_path("${EXTERNALS}/vulkan-headers" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + "76f00ef6cbb1886eb1162d1fa39bee8b51e22ee8" + ) + + checkout_in_path("${EXTERNALS}/vulkan-tools" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + "ef20059aea7ec24d0842edca2f75255eaa33a7b0" + ) + + checkout_in_path("${EXTERNALS}/abseil-cpp" + "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git" + "c5a424a2a21005660b182516eb7a079cd8021699" + ) + +## REMOVE ^ + checkout_in_path("${EXTERNALS}/dawn" + "https://dawn.googlesource.com/dawn.git" + "e6d4598d36157639606a780164c425c6bffb93f6" + ) + + vcpkg_find_acquire_program(GIT) + file(READ "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" DVG_CONTENT) + string(REPLACE "return 'git.bat' if sys.platform == 'win32' else 'git'" "return '${GIT}'" DVG_CONTENT ${DVG_CONTENT}) + file(WRITE "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" ${DVG_CONTENT}) +endif() + +if("gl" IN_LIST FEATURES) + string(APPEND OPTIONS " skia_use_gl=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_GL) endif() -set(OPTIONS_REL "${OPTIONS} is_official_build=true") set(OPTIONS_DBG "${OPTIONS} is_debug=true") +set(OPTIONS_REL "${OPTIONS} is_official_build=true") if(CMAKE_HOST_WIN32) # Load toolchains @@ -149,17 +300,15 @@ if(CMAKE_HOST_WIN32) to_gn_list(SKIA_CXX_FLAGS_DBG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") to_gn_list(SKIA_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - set(OPTIONS_DBG "${OPTIONS_DBG} extra_cflags_c=${SKIA_C_FLAGS_DBG} \ + string(APPEND OPTIONS_DBG " extra_cflags_c=${SKIA_C_FLAGS_DBG} \ extra_cflags_cc=${SKIA_CXX_FLAGS_DBG}") - - set(OPTIONS_REL "${OPTIONS_REL} extra_cflags_c=${SKIA_C_FLAGS_REL} \ + string(APPEND OPTIONS_REL " extra_cflags_c=${SKIA_C_FLAGS_REL} \ extra_cflags_cc=${SKIA_CXX_FLAGS_REL}") set(WIN_VC "$ENV{VCINSTALLDIR}") string(REPLACE "\\VC\\" "\\VC" WIN_VC "${WIN_VC}") - set(OPTIONS_DBG "${OPTIONS_DBG} win_vc=\"${WIN_VC}\"") - set(OPTIONS_REL "${OPTIONS_REL} win_vc=\"${WIN_VC}\"") - + string(APPEND OPTIONS_DBG " win_vc=\"${WIN_VC}\"") + string(APPEND OPTIONS_REL " win_vc=\"${WIN_VC}\"") endif() vcpkg_configure_gn( @@ -168,9 +317,26 @@ vcpkg_configure_gn( OPTIONS_RELEASE "${OPTIONS_REL}" ) +set(DAWN_LINKAGE "") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DAWN_LINKAGE "shared") +else() + set(DAWN_LINKAGE "static") +endif() + +vcpkg_list(SET SKIA_TARGETS ":skia") +if("dawn" IN_LIST FEATURES) + vcpkg_list(APPEND SKIA_TARGETS + "third_party/externals/dawn/src/dawn:proc_${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/native:${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/platform:${DAWN_LINKAGE}" + ) +endif() + vcpkg_install_gn( SOURCE_PATH "${SOURCE_PATH}" - TARGETS ":skia" + TARGETS + ${SKIA_TARGETS} ) message(STATUS "Installing: ${CURRENT_PACKAGES_DIR}/include/${PORT}") @@ -186,33 +352,46 @@ endforeach() # get a list of library dependencies for TARGET function(gn_desc_target_libs OUTPUT BUILD_DIR TARGET) - vcpkg_find_acquire_program(GN) - execute_process( - COMMAND ${GN} desc "${BUILD_DIR}" "${TARGET}" libs - WORKING_DIRECTORY "${SOURCE_PATH}" - OUTPUT_VARIABLE OUTPUT_ - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - string(REGEX REPLACE "\n|(\r\n)" ";" OUTPUT_ "${OUTPUT_}") + z_vcpkg_install_gn_get_desc("${OUTPUT}" + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY libs) +endfunction() + +function(gn_desc_target_defines OUTPUT BUILD_DIR TARGET) + z_vcpkg_install_gn_get_desc(OUTPUT_ + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY defines) + # exclude system defines such as _HAS_EXCEPTIONS=0 + list(FILTER OUTPUT_ EXCLUDE REGEX "^_") set(${OUTPUT} ${OUTPUT_} PARENT_SCOPE) endfunction() # skiaConfig.cmake.in input variables -gn_desc_target_libs(SKIA_DEP_DBG - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - //:skia) -gn_desc_target_libs(SKIA_DEP_REL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - //:skia) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + gn_desc_target_libs(SKIA_DEP_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //extract_public_config:extract_skia) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + gn_desc_target_libs(SKIA_DEP_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //extract_public_config:extract_skia) +endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/skia/skiaConfig.cmake" @ONLY) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/skia") -vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/skia/skiaConfig.cmake.in b/ports/skia/skiaConfig.cmake.in index b4c7c82ce86..62f816a6ba4 100644 --- a/ports/skia/skiaConfig.cmake.in +++ b/ports/skia/skiaConfig.cmake.in @@ -1,12 +1,9 @@ add_library(skia INTERFACE) add_library(skia::skia ALIAS skia) - -set(SKIA_LIBRARY_NAME_DBG @SKIA_LIBRARY_NAME_DBG@) -set(SKIA_LIBRARY_NAME_REL @SKIA_LIBRARY_NAME_REL@) -set(SKIA_LIBRARY_IMPLIB_DBG @SKIA_LIBRARY_IMPLIB_DBG@) -set(SKIA_LIBRARY_IMPLIB_REL @SKIA_LIBRARY_IMPLIB_REL@) - -set(SKIA_PUBLIC_DEFINITIONS @SKIA_PUBLIC_DEFINITIONS@) +set(SKIA_DEP_DBG @SKIA_DEP_DBG@) +set(SKIA_DEP_REL @SKIA_DEP_REL@) +set(SKIA_DEFINITIONS_DBG @SKIA_DEFINITIONS_DBG@) +set(SKIA_DEFINITIONS_REL @SKIA_DEFINITIONS_REL@) # Compute the installation prefix relative to this file. get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) @@ -16,9 +13,6 @@ if(_IMPORT_PREFIX STREQUAL "/") set(_IMPORT_PREFIX "") endif() -set(SKIA_DEP_DBG @SKIA_DEP_DBG@) -set(SKIA_DEP_REL @SKIA_DEP_REL@) - find_library(SKIA_LIB NAMES skia skia.dll) target_link_libraries(skia INTERFACE "${SKIA_LIB}") @@ -45,42 +39,8 @@ endfunction() set_dependencies(Debug "${SKIA_DEP_DBG}") set_dependencies(Release "${SKIA_DEP_REL}") -set(SKIA_DEFINITIONS_DBG - _CRT_SECURE_NO_WARNINGS - _HAS_EXCEPTIONS=0 - WIN32_LEAN_AND_MEAN - NOMINMAX - SK_GL - SK_ENABLE_DUMP_GPU - SK_SUPPORT_PDF - SK_HAS_JPEG_LIBRARY - SK_USE_LIBGIFCODEC - SK_HAS_HEIF_LIBRARY - SK_HAS_PNG_LIBRARY - SK_ENABLE_SKSL_INTERPRETER - SK_HAS_WEBP_LIBRARY - SK_XML - SKIA_DLL - SK_SUPPORT_ATLAS_TEXT=1) - -set(SKIA_DEFINITIONS_REL - _CRT_SECURE_NO_WARNINGS - _HAS_EXCEPTIONS=0 - WIN32_LEAN_AND_MEAN - NOMINMAX - NDEBUG - SK_GL - SK_SUPPORT_PDF - SK_HAS_JPEG_LIBRARY - SK_USE_LIBGIFCODEC - SK_HAS_PNG_LIBRARY - SK_HAS_WEBP_LIBRARY - SK_XML - SKIA_DLL) - target_compile_definitions(skia INTERFACE $<$:${SKIA_DEFINITIONS_DBG}> $<$:${SKIA_DEFINITIONS_REL}>) target_include_directories(skia INTERFACE ${_IMPORT_PREFIX}/include) -target_compile_definitions(skia INTERFACE ${SKIA_PUBLIC_DEFINITIONS}) diff --git a/ports/skia/use_vcpkg_fontconfig.patch b/ports/skia/use_vcpkg_fontconfig.patch new file mode 100644 index 00000000000..56bfd2c2b7a --- /dev/null +++ b/ports/skia/use_vcpkg_fontconfig.patch @@ -0,0 +1,42 @@ +diff --git a/BUILD.gn b/BUILD.gn +index aeb46b4664..2ddbcd0ebe 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -452,7 +452,7 @@ optional("fontmgr_fontconfig") { + enabled = skia_enable_fontmgr_fontconfig + + # The public header includes fontconfig.h and uses FcConfig* +- public_deps = [ "//third_party:fontconfig" ] ++ public_deps = [ "//third_party/fontconfig" ] + public = [ "include/ports/SkFontMgr_fontconfig.h" ] + deps = [ ":typeface_freetype" ] + sources = [ "src/ports/SkFontMgr_fontconfig.cpp" ] +@@ -469,7 +469,7 @@ optional("fontmgr_FontConfigInterface") { + + deps = [ + ":typeface_freetype", +- "//third_party:fontconfig", ++ "//third_party/fontconfig", + ] + public = [ + "include/ports/SkFontConfigInterface.h", +diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn +index 63fa748d16..6760e0f41b 100644 +--- a/third_party/BUILD.gn ++++ b/third_party/BUILD.gn +@@ -6,9 +6,9 @@ + declare_args() { + } + +-config("system_fontconfig") { +- libs = [ "fontconfig" ] +-} +-group("fontconfig") { +- public_configs = [ ":system_fontconfig" ] +-} ++#config("system_fontconfig") { ++# libs = [ "fontconfig" ] ++#} ++#group("fontconfig") { ++# public_configs = [ ":system_fontconfig" ] ++#} diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 756ab79e83b..39f604a2d52 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,26 +1,22 @@ { "name": "skia", - "version-date": "2020-05-18", - "port-version": 9, + "version-date": "2022-04-15", "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source." ], "homepage": "https://skia.org", - "supports": "osx | windows", + "license": "BSD-3-Clause", + "supports": "(osx | windows | linux) & !(windows & x86)", "dependencies": [ "expat", + "fontconfig", { "name": "freetype", "default-features": false }, - { - "name": "harfbuzz", - "features": [ - "icu" - ] - }, + "harfbuzz", "icu", "libjpeg-turbo", "libpng", @@ -29,11 +25,30 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-tool-gn", + "host": true + }, "zlib" ], + "default-features": [ + "gl" + ], "features": { + "dawn": { + "description": "dawn support for skia" + }, + "direct3d": { + "description": "Direct3D support for skia" + }, + "gl": { + "description": "OpenGL support for skia" + }, "metal": { - "description": "metal support for skia" + "description": "Metal support for skia" + }, + "vulkan": { + "description": "Vulkan support for skia" } } } diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json index 5f82dceb8c4..eae65fcd0c5 100644 --- a/ports/v8/vcpkg.json +++ b/ports/v8/vcpkg.json @@ -1,10 +1,11 @@ { "name": "v8", "version": "9.1.269.39", - "port-version": 3, + "port-version": 4, "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", - "supports": "!(arm | arm64 | uwp | osx)", + "license": "BSD-3-Clause", + "supports": "!(arm | arm64 | uwp | osx | linux)", "dependencies": [ { "name": "glib", diff --git a/ports/vcpkg-tool-gn/portfile.cmake b/ports/vcpkg-tool-gn/portfile.cmake new file mode 100644 index 00000000000..a8c42daa495 --- /dev/null +++ b/ports/vcpkg-tool-gn/portfile.cmake @@ -0,0 +1,62 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(program GN) +set(search_names gn gn.exe) +set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/gn") + +set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "aarch64") + set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") + set(gn_platform "linux-arm64") + set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") + else() + set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") + set(gn_platform "linux-amd64") + set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") + endif() +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "arm64") + set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") + set(gn_platform "mac-arm64") + set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") + else() + set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") + set(gn_platform "mac-amd64") + set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") + endif() +else() + if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + else() # AMD64 + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + endif() +endif() + +set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") +set(download_filename "gn-${gn_platform}.zip") +vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" +) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn") +vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn" +) + +z_vcpkg_find_acquire_program_find_internal("${program}" + PATHS ${paths_to_search} + NAMES ${search_names} +) + +message(STATUS "Using gn: ${GN}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/gn/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-gn/vcpkg.json b/ports/vcpkg-tool-gn/vcpkg.json new file mode 100644 index 00000000000..2239a3aa530 --- /dev/null +++ b/ports/vcpkg-tool-gn/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-gn", + "version-date": "2022-04-16", + "description": "GN build system", + "homepage": "https://gn.googlesource.com/gn/", + "license": null, + "supports": "native" +} diff --git a/ports/zeroc-ice/change_to_mt.ps1 b/ports/zeroc-ice/change_to_mt.ps1 new file mode 100644 index 00000000000..91306095423 --- /dev/null +++ b/ports/zeroc-ice/change_to_mt.ps1 @@ -0,0 +1,53 @@ + +$projFilePath = $args[0] +$crtLinkage = $args[1] + +if($projFilePath) +{ + $xpath = "/rs:Project/rs:ItemGroup/rs:ProjectConfiguration" + $xmldoc = New-Object System.Xml.XmlDocument + $xmldoc.load($projFilePath) + $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmldoc.NameTable); + $nsmgr.AddNamespace("rs", "http://schemas.microsoft.com/developer/msbuild/2003"); + $root = $xmldoc.DocumentElement + + foreach($conf in $root.ItemDefinitionGroup) + { + if($conf.Condition) + { + if(-Not ($conf.ClCompile.RuntimeLibrary)) + { + $rtl = $xmldoc.CreateElement("RuntimeLibrary", $conf.ClCompile.NamespaceURI) + $conf.ClCompile.AppendChild($rtl) + } + + if($conf.Condition.Contains("Debug")) + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebug" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebugDLL" + } + } + else + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "Multithreaded" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDLL" + } + } + } + } + $xmldoc.save($projFilePath) +} +else +{ + Write-Error "Error: No path defined!" +} diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index c1eaf7d0219..c1cf8c1d36f 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -257,6 +257,12 @@ else() # VCPKG_TARGET_IS_WINDOWS include("${CURRENT_PORT_DIR}/prepare_for_build.cmake") prepare_for_build("${SOURCE_PATH}") + vcpkg_list(SET MSBUILD_OPTIONS + "/p:UseVcpkg=yes" + "/p:IceBuildingSrc=yes" + ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ) + # Build Ice vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} @@ -265,9 +271,7 @@ else() # VCPKG_TARGET_IS_WINDOWS TARGET "C++11\\ice++11" USE_VCPKG_INTEGRATION OPTIONS - /p:UseVcpkg=yes - /p:IceBuildingSrc=yes - ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ${MSBUILD_OPTIONS} ) if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") diff --git a/ports/zeroc-ice/prepare_for_build.cmake b/ports/zeroc-ice/prepare_for_build.cmake index 4287fbdc820..df3e93003d0 100644 --- a/ports/zeroc-ice/prepare_for_build.cmake +++ b/ports/zeroc-ice/prepare_for_build.cmake @@ -1,37 +1,53 @@ -# This function removes hardcoded RuntimeLibrary directives from Ice's vcxproh files and downloads +# This function modifies hardcoded RuntimeLibrary directives in Ice's .vcxproj files and downloads # Ice Builder for MSBuild, which is required to generate C++ files based on the interface definition -# files (.ice). +# files (.ice). function(prepare_for_build ICE_SOURCE_DIR) - message("-- Removing hardcoded 'RuntimeLibrary' directives from .vcxproj files") + message("-- Modifying hardcoded 'RuntimeLibrary' directives in .vcxproj files") set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src") file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj") foreach(PROJ_FILE ${PROJ_FILES}) file(READ ${PROJ_FILE} PROJ_FILE_CONTENT) - STRING(REGEX - REPLACE - "" + STRING(REGEX + REPLACE + "" "" PROJ_FILE_CONTENT "${PROJ_FILE_CONTENT}" ) - STRING(REGEX - REPLACE - "MultiThreadedDebug" - "" - PROJ_FILE_CONTENT - "${PROJ_FILE_CONTENT}" - ) - STRING(REGEX - REPLACE - "MultiThreaded" - "" - PROJ_FILE_CONTENT - "${PROJ_FILE_CONTENT}" - ) + + if((NOT ${PROJ_FILE} MATCHES ".*slice\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*iceutil\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*slice2cpp\.vcxproj")) + + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") + STRING(REGEX + REPLACE + "DynamicLibrary" + "StaticLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + else() + STRING(REGEX + REPLACE + "StaticLibrary" + "DynamicLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + endif() + endif() + file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}") + + vcpkg_execute_required_process( + COMMAND pwsh ${CURRENT_PORT_DIR}/change_to_mt.ps1 ${PROJ_FILE} ${VCPKG_CRT_LINKAGE} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME change_to_mt-${TARGET_TRIPLET}-rel + ) endforeach() set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages") @@ -46,8 +62,8 @@ function(prepare_for_build ICE_SOURCE_DIR) ) vcpkg_extract_source_archive( - ICE_BUILDER_MSBUILD_DIRECTORY - ARCHIVE + ICE_BUILDER_MSBUILD_DIRECTORY + ARCHIVE "${ICE_BUILDER_MSBUILD_ARCHIVE}" NO_REMOVE_ONE_LEVEL SOURCE_BASE icebuilder diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index fa2d4c4968b..2335597fc32 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,12 +1,12 @@ { "name": "zeroc-ice", "version": "3.7.7", - "port-version": 1, + "port-version": 2, "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", "license": null, - "supports": "!uwp & !(windows & arm) & !(windows & staticcrt) & !wasm32", + "supports": "!uwp & !(windows & arm) & !wasm32", "dependencies": [ "bzip2", "expat", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8cc1e706680..2ab6bde42a2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1155,9 +1155,7 @@ shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail skia:arm-uwp=fail -skia:x64-linux=fail skia:x64-uwp=fail -skia:x86-windows=fail sleef:x86-windows=fail slikenet:arm-uwp=fail slikenet:x64-uwp=fail diff --git a/scripts/cmake/vcpkg_configure_gn.cmake b/scripts/cmake/vcpkg_configure_gn.cmake index cdd4c313aa2..d3ec8ab59d5 100644 --- a/scripts/cmake/vcpkg_configure_gn.cmake +++ b/scripts/cmake/vcpkg_configure_gn.cmake @@ -56,9 +56,9 @@ function(vcpkg_configure_gn) message(FATAL_ERROR "SOURCE_PATH must be specified.") endif() - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) - vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") vcpkg_find_acquire_program(GN) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index c85932dc7c9..b5be6bbcbad 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -216,21 +216,47 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "GN") set(program_name gn) set(rename_binary_to "gn") - set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(supported_on_unix ON) - set(program_version "xus7xtaPhpv5vCmKFOnsBVoB-PKmhZvRsSTjbQAuF0MC") - set(gn_platform "linux-amd64") - set(download_sha512 "871e75d7f3597b74fb99e36bb41fe5a9f8ce8a4d9f167f4729fc6e444807a59f35ec8aca70c2274a99c79d70a1108272be1ad991678a8ceb39e30f77abb13135") - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(supported_on_unix ON) - set(program_version "qhxILDNcJ2H44HfHmfiU-XIY3E_SIXvFqLd2wvbIgOoC") - set(gn_platform "mac-amd64") - set(download_sha512 "03ee64cb15bae7fceb412900d470601090bce147cfd45eb9b46683ac1a5dca848465a5d74c55a47df7f0e334d708151249a6d37bb021de74dd48b97ed4a07937") - else() - set(program_version "qUkAhy9J0P7c5racy-9wB6AHNK_btS18im8S06_ehhwC") - set(gn_platform "windows-amd64") - set(download_sha512 "263e02bd79eee0cb7b664831b7898565c5656a046328d8f187ef7ae2a4d766991d477b190c9b425fcc960ab76f381cd3e396afb85cba7408ca9e74eb32c175db") + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/gn") + else() # Old behavior + message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues") + set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "aarch64") + set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") + set(gn_platform "linux-arm64") + set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") + else() + set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") + set(gn_platform "linux-amd64") + set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") + endif() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "arm64") + set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") + set(gn_platform "mac-arm64") + set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") + else() + set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") + set(gn_platform "mac-amd64") + set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") + endif() + else() + if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + else() # AMD64 + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + endif() + endif() endif() set(tool_subdirectory "${program_version}") set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") diff --git a/versions/baseline.json b/versions/baseline.json index 053f8a94080..c5143ecdae7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1366,7 +1366,7 @@ }, "chromium-base": { "baseline": "86.0.4199.1", - "port-version": 3 + "port-version": 4 }, "cimg": { "baseline": "2.9.9", @@ -1669,8 +1669,8 @@ "port-version": 1 }, "crashpad": { - "baseline": "2020-03-18", - "port-version": 2 + "baseline": "2022-04-16", + "port-version": 0 }, "crashrpt": { "baseline": "1.4.3", @@ -6521,8 +6521,8 @@ "port-version": 0 }, "skia": { - "baseline": "2020-05-18", - "port-version": 9 + "baseline": "2022-04-15", + "port-version": 0 }, "skyr-url": { "baseline": "1.13.0", @@ -7274,7 +7274,7 @@ }, "v8": { "baseline": "9.1.269.39", - "port-version": 3 + "port-version": 4 }, "valijson": { "baseline": "0.6", @@ -7328,6 +7328,10 @@ "baseline": "2022-02-14", "port-version": 0 }, + "vcpkg-tool-gn": { + "baseline": "2022-04-16", + "port-version": 0 + }, "vcpkg-tool-gyp-nss": { "baseline": "2022-03-04", "port-version": 0 @@ -7662,7 +7666,7 @@ }, "zeroc-ice": { "baseline": "3.7.7", - "port-version": 1 + "port-version": 2 }, "zeromq": { "baseline": "4.3.4", diff --git a/versions/c-/chromium-base.json b/versions/c-/chromium-base.json index 74ed1896208..c539ab612d0 100644 --- a/versions/c-/chromium-base.json +++ b/versions/c-/chromium-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dbf253ab140a0d754230e2cffa7b4f94686a9e9", + "version": "86.0.4199.1", + "port-version": 4 + }, { "git-tree": "36e6dbafdea0e90a8717907171efa375d2580d8b", "version-string": "86.0.4199.1", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 6a57a616103..013a9dacf38 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "448abcac90e97d8b5ee03843775dd7fcba971979", + "version-date": "2022-04-16", + "port-version": 0 + }, { "git-tree": "88ee612aa949155b1e363bb710578811d3283033", "version-date": "2020-03-18", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 7499ae3b7cd..00a465e3e9c 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d167d79c12796fb226b9a869705fde2f4594e789", + "version-date": "2022-04-15", + "port-version": 0 + }, { "git-tree": "cdf8cda1612a4770f3a01e35ae5da93654abc17d", "version-date": "2020-05-18", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 9583dc8d427..3be97ab880e 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f57ec75cb9169900555359752c65e8e4c79c34ec", + "version": "9.1.269.39", + "port-version": 4 + }, { "git-tree": "3abf0953ae7dcf4bb4b4ede21adb27ad850b1e1c", "version": "9.1.269.39", diff --git a/versions/v-/vcpkg-tool-gn.json b/versions/v-/vcpkg-tool-gn.json new file mode 100644 index 00000000000..cd79c22ef4d --- /dev/null +++ b/versions/v-/vcpkg-tool-gn.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "811d8c3a4d4489a291c69cde7788c620f950eb9e", + "version-date": "2022-04-16", + "port-version": 0 + } + ] +} diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index cf4a0d74ce3..905dc77c321 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ddc4746c1f19fca41706071fac4575ea99fe6b9", + "version": "3.7.7", + "port-version": 2 + }, { "git-tree": "f32e4c338e25d36018095348e632c794b13fc513", "version": "3.7.7",