From 883f01d23c743f623f2909690ad48cd679ba1598 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 12 Jun 2024 17:17:47 -0700 Subject: [PATCH 1/6] Update Ninja to 1.12. Fixes #38494 Resurrects #38538 Co-authored-by: xb284524239 <40262910+xb284524239@users.noreply.github.com> --- .../vcpkg_find_acquire_program(NINJA).cmake | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake index 3bca6338a317b3..bdc23a9eb988ca 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake @@ -1,17 +1,29 @@ set(program_name ninja) -set(program_version 1.10.2) +set(program_version 1.12.0) set(version_command --version) if(CMAKE_HOST_WIN32) - set(download_filename "ninja-win-${program_version}.zip") - set(tool_subdirectory "${program_version}-windows") - set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") - set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(build_arch $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if((build_arch MATCHES "^(ARM|arm)64$") OR (build_arch MATCHES "^(ARM|arm)$")) + set(download_filename "ninja-winarm64-${program_version}.zip") + set(tool_subdirectory "${program_version}-windows-arm64") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-winarm64.zip") + set(download_sha512 35b9228d91c133eabf8318b0842d6621be7b11ffaa46bfc3cf0cfe9aa5858c2db7b5dc7c475444f0da8cd07b35304e0c61f53cf264f258a6902c74b26438c248) + else() + set(download_filename "ninja-win-${program_version}.zip") + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") + set(download_sha512 cb271573df79c36a61bf6f63ff7aca7e2e7e3764c1ef0ce8e6f4667dae54326f905061cf56f19aea37625c94eeb96abc8f643b14d0e65da70e2e6cf9d127a52a) + endif() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(download_filename "ninja-mac-${program_version}.zip") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") set(tool_subdirectory "${program_version}-osx") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") - set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) + set(download_sha512 23726030fa0ffd05afef6cf75042ad7518fb954af058f85a8a3fdab4e8d157ef42347b6232d20c1a609e91d9c38ebfd2f1cdc751ca6eb1f87e333cc6971455a5) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") else() @@ -21,7 +33,13 @@ else() set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") set(tool_subdirectory "${program_version}-linux") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") - set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + set(download_sha512 a6d4c8410cc7cd0eced47518b8deca90af9e6f9b1e9fba992bcc5bc92645d07e20bd005a59c90c4c24cded68a4f2178f3a2043707e578e326881ffdaae073f2f) + elseif(HOST_ARCH MATCHES "arm64|aarch64|ARM64|AARCH64") + set(download_filename "ninja-linux-aarch64-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux-aarch64.zip") + set(tool_subdirectory "${program_version}-linux-aarch64") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux-aarch64") + set(download_sha512 daa94231f55bf32a46b1b45e3a0dc767f73483a681d3277923833df9ac4f12532d67e9aca2f45768f31c8b3b8e63149d69867cb0a0e6c48683f197bf2634d681) else() set(version_command "") # somewhat hacky way to skip version check and use system binary endif() From a632c24d68c3cc789b7da217ca6fccd9ea4077cc Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 12 Jun 2024 17:22:16 -0700 Subject: [PATCH 2/6] 1.12.1 Also fix vcpkgTools.xml --- .../vcpkg_find_acquire_program(NINJA).cmake | 12 +++++----- scripts/vcpkgTools.xml | 24 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake index bdc23a9eb988ca..257417fb5716fa 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake @@ -1,5 +1,5 @@ set(program_name ninja) -set(program_version 1.12.0) +set(program_version 1.12.1) set(version_command --version) if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) @@ -11,19 +11,19 @@ if(CMAKE_HOST_WIN32) set(download_filename "ninja-winarm64-${program_version}.zip") set(tool_subdirectory "${program_version}-windows-arm64") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-winarm64.zip") - set(download_sha512 35b9228d91c133eabf8318b0842d6621be7b11ffaa46bfc3cf0cfe9aa5858c2db7b5dc7c475444f0da8cd07b35304e0c61f53cf264f258a6902c74b26438c248) + set(download_sha512 b1826c422a677f47f9f7e001672ce831791b092e4f1cd84ddf2ea067781c31aa8246f26e91dd66300c23ffa77a8ea29910c48ccf7e4235ff20bccc2d2b6e247b) else() set(download_filename "ninja-win-${program_version}.zip") set(tool_subdirectory "${program_version}-windows") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") - set(download_sha512 cb271573df79c36a61bf6f63ff7aca7e2e7e3764c1ef0ce8e6f4667dae54326f905061cf56f19aea37625c94eeb96abc8f643b14d0e65da70e2e6cf9d127a52a) + set(download_sha512 d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f) endif() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(download_filename "ninja-mac-${program_version}.zip") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") set(tool_subdirectory "${program_version}-osx") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") - set(download_sha512 23726030fa0ffd05afef6cf75042ad7518fb954af058f85a8a3fdab4e8d157ef42347b6232d20c1a609e91d9c38ebfd2f1cdc751ca6eb1f87e333cc6971455a5) + set(download_sha512 4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") else() @@ -33,13 +33,13 @@ else() set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") set(tool_subdirectory "${program_version}-linux") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") - set(download_sha512 a6d4c8410cc7cd0eced47518b8deca90af9e6f9b1e9fba992bcc5bc92645d07e20bd005a59c90c4c24cded68a4f2178f3a2043707e578e326881ffdaae073f2f) + set(download_sha512 9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014) elseif(HOST_ARCH MATCHES "arm64|aarch64|ARM64|AARCH64") set(download_filename "ninja-linux-aarch64-${program_version}.zip") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux-aarch64.zip") set(tool_subdirectory "${program_version}-linux-aarch64") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux-aarch64") - set(download_sha512 daa94231f55bf32a46b1b45e3a0dc767f73483a681d3277923833df9ac4f12532d67e9aca2f45768f31c8b3b8e63149d69867cb0a0e6c48683f197bf2634d681) + set(download_sha512 22c46abb7e6d916e11713705f78d093e9b30029cb49cadc65755908ad9f44b3f2548105174cc615a5ef86c4672b366173f18bd04c2d71710a303d952c06db334) else() set(version_command "") # somewhat hacky way to skip version check and use system binary endif() diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 77db673183c69b..c5aad855756c07 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -159,25 +159,25 @@ aria2-1.35.0-osx-darwin.tar.bz2 - 1.11.1 + 1.12.1 ninja.exe - https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip - a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199 - ninja-win-1.11.1.zip + https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip + d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f + ninja-win-1.12.1.zip - 1.11.1 + 1.12.1 ninja - https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip - 6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde - ninja-linux-1.11.1.zip + https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip + 9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014 + ninja-linux-1.12.1.zip - 1.11.1 + 1.12.1 ninja - https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip - dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427 - ninja-mac-1.11.1.zip + https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip + 4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351 + ninja-mac-1.12.1.zip 7.2.16 From 081c69d000912131ffcc18a30c07e27b594522a0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 21 Nov 2024 20:36:42 +0100 Subject: [PATCH 3/6] [qt5-webengine] Check ninja version --- ports/qt5-webengine/portfile.cmake | 13 +++++++++++++ ports/qt5-webengine/vcpkg.json | 1 + versions/baseline.json | 6 +++--- versions/q-/qt5-webengine.json | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 1a182c74f35a7b..e83fe277feb9d2 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -45,6 +45,19 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}") vcpkg_add_to_path(PREPEND "${NINJA_DIR}") vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") +vcpkg_execute_in_download_mode( + COMMAND "${NINJA}" --version + OUTPUT_VARIABLE ninja_version + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" +) +if(ninja_version VERSION_GREATER_EQUAL "1.12.1") + message(WARNING + "Found ninja version ${ninja_version} which may fail to build ${PORT}." + "You can supply a different filepath using per-port customization of CMake variable NINJA." + ) +endif() + set(PATCHES common.pri.patch gl.patch build_1.patch diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 4498cdeffe6666..ce90e10c972125 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.15", + "port-version": 1, "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "license": null, "supports": "!static", diff --git a/versions/baseline.json b/versions/baseline.json index 1f38897927c65b..4e656566b2a7b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5665,8 +5665,8 @@ "port-version": 1 }, "luau": { - "baseline": "0.651", - "port-version": 0 + "baseline": "0.651", + "port-version": 0 }, "luminoengine": { "baseline": "0.10.1", @@ -7502,7 +7502,7 @@ }, "qt5-webengine": { "baseline": "5.15.15", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.15", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 44eb4d783db586..13a183d5e8481f 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c0302ffbef2d114f867ba6b0b34cfe1de78bb44", + "version": "5.15.15", + "port-version": 1 + }, { "git-tree": "eeece45f507ad36455883b753c5914ef7e266c26", "version": "5.15.15", From 8ca510c10538e3b620e01793b9cae0648f6684e3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 21 Nov 2024 20:46:38 +0100 Subject: [PATCH 4/6] [qt5-webengine] Skip in vcpkg CI --- scripts/ci.baseline.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 985a5beb971f21..a1966307c30b21 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -908,12 +908,15 @@ qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip -# Missing system libraries -qtwayland:x64-osx=skip -qtwayland:arm64-osx=skip +# Long build time, ninja trouble +qt5-webengine:x64-windows=skip +qt5-webengine:x86-windows=skip # Missing system libraries qt5-x11extras:x64-osx=skip qt5-x11extras:arm64-osx=skip +# Missing system libraries +qtwayland:x64-osx=skip +qtwayland:arm64-osx=skip quickfix:arm-neon-android=fail quickfix:arm64-android=fail qwt-qt6:x64-osx=fail From 02175f109c7421b501f4e7397bb2378ecfe40822 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 7 Dec 2024 19:39:50 +0100 Subject: [PATCH 5/6] Fixup --- scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake index 257417fb5716fa..14deacb32fa7ec 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake @@ -7,7 +7,7 @@ if(CMAKE_HOST_WIN32) else() set(build_arch $ENV{PROCESSOR_ARCHITECTURE}) endif() - if((build_arch MATCHES "^(ARM|arm)64$") OR (build_arch MATCHES "^(ARM|arm)$")) + if(build_arch MATCHES "^(ARM|arm)64$") set(download_filename "ninja-winarm64-${program_version}.zip") set(tool_subdirectory "${program_version}-windows-arm64") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-winarm64.zip") From 140ea0c1c46c9598daeebfc49bbd1adb1abf518e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 10 Jan 2025 20:22:31 +0100 Subject: [PATCH 6/6] [libdatachannel] Disable parallel configure --- ports/libdatachannel/portfile.cmake | 1 + ports/libdatachannel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index ab1db9c674db5d..4a9b92288d8c30 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # version.h configuration OPTIONS ${FEATURE_OPTIONS} -DPREFER_SYSTEM_LIB=ON diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 71d55e0f4dad2b..d5bfcea0042d66 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.21.2", - "port-version": 1, + "port-version": 2, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8ba63ec37c8d40..2824e0635e7e8f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4438,7 +4438,7 @@ }, "libdatachannel": { "baseline": "0.21.2", - "port-version": 1 + "port-version": 2 }, "libdatrie": { "baseline": "0.2.13", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 7e27848a8f2baa..d09ca00928681c 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdae5c743dedd26494c0c49587b1eef0bdffe042", + "version-semver": "0.21.2", + "port-version": 2 + }, { "git-tree": "df0663ab881ed7a331bf51b6bf652e80fc55dbf4", "version-semver": "0.21.2",