From c3cd7c84d11687ce4ab4ba92247f0b0fbaa9f050 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 18 Jun 2025 09:56:05 +0200 Subject: [PATCH 1/5] [lunarg-vulkantools] Revise --- ports/lunarg-vulkantools/jsoncpp.diff | 14 ++++++++++ ports/lunarg-vulkantools/portfile.cmake | 36 ++++++++++++------------- ports/lunarg-vulkantools/vcpkg.json | 13 ++++++++- versions/baseline.json | 2 +- versions/l-/lunarg-vulkantools.json | 5 ++++ 5 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 ports/lunarg-vulkantools/jsoncpp.diff diff --git a/ports/lunarg-vulkantools/jsoncpp.diff b/ports/lunarg-vulkantools/jsoncpp.diff new file mode 100644 index 00000000000000..0177c781bf2548 --- /dev/null +++ b/ports/lunarg-vulkantools/jsoncpp.diff @@ -0,0 +1,14 @@ +diff --git a/via/CMakeLists.txt b/via/CMakeLists.txt +index 975fdb3..327acb1 100644 +--- a/via/CMakeLists.txt ++++ b/via/CMakeLists.txt +@@ -72,6 +72,9 @@ endif() + find_package(jsoncpp CONFIG) + if (TARGET jsoncpp_static) + target_link_libraries(vkvia PRIVATE jsoncpp_static) ++ ++elseif (TARGET JsonCpp::JsonCpp) ++ target_link_libraries(vkvia PRIVATE JsonCpp::JsonCpp) + + # Support using jsoncpp.pc but only for UNIX platforms. + # And only if UPDATE_DEPS is disabled. diff --git a/ports/lunarg-vulkantools/portfile.cmake b/ports/lunarg-vulkantools/portfile.cmake index 1d22a4cb9e6c9c..a40917aad482a8 100644 --- a/ports/lunarg-vulkantools/portfile.cmake +++ b/ports/lunarg-vulkantools/portfile.cmake @@ -1,3 +1,6 @@ +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -8,33 +11,28 @@ vcpkg_from_github( HEAD_REF main PATCHES disable-qtdeploy.patch + jsoncpp.diff ) -vcpkg_replace_string("${SOURCE_PATH}/via/CMakeLists.txt" "jsoncpp_static" "JsonCpp::JsonCpp") - x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES jsonschema OUT_PYTHON_VAR PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DVULKAN_HEADERS_INSTALL_DIR=${CURRENT_INSTALLED_DIR} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON - -DBUILD_TESTS:BOOL=OFF - OPTIONS_RELEASE - -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR} - OPTIONS_DEBUG - -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}/debug - + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6=ON + "-DPython3_EXECUTABLE=${PYTHON3}" + "-DVULKAN_HEADERS_INSTALL_DIR=${CURRENT_INSTALLED_DIR}" + OPTIONS_RELEASE + "-DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}" + OPTIONS_DEBUG + "-DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}/debug" ) vcpkg_cmake_install() +vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig vkconfig-gui AUTO_CLEAN) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") - -vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig vkconfig-gui AUTO_CLEAN ) - -set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/lunarg-vulkantools/vcpkg.json b/ports/lunarg-vulkantools/vcpkg.json index d08aa563676cf2..4dd14bf7fde784 100644 --- a/ports/lunarg-vulkantools/vcpkg.json +++ b/ports/lunarg-vulkantools/vcpkg.json @@ -1,13 +1,24 @@ { "name": "lunarg-vulkantools", "version": "1.4.309.0", + "port-version": 1, "description": "Tools to aid in Vulkan development", "homepage": "https://github.com/LunarG/VulkanTools", "license": null, "supports": "!osx & !staticcrt", "dependencies": [ "jsoncpp", - "qt5-base", + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "network", + "thread", + "vulkan", + "widgets" + ] + }, "valijson", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index ac187ee5b14b09..b99b392c803dd6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5930,7 +5930,7 @@ }, "lunarg-vulkantools": { "baseline": "1.4.309.0", - "port-version": 0 + "port-version": 1 }, "lunasvg": { "baseline": "3.3.0", diff --git a/versions/l-/lunarg-vulkantools.json b/versions/l-/lunarg-vulkantools.json index cd0005db4d6916..c63815f1fe60bb 100644 --- a/versions/l-/lunarg-vulkantools.json +++ b/versions/l-/lunarg-vulkantools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8932e52440aba5c3eef9648513539501529ef7a8", + "version": "1.4.309.0", + "port-version": 1 + }, { "git-tree": "e556ea3035f1822d6af25c004bf5991b6ea472e1", "version": "1.4.309.0", From 9860c19f8e278640edebdc00cdd8618a8e3d29b1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 17 Jul 2025 21:50:05 +0200 Subject: [PATCH 2/5] [skip actions] --- ports/qtwebengine/include-dir-order.diff | 19 +++++++++++++++++++ ports/qtwebengine/portfile.cmake | 2 +- ports/qtwebengine/vcpkg.json | 2 +- scripts/azure-pipelines/azure-pipelines.yml | 2 +- versions/baseline.json | 2 +- versions/q-/qtwebengine.json | 5 +++++ 6 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 ports/qtwebengine/include-dir-order.diff diff --git a/ports/qtwebengine/include-dir-order.diff b/ports/qtwebengine/include-dir-order.diff new file mode 100644 index 00000000000000..e078f5ead626bf --- /dev/null +++ b/ports/qtwebengine/include-dir-order.diff @@ -0,0 +1,19 @@ +diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake +index 239eaa1dd..7ded50aa9 100644 +--- a/cmake/Functions.cmake ++++ b/cmake/Functions.cmake +@@ -274,8 +274,14 @@ function(resolve_target_includes resultVar target) + foreach(includeDir ${includeDirs}) + if(includeDir MATCHES "\\$]+)>") + list(APPEND includeDirList ${CMAKE_MATCH_1}) ++ set(maybe_protobuf_dir "${CMAKE_MATCH_1}") ++ if(maybe_protobuf_dir MATCHES "src/3rdparty/chromium/third_party/protobuf/src\$") ++ list(REMOVE_ITEM includeDirList "${maybe_protobuf_dir}") ++ list(PREPEND includeDirList "${maybe_protobuf_dir}") ++ endif() + endif() + endforeach() ++ message(STATUS "${target} : ${includeDirList}") + set(${resultVar} ${includeDirList} PARENT_SCOPE) + endfunction() + diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index c04a7dd40a8ed9..c624e6651baa0c 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -13,9 +13,9 @@ set(${PORT}_PATCHES "pdf-system-libpng.diff" "pkg-config.diff" "rpath.diff" + "include-dir-order.diff" ) -list(REMOVE_ITEM FEATURES "private-dependencies") set(qtwebengine_target "${VCPKG_TARGET_TRIPLET}-${VCPKG_CMAKE_SYSTEM_NAME}") if(VCPKG_CROSSCOMPILING) if(NOT qtwebengine_host STREQUAL qtwebengine_target) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 893291850e422a..034a511f7d02b0 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.8.3", - "port-version": 2, + "port-version": 3, "description": "Qt modules for rendering web and PDF content.", "homepage": "https://www.qt.io/", "license": null, diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index fe6de219e79258..37db0136829cc8 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -9,7 +9,7 @@ parameters: - name: tripletPattern displayName: 'Enable triplets which contain this substring' type: string - default: '-' + default: 'x64-windows-release' jobs: - template: windows/azure-pipelines.yml diff --git a/versions/baseline.json b/versions/baseline.json index 2b5f55f4e61082..89f334f2cbc019 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8086,7 +8086,7 @@ }, "qtwebengine": { "baseline": "6.8.3", - "port-version": 2 + "port-version": 3 }, "qtwebsockets": { "baseline": "6.8.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 3cec57d5296513..565ba787791296 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af1d4a8b0b2e7a53e6668b61186d877940e6dc53", + "version": "6.8.3", + "port-version": 3 + }, { "git-tree": "d6ba2c93ca1df0a2b8d4025aa97e9539ba99bfa1", "version": "6.8.3", From 9cc56c8049748f1df3a190814fb1651b1509330d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 20 Jul 2025 23:14:02 +0200 Subject: [PATCH 3/5] [skip actions] --- ports/qtwebengine/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index c624e6651baa0c..24970d61c83aab 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -222,9 +222,11 @@ qt_cmake_configure( -DVCPKG_LOCK_FIND_PACKAGE_GPerf=ON -DVCPKG_LOCK_FIND_PACKAGE_Ninja=ON -DVCPKG_LOCK_FIND_PACKAGE_Nodejs=ON + --trace-expand OPTIONS_MAYBE_UNUSED FEATURE_webengine_webrtc ) +message(FATAL_ERROR Stop.) vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) file(GLOB target_args_gn RELATIVE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/core/Release" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/core/Release/*/args.gn") From 80dfa220f83ca72273db16773b358eac6a100696 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 6 Oct 2025 05:58:11 +0200 Subject: [PATCH 4/5] Cont. --- ports/qtwebengine/include-dir-order.diff | 32 ++++++++++-------------- ports/qtwebengine/portfile.cmake | 4 +-- versions/q-/qtwebengine.json | 2 +- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/ports/qtwebengine/include-dir-order.diff b/ports/qtwebengine/include-dir-order.diff index e078f5ead626bf..bae62de242843c 100644 --- a/ports/qtwebengine/include-dir-order.diff +++ b/ports/qtwebengine/include-dir-order.diff @@ -1,19 +1,13 @@ -diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake -index 239eaa1dd..7ded50aa9 100644 ---- a/cmake/Functions.cmake -+++ b/cmake/Functions.cmake -@@ -274,8 +274,14 @@ function(resolve_target_includes resultVar target) - foreach(includeDir ${includeDirs}) - if(includeDir MATCHES "\\$]+)>") - list(APPEND includeDirList ${CMAKE_MATCH_1}) -+ set(maybe_protobuf_dir "${CMAKE_MATCH_1}") -+ if(maybe_protobuf_dir MATCHES "src/3rdparty/chromium/third_party/protobuf/src\$") -+ list(REMOVE_ITEM includeDirList "${maybe_protobuf_dir}") -+ list(PREPEND includeDirList "${maybe_protobuf_dir}") -+ endif() - endif() - endforeach() -+ message(STATUS "${target} : ${includeDirList}") - set(${resultVar} ${includeDirList} PARENT_SCOPE) - endfunction() - +diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt +index e2456a4..a9f8ec0 100644 +--- a/src/core/api/CMakeLists.txt ++++ b/src/core/api/CMakeLists.txt +@@ -54,6 +54,8 @@ qt_internal_add_module(WebEngineCore + ../../3rdparty/chromium/third_party/perfetto/include + ../../3rdparty/chromium/third_party/boringssl/src/include + ../../3rdparty/chromium/base/allocator/partition_allocator/src ++ # vendored protobuf must be listed before vcpkg include dir ++ ../../3rdparty/chromium/third_party/protobuf/src + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index a192f1888e95cc..6f9cf160599ce4 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -207,7 +207,7 @@ if(QT_UPDATE_VERSION) endif() qt_cmake_configure( - DISABLE_PARALLEL_CONFIGURE # due to in source changes. + DISABLE_PARALLEL_CONFIGURE # due to in-source changes. OPTIONS ${FEATURE_OPTIONS} "-DGPerf_EXECUTABLE=${GPERF}" @@ -221,11 +221,9 @@ qt_cmake_configure( -DVCPKG_LOCK_FIND_PACKAGE_GPerf=ON -DVCPKG_LOCK_FIND_PACKAGE_Ninja=ON -DVCPKG_LOCK_FIND_PACKAGE_Nodejs=ON - --trace-expand OPTIONS_MAYBE_UNUSED FEATURE_webengine_webrtc ) -message(FATAL_ERROR Stop.) vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) file(GLOB target_args_gn RELATIVE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/core/Release" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/core/Release/*/args.gn") diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 2a923ce70f4f21..125a583794a5ce 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2a7e2fe92ccc05f0086ee775da3d2a9706daf2d4", + "git-tree": "7f92c6dd56893246db97a71ca18b9df8a5f3bee3", "version": "6.9.1", "port-version": 2 }, From 8496b47f06df749cfdb10028e48646915a666666 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 6 Oct 2025 21:13:38 +0200 Subject: [PATCH 5/5] Finish --- ports/qtwebengine/include-dir-order.diff | 5 +++-- scripts/azure-pipelines/azure-pipelines.yml | 2 +- versions/q-/qtwebengine.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/qtwebengine/include-dir-order.diff b/ports/qtwebengine/include-dir-order.diff index bae62de242843c..4a58bb6da8e4ff 100644 --- a/ports/qtwebengine/include-dir-order.diff +++ b/ports/qtwebengine/include-dir-order.diff @@ -2,11 +2,12 @@ diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt index e2456a4..a9f8ec0 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt -@@ -54,6 +54,8 @@ qt_internal_add_module(WebEngineCore +@@ -54,6 +54,9 @@ qt_internal_add_module(WebEngineCore ../../3rdparty/chromium/third_party/perfetto/include ../../3rdparty/chromium/third_party/boringssl/src/include ../../3rdparty/chromium/base/allocator/partition_allocator/src -+ # vendored protobuf must be listed before vcpkg include dir ++ # vendored protobuf must be listed here in order to appear ++ # before the vcpkg include dir coming with Qt targets. + ../../3rdparty/chromium/third_party/protobuf/src LIBRARIES Qt::CorePrivate diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 670a8b81dd9ed6..d4ea9e531eee13 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -9,7 +9,7 @@ parameters: - name: tripletPattern displayName: 'Enable triplets which contain this substring (^ matches begin, $ matches end)' type: string - default: '^x64-windows-release' + default: '^' jobs: - template: windows/azure-pipelines.yml diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 125a583794a5ce..460a7275d5dbef 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7f92c6dd56893246db97a71ca18b9df8a5f3bee3", + "git-tree": "0cf8cb5f057bcd20d831317cee64096954eba501", "version": "6.9.1", "port-version": 2 },