From e948ae24bc43c0574677d482555d19bb4377187f Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Wed, 1 May 2024 10:55:53 +0700 Subject: [PATCH] Update vcpkg revision to catch Qt 6.6.3, say bye bye to a bunch of overlays --- CMakeLists.txt | 2 +- vcpkg/ports/qt/portfile.cmake | 1 - vcpkg/ports/qt/vcpkg.json | 222 ------------------ vcpkg/ports/qt3d/portfile.cmake | 35 --- vcpkg/ports/qt3d/vcpkg.json | 106 --------- vcpkg/ports/qt5compat/portfile.cmake | 40 ---- vcpkg/ports/qt5compat/vcpkg.json | 81 ------- vcpkg/ports/qtactiveqt/portfile.cmake | 36 --- vcpkg/ports/qtactiveqt/vcpkg.json | 35 --- .../ports/qtapplicationmanager/portfile.cmake | 64 ----- .../stack-walker-arm64.patch | 19 -- vcpkg/ports/qtapplicationmanager/vcpkg.json | 29 --- .../qtapplicationmanager/wrapper-fixes.patch | 56 ----- vcpkg/ports/qtbase/allow_outside_prefix.patch | 2 + .../qtbase/cmake/qt_install_submodule.cmake | 4 +- vcpkg/ports/qtbase/cmake/qt_port_data.cmake | 91 +++---- .../ports/qtbase/cmake/qt_port_details.cmake | 2 +- vcpkg/ports/qtbase/config_install.patch | 4 +- vcpkg/ports/qtbase/portfile.cmake | 1 - vcpkg/ports/qtbase/vcpkg.json | 2 +- vcpkg/ports/qtcharts/portfile.cmake | 17 -- vcpkg/ports/qtcharts/vcpkg.json | 37 --- vcpkg/ports/qtcoap/portfile.cmake | 10 - vcpkg/ports/qtcoap/vcpkg.json | 16 -- vcpkg/ports/qtconnectivity/portfile.cmake | 12 - vcpkg/ports/qtconnectivity/vcpkg.json | 18 -- vcpkg/ports/qtdatavis3d/portfile.cmake | 10 - vcpkg/ports/qtdatavis3d/vcpkg.json | 21 -- vcpkg/ports/qtdeclarative/portfile.cmake | 31 --- vcpkg/ports/qtdeclarative/vcpkg.json | 27 --- vcpkg/ports/qtdeviceutilities/portfile.cmake | 13 - vcpkg/ports/qtdeviceutilities/vcpkg.json | 18 -- vcpkg/ports/qtdoc/portfile.cmake | 13 - vcpkg/ports/qtdoc/vcpkg.json | 13 - vcpkg/ports/qtgraphs/portfile.cmake | 8 - vcpkg/ports/qtgraphs/vcpkg.json | 26 -- vcpkg/ports/qtgrpc/portfile.cmake | 17 -- vcpkg/ports/qtgrpc/protoc-host.patch | 23 -- vcpkg/ports/qtgrpc/vcpkg.json | 26 -- vcpkg/ports/qthttpserver/portfile.cmake | 13 - vcpkg/ports/qthttpserver/vcpkg.json | 17 -- .../no_target_promotion_latest.patch | 21 -- vcpkg/ports/qtimageformats/portfile.cmake | 41 ---- vcpkg/ports/qtimageformats/vcpkg.json | 45 ---- .../fix-taglib-search.patch | 13 - .../ports/qtinterfaceframework/portfile.cmake | 53 ----- .../requirements_minimal.txt | 14 -- vcpkg/ports/qtinterfaceframework/vcpkg.json | 40 ---- vcpkg/ports/qtlanguageserver/portfile.cmake | 12 - vcpkg/ports/qtlanguageserver/vcpkg.json | 25 -- vcpkg/ports/qtlocation/portfile.cmake | 22 -- vcpkg/ports/qtlocation/vcpkg.json | 32 --- vcpkg/ports/qtlottie/portfile.cmake | 10 - vcpkg/ports/qtlottie/vcpkg.json | 25 -- vcpkg/ports/qtmqtt/portfile.cmake | 10 - vcpkg/ports/qtmqtt/vcpkg.json | 16 -- .../fix_avfoundation_target.patch | 13 - .../qtmultimedia/fix_camera_android.patch | 62 ----- .../fix_camera_leak_android.patch | 162 ------------- .../fix_camera_thread_android.patch | 118 ---------- vcpkg/ports/qtmultimedia/portfile.cmake | 86 ------- .../qtmultimedia/remove_export_macro.patch | 182 -------------- vcpkg/ports/qtmultimedia/remove_unistd.patch | 24 -- .../qtmultimedia/static_find_modules.patch | 94 -------- vcpkg/ports/qtmultimedia/vcpkg.json | 78 ------ vcpkg/ports/qtnetworkauth/portfile.cmake | 10 - vcpkg/ports/qtnetworkauth/vcpkg.json | 16 -- vcpkg/ports/qtopcua/fix-build.patch | 27 --- vcpkg/ports/qtopcua/portfile.cmake | 36 --- vcpkg/ports/qtopcua/vcpkg.json | 70 ------ .../qtpositioning/devendor-poly2tri.patch | 37 --- vcpkg/ports/qtpositioning/portfile.cmake | 22 -- vcpkg/ports/qtpositioning/vcpkg.json | 30 --- vcpkg/ports/qtquick3d/portfile.cmake | 28 --- vcpkg/ports/qtquick3d/vcpkg.json | 38 --- vcpkg/ports/qtquick3dphysics/portfile.cmake | 13 - vcpkg/ports/qtquick3dphysics/vcpkg.json | 13 - vcpkg/ports/qtquicktimeline/portfile.cmake | 15 -- vcpkg/ports/qtquicktimeline/vcpkg.json | 14 -- vcpkg/ports/qtremoteobjects/portfile.cmake | 19 -- vcpkg/ports/qtremoteobjects/vcpkg.json | 43 ---- vcpkg/ports/qtscxml/portfile.cmake | 20 -- vcpkg/ports/qtscxml/vcpkg.json | 32 --- vcpkg/ports/qtsensors/portfile.cmake | 17 -- vcpkg/ports/qtsensors/vcpkg.json | 31 --- vcpkg/ports/qtserialbus/portfile.cmake | 18 -- vcpkg/ports/qtserialbus/vcpkg.json | 33 --- vcpkg/ports/qtserialport/portfile.cmake | 10 - vcpkg/ports/qtserialport/vcpkg.json | 14 -- vcpkg/ports/qtshadertools/portfile.cmake | 13 - vcpkg/ports/qtshadertools/vcpkg.json | 21 -- vcpkg/ports/qtspeech/portfile.cmake | 29 --- vcpkg/ports/qtspeech/vcpkg.json | 26 -- vcpkg/ports/qtsvg/portfile.cmake | 13 - vcpkg/ports/qtsvg/vcpkg.json | 16 -- vcpkg/ports/qttools/devendor-litehtml.patch | 69 ------ vcpkg/ports/qttools/portfile.cmake | 115 --------- vcpkg/ports/qttools/vcpkg.json | 106 --------- vcpkg/ports/qttools/windeployqt.debug.bat | 10 - vcpkg/ports/qttranslations/portfile.cmake | 15 -- vcpkg/ports/qttranslations/vcpkg.json | 28 --- .../hunspell_include_path_fix.patch | 39 --- vcpkg/ports/qtvirtualkeyboard/portfile.cmake | 31 --- vcpkg/ports/qtvirtualkeyboard/vcpkg.json | 39 --- vcpkg/ports/qtwayland/portfile.cmake | 25 -- vcpkg/ports/qtwayland/vcpkg.json | 28 --- vcpkg/ports/qtwebchannel/portfile.cmake | 18 -- vcpkg/ports/qtwebchannel/vcpkg.json | 24 -- vcpkg/ports/qtwebengine/clang-cl.patch | 24 -- vcpkg/ports/qtwebengine/portfile.cmake | 126 ---------- vcpkg/ports/qtwebengine/vcpkg.json | 162 ------------- vcpkg/ports/qtwebsockets/portfile.cmake | 18 -- vcpkg/ports/qtwebsockets/vcpkg.json | 27 --- vcpkg/ports/qtwebview/portfile.cmake | 18 -- vcpkg/ports/qtwebview/vcpkg.json | 32 --- 115 files changed, 57 insertions(+), 4037 deletions(-) delete mode 100644 vcpkg/ports/qt/portfile.cmake delete mode 100644 vcpkg/ports/qt/vcpkg.json delete mode 100644 vcpkg/ports/qt3d/portfile.cmake delete mode 100644 vcpkg/ports/qt3d/vcpkg.json delete mode 100644 vcpkg/ports/qt5compat/portfile.cmake delete mode 100644 vcpkg/ports/qt5compat/vcpkg.json delete mode 100644 vcpkg/ports/qtactiveqt/portfile.cmake delete mode 100644 vcpkg/ports/qtactiveqt/vcpkg.json delete mode 100644 vcpkg/ports/qtapplicationmanager/portfile.cmake delete mode 100644 vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch delete mode 100644 vcpkg/ports/qtapplicationmanager/vcpkg.json delete mode 100644 vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch delete mode 100644 vcpkg/ports/qtcharts/portfile.cmake delete mode 100644 vcpkg/ports/qtcharts/vcpkg.json delete mode 100644 vcpkg/ports/qtcoap/portfile.cmake delete mode 100644 vcpkg/ports/qtcoap/vcpkg.json delete mode 100644 vcpkg/ports/qtconnectivity/portfile.cmake delete mode 100644 vcpkg/ports/qtconnectivity/vcpkg.json delete mode 100644 vcpkg/ports/qtdatavis3d/portfile.cmake delete mode 100644 vcpkg/ports/qtdatavis3d/vcpkg.json delete mode 100644 vcpkg/ports/qtdeclarative/portfile.cmake delete mode 100644 vcpkg/ports/qtdeclarative/vcpkg.json delete mode 100644 vcpkg/ports/qtdeviceutilities/portfile.cmake delete mode 100644 vcpkg/ports/qtdeviceutilities/vcpkg.json delete mode 100644 vcpkg/ports/qtdoc/portfile.cmake delete mode 100644 vcpkg/ports/qtdoc/vcpkg.json delete mode 100644 vcpkg/ports/qtgraphs/portfile.cmake delete mode 100644 vcpkg/ports/qtgraphs/vcpkg.json delete mode 100644 vcpkg/ports/qtgrpc/portfile.cmake delete mode 100644 vcpkg/ports/qtgrpc/protoc-host.patch delete mode 100644 vcpkg/ports/qtgrpc/vcpkg.json delete mode 100644 vcpkg/ports/qthttpserver/portfile.cmake delete mode 100644 vcpkg/ports/qthttpserver/vcpkg.json delete mode 100644 vcpkg/ports/qtimageformats/no_target_promotion_latest.patch delete mode 100644 vcpkg/ports/qtimageformats/portfile.cmake delete mode 100644 vcpkg/ports/qtimageformats/vcpkg.json delete mode 100644 vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch delete mode 100644 vcpkg/ports/qtinterfaceframework/portfile.cmake delete mode 100644 vcpkg/ports/qtinterfaceframework/requirements_minimal.txt delete mode 100644 vcpkg/ports/qtinterfaceframework/vcpkg.json delete mode 100644 vcpkg/ports/qtlanguageserver/portfile.cmake delete mode 100644 vcpkg/ports/qtlanguageserver/vcpkg.json delete mode 100644 vcpkg/ports/qtlocation/portfile.cmake delete mode 100644 vcpkg/ports/qtlocation/vcpkg.json delete mode 100644 vcpkg/ports/qtlottie/portfile.cmake delete mode 100644 vcpkg/ports/qtlottie/vcpkg.json delete mode 100644 vcpkg/ports/qtmqtt/portfile.cmake delete mode 100644 vcpkg/ports/qtmqtt/vcpkg.json delete mode 100644 vcpkg/ports/qtmultimedia/fix_avfoundation_target.patch delete mode 100644 vcpkg/ports/qtmultimedia/fix_camera_android.patch delete mode 100644 vcpkg/ports/qtmultimedia/fix_camera_leak_android.patch delete mode 100644 vcpkg/ports/qtmultimedia/fix_camera_thread_android.patch delete mode 100644 vcpkg/ports/qtmultimedia/portfile.cmake delete mode 100644 vcpkg/ports/qtmultimedia/remove_export_macro.patch delete mode 100644 vcpkg/ports/qtmultimedia/remove_unistd.patch delete mode 100644 vcpkg/ports/qtmultimedia/static_find_modules.patch delete mode 100644 vcpkg/ports/qtmultimedia/vcpkg.json delete mode 100644 vcpkg/ports/qtnetworkauth/portfile.cmake delete mode 100644 vcpkg/ports/qtnetworkauth/vcpkg.json delete mode 100644 vcpkg/ports/qtopcua/fix-build.patch delete mode 100644 vcpkg/ports/qtopcua/portfile.cmake delete mode 100644 vcpkg/ports/qtopcua/vcpkg.json delete mode 100644 vcpkg/ports/qtpositioning/devendor-poly2tri.patch delete mode 100644 vcpkg/ports/qtpositioning/portfile.cmake delete mode 100644 vcpkg/ports/qtpositioning/vcpkg.json delete mode 100644 vcpkg/ports/qtquick3d/portfile.cmake delete mode 100644 vcpkg/ports/qtquick3d/vcpkg.json delete mode 100644 vcpkg/ports/qtquick3dphysics/portfile.cmake delete mode 100644 vcpkg/ports/qtquick3dphysics/vcpkg.json delete mode 100644 vcpkg/ports/qtquicktimeline/portfile.cmake delete mode 100644 vcpkg/ports/qtquicktimeline/vcpkg.json delete mode 100644 vcpkg/ports/qtremoteobjects/portfile.cmake delete mode 100644 vcpkg/ports/qtremoteobjects/vcpkg.json delete mode 100644 vcpkg/ports/qtscxml/portfile.cmake delete mode 100644 vcpkg/ports/qtscxml/vcpkg.json delete mode 100644 vcpkg/ports/qtsensors/portfile.cmake delete mode 100644 vcpkg/ports/qtsensors/vcpkg.json delete mode 100644 vcpkg/ports/qtserialbus/portfile.cmake delete mode 100644 vcpkg/ports/qtserialbus/vcpkg.json delete mode 100644 vcpkg/ports/qtserialport/portfile.cmake delete mode 100644 vcpkg/ports/qtserialport/vcpkg.json delete mode 100644 vcpkg/ports/qtshadertools/portfile.cmake delete mode 100644 vcpkg/ports/qtshadertools/vcpkg.json delete mode 100644 vcpkg/ports/qtspeech/portfile.cmake delete mode 100644 vcpkg/ports/qtspeech/vcpkg.json delete mode 100644 vcpkg/ports/qtsvg/portfile.cmake delete mode 100644 vcpkg/ports/qtsvg/vcpkg.json delete mode 100644 vcpkg/ports/qttools/devendor-litehtml.patch delete mode 100644 vcpkg/ports/qttools/portfile.cmake delete mode 100644 vcpkg/ports/qttools/vcpkg.json delete mode 100644 vcpkg/ports/qttools/windeployqt.debug.bat delete mode 100644 vcpkg/ports/qttranslations/portfile.cmake delete mode 100644 vcpkg/ports/qttranslations/vcpkg.json delete mode 100644 vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch delete mode 100644 vcpkg/ports/qtvirtualkeyboard/portfile.cmake delete mode 100644 vcpkg/ports/qtvirtualkeyboard/vcpkg.json delete mode 100644 vcpkg/ports/qtwayland/portfile.cmake delete mode 100644 vcpkg/ports/qtwayland/vcpkg.json delete mode 100644 vcpkg/ports/qtwebchannel/portfile.cmake delete mode 100644 vcpkg/ports/qtwebchannel/vcpkg.json delete mode 100644 vcpkg/ports/qtwebengine/clang-cl.patch delete mode 100644 vcpkg/ports/qtwebengine/portfile.cmake delete mode 100644 vcpkg/ports/qtwebengine/vcpkg.json delete mode 100644 vcpkg/ports/qtwebsockets/portfile.cmake delete mode 100644 vcpkg/ports/qtwebsockets/vcpkg.json delete mode 100644 vcpkg/ports/qtwebview/portfile.cmake delete mode 100644 vcpkg/ports/qtwebview/vcpkg.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 307541e274..cc5630f3fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # CMake settings cmake_minimum_required(VERSION 3.19) -set(VCPKG_TAG 37c3e63a1306562f7f59c4c3c8892ddd50fdf992) +set(VCPKG_TAG c591ac6466a55ef0a05a3d56bb1489ca36e50102) set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/src/qml/imports CACHE PATH "QML import path for Qt Creator to detect custom modules properly") diff --git a/vcpkg/ports/qt/portfile.cmake b/vcpkg/ports/qt/portfile.cmake deleted file mode 100644 index 9aefc82414..0000000000 --- a/vcpkg/ports/qt/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/vcpkg/ports/qt/vcpkg.json b/vcpkg/ports/qt/vcpkg.json deleted file mode 100644 index 23dae01afd..0000000000 --- a/vcpkg/ports/qt/vcpkg.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "name": "qt", - "version": "6.6.2", - "description": "Qt", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "animation", - "assimp", - "extras", - "input", - "logic", - "qml", - "render", - "rhi" - ] - }, - { - "name": "qt5compat", - "default-features": false, - "features": [ - "big-codecs", - "codecs", - "qml", - "textcodec" - ] - }, - "qtapplicationmanager", - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtcharts", - "default-features": false, - "features": [ - "designer", - "qml" - ] - }, - "qtcoap", - "qtconnectivity", - "qtdatavis3d", - "qtdeclarative", - { - "name": "qtdeviceutilities", - "default-features": false, - "platform": "linux" - }, - "qtdoc", - "qtgraphs", - "qtgrpc", - { - "name": "qtimageformats", - "default-features": false, - "features": [ - "jasper", - "tiff", - "webp" - ] - }, - "qtinterfaceframework", - "qtlanguageserver", - { - "name": "qtlottie", - "default-features": false, - "features": [ - "qml" - ] - }, - "qtmqtt", - { - "name": "qtmultimedia", - "default-features": false, - "features": [ - "qml", - "widgets" - ] - }, - { - "name": "qtmultimedia", - "default-features": false, - "features": [ - "gstreamer" - ], - "platform": "!windows" - }, - { - "name": "qtmultimedia", - "default-features": false, - "features": [ - "ffmpeg", - "gstreamer" - ], - "platform": "windows & !static" - }, - "qtnetworkauth", - { - "name": "qtopcua", - "features": [ - "qml" - ] - }, - { - "name": "qtpositioning", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtquick3d", - "default-features": false - }, - "qtquicktimeline", - { - "name": "qtremoteobjects", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtscxml", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtsensors", - "default-features": false, - "features": [ - "qml" - ] - }, - "qtserialbus", - "qtserialport", - "qtshadertools", - { - "name": "qtspeech", - "default-features": false, - "platform": "!(windows & x86)" - }, - "qtsvg", - { - "name": "qttools", - "default-features": false, - "features": [ - "assistant", - "designer", - "qml" - ] - }, - "qttranslations", - "qtvirtualkeyboard", - { - "name": "qtwebchannel", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtwebengine", - "default-features": false, - "features": [ - "geolocation", - "spellchecker", - "webchannel" - ], - "platform": "!static & !(windows & arm)" - }, - { - "name": "qtwebsockets", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtwebview", - "default-features": false - }, - { - "name": "qtwebview", - "default-features": false, - "features": [ - "webengine" - ], - "platform": "!static & !(windows & arm)" - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features", - "dependencies": [ - { - "name": "qtactiveqt", - "features": [ - "qml" - ], - "platform": "windows" - }, - { - "name": "qtwayland", - "features": [ - "qml" - ], - "platform": "linux" - } - ] - } - } -} diff --git a/vcpkg/ports/qt3d/portfile.cmake b/vcpkg/ports/qt3d/portfile.cmake deleted file mode 100644 index add3092152..0000000000 --- a/vcpkg/ports/qt3d/portfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick - "vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan - "vulkan" FEATURE_qt3d_vulkan - "rhi" FEATURE_qt3d_rhi_renderer - "render" FEATURE_qt3d_render - "input" FEATURE_qt3d_input - "logic" FEATURE_qt3d_logic - "extras" FEATURE_qt3d_extras - "animation" FEATURE_qt3d_animation -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan - ) - -if("assimp" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_assimp=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_assimp=no) -endif() - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - #-DINPUT_fbxsdk=no - -DFEATURE_qt3d_fbxsdk=OFF # OpenFBX? Probably not! - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qt3d/vcpkg.json b/vcpkg/ports/qt3d/vcpkg.json deleted file mode 100644 index ca1db1b576..0000000000 --- a/vcpkg/ports/qt3d/vcpkg.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "qt3d", - "version": "6.6.2", - "description": "Qt wrapper for existing OPC UA stacks", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "assimp", - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "gui", - "network", - "widgets" - ] - } - ], - "default-features": [ - "animation", - "assimp", - "extras", - "input", - "logic", - "render" - ], - "features": { - "animation": { - "description": "Use the 3D Animation Aspect library", - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "render" - ] - } - ] - }, - "assimp": { - "description": "Build with assimp", - "dependencies": [ - "assimp" - ] - }, - "extras": { - "description": "Use the 3D Extra library", - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "input", - "logic", - "render" - ] - } - ] - }, - "input": { - "description": "Use the 3D Input Aspect library" - }, - "logic": { - "description": "Use the 3D Logic Aspect library" - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "render": { - "description": "Use the 3D Render Aspect library" - }, - "rhi": { - "description": "Enable RHI renderer", - "dependencies": [ - "qtshadertools" - ] - }, - "vulkan": { - "description": "Build with vulkan support", - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "rhi" - ] - }, - "vulkan" - ] - } - } -} diff --git a/vcpkg/ports/qt5compat/portfile.cmake b/vcpkg/ports/qt5compat/portfile.cmake deleted file mode 100644 index d13a078b94..0000000000 --- a/vcpkg/ports/qt5compat/portfile.cmake +++ /dev/null @@ -1,40 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "textcodec" FEATURE_textcodec - "codecs" FEATURE_codecs - "big-codecs" FEATURE_big_codecs - "iconv" FEATURE_iconv - "iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU - #"iconv" CMAKE_REQUIRE_FIND_PACKAGE_WrapIconv - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - ) - -#For iconv feature to work the following must be true: -#CONDITION NOT FEATURE_icu AND FEATURE_textcodec AND NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND WrapIconv_FOUND -if("iconv" IN_LIST FEATURES) - include("${SCRIPT_PATH}/port_status.cmake") - if(qtbase_with_icu) - message(FATAL_ERROR "qtbase was built with ICU. The iconv feature is not compatible with ICU.") - endif() -endif() - -set(TOOL_NAMES) -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -#For my documentation: -# find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -# find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml Gui Quick) diff --git a/vcpkg/ports/qt5compat/vcpkg.json b/vcpkg/ports/qt5compat/vcpkg.json deleted file mode 100644 index 99d82b68a1..0000000000 --- a/vcpkg/ports/qt5compat/vcpkg.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "name": "qt5compat", - "version": "6.6.2", - "description": "The module contains unsupported Qt 5 APIs", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ], - "default-features": [ - "big-codecs", - "codecs", - "default-features", - "qml", - "textcodec" - ], - "features": { - "big-codecs": { - "description": "Supports big codecs, e.g. CJK.", - "dependencies": [ - { - "name": "qt5compat", - "default-features": false, - "features": [ - "textcodec" - ] - } - ] - }, - "codecs": { - "description": "Supports non-unicode text conversions.", - "dependencies": [ - { - "name": "qt5compat", - "default-features": false, - "features": [ - "textcodec" - ] - } - ] - }, - "default-features": { - "description": "Platform-dependent default features" - }, - "iconv": { - "description": "Provides internationalization on Unix.", - "dependencies": [ - "libiconv", - { - "name": "qt5compat", - "default-features": false, - "features": [ - "textcodec" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "textcodec": { - "description": "Supports conversions between text encodings." - } - } -} diff --git a/vcpkg/ports/qtactiveqt/portfile.cmake b/vcpkg/ports/qtactiveqt/portfile.cmake deleted file mode 100644 index 32b1aa7b18..0000000000 --- a/vcpkg/ports/qtactiveqt/portfile.cmake +++ /dev/null @@ -1,36 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(NO_BIN_AND_TOOLS FALSE) -if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm" AND VCPKG_TARGET_IS_WINDOWS) - set(NO_BIN_AND_TOOLS TRUE) -endif() - -if(NOT NO_BIN_AND_TOOLS) - set(TOOL_NAMES - dumpcpp - dumpdoc - idc - testcon - ) -endif() - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -if(NO_BIN_AND_TOOLS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools") -endif() diff --git a/vcpkg/ports/qtactiveqt/vcpkg.json b/vcpkg/ports/qtactiveqt/vcpkg.json deleted file mode 100644 index 2b4d0fa9c4..0000000000 --- a/vcpkg/ports/qtactiveqt/vcpkg.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "qtactiveqt", - "version": "6.6.2", - "description": "ActiveQt", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "windows", - "dependencies": [ - { - "name": "qtactiveqt", - "host": true, - "default-features": false - }, - { - "$comment": "also requires printsupport!", - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "widgets" - ] - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtapplicationmanager/portfile.cmake b/vcpkg/ports/qtapplicationmanager/portfile.cmake deleted file mode 100644 index 68686b02f3..0000000000 --- a/vcpkg/ports/qtapplicationmanager/portfile.cmake +++ /dev/null @@ -1,64 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - wrapper-fixes.patch - stack-walker-arm64.patch - ) - -set(TOOL_NAMES appman - appman-controller - appman-dumpqmltypes - appman-packager - appman-qmltestrunner - appman-launcher-qml - package-uploader - ) - -qt_download_submodule(PATCHES ${${PORT}_PATCHES}) -if(QT_UPDATE_VERSION) - return() -endif() - -set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) -set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) -qt_cmake_configure(${_opt} - OPTIONS - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - -DINPUT_libarchive=system - -DINPUT_libyaml=system - -DFEATURE_am_system_libyaml=ON - -DFEATURE_am_system_libarchive=ON - --trace-expand - OPTIONS_DEBUG - OPTIONS_RELEASE) - -### Need to fix one post-build.bat; Couldn't find the place where it gets generated! -if(VCPKG_TARGET_IS_WINDOWS) - set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) - if(EXISTS "${scriptfile}") - vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") - endif() -endif() -vcpkg_cmake_install(ADD_BIN_TO_PATH) - -qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) - -qt_install_copyright("${SOURCE_PATH}") - -# Switch to a more complicated script due to the one post-build script which needed fixing after configure. -# If somebody finds out how/where post-build.bat gets generated please fix it there instead. -#qt_install_submodule(PATCHES ${${PORT}_PATCHES} -# TOOL_NAMES ${TOOL_NAMES} -# CONFIGURE_OPTIONS -# --trace-expand -# -DINPUT_libarchive=system -# -DINPUT_libyaml=system -# -DFEATURE_am_system_libyaml=ON -# -DFEATURE_am_system_libarchive=ON -# CONFIGURE_OPTIONS_RELEASE -# CONFIGURE_OPTIONS_DEBUG -# ) - -set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug diff --git a/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch b/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch deleted file mode 100644 index 4dd674ede3..0000000000 --- a/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/3rdparty/stackwalker/stackwalker.cpp b/src/3rdparty/stackwalker/stackwalker.cpp -index 7008ac6..cfa0d0e 100644 ---- a/src/3rdparty/stackwalker/stackwalker.cpp -+++ b/src/3rdparty/stackwalker/stackwalker.cpp -@@ -1121,6 +1121,14 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, - s.AddrBStore.Mode = AddrModeFlat; - s.AddrStack.Offset = c.IntSp; - s.AddrStack.Mode = AddrModeFlat; -+#elif _M_ARM64 -+ imageType = IMAGE_FILE_MACHINE_ARM64; -+ s.AddrPC.Offset = c.Pc; -+ s.AddrPC.Mode = AddrModeFlat; -+ s.AddrFrame.Offset = c.Fp; -+ s.AddrFrame.Mode = AddrModeFlat; -+ s.AddrStack.Offset = c.Sp; -+ s.AddrStack.Mode = AddrModeFlat; - #else - #error "Platform not supported!" - #endif diff --git a/vcpkg/ports/qtapplicationmanager/vcpkg.json b/vcpkg/ports/qtapplicationmanager/vcpkg.json deleted file mode 100644 index 681708d378..0000000000 --- a/vcpkg/ports/qtapplicationmanager/vcpkg.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "qtapplicationmanager", - "version": "6.6.2", - "description": "Qt component for application lifecycle management", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "libarchive", - "libyaml", - { - "name": "qtapplicationmanager", - "host": true, - "default-features": false - }, - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtwayland", - "default-features": false, - "platform": "!windows" - } - ] -} diff --git a/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch b/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch deleted file mode 100644 index 194e35f816..0000000000 --- a/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/cmake/FindWrapLibArchive.cmake b/cmake/FindWrapLibArchive.cmake -index 67e4ce0..887b766 100644 ---- a/cmake/FindWrapLibArchive.cmake -+++ b/cmake/FindWrapLibArchive.cmake -@@ -16,3 +16,24 @@ add_library(WrapLibArchive::WrapLibArchive INTERFACE IMPORTED) - target_link_libraries(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_LIBRARIES}) - target_include_directories(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_INCLUDE_DIRS}) - set(WrapLibArchive_FOUND TRUE) -+if(TARGET BZip2::BZip2) -+ set_property(TARGET BZip2::BZip2 PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET Threads::Threads) -+ set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET OpenSSL::Crypto) -+ set_property(TARGET OpenSSL::Crypto PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET zstd::libzstd) -+ set_property(TARGET zstd::libzstd PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET zstd::libzstd_shared) -+ set_property(TARGET zstd::libzstd_shared PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET zstd::libzstd_static) -+ set_property(TARGET zstd::libzstd_static PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET ZLIB::ZLIB) -+ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) -+endif() -diff --git a/cmake/FindWrapLibYaml.cmake b/cmake/FindWrapLibYaml.cmake -index 1dab912..c09e97f 100644 ---- a/cmake/FindWrapLibYaml.cmake -+++ b/cmake/FindWrapLibYaml.cmake -@@ -10,10 +10,17 @@ pkg_check_modules(pc_libyaml yaml-0.1 IMPORTED_TARGET) - - - if (NOT pc_libyaml_FOUND) -- set(WrapLibYaml_FOUND FALSE) -- return() -+ find_package(yaml) -+ if(yaml_FOUND) -+ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) -+ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${yaml_LIBRARIES}) -+ else() -+ set(WrapLibYaml_FOUND FALSE) -+ return() -+ endif() -+else() -+ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) -+ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE PkgConfig::pc_libyaml) - endif() -- --add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) --target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES}) - set(WrapLibYaml_FOUND TRUE) -+ diff --git a/vcpkg/ports/qtbase/allow_outside_prefix.patch b/vcpkg/ports/qtbase/allow_outside_prefix.patch index 557b4c6a05..cd5a256a7b 100644 --- a/vcpkg/ports/qtbase/allow_outside_prefix.patch +++ b/vcpkg/ports/qtbase/allow_outside_prefix.patch @@ -1,3 +1,5 @@ +diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake +index bd186c28b..2c1994d2e 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake @@ -135,11 +135,13 @@ function(qt_configure_process_path name default docstring) diff --git a/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake b/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake index 38819d7072..8537f48775 100644 --- a/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake @@ -149,6 +149,7 @@ function(qt_cmake_configure) ${ninja_option} ${disable_parallel} OPTIONS + -DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Because Qt doesn't correctly scope find_package calls. #-DQT_HOST_PATH= # For crosscompiling @@ -211,7 +212,7 @@ function(qt_fix_prl_files) file(TO_CMAKE_PATH "${package_dir}/lib" lib_path) file(TO_CMAKE_PATH "${package_dir}/include/Qt6" include_path) file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" install_prefix) - file(GLOB_RECURSE prl_files "${CURRENT_PACKAGES_DIR}/*.prl") + file(GLOB_RECURSE prl_files "${CURRENT_PACKAGES_DIR}/*.prl" "${CURRENT_PACKAGES_DIR}/*.pri") foreach(prl_file IN LISTS prl_files) file(READ "${prl_file}" _contents) string(REPLACE "${lib_path}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") @@ -323,6 +324,7 @@ function(qt_fixup_and_cleanup) endif() endif() + vcpkg_fixup_pkgconfig() endfunction() function(qt_install_submodule) diff --git a/vcpkg/ports/qtbase/cmake/qt_port_data.cmake b/vcpkg/ports/qtbase/cmake/qt_port_data.cmake index 68d2b1c10e..12ff990b0b 100644 --- a/vcpkg/ports/qtbase/cmake/qt_port_data.cmake +++ b/vcpkg/ports/qtbase/cmake/qt_port_data.cmake @@ -1,48 +1,49 @@ -set(qtbase_HASH "ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece") -set(qttools_HASH "bf8d7fc92768b2a4992cef021576b1a6ed1405995ab18113db22c72f9e159b38012ff98d797b2a9578cc82527dc51fae92605a5e6a94fdeecd7e0da95509ce90") -set(qtdeclarative_HASH "944e9f824dd8ec47d9e23e716d09142c5942f4478238f207d70f1144993440afa7925f85f3fd4cb5659191dee6a142524db40c7144c69c8bec9817591324cee1") -set(qtsvg_HASH "cdfc3fb9aa00eaedd232c2b93482154f97e4e37d48db62b91142ae0dcc9d03bb9aa07cdfaa77e2973e6bfb5fdcdbf4365e6b9c855ffc82b3542d4cd07c1857a7") -set(qt5compat_HASH "12e4142ce8e9b0863ee5d39c37f9a04ef696fd34c98b5d955464a1cfcc7d55ea8387b6238a49d9e9380f8c95f4b655ffa64fe250f27fee3d4e9f48065bcabb6a") -set(qtshadertools_HASH "f016b55d229bf331141bf439de2b094080c601efca524f2f904e8767e6c3d82f097e62e671014e44680bd63c966509eb45f55d1b661b56ed65b13f987e9bb9c5") -set(qtquicktimeline_HASH "e3ec90ff0bb8646a2804abe9663b58953b768a727a5305882de0fc0abf054901ed6138b95f9e88b845150cfd437ba4328245aef42a93dc3071e43baede0f4dd3") -set(qtquick3d_HASH "d8b32ec1a5f9233e79612b5d9b56890c04a921edcc6369f4a047f8e58af92f5e6dc936fdde707df4afca81da53f9fb8959f03b00af24077c3dc723f3445e8123") -set(qttranslations_HASH "4df875fd0194d7a7f60459be9736202858465d1cdfe4f27a311139c9f12a3bd48d9a5b25277b2df9a7facfb61cea108750c78a0102e11b9a2caed55d629960bb") -set(qtwayland_HASH "ed5539ac9515ba93822ee1dfdedd3ece46a51c50b23efd0fb90ead2728b651c41bec42a6e2e2caf72bda0f274940e9f00049bae42c1315e0226e4a42c708f664") -set(qtdoc_HASH "b81f96992419479354ef93d389033703f924f2d9b709d218d8905a405577bea200567fc4db45004380bf078235435fd1c91501930744d5edb392780bc27bb07c") -set(qtcoap_HASH "0440a23c04865436b0537d3f356a55733dda94fa85f9a6c37a40b5b2511d0a020a98e578b5c9b560c40f7a2457ef7ad72857d7c0a5b200b768895fd9052fcbe0") -set(qtopcua_HASH "c128a9b80f6c7a24f3369d6aae7e12d29a15cfc1457f11d89aa785cb842c4c2ccdc106378f74cc709687cbd0b5e73969b3f87d9dc5f0bae21b75227e2e3e6035") -set(qtimageformats_HASH "64704becdd6f1a50f4a4c0edabc6be2f8a114c978728a62b2a5c9502e2457699f6e86135146c56afef715f865dd1c10062cf485ad97c890884bace8a163c24a5") -set(qtmqtt_HASH "1b383c39bcfb02dac0e5762d264f0b5ea292f883d983da914db5e1b0242a415d076c4149feac0de9e3bf2082a1c537961afd383b60ee473cb236f6ec2972ed77") -set(qtnetworkauth_HASH "1fff9c52d47c8f97569bf201aa3051da57dbcf10f63c7e7334286b40042b6437f9636f8fd1db3a8d1a519036dae162ae57d6a24908441df84003134cfdb5cfd3") -set(qt3d_HASH "33b5e2e2d4ba78fca31fcc17c1636c04f7092b959711589655d31bd32e8d47043977e27a28157dc44c6f47542b42d6f26d41bd145b382279fcb9cf19bf7b67a0") -set(qtactiveqt_HASH "18606e86836d4f394f766590946f82a68e87ee0fa6b1efc3d940bc477221e731c1a273a3969d47e36c2d785047c6fc0cb538e0d3335608413aa46be04d8402dc") -set(qtdatavis3d_HASH "8e62f538aa4b2a7fcf51e2016484c17afd3807e097bf3c206dc33cf7b75f71a4ec3baa7ab168dc9dec8f466d46d3aa0e06f11e61a97930302fb4096ef9d5fc12") -set(qtdeviceutilities_HASH "9b7a2115531db5d54dfb6c95a2276f738c89b9e0c92a82e83ec23a652259faa8f1b0febfd18a5c116509e038cc914ed23665e6c4873c08e6928da02af137969a") -set(qtlottie_HASH "fa6150cbe64e8f4e9893030c7484a73bb9c2bc585b6aa2554c3191f37c3d0d305292be57a30eec9907348ea6cfe2d14f2f4e157d932ee98282ee0b00c77be03c") -set(qtscxml_HASH "b7058d310dd82d09ca859dae5529d63bcde68a985a4c3f8f00474e2ffcd8f2f1162ffdafe3bb0cfc29769bc53ea4725dc8b68b04a09dcbea653d9afafca2643c") -set(qtvirtualkeyboard_HASH "bafff245ca6340e57a7abf312369ad2196beb85fd6dee4920e0cd5dc08f35f1f1ae3f861e6f3ac8766ef4e1059cca34ae9fc15a4eca806e7b5c7a9319e56bf2c") -set(qtcharts_HASH "c6e001033aa2771288786924e2eea87840eb13227a6bb3d7a7605b33bb1d835db334a6c4023bdd79b63b6078267d16b5fdfeb2e4827752c00aefb9def24a3ec0") -set(qtconnectivity_HASH "aa66652cb8bd9f44cec616922f76b02c8dccdaea2bc8d24be8b8a4b6b76f08925a5088a2559eca3042e6aa77c67c722ec90910d2e2a092705c6f74ca413e4c5a") -set(qtpositioning_HASH "f2f67c7b25ff79e085a4a36421295f4ec4ef97a7df9fedcfb90ebd60483755109d0b595b30f7ff1881ad635ddbd2c6a227771df3549d7933fda03cf63f935cd3") -set(qtlocation_HASH "a2c4b9d9fb3b3675d25d3e7abeb8eec42f5998a9b275648a355df61c7d21258fb6bf5ecefeb635bab1a37f3382fc71b588a05eafc1bd7b57580c0f9999c9f1cd") -set(qtmultimedia_HASH "311f47acd7658d725855df06c25b4d516d4046922cc92ad44c91c48f1696fbcbb25a0d778b1a72f15834ce2e74ce64199814476ac04fc705fc19af73c91f2006") -set(qtremoteobjects_HASH "93d8a3c9baa3d290665fbf015f6d04b6f8185a76cdf5606327b61b8977ceffc83eb97ce036636ef04250e72c3a8284e04c25e3ace97b27c1dedaf1f3a0602991") -set(qtsensors_HASH "9b64605f5a6dca205249480f3dfbc8f1ff247ad1acc6468417bd25a91c216a8d99ee608e68ba1b5aa39c659bb5027e7abeccddce772d10109d33877626228a3d") -set(qtserialbus_HASH "d21c1c95b7dc495f2d963af7e0e927265573d5d0ff163ee51e19c0a62486ba78b8769ba65f7e196116fa0d029db78e6a453c3bde8a3c7f4447a278bde4de87be") -set(qtserialport_HASH "1925c1a319ce734c9b9d52b7a69cb92ac593d29bf86c89472d9e2df73eb2e6c8bbd148e511f9014680c3a05b9f2f92a7e16f83712022570b9cb3fdc2d67a07db") -set(qtwebchannel_HASH "5a56c88847dd107dae00ccc65d8e2410892ac7a64a71df0295007af9512ff1a05f05474b677f08c7f1c51512bd198a8aa612e6afe2e9c15e572d082952ad2644") -set(qtwebengine_HASH "8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d") -set(qtwebsockets_HASH "ea3390088ab1c0ff61288c736e8a6d8e5270b3d0450264ac26d291658a2fc49b0866df9c4257ba4157a07937cae348aad385a664d92062969ad4f4c0f8c457a9") -set(qtwebview_HASH "a3e017ffee8adffe9c091c8b00f0b0a4133af57d1959e5999cf4baaa2f890064fe2cd5cb1628bbc2cb35948a7c51be135912cccf27c2b751ac88c9b6dbcdb534") -set(qtinterfaceframework_REF "16cd27311f8a6e7e88c4477e6da989663d1118da") -set(qtapplicationmanager_HASH "49b3138c215550d99a18cb2662074a0c42bf476e8e2d5d808aa33ba024cdd694603c807ec8ed1752f4934f4f758d08b8d48e2e8d261b8591bcefa6dfa551b6d5") -set(qtlanguageserver_HASH "6b205fe34944ae52bb41ef50c816b80d1e35abc2c2b9251ff2a4fa951d0ec339de0196e43e2e81731b651e9f0380bee02df2cc5f3e71a563d780da357ac7d432") -set(qthttpserver_HASH "e436c8525febbf58071159032d3d115c1eb9780e1b261aa7bb2d33e29979cc2a24be559d9db348e8b5356079e469644fa10865b8d042d91d64c86aa72c0682b4") -set(qtquick3dphysics_HASH "db23774629c180b575243583bdcf0ecd957bb0463e1999c7a236a0abb40409cf89500e43bac7618d4f3f950614d8ab6600e7bc6d083140a37aad5b1028b3ee30") -set(qtspeech_HASH "e43793931b81bb86cc074a2153ec0160991c86bc255ea1b11e5b4a272b8d067fcfc6788261d4b2f6f7630eadbcab7be23249b980d2792cb9a109137af614601e") -set(qtgrpc_HASH "8f8329086f04fc2d7835c6015fead2e48c7e49d74f1d5ea9211eaebe4de23cc0a1c150ce732d837346edc38e875b7f1be9ce9b1e0c9f1b696c9dceef3e78f0ba") -set(qtquickeffectmaker_HASH "7b88f4d4d4e7ede1923c558ef791b20e00de668e643f06baaacc1ca17f95a2d02f46293a966e5e6832a2f479f6292cbfd1302abe179a2c7fb8768ce9aea7df16") -set(qtgraphs_HASH "bb303a1353a9a5737f5948d6190a535ae572661be517d844cc72706f78b8c35a85ca7c050ba533a56b70b11f290c336fb61352ed5d15a8dd5fe282c941602f3a") +set(qtbase_HASH "cd96903a3947a1f5cf6a3ff21ab0b3209ed421d2a8c45acb34ae5aa7ad0501cb79e26cfa81bc02141d5731ebfa662442f37806e97994332077d963c9e70a5f54") +set(qttools_HASH "621277c1f8ea7b0742ce2679bc938d8c5611f712b06f6ec7afa8231e9d8ae3184870f0d9d9358076bdeac220072798e236745bf68c33eaf23dc7896a1a478235") +set(qtdeclarative_HASH "78b19353ddc447dc2b850987ee1e9fe5c898c641190fdc45001369d3d08487d62b3a20f22532c9bd9a365d3e2fcb910091001c7766142c4c6c510ac61c6a6fca") +set(qtsvg_HASH "78d588ebc60d90b86f8d639b49081a616abe0adedbd32381dd7853693065ee2e41b40ee4221d4c13c04c71a7f9780b35f3c472f5b9b5fa96af6835d711eb4937") +set(qt5compat_HASH "11a1e03216c434c07ff984fc7f225072067bd17f1d469513e84d610d067953ad8f0e492973cfab3afbaaadffd5b1d0db3e84cc96f1abfad4fced0ee852729330") +set(qtshadertools_HASH "7c6aefb6fe18e7febaa45ef84853d9400d57dfa424c7fc847dee50d155a95a54e27dafdd9a0186a8ce9476dec8b3715ad8d5b9fe6053ab777f6acb9213ab0519") +set(qtquicktimeline_HASH "1e0976a34496f3961f958a38296b1aebf5bb0be7e077b70a91d93ff4e2c652b09ba5cdf94e26c748988ce489d025328a0bd9feca77bc2ddfb360815682055e47") +set(qtquick3d_HASH "49c9a5e336a011c592c2273420044d4cdea45a11db9c684fe7289b9e552d1f8c3e2cb690350a53ddad739f5334d045e213cc225c451c9e0f2a481afb9b1e255b") +set(qttranslations_HASH "b764161def8d9e7f1f7e6417dc37e166cde402642234f8a3b55f93a56ef2f46c68799d4e80c283fe76f9790b3d84274e6be680189bc04cc09fa8ca2ea68397e7") +set(qtwayland_HASH "6829c9aef2b7fc37a6a94c0093d478c13742d8c2b3d2b9444b7a1dbe022bfce1f6a5665d16bebe221e93bddd964b726451b2949352877b25d65654df17a58eb1") +set(qtdoc_HASH "3d508ef311718aa72cb5e3ede55b6237e2e15d632261c320751dd3245c6a93978c0e0513bffea64a81f7cdff80f61675a21bc79cebd4bdc4923e5a36a699a5bb") +set(qtcoap_HASH "1aff7d048beab105b380b468bf3e893084a95bb05edae06981cf71a32d5d4b8323e0009cca9b7150a08a2f84f2c71e8ce268e13a47870e8c2e89585b2268469b") +set(qtopcua_HASH "7cd67a49d010b631ce99128f8cf0a632fdb9144e81f073b6f813f01e476f53cebc155920f2f57410d736a010fe8980544c8e8652034dcf1822c00a8fdf6b7633") +set(qtimageformats_HASH "4fe56a787742f4af5e3e5c41c8c7850190bacea6a6d13ccde4ce299dbd15d2a1ab8b1825353ad324ca159333c0adc5dede823e79e217de3ab5910c5803b96d6d") +set(qtmqtt_HASH "a4564279f486b6e0ee5d5f398c2598e9d8f2493ec6b4d5a94d2369eac4c5dac873debfd23174a8ad5a3318c2927729634a1975d9475fbba2fc0cb3f890bc6ee4") +set(qtnetworkauth_HASH "c9976ab38f8a28a5944a70c6312490df9d3823d2125fe7a23aa8752a2d5dc9c2a7bc5f256f7e95acd475806cb64fcb703ae1f633311d8f03f690e87b2de49f8e") +set(qt3d_HASH "de47d1131fb4219481cb59d3b61f9f06b3785ac429d267da197d637fde1c72b6f8a0633bf1b6e4469dd22c95f2f2fd70f5eadc3b7d7e6324fad764271f741b71") +set(qtactiveqt_HASH "8b627209bd3089b20af1c93dce408315a05f39c947f3e4a4abe30af5ffc5078ede6e9af6bf20ae1273c99e1466bdb149f9859fdc78926a6fa6d996c5f390d494") +set(qtdatavis3d_HASH "a81fb36da432d2b5ec6b79263c8ceaeb81f413d793e7af77fad27a1c094e842debfe08174d26ea511cfe28127deecaad9e2ec88125e603225230ebf31e26751b") +set(qtdeviceutilities_HASH "04da4ca56e1481e93d4ce9c77f7785a8a9e9b061acc1198aa8776fc3f4647480cbbc58245eabf6bd0d7d5bab6e6d97ead4bdb0094c83f0cf327c453c49fdeda2") +set(qtlottie_HASH "4ea0c56d5c2d12bda1d3ee0e5d820000f8ebef36ca957d69de9f40180cb07dab4f2301b4e3b06a01e33339da4b326a26d7d43de8566e6c42a42b322aeaf32a4b") +set(qtscxml_HASH "626efd53f5f54d1742b86e95c8eb240354a88492601fc650bde0229670a1c75a009320ebf50b135634a3deaddb111ddffd878e392b806f723f8b0e965dacb270") +set(qtvirtualkeyboard_HASH "badfb9145315bb60a2a3a7b858e23af25a99e4209356f94ba098fc7a9f903d4ca7c995c3d0185b8c6492394846959136479c9b2e1c94d88a41f0c68d88d2fe36") +set(qtcharts_HASH "86f201d22104789d1e0de5c7cb8241301ab4cb138cc2e82dace9509e96afcbfbd05e1d7990a8d1939567f6086dfb4acccf954c1cd558fcf2a12332f279be4e61") +set(qtconnectivity_HASH "e75eea3d9c95532dafd3e2c765b1109f066e4b583d00205d18655e39f43f7373122e4d014d405d655d12b2246470083f1ac5dada0698bc1b0fb1d115a9fca6ea") +set(qtpositioning_HASH "6ae48b27851a18c44fa3167fa05d7da9b885a85e8b99c2efc750092d1bc0bc2c438b10e085486fce143b4f961189be843fd1a58581d31bd212e79596ce52a686") +set(qtlocation_HASH "3a014f498158151ad3932d9bed40622d54e75c2cc64660f12ea02645b93777eaad67b743c073d561f1b48a3558b3b66a5cd65a6f8bcb25a57ffc20d6f7371825") +set(qtmultimedia_HASH "4cad4a7c248adba709f5fda91780151a1136bd7ebb3a249602e401c2e3ae5aceb57a3ddc3825079bfbdb0200af403ad5cf3aa252b2090102f5ab22122445dc02") +set(qtremoteobjects_HASH "4cf25b3b6d8574ebd0028b605a96c74737f35895ffe267b8986e2145c180f383e4c21002a18fa45ded11610f6f54775893f7af8ac22d0006a5f127e7e93e85ae") +set(qtsensors_HASH "2a0b56bab4eebb09236ef2e0fb6dc54a719bef955833c24ba8c28eedee0abe4a06fb3f7d804c3189b4f8ffe6d0b93bceb9c53ed6fdf23d914402ace81f219b4c") +set(qtserialbus_HASH "22e3ba8a454abb46ac776ea33b3ff7f9e83573451226cb3801ad6e3a09d4d8089e5ba33263c7a43058cf44057f1be189ff06e7d394dca12c6f74660597642fd0") +set(qtserialport_HASH "b5a92452889f6fdcf05bd9395b803557ade0df60b49c698d7131df611cde1980d0b957127034aa6aae23f24dec6e97dff129c60e5d0291f057ba6d9fb51dcfca") +set(qtwebchannel_HASH "81b264aa661460b7872bfdf49b4404f090382346997ee288afc8c00a92c52a72d963cba9667ef99e02b8bd696456ee34e811e5885ed5d400076cdcc1e6cf72fa") +set(qtwebengine_HASH "cb026f2dd389d83fbeff3eedc3fa77fc22ff5cf6d444ec163b0dc4649abdf2d16683e9d31f46324f7b3546bb1ec80e40d35854537aa3c09959457fa3c79fa96d") +set(qtwebsockets_HASH "d9d6ab3380dfd0f74dc5c37d9aedcbd3349535d97f732e1fd6adef9a8d7ca3eb5a99b0cf94d0b7dafccd910689b82c0e2fcb631b3befe89e04778f92612d0190") +set(qtwebview_HASH "ea35725f666930fa7e5d83457ad7eb30c635cd2aa469111592850307b62888140077ed7e6c659ff1523c1d048fb1c90c506694133a5048d0daa189f9b01fb356") +set(qtinterfaceframework_REF "0455bf81a5777bf19894a2dc917b20df98d2ed0c") +set(qtapplicationmanager_HASH "dbc43da631ee0d76981f3667507e3daad566ef660f909da915890a92bea8bae7b8c047bf338cf3b5c66ab3f8fbdfcdc648c3c1e478fe225204599467a4f1d927") +set(qtlanguageserver_HASH "13d4fff90e45332337b822cdb77f1b6844d1e2754846788bf8a88b1d7b526dc820b9c3d570c26371ae318020de5417133e98a75d8309b596f4973130c4c842a5") +set(qthttpserver_HASH "a1a792beedef9c4e492ecae46d20c683773db690ac6d879b557a9223b64cedc6b7260668ee8fa781db16f478b2e98a0fd3ecd81fa9620766c9ee308a49d1bda1") +set(qtquick3dphysics_HASH "b6831732fa063df7303709d06ebb831e643a3b0a3a23e9e1101c3e7c1268e75f444d3e9ffd1b21c5ae403af317b588700dba5a07fef2481fdf8dbc4ce7e19a43") +set(qtspeech_HASH "4a43e1895ae477f6b6890a36ba2da365420e7778dece26535642ead39aab39c0c10d3be1c78a5b823eaddc646bdb60c5bd16bf3ac02f279832bc9724cfedc5d2") +set(qtgrpc_HASH "2633d1693d28343b58a1a69ecc88f27a34899d0a0a1a2e3010158944323330aeb166dd02fe4e981fb88a279d333670f4be205db686057912e51e68b7b7d1606d") +set(qtquickeffectmaker_HASH "8431c06a918530d93db54cb05528c84eaf39c0e68b7c769a09e5ffd896a2a5f4a774bcf8cc153d814b64728f3841a1c897297d775bec0129f69d1436e4c31cfd") +set(qtgraphs_HASH "2bb24700d486e3dc866521e680f772e9ddf2e9d07869d4f2a11c9a5853d830f28f3624e0f547a534fcf6ab7eb1d95fe3ebca69ee389a1dee0489bf936826bd74") + # Keep for beta/rc #set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) diff --git a/vcpkg/ports/qtbase/cmake/qt_port_details.cmake b/vcpkg/ports/qtbase/cmake/qt_port_details.cmake index e9f606b3fb..574442394a 100644 --- a/vcpkg/ports/qtbase/cmake/qt_port_details.cmake +++ b/vcpkg/ports/qtbase/cmake/qt_port_details.cmake @@ -7,7 +7,7 @@ ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake ## 7. Set QT_UPDATE_VERSION back to 0 -set(QT_VERSION 6.6.2) +set(QT_VERSION 6.6.3) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) diff --git a/vcpkg/ports/qtbase/config_install.patch b/vcpkg/ports/qtbase/config_install.patch index 8bd44936d5..fdfc703301 100644 --- a/vcpkg/ports/qtbase/config_install.patch +++ b/vcpkg/ports/qtbase/config_install.patch @@ -1,6 +1,8 @@ +diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake +index bd186c28b..edee52e8b 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake -@@ -100,7 +100,7 @@ function(qt_internal_setup_build_and_install_paths) +@@ -100,7 +100,7 @@ function(qt_internal_set_up_global_paths) if(QT_CONFIG_INSTALL_DIR) string(APPEND QT_CONFIG_INSTALL_DIR "/") endif() diff --git a/vcpkg/ports/qtbase/portfile.cmake b/vcpkg/ports/qtbase/portfile.cmake index 2041592e96..3b4d4081c3 100644 --- a/vcpkg/ports/qtbase/portfile.cmake +++ b/vcpkg/ports/qtbase/portfile.cmake @@ -13,7 +13,6 @@ set(${PORT}_PATCHES allow_outside_prefix.patch config_install.patch fix_cmake_build.patch - fix_cmake_build_type.patch harfbuzz.patch fix_egl.patch fix_egl_2.patch diff --git a/vcpkg/ports/qtbase/vcpkg.json b/vcpkg/ports/qtbase/vcpkg.json index 38ad4a0d86..3fac13c6d2 100644 --- a/vcpkg/ports/qtbase/vcpkg.json +++ b/vcpkg/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version": "6.6.2", + "version": "6.6.3", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/vcpkg/ports/qtcharts/portfile.cmake b/vcpkg/ports/qtcharts/portfile.cmake deleted file mode 100644 index 0f5be8a036..0000000000 --- a/vcpkg/ports/qtcharts/portfile.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtcharts/vcpkg.json b/vcpkg/ports/qtcharts/vcpkg.json deleted file mode 100644 index 732b2c78cf..0000000000 --- a/vcpkg/ports/qtcharts/vcpkg.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "qtcharts", - "version": "6.6.2", - "description": "QtCharts module", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "widgets" - ] - } - ], - "features": { - "designer": { - "description": "Build Designer plugin", - "dependencies": [ - { - "name": "qttools", - "default-features": false - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtcoap/portfile.cmake b/vcpkg/ports/qtcoap/portfile.cmake deleted file mode 100644 index 1940e3989d..0000000000 --- a/vcpkg/ports/qtcoap/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtcoap/vcpkg.json b/vcpkg/ports/qtcoap/vcpkg.json deleted file mode 100644 index 9518b34152..0000000000 --- a/vcpkg/ports/qtcoap/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtcoap", - "version": "6.6.2", - "description": "Qt CoAP client module", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtconnectivity/portfile.cmake b/vcpkg/ports/qtconnectivity/portfile.cmake deleted file mode 100644 index 5eefc2decd..0000000000 --- a/vcpkg/ports/qtconnectivity/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_BlueZ:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_PCSCLITE:BOOL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtconnectivity/vcpkg.json b/vcpkg/ports/qtconnectivity/vcpkg.json deleted file mode 100644 index 2c71d3d59a..0000000000 --- a/vcpkg/ports/qtconnectivity/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "qtconnectivity", - "version": "6.6.2", - "description": "Qt Connectivity", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus", - "gui", - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtdatavis3d/portfile.cmake b/vcpkg/ports/qtdatavis3d/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtdatavis3d/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtdatavis3d/vcpkg.json b/vcpkg/ports/qtdatavis3d/vcpkg.json deleted file mode 100644 index ee4dddcaea..0000000000 --- a/vcpkg/ports/qtdatavis3d/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "qtdatavis3d", - "version": "6.6.2", - "description": "Qt 3D data visualization framework", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "testlib" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtdeclarative/portfile.cmake b/vcpkg/ports/qtdeclarative/portfile.cmake deleted file mode 100644 index 3c9525d667..0000000000 --- a/vcpkg/ports/qtdeclarative/portfile.cmake +++ /dev/null @@ -1,31 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -vcpkg_buildpath_length_warning(44) - - set(TOOL_NAMES - qml - qmlcachegen - qmleasing - qmlformat - qmlimportscanner - qmllint - qmlplugindump - qmlpreview - qmlprofiler - qmlscene - qmltestrunner - qmltime - qmltyperegistrar - qmldom - qmltc - qmlls - ) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtdeclarative/vcpkg.json b/vcpkg/ports/qtdeclarative/vcpkg.json deleted file mode 100644 index 0dc4d45b6e..0000000000 --- a/vcpkg/ports/qtdeclarative/vcpkg.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "qtdeclarative", - "version": "6.6.2", - "description": "Qt Declarative (Quick 2)", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network", - "testlib" - ] - }, - { - "name": "qtdeclarative", - "host": true, - "default-features": false - }, - "qtlanguageserver", - { - "name": "qtshadertools", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtdeviceutilities/portfile.cmake b/vcpkg/ports/qtdeviceutilities/portfile.cmake deleted file mode 100644 index f83d1fd6f0..0000000000 --- a/vcpkg/ports/qtdeviceutilities/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES settingsui) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtdeviceutilities/vcpkg.json b/vcpkg/ports/qtdeviceutilities/vcpkg.json deleted file mode 100644 index bff120eb5e..0000000000 --- a/vcpkg/ports/qtdeviceutilities/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "qtdeviceutilities", - "version": "6.6.2", - "description": "Utils for Boot2Qt", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "linux", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qttools", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtdoc/portfile.cmake b/vcpkg/ports/qtdoc/portfile.cmake deleted file mode 100644 index df99e640f4..0000000000 --- a/vcpkg/ports/qtdoc/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/vcpkg/ports/qtdoc/vcpkg.json b/vcpkg/ports/qtdoc/vcpkg.json deleted file mode 100644 index 3cd22334cf..0000000000 --- a/vcpkg/ports/qtdoc/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "qtdoc", - "version": "6.6.2", - "description": "Qt Documentation", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtgraphs/portfile.cmake b/vcpkg/ports/qtgraphs/portfile.cmake deleted file mode 100644 index 014d19bd67..0000000000 --- a/vcpkg/ports/qtgraphs/portfile.cmake +++ /dev/null @@ -1,8 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtgraphs/vcpkg.json b/vcpkg/ports/qtgraphs/vcpkg.json deleted file mode 100644 index 585e32acf5..0000000000 --- a/vcpkg/ports/qtgraphs/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "qtgraphs", - "version": "6.6.2", - "description": "Qt Location", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "testlib", - "widgets" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtquick3d", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtgrpc/portfile.cmake b/vcpkg/ports/qtgrpc/portfile.cmake deleted file mode 100644 index 4304d66390..0000000000 --- a/vcpkg/ports/qtgrpc/portfile.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES protoc-host.patch) -set(TOOL_NAMES qtprotobufgen qtgrpcgen) -# native_grpc ->grpc WrapgRPC -# grp -> qt[network] -# qtprotobufgen -> protobuf WrapProtobuf -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - #--trace-expand - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) diff --git a/vcpkg/ports/qtgrpc/protoc-host.patch b/vcpkg/ports/qtgrpc/protoc-host.patch deleted file mode 100644 index a2d81fb5af..0000000000 --- a/vcpkg/ports/qtgrpc/protoc-host.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/FindWrapProtoc.cmake b/cmake/FindWrapProtoc.cmake -index 82972c8f18..08335fa746 100644 ---- a/cmake/FindWrapProtoc.cmake -+++ b/cmake/FindWrapProtoc.cmake -@@ -13,7 +13,7 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) - list(APPEND __WrapProtoc_find_package_args QUIET) - endif() - --if(NOT CMAKE_CROSSCOMPILING) -+if(0) - if(NOT TARGET Threads::Threads) - find_package(Threads ${__WrapProtoc_find_package_args}) - endif() -@@ -52,8 +52,8 @@ if(NOT CMAKE_CROSSCOMPILING) - endif() - endif() - --if(NOT __WrapProtoc_protoc_imported_location) -+if(1) - if(CMAKE_CROSSCOMPILING) - set(__WrapProtoc_extra_prefix_paths "${QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH}") - endif() - find_program(__WrapProtoc_protoc_imported_location diff --git a/vcpkg/ports/qtgrpc/vcpkg.json b/vcpkg/ports/qtgrpc/vcpkg.json deleted file mode 100644 index adc911cd61..0000000000 --- a/vcpkg/ports/qtgrpc/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "qtgrpc", - "version": "6.6.2", - "description": "Qt framework based gRPC clients and services.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "grpc", - "default-features": false - }, - { - "name": "protobuf", - "default-features": false - }, - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtgrpc", - "host": true, - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qthttpserver/portfile.cmake b/vcpkg/ports/qthttpserver/portfile.cmake deleted file mode 100644 index 975bf122fd..0000000000 --- a/vcpkg/ports/qthttpserver/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qthttpserver/vcpkg.json b/vcpkg/ports/qthttpserver/vcpkg.json deleted file mode 100644 index 053b5d8791..0000000000 --- a/vcpkg/ports/qthttpserver/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "qthttpserver", - "version": "6.6.2", - "description": "Qt Extension: Qt HTTP Server", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch b/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch deleted file mode 100644 index 244e09f4b1..0000000000 --- a/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7fdd7ddbd..f189c472c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,6 +9,15 @@ project(QtImageFormats # special case - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C - ) -- -+find_package(Threads) -+set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) -+find_package(ZLIB) -+if(TARGET ZLIB::ZLIB) -+ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) -+endif() -+find_package(JPEG) -+if(TARGET JPEG::JPEG) -+ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) -+endif() - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) - find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) diff --git a/vcpkg/ports/qtimageformats/portfile.cmake b/vcpkg/ports/qtimageformats/portfile.cmake deleted file mode 100644 index 74660c1a68..0000000000 --- a/vcpkg/ports/qtimageformats/portfile.cmake +++ /dev/null @@ -1,41 +0,0 @@ -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES no_target_promotion_latest.patch) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - #"jasper" CMAKE_REQUIRE_FIND_PACKAGE_WrapJasper - #"webp" CMAKE_REQUIRE_FIND_PACKAGE_WrapWebP - #"tiff" CMAKE_REQUIRE_FIND_PACKAGE_TIFF - INVERTED_FEATURES - "jasper" CMAKE_DISABLE_FIND_PACKAGE_WrapJasper - "webp" CMAKE_DISABLE_FIND_PACKAGE_WrapWebP - "tiff" CMAKE_DISABLE_FIND_PACKAGE_TIFF - ) - -if("jasper" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_jasper=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_jasper=no) -endif() -if("webp" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_webp=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_webp=no) -endif() -if("tiff" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_tiff=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_tiff=no) -endif() -list(APPEND FEATURE_OPTIONS -DINPUT_mng=no) # marked as FIXME - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Cf. QTBUG-95052 - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtimageformats/vcpkg.json b/vcpkg/ports/qtimageformats/vcpkg.json deleted file mode 100644 index 78454eb6ee..0000000000 --- a/vcpkg/ports/qtimageformats/vcpkg.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "qtimageformats", - "version": "6.6.2", - "description": "Additional Image Format plugins for Qt", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ], - "default-features": [ - "default-features", - "jasper", - "tiff", - "webp" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "jasper": { - "description": "Use jasper", - "dependencies": [ - "jasper" - ] - }, - "tiff": { - "description": "Use TIFF", - "dependencies": [ - "tiff" - ] - }, - "webp": { - "description": "Use WebP", - "dependencies": [ - "libwebp" - ] - } - } -} diff --git a/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch b/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch deleted file mode 100644 index b8027bdf6a..0000000000 --- a/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindWrapSystemTagLib.cmake b/cmake/FindWrapSystemTagLib.cmake -index e82d2c1a9..14463c791 100644 ---- a/cmake/FindWrapSystemTagLib.cmake -+++ b/cmake/FindWrapSystemTagLib.cmake -@@ -4,7 +4,7 @@ if(TARGET WrapSystemTagLib::WrapSystemTagLib) - set(WrapSystemTagLib_FOUND ON) - return() - endif() -- -+unset(PKG_CONFIG_EXECUTABLE CACHE) - find_package(PkgConfig) - - pkg_check_modules(TagLib taglib IMPORTED_TARGET) diff --git a/vcpkg/ports/qtinterfaceframework/portfile.cmake b/vcpkg/ports/qtinterfaceframework/portfile.cmake deleted file mode 100644 index e93aa878ce..0000000000 --- a/vcpkg/ports/qtinterfaceframework/portfile.cmake +++ /dev/null @@ -1,53 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. - ) -set(TOOL_NAMES - ifmedia-simulation-server - ifvehiclefunctions-simulation-server - ) - -qt_download_submodule(PATCHES ${${PORT}_PATCHES}) -if(QT_UPDATE_VERSION) - return() -endif() - -if(_qis_DISABLE_NINJA) - set(_opt DISABLE_NINJA) -endif() - -vcpkg_find_acquire_program(PKGCONFIG) - -x_vcpkg_get_python_packages(PYTHON_VERSION "3" - REQUIREMENTS_FILE "${CURRENT_PORT_DIR}/requirements_minimal.txt" - PACKAGES qface==2.0.5 - OUT_PYTHON_VAR "PYTHON3") - -if(VCPKG_CROSSCOMPILING) - list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}") -endif() - -set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) -set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) -qt_cmake_configure(${_opt} - OPTIONS ${FEATURE_OPTIONS} - "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. - OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) - -qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) - -qt_install_copyright("${SOURCE_PATH}") - -if(NOT VCPKG_CROSSCOMPILING) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() -endif() - -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/${VERSION}/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "") diff --git a/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt b/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt deleted file mode 100644 index 4e4ae361f6..0000000000 --- a/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt +++ /dev/null @@ -1,14 +0,0 @@ -antlr4-python3-runtime==4.7.1 -argh==0.26.2 -click==6.7 -coloredlogs==10.0 -humanfriendly==4.15.1 -Jinja2==2.11.3 -MarkupSafe==1.1 -path.py==11.0.1 -pathtools==0.1.2 -PyYAML==6.0.1 -six==1.11.0 -watchdog==2.1.7 -pytest==5.3.5 -pytest-cov==2.8.1 diff --git a/vcpkg/ports/qtinterfaceframework/vcpkg.json b/vcpkg/ports/qtinterfaceframework/vcpkg.json deleted file mode 100644 index 44d4e35f2e..0000000000 --- a/vcpkg/ports/qtinterfaceframework/vcpkg.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "qtinterfaceframework", - "version": "6.6.2", - "description": "Qt Interface Framework", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "pkgconf", - "host": true - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtinterfaceframework", - "host": true, - "default-features": false - }, - { - "name": "qtmultimedia", - "default-features": false - }, - { - "name": "qtremoteobjects", - "default-features": false - }, - { - "name": "qttools", - "default-features": false - }, - "taglib", - { - "name": "vcpkg-get-python-packages", - "host": true, - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtlanguageserver/portfile.cmake b/vcpkg/ports/qtlanguageserver/portfile.cmake deleted file mode 100644 index b7de4dd7c8..0000000000 --- a/vcpkg/ports/qtlanguageserver/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) diff --git a/vcpkg/ports/qtlanguageserver/vcpkg.json b/vcpkg/ports/qtlanguageserver/vcpkg.json deleted file mode 100644 index 48ad6934bb..0000000000 --- a/vcpkg/ports/qtlanguageserver/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "qtlanguageserver", - "version": "6.6.2", - "description": "An implementation of the Language Server Protocol", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "network" - ] - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ], - "platform": "android" - } - ] -} diff --git a/vcpkg/ports/qtlocation/portfile.cmake b/vcpkg/ports/qtlocation/portfile.cmake deleted file mode 100644 index d4afa6dfbc..0000000000 --- a/vcpkg/ports/qtlocation/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -# set(${PORT}_PATCHES) - -# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -# FEATURES -# INVERTED_FEATURES - # "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort - # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network -# ) - -# list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" - # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" -# ) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtlocation/vcpkg.json b/vcpkg/ports/qtlocation/vcpkg.json deleted file mode 100644 index 1f644c2ee0..0000000000 --- a/vcpkg/ports/qtlocation/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "qtlocation", - "version": "6.6.2", - "description": "Qt Location", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus" - ], - "platform": "linux" - }, - { - "name": "qtpositioning", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtshadertools", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtlottie/portfile.cmake b/vcpkg/ports/qtlottie/portfile.cmake deleted file mode 100644 index 2bffdc7d9e..0000000000 --- a/vcpkg/ports/qtlottie/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtlottie/vcpkg.json b/vcpkg/ports/qtlottie/vcpkg.json deleted file mode 100644 index 44d344b028..0000000000 --- a/vcpkg/ports/qtlottie/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "qtlottie", - "version": "6.6.2", - "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ], - "features": { - "qml": { - "description": "(deprecated since Qt 6.4)" - } - } -} diff --git a/vcpkg/ports/qtmqtt/portfile.cmake b/vcpkg/ports/qtmqtt/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtmqtt/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtmqtt/vcpkg.json b/vcpkg/ports/qtmqtt/vcpkg.json deleted file mode 100644 index f6697fd7d8..0000000000 --- a/vcpkg/ports/qtmqtt/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtmqtt", - "version": "6.6.2", - "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtmultimedia/fix_avfoundation_target.patch b/vcpkg/ports/qtmultimedia/fix_avfoundation_target.patch deleted file mode 100644 index 83c457821b..0000000000 --- a/vcpkg/ports/qtmultimedia/fix_avfoundation_target.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plugins/multimedia/darwin/CMakeLists.txt b/src/plugins/multimedia/darwin/CMakeLists.txt -index a1a0cb1..242ceac 100644 ---- a/src/plugins/multimedia/darwin/CMakeLists.txt -+++ b/src/plugins/multimedia/darwin/CMakeLists.txt -@@ -34,7 +34,7 @@ qt_internal_add_plugin(QDarwinMediaPlugin - ${FWMetal} - ${FWQuartzCore} - ${FWAudioToolbox} -- AVFoundation::AVFoundation -+ ${FWAVFoundation} - ) - - qt_internal_extend_target(QDarwinMediaPlugin CONDITION NOT TVOS diff --git a/vcpkg/ports/qtmultimedia/fix_camera_android.patch b/vcpkg/ports/qtmultimedia/fix_camera_android.patch deleted file mode 100644 index e25d54e46f..0000000000 --- a/vcpkg/ports/qtmultimedia/fix_camera_android.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3981f59d558689997b37666e414111ed23dc0dae Mon Sep 17 00:00:00 2001 -From: Volker Krause -Date: Thu, 14 Dec 2023 17:26:43 +0100 -Subject: [PATCH] Reset RHI state on application suspend - -This fixes a crash on Android when mapping a QVideoFrame from the camera -after the application has been resumed from suspension. - -Pick-to: 6.5 -Fixes: QTBUG-113616 -Change-Id: If107c7e8b9595f638034ea0bb05995ce5f096c0d -Reviewed-by: Qt CI Bot -Reviewed-by: Artem Dyomin -Reviewed-by: Bartlomiej Moskal -(cherry picked from commit c1e2f1e0dcac6d553fbef5a8abe7a652b9b3b70e) -Reviewed-by: Qt Cherry-pick Bot -(cherry picked from commit 24a43429e215a7bfc9c6cecf8f236fdec945dccf) ---- - -diff --git a/src/multimedia/video/qvideoframeconverter.cpp b/src/multimedia/video/qvideoframeconverter.cpp -index 5060ee9..2b4945c 100644 ---- a/src/multimedia/video/qvideoframeconverter.cpp -+++ b/src/multimedia/video/qvideoframeconverter.cpp -@@ -35,11 +35,21 @@ - QOffscreenSurface *fallbackSurface = nullptr; - #endif - bool cpuOnly = false; -+#if defined(Q_OS_ANDROID) -+ QMetaObject::Connection appStateChangedConnection; -+#endif - ~State() { -+ resetRhi(); -+ } -+ -+ void resetRhi() { - delete rhi; -+ rhi = nullptr; - #if QT_CONFIG(opengl) - delete fallbackSurface; -+ fallbackSurface = nullptr; - #endif -+ cpuOnly = false; - } - }; - -@@ -159,6 +169,16 @@ - if (backend == QRhi::OpenGLES2) - params.shareContext = static_cast(videoFrameRhi->nativeHandles())->context; - g_state.localData().rhi = QRhi::create(QRhi::OpenGLES2, ¶ms); -+ -+#if defined(Q_OS_ANDROID) -+ // reset RHI state on application suspension, as this will be invalid after resuming -+ if (!g_state.localData().appStateChangedConnection) { -+ g_state.localData().appStateChangedConnection = QObject::connect(qApp, &QGuiApplication::applicationStateChanged, qApp, [](auto state) { -+ if (state == Qt::ApplicationSuspended) -+ g_state.localData().resetRhi(); -+ }); -+ } -+#endif - } - } - #endif diff --git a/vcpkg/ports/qtmultimedia/fix_camera_leak_android.patch b/vcpkg/ports/qtmultimedia/fix_camera_leak_android.patch deleted file mode 100644 index f1a7f9b1d8..0000000000 --- a/vcpkg/ports/qtmultimedia/fix_camera_leak_android.patch +++ /dev/null @@ -1,162 +0,0 @@ -From a443ea329f681eec632c4a85b24da8546a8ec88c Mon Sep 17 00:00:00 2001 -From: Bartlomiej Moskal -Date: Tue, 25 Jul 2023 12:49:12 +0200 -Subject: [PATCH] Android: Fix for memory leak in QAndroidVideoOutput - -QRhi cannot be deleted while it is still used by QVideoFrame. -What is more QRhi need to be deleted from the same thread that it was -created. - -Pick-to: 6.5 -Fixes: QTBUG-119471 -Change-Id: Id83464d248e031854d5742475c56d0c5b20773ba -Reviewed-by: Artem Dyomin -Reviewed-by: Assam Boudjelthia -(cherry picked from commit 7d53ccf2623dfacd4cc8f400729fb78d886924b4) ---- - -diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp -index bb2a10d..5724a56 100644 ---- a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp -+++ b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp -@@ -36,11 +36,27 @@ - std::unique_ptr m_tex; - }; - --class AndroidTextureVideoBuffer : public QAbstractVideoBuffer -+// QRhiWithThreadGuard keeps QRhi and QThread (that created it) alive to allow proper cleaning -+class QRhiWithThreadGuard : public QObject { -+ Q_OBJECT -+public: -+ QRhiWithThreadGuard(std::shared_ptr r, std::shared_ptr t) -+ : m_rhi(std::move(r)), m_thread(std::move(t)) {} -+ ~QRhiWithThreadGuard(); -+private: -+ std::shared_ptr m_rhi; -+ std::shared_ptr m_thread; -+}; -+ -+ -+class AndroidTextureVideoBuffer : public QRhiWithThreadGuard, public QAbstractVideoBuffer - { - public: -- AndroidTextureVideoBuffer(QRhi *rhi, std::unique_ptr tex, const QSize &size) -- : QAbstractVideoBuffer(QVideoFrame::RhiTextureHandle, rhi) -+ AndroidTextureVideoBuffer( -+ std::shared_ptr rhi, std::shared_ptr thread, -+ std::unique_ptr tex, const QSize &size) -+ : QRhiWithThreadGuard(std::move(rhi), std::move(thread)) -+ , QAbstractVideoBuffer(QVideoFrame::RhiTextureHandle, rhi.get()) - , m_size(size) - , m_tex(std::move(tex)) - {} -@@ -254,7 +270,10 @@ - { - Q_OBJECT - public: -- AndroidTextureThread() : QThread() { -+ AndroidTextureThread(QAndroidTextureVideoOutput * vo) -+ : QThread() -+ , m_videoOutput(vo) -+ { - } - - ~AndroidTextureThread() { -@@ -286,7 +305,7 @@ - m_surfaceTexture->updateTexImage(); - auto matrix = extTransformMatrix(m_surfaceTexture.get()); - auto tex = m_textureCopy->copyExternalTexture(m_size, matrix); -- auto *buffer = new AndroidTextureVideoBuffer(m_rhi.get(), std::move(tex), m_size); -+ auto *buffer = new AndroidTextureVideoBuffer(m_rhi, m_videoOutput->getSurfaceThread(), std::move(tex), m_size); - QVideoFrame frame(buffer, QVideoFrameFormat(m_size, QVideoFrameFormat::Format_RGBA8888)); - emit newFrame(frame); - } -@@ -335,13 +354,20 @@ - void newFrame(const QVideoFrame &); - - private: -- std::unique_ptr m_rhi; -+ QAndroidTextureVideoOutput * m_videoOutput; -+ std::shared_ptr m_rhi; - std::unique_ptr m_surfaceTexture; - std::unique_ptr m_texture; - std::unique_ptr m_textureCopy; - QSize m_size; - }; - -+QRhiWithThreadGuard::~QRhiWithThreadGuard() { -+ // It may happen that reseting m_rhi shared_ptr will delete it (if it is the last reference) -+ // QRHI need to be deleted from the thread that created it. -+ QMetaObject::invokeMethod(m_thread.get(), [&]() {m_rhi.reset();}, Qt::BlockingQueuedConnection); -+} -+ - QAndroidTextureVideoOutput::QAndroidTextureVideoOutput(QVideoSink *sink, QObject *parent) - : QAndroidVideoOutput(parent) - , m_sink(sink) -@@ -352,7 +378,12 @@ - return; - } - -- m_surfaceThread = std::make_unique(); -+ startNewSurfaceThread(); -+} -+ -+void QAndroidTextureVideoOutput::startNewSurfaceThread() -+{ -+ m_surfaceThread = std::make_shared(this); - connect(m_surfaceThread.get(), &AndroidTextureThread::newFrame, - this, &QAndroidTextureVideoOutput::newFrame); - m_surfaceThread->start(); -@@ -360,6 +391,9 @@ - - QAndroidTextureVideoOutput::~QAndroidTextureVideoOutput() - { -+ // Make sure that no more VideFrames will be created by surfaceThread -+ QMetaObject::invokeMethod(m_surfaceThread.get(), -+ &AndroidTextureThread::clearSurfaceTexture, Qt::BlockingQueuedConnection); - } - - void QAndroidTextureVideoOutput::setSubtitle(const QString &subtitle) -@@ -419,6 +453,11 @@ - if (m_sink) - m_sink->platformVideoSink()->setVideoFrame({}); - QMetaObject::invokeMethod(m_surfaceThread.get(), &AndroidTextureThread::clearSurfaceTexture); -+ // We are not allowed to work on the same thread after the reset -+ // as there may be pending frames and should not be handled. -+ startNewSurfaceThread(); -+ QMetaObject::invokeMethod(m_surfaceThread.get(), -+ [&](){ m_surfaceThread->setFrameSize(m_nativeSize); }, Qt::BlockingQueuedConnection); - } - - void QAndroidTextureVideoOutput::newFrame(const QVideoFrame &frame) -diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput_p.h b/src/plugins/multimedia/android/common/qandroidvideooutput_p.h -index bf17ee6..c59a1b7 100644 ---- a/src/plugins/multimedia/android/common/qandroidvideooutput_p.h -+++ b/src/plugins/multimedia/android/common/qandroidvideooutput_p.h -@@ -53,6 +53,7 @@ - QAndroidVideoOutput(QObject *parent) : QObject(parent) { } - }; - -+class AndroidTextureThread; - class QAndroidTextureVideoOutput : public QAndroidVideoOutput - { - Q_OBJECT -@@ -71,15 +72,17 @@ - QSize getVideoSize() const override { return m_nativeSize; } - - void setSubtitle(const QString &subtitle); -+ std::shared_ptr getSurfaceThread() { return m_surfaceThread; } - private Q_SLOTS: - void newFrame(const QVideoFrame &); - - private: -+ void startNewSurfaceThread(); - QVideoSink *m_sink = nullptr; - QSize m_nativeSize; - bool m_surfaceCreatedWithoutRhi = false; - -- std::unique_ptr m_surfaceThread; -+ std::shared_ptr m_surfaceThread; - }; - - QT_END_NAMESPACE diff --git a/vcpkg/ports/qtmultimedia/fix_camera_thread_android.patch b/vcpkg/ports/qtmultimedia/fix_camera_thread_android.patch deleted file mode 100644 index dc0f4b876e..0000000000 --- a/vcpkg/ports/qtmultimedia/fix_camera_thread_android.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 827487d056a0a53bbb86e219acdc9e4df84a6559 Mon Sep 17 00:00:00 2001 -From: Bartlomiej Moskal -Date: Wed, 13 Dec 2023 14:09:22 +0100 -Subject: [PATCH] Android-backend: Use the same thread by TextureVideoOutput after reset - -7d53ccf2623dfacd4cc8f400729fb78d886924b4 commit fixed the Memory leak -related to not deleted QRhi. QRhiWithThreadGuard was added to keep m_rhi -and m_thread until frame will be released. - -Currently there is a problem when frame is kept too long. After -unlocking the screen and going back to app, QRhi is recreated. It is -recreated from the new thread. If the old frame (from previous m_rhi and -previous m_thread) was somehow still kept and it will be released after -that, app will crash with: - - "Cannot make QOpenGLContext current in a different thread" - -After mentioned commit, QRhi is recreated from the new thread. The -reason of re-creating AndroidTextureThread was to not handle old pending -frames after reset. As this solution may cause the crash - it needs to -be handled in other way. - -This commit stops re-creating texture thread during reset. Instead of -this, there is an additional check if current surfaceTexture is the same -that was used for connection. - -Pick-to: 6.5 -Fixes: QTBUG-118839 -Change-Id: I853c3c96b690778435fd592898973f1f478fcea3 -Reviewed-by: Artem Dyomin -(cherry picked from commit c07c261eb311ac4f3a22c03b27d4b0c65cf69917) -Reviewed-by: Qt Cherry-pick Bot -(cherry picked from commit 312c718a8b7c65e16a266a71d8d39efd8ff1a589) ---- - -diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp -index 5724a56..16bbc0d 100644 ---- a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp -+++ b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp -@@ -298,10 +298,11 @@ - } - - public slots: -- void onFrameAvailable() -+ void onFrameAvailable(quint64 index) - { -- // Check if 'm_surfaceTexture' is not reset because there can be pending frames in queue. -- if (m_surfaceTexture) { -+ // Check if 'm_surfaceTexture' is not reset and if the current index is the same that -+ // was used for creating connection because there can be pending frames in queue. -+ if (m_surfaceTexture && m_surfaceTexture->index() == index) { - m_surfaceTexture->updateTexImage(); - auto matrix = extTransformMatrix(m_surfaceTexture.get()); - auto tex = m_textureCopy->copyExternalTexture(m_size, matrix); -@@ -337,8 +338,9 @@ - m_texture->create(); - m_surfaceTexture = std::make_unique(m_texture->nativeTexture().object); - if (m_surfaceTexture->surfaceTexture()) { -+ const quint64 index = m_surfaceTexture->index(); - connect(m_surfaceTexture.get(), &AndroidSurfaceTexture::frameAvailable, this, -- &AndroidTextureThread::onFrameAvailable); -+ [this, index] () { this->onFrameAvailable(index); }); - - m_textureCopy = std::make_unique(m_rhi.get(), m_texture.get()); - -@@ -453,11 +455,6 @@ - if (m_sink) - m_sink->platformVideoSink()->setVideoFrame({}); - QMetaObject::invokeMethod(m_surfaceThread.get(), &AndroidTextureThread::clearSurfaceTexture); -- // We are not allowed to work on the same thread after the reset -- // as there may be pending frames and should not be handled. -- startNewSurfaceThread(); -- QMetaObject::invokeMethod(m_surfaceThread.get(), -- [&](){ m_surfaceThread->setFrameSize(m_nativeSize); }, Qt::BlockingQueuedConnection); - } - - void QAndroidTextureVideoOutput::newFrame(const QVideoFrame &frame) -diff --git a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp -index 53da2ff..c5860b2 100644 ---- a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp -+++ b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp -@@ -12,6 +12,8 @@ - Q_GLOBAL_STATIC(SurfaceTextures, g_surfaceTextures); - Q_GLOBAL_STATIC(QMutex, g_textureMutex); - -+static QAtomicInteger indexCounter = 0u; -+ - // native method for QtSurfaceTexture.java - static void notifyFrameAvailable(JNIEnv* , jobject, jlong id) - { -@@ -27,6 +29,7 @@ - - AndroidSurfaceTexture::AndroidSurfaceTexture(quint32 texName) - : QObject() -+ , m_index(indexCounter.fetchAndAddRelaxed(1)) - { - Q_STATIC_ASSERT(sizeof (jlong) >= sizeof (void *)); - m_surfaceTexture = QJniObject("android/graphics/SurfaceTexture", "(I)V", jint(texName)); -diff --git a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture_p.h b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture_p.h -index fce840e..24581ca 100644 ---- a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture_p.h -+++ b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture_p.h -@@ -43,6 +43,7 @@ - - static bool registerNativeMethods(); - -+ quint64 index() const { return m_index; } - Q_SIGNALS: - void frameAvailable(); - -@@ -52,6 +53,7 @@ - QJniObject m_surfaceTexture; - QJniObject m_surface; - QJniObject m_surfaceHolder; -+ const quint64 m_index = 0; - }; - - QT_END_NAMESPACE diff --git a/vcpkg/ports/qtmultimedia/portfile.cmake b/vcpkg/ports/qtmultimedia/portfile.cmake deleted file mode 100644 index 4717d040d4..0000000000 --- a/vcpkg/ports/qtmultimedia/portfile.cmake +++ /dev/null @@ -1,86 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - remove_unistd.patch - remove_export_macro.patch - static_find_modules.patch - fix_avfoundation_target.patch -) - -#Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added - -# qt_find_package(ALSA PROVIDED_TARGETS ALSA::ALSA MODULE_NAME multimedia QMAKE_LIB alsa) -# qt_find_package(AVFoundation PROVIDED_TARGETS AVFoundation::AVFoundation MODULE_NAME multimedia QMAKE_LIB avfoundation) -# qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio) -# qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf) - -# qt_configure_add_summary_section(NAME "Qt Multimedia") -# qt_configure_add_summary_entry(ARGS "alsa") -# qt_configure_add_summary_entry(ARGS "gstreamer_1_0") -# qt_configure_add_summary_entry(ARGS "linux_v4l") -# qt_configure_add_summary_entry(ARGS "pulseaudio") -# qt_configure_add_summary_entry(ARGS "mmrenderer") -# qt_configure_add_summary_entry(ARGS "avfoundation") -# qt_configure_add_summary_entry(ARGS "wmf") - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick - "widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets - "gstreamer" CMAKE_DISABLE_FIND_PACKAGE_GStreamer - "ffmpeg" CMAKE_DISABLE_FIND_PACKAGE_FFmpeg - # Features not yet added in the manifest: - "vaapi" CMAKE_DISABLE_FIND_PACKAGE_VAAPI # not in vpckg -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if("gstreamer" IN_LIST FEATURES AND "ffmpeg" IN_LIST FEATURES) - message(FATAL_ERROR "Qt will by default autolink both plugin backends in static builds leading to symbol collisions and a build failure in dependent ports!\n -As such in static builds only one backend is allowed by default.\n If you plan to manually link the plugins feel free to remove this error in an overlay.") - endif() -endif() - -if("gstreamer" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'") -else() - list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") -endif() -list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_gl='no'") -list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_photography='no'") - -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND FEATURE_OPTIONS "-DFEATURE_wmf=ON") -else() - list(APPEND FEATURE_OPTIONS "-DFEATURE_wmf=OFF") -endif() - -if("ffmpeg" IN_LIST FEATURES) - # Note: Requires pulsadio on linux and wmfsdk on windows - list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='yes'") - if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_ANDROID) - list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'") - else() - list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='yes'") - endif() -else() - list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='no'") - list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'") -endif() - -# alsa is not ready -list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=OFF") - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -if("gstreamer" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6Multimedia/Qt6QGstreamerMediaPluginDependencies.cmake" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl;EGL\;FALSE\;\;\;" ) -endif() diff --git a/vcpkg/ports/qtmultimedia/remove_export_macro.patch b/vcpkg/ports/qtmultimedia/remove_export_macro.patch deleted file mode 100644 index 61a8fff528..0000000000 --- a/vcpkg/ports/qtmultimedia/remove_export_macro.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff --git a/src/plugins/multimedia/gstreamer/common/qgst_p.h b/src/plugins/multimedia/gstreamer/common/qgst_p.h -index a7ce0b5fe..9c66b217d 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgst_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgst_p.h -@@ -127,7 +127,7 @@ public: - inline int listSize() const { return gst_value_list_get_size(value); } - inline QGValue at(int index) const { return gst_value_list_get_value(value, index); } - -- Q_MULTIMEDIA_EXPORT QList getSampleFormats() const; -+ QList getSampleFormats() const; - }; - - class QGstStructure { -@@ -143,9 +143,9 @@ public: - - QGValue operator[](const char *name) const { return gst_structure_get_value(structure, name); } - -- Q_MULTIMEDIA_EXPORT QSize resolution() const; -- Q_MULTIMEDIA_EXPORT QVideoFrameFormat::PixelFormat pixelFormat() const; -- Q_MULTIMEDIA_EXPORT QGRange frameRateRange() const; -+ QSize resolution() const; -+ QVideoFrameFormat::PixelFormat pixelFormat() const; -+ QGRange frameRateRange() const; - - QByteArray toString() const - { -diff --git a/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h b/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h -index 0266e0312..ca32cbab4 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstappsrc_p.h -@@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE - - class QNetworkReply; - --class Q_MULTIMEDIA_EXPORT QGstAppSrc : public QObject -+class QGstAppSrc : public QObject - { - Q_OBJECT - public: -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h -index 2586898b2..cb7908508 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h -@@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE - class QGstreamerMessage; - class QAudioDevice; - --class Q_MULTIMEDIA_EXPORT QGstreamerAudioInput : public QObject, public QPlatformAudioInput -+class QGstreamerAudioInput : public QObject, public QPlatformAudioInput - { - Q_OBJECT - -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h -index a44e6589a..cdfb75584 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h -@@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE - class QGstreamerMessage; - class QAudioDevice; - --class Q_MULTIMEDIA_EXPORT QGstreamerAudioOutput : public QObject, public QPlatformAudioOutput -+class QGstreamerAudioOutput : public QObject, public QPlatformAudioOutput - { - Q_OBJECT - -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h -index 83604c5d1..cf6e508b1 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreamerbufferprobe_p.h -@@ -23,7 +23,7 @@ - - QT_BEGIN_NAMESPACE - --class Q_MULTIMEDIA_EXPORT QGstreamerBufferProbe -+class QGstreamerBufferProbe - { - public: - enum Flags -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h -index 7afad3ba7..ec74ad907 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer_p.h -@@ -34,7 +34,7 @@ class QGstAppSrc; - class QGstreamerAudioOutput; - class QGstreamerVideoOutput; - --class Q_MULTIMEDIA_EXPORT QGstreamerMediaPlayer -+class QGstreamerMediaPlayer - : public QObject, - public QPlatformMediaPlayer, - public QGstreamerBusMessageFilter, -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h -index 04bcfc8d8..8190756a9 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreamermessage_p.h -@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE - // Required for QDoc workaround - class QString; - --class Q_MULTIMEDIA_EXPORT QGstreamerMessage -+class QGstreamerMessage - { - public: - QGstreamerMessage() = default; -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h -index 74652aa77..36f3226f1 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideooutput_p.h -@@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE - - class QVideoSink; - --class Q_MULTIMEDIA_EXPORT QGstreamerVideoOutput : public QObject -+class QGstreamerVideoOutput : public QObject - { - Q_OBJECT - -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h -index 66345c44c..82a9cceba 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideooverlay_p.h -@@ -23,7 +23,7 @@ - QT_BEGIN_NAMESPACE - class QGstreamerVideoSink; - --class Q_MULTIMEDIA_EXPORT QGstreamerVideoOverlay -+class QGstreamerVideoOverlay - : public QObject - , public QGstreamerSyncMessageFilter - , private QGstreamerBufferProbe -diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h -index e628280e9..09b9a2699 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink_p.h -@@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE - class QGstreamerVideoRenderer; - class QVideoWindow; - --class Q_MULTIMEDIA_EXPORT QGstreamerVideoSink -+class QGstreamerVideoSink - : public QPlatformVideoSink - { - Q_OBJECT -diff --git a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h -index cd0f9d3ca..083a5ea2d 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink_p.h -@@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE - - class QGstreamerVideoSink; - --class Q_MULTIMEDIA_EXPORT QGstSubtitleSink -+class QGstSubtitleSink - { - public: - GstBaseSink parent; -diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h b/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h -index c534dddba..7309db5e5 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstvideobuffer_p.h -@@ -27,7 +27,7 @@ class QVideoFrameFormat; - class QGstreamerVideoSink; - class QOpenGLContext; - --class Q_MULTIMEDIA_EXPORT QGstVideoBuffer : public QAbstractVideoBuffer -+class QGstVideoBuffer : public QAbstractVideoBuffer - { - public: - -diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h -index 139eaec5e..0f3e845ac 100644 ---- a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h -+++ b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink_p.h -@@ -90,7 +90,7 @@ private: - QGstCaps::MemoryFormat memoryFormat = QGstCaps::CpuMemory; - }; - --class Q_MULTIMEDIA_EXPORT QGstVideoRendererSink -+class QGstVideoRendererSink - { - public: - GstVideoSink parent; diff --git a/vcpkg/ports/qtmultimedia/remove_unistd.patch b/vcpkg/ports/qtmultimedia/remove_unistd.patch deleted file mode 100644 index 906bbefdb8..0000000000 --- a/vcpkg/ports/qtmultimedia/remove_unistd.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosink.cpp b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosink.cpp -index d4806b23a..f985a973b 100644 ---- a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosink.cpp -+++ b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosink.cpp -@@ -45,7 +45,6 @@ - #include "qgstreameraudiosink_p.h" - #include "qgstreameraudiodevice_p.h" - #include --#include - - #include - #include -diff --git a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp -index 51fc26c42..3b04a77bb 100644 ---- a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp -+++ b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosource.cpp -@@ -45,7 +45,6 @@ - #include "qgstreameraudiosource_p.h" - #include "qgstreameraudiodevice_p.h" - #include --#include - - #include - Q_DECLARE_OPAQUE_POINTER(GstSample *); diff --git a/vcpkg/ports/qtmultimedia/static_find_modules.patch b/vcpkg/ports/qtmultimedia/static_find_modules.patch deleted file mode 100644 index fc4629229d..0000000000 --- a/vcpkg/ports/qtmultimedia/static_find_modules.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/cmake/FindFFmpeg.cmake -+++ b/cmake/FindFFmpeg.cmake -@@ -291,6 +291,9 @@ endfunction() - if (UNIX AND NOT APPLE) - target_link_options(FFmpeg::${_lowerComponent} INTERFACE "-Wl,--exclude-libs=lib${_lowerComponent}") - endif () -+ if(WIN32 AND _lowerComponent STREQUAL "avutil") -+ target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "Bcrypt.lib") -+ endif() - endif() - endif() - endforeach () -@@ -328,14 +331,19 @@ if(FFMPEG_SHARED_COMPONENTS AND FFMPEG_STATIC_COMPONENTS) - endif() - - if (NOT TARGET FFmpeg::FFmpeg) -- add_library(FFmpeg INTERFACE) -+ add_library(FFmpeg INTERFACE IMPORTED) - set_target_properties(FFmpeg PROPERTIES - INTERFACE_COMPILE_OPTIONS "${FFMPEG_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${FFMPEG_LIBRARIES}" - INTERFACE_LINK_DIRECTORIES "${FFMPEG_LIBRARY_DIRS}" - ) -- add_library(FFmpeg::FFmpeg ALIAS FFmpeg) -+ if(WIN32) -+ target_link_libraries(FFmpeg INTERFACE "Bcrypt.lib") -+ endif() -+ -+ add_library(FFmpeg::FFmpeg INTERFACE IMPORTED) -+ target_link_libraries(FFmpeg::FFmpeg INTERFACE FFmpeg) - endif() - - # Compile the list of required vars -diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake -index 19a8a67..09e95d1 100644 ---- a/cmake/FindGObject.cmake -+++ b/cmake/FindGObject.cmake -@@ -13,8 +13,8 @@ - # ``GObject::GObject`` - # The gobject-2.0 library - --include(CMakeFindDependencyMacro) --find_dependency(GLIB2) -+find_package(GLIB2) -+find_package(libffi) - qt_internal_disable_find_package_global_promotion(GLIB2::GLIB2) - - if(NOT TARGET GObject::GObject) -@@ -40,6 +40,7 @@ if(NOT TARGET GObject::GObject) - target_link_libraries(GObject::GObject INTERFACE - ${GObject_LIBRARY} - GLIB2::GLIB2 -+ libffi - ) - endif() - include(FindPackageHandleStandardArgs) -diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake -index c3becd7..895e1c8 100644 ---- a/cmake/FindGStreamer.cmake -+++ b/cmake/FindGStreamer.cmake -@@ -19,8 +19,8 @@ - # If the gstgl-1.0 library is available and target GStreamer::GStreamer exists - # - --include(CMakeFindDependencyMacro) --find_dependency(GObject) -+find_package(GObject) -+find_package(GLIB2) - - find_package(PkgConfig QUIET) - function(find_gstreamer_component component prefix header library) -@@ -74,7 +74,7 @@ find_gstreamer_component(Pbutils gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gst - find_gstreamer_component(Allocators gstreamer-allocators-1.0 gst/allocators/allocators.h gstallocators-1.0) - - if(TARGET GStreamer::Core) -- target_link_libraries(GStreamer::Core INTERFACE GObject::GObject) -+ target_link_libraries(GStreamer::Core INTERFACE GObject::GObject GLIB2::GMODULE) - endif() - if(TARGET GStreamer::Base AND TARGET GStreamer::Core) - target_link_libraries(GStreamer::Base INTERFACE GStreamer::Core) -@@ -107,7 +107,11 @@ foreach(component ${GStreamer_FIND_COMPONENTS}) - elseif (${component} STREQUAL "Gl") - find_gstreamer_component(Gl gstreamer-gl-1.0 gst/gl/gl.h gstgl-1.0) - if(TARGET GStreamer::Gl AND TARGET GStreamer::Video AND TARGET GStreamer::Allocators) -- target_link_libraries(GStreamer::Gl INTERFACE GStreamer::Video GStreamer::Allocators) -+ find_package(OpenGL) -+ if(OpenGL_FOUND) -+ target_link_libraries(GStreamer::Gl INTERFACE OpenGL::GL) -+ endif() -+ target_link_libraries(GStreamer::Gl INTERFACE GStreamer::Video GStreamer::Allocators GLIB2::GMODULE) - endif() - else() - message(WARNING "FindGStreamer.cmake: Invalid Gstreamer component \"${component}\" requested") diff --git a/vcpkg/ports/qtmultimedia/vcpkg.json b/vcpkg/ports/qtmultimedia/vcpkg.json deleted file mode 100644 index d42c246592..0000000000 --- a/vcpkg/ports/qtmultimedia/vcpkg.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "name": "qtmultimedia", - "version": "6.6.2", - "description": "Qt Multimedia", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "gui", - "network" - ] - }, - { - "name": "qtshadertools", - "default-features": false - } - ], - "default-features": [ - "widgets" - ], - "features": { - "ffmpeg": { - "description": "Build with ffmpeg", - "supports": "!(windows & static)", - "dependencies": [ - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "avcodec", - "avdevice", - "avformat", - "swresample", - "swscale" - ] - } - ] - }, - "gstreamer": { - "description": "Build with gstreamer", - "dependencies": [ - "egl", - { - "name": "gstreamer", - "default-features": false, - "features": [ - "plugins-base" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "widgets": { - "description": "Build Multimedia Widgets", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "widgets" - ] - } - ] - } - } -} diff --git a/vcpkg/ports/qtnetworkauth/portfile.cmake b/vcpkg/ports/qtnetworkauth/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtnetworkauth/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtnetworkauth/vcpkg.json b/vcpkg/ports/qtnetworkauth/vcpkg.json deleted file mode 100644 index ec9aaf7c5c..0000000000 --- a/vcpkg/ports/qtnetworkauth/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtnetworkauth", - "version": "6.6.2", - "description": "Qt Network Authenticators; QtOAuth in particular", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtopcua/fix-build.patch b/vcpkg/ports/qtopcua/fix-build.patch deleted file mode 100644 index 33f4e84e7f..0000000000 --- a/vcpkg/ports/qtopcua/fix-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/FindOpen62541.cmake b/cmake/FindOpen62541.cmake -index b4fcea410..91958e554 100644 ---- a/cmake/FindOpen62541.cmake -+++ b/cmake/FindOpen62541.cmake -@@ -21,6 +21,7 @@ - # ``open62541`` - # The open62541 library - -+if(0) - find_path(Open62541_INCLUDE_DIRS - NAMES open62541.h - HINTS "${OPEN62541_INCDIR}") -@@ -46,6 +47,14 @@ if (Open62541_FOUND) - endif() - - mark_as_advanced(Open62541_INCLUDE_DIRS Open62541_LIBRARIES) -+elseif() -+ find_package(open62541 CONFIG REQUIRED) -+ if(NOT TARGET open62541) -+ add_library(open62541 INTERFACE IMPORTED) -+ set_property(TARGET open62541 APPEND PROPERTY -+ INTERFACE_LINK_LIBRARIES open62541::open62541) -+ endif() -+endif() - - include(FeatureSummary) - set_package_properties(Open62541 PROPERTIES diff --git a/vcpkg/ports/qtopcua/portfile.cmake b/vcpkg/ports/qtopcua/portfile.cmake deleted file mode 100644 index 0f2c0ed593..0000000000 --- a/vcpkg/ports/qtopcua/portfile.cmake +++ /dev/null @@ -1,36 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES fix-build.patch) - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "open62541" FEATURE_open62541 -# "open62541" FEATURE_open62541_security # requires vendored open62541 - "uacpp" FEATURE_uacpp - "ns0idnames" FEATURE_ns0idnames - "ns0idgenerator" FEATURE_ns0idgenerator - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - ) -if("open62541" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system - -DHAVE_open62541=true) - vcpkg_find_acquire_program(PYTHON3) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_open62541=no) -endif() - -if("uacpp" IN_LIST FEATURES) - message(WARNING "\nPlease note that you have to install the Unified Automation C++ SDK yourself.\n") -endif() - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - "-DPYTHON_EXECUTABLE=${PYTHON3}" - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtopcua/vcpkg.json b/vcpkg/ports/qtopcua/vcpkg.json deleted file mode 100644 index 87b536dafd..0000000000 --- a/vcpkg/ports/qtopcua/vcpkg.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "name": "qtopcua", - "version": "6.6.2", - "description": "Qt wrapper for existing OPC UA stacks", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ], - "default-features": [ - "default-features", - "gds", - "ns0idnames", - "open62541" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "gds": { - "description": "Support for global discovery server" - }, - "ns0idgenerator": { - "description": "Namespace 0 NodeIds generator from the NodeIds.csv file.", - "supports": "native" - }, - "ns0idnames": { - "description": "Support for namespace 0 NodeId names" - }, - "open62541": { - "description": "Open62541 with plugin to connect to servers with signing and encryption", - "dependencies": [ - { - "name": "open62541", - "default-features": false, - "features": [ - "amalgamation", - "historizing", - "openssl" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "uacpp": { - "description": "Unified Automation C++ SDK" - } - } -} diff --git a/vcpkg/ports/qtpositioning/devendor-poly2tri.patch b/vcpkg/ports/qtpositioning/devendor-poly2tri.patch deleted file mode 100644 index 85e18ca986..0000000000 --- a/vcpkg/ports/qtpositioning/devendor-poly2tri.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --color -Naur a/src/3rdparty/clip2tri/CMakeLists.txt b/src/3rdparty/clip2tri/CMakeLists.txt ---- a/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 16:59:42.377052155 +0200 -+++ b/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 23:05:44.950379088 +0200 -@@ -4,6 +4,7 @@ - ## Bundled_Clip2Tri Generic Library: - ##################################################################### - -+find_package(poly2tri) - qt_internal_add_3rdparty_library(Bundled_Clip2Tri - QMAKE_LIB_NAME _clip2tri - STATIC -@@ -13,11 +14,12 @@ - clip2tri.cpp clip2tri.h - INCLUDE_DIRECTORIES - ../clipper -- ../poly2tri - LIBRARIES - Qt::Bundled_Clipper # special case -- Qt::Bundled_Poly2Tri # special case -+ poly2tri::poly2tri - ) -+target_link_libraries(Bundled_Clip2Tri PRIVATE poly2tri::poly2tri) -+set_target_properties(poly2tri::poly2tri PROPERTIES INTERFACE_QT_PACKAGE_NAME poly2tri) - qt_disable_warnings(Bundled_Clip2Tri) - qt_set_symbol_visibility_hidden(Bundled_Clip2Tri) - -diff --color -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2023-05-13 16:59:42.379052157 +0200 -+++ b/src/CMakeLists.txt 2023-05-13 17:00:19.256085781 +0200 -@@ -2,7 +2,6 @@ - # SPDX-License-Identifier: BSD-3-Clause - - # special case begin --add_subdirectory(3rdparty/poly2tri) - add_subdirectory(3rdparty/clipper) - add_subdirectory(3rdparty/clip2tri) - add_subdirectory(positioning) diff --git a/vcpkg/ports/qtpositioning/portfile.cmake b/vcpkg/ports/qtpositioning/portfile.cmake deleted file mode 100644 index dc9da8a1d0..0000000000 --- a/vcpkg/ports/qtpositioning/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - devendor-poly2tri.patch) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtpositioning/vcpkg.json b/vcpkg/ports/qtpositioning/vcpkg.json deleted file mode 100644 index 76d3d25c5a..0000000000 --- a/vcpkg/ports/qtpositioning/vcpkg.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "qtpositioning", - "version": "6.6.2", - "description": "Qt Positioning", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "jhasse-poly2tri", - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtserialport", - "default-features": false, - "platform": "!ios" - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtquick3d/portfile.cmake b/vcpkg/ports/qtquick3d/portfile.cmake deleted file mode 100644 index fc2e1d75ce..0000000000 --- a/vcpkg/ports/qtquick3d/portfile.cmake +++ /dev/null @@ -1,28 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "assimp" FEATURE_quick3d_assimp - #"assimp" CMAKE_REQUIRE_FIND_PACKAGE_WrapQuick3DAssimp -INVERTED_FEATURES - "assimp" CMAKE_DISABLE_FIND_PACKAGE_WrapQuick3DAssimp - ) - -if("assimp" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=system -DTEST_quick3d_assimp=ON -DHAVE_Assimp=ON) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no) -endif() - -set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer materialeditor shapegen) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtquick3d/vcpkg.json b/vcpkg/ports/qtquick3d/vcpkg.json deleted file mode 100644 index 8340b59d8b..0000000000 --- a/vcpkg/ports/qtquick3d/vcpkg.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "qtquick3d", - "version": "6.6.2", - "description": "A new module and API for defining 3D content in Qt Quick.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - "qtdeclarative", - { - "name": "qtquick3d", - "host": true, - "default-features": false - }, - "qtquicktimeline", - "qtshadertools" - ], - "default-features": [ - "default-features" - ], - "features": { - "assimp": { - "description": "assimp", - "dependencies": [ - "assimp" - ] - }, - "default-features": { - "description": "Platform-dependent default features" - } - } -} diff --git a/vcpkg/ports/qtquick3dphysics/portfile.cmake b/vcpkg/ports/qtquick3dphysics/portfile.cmake deleted file mode 100644 index 1110561e65..0000000000 --- a/vcpkg/ports/qtquick3dphysics/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES cooker) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtquick3dphysics/vcpkg.json b/vcpkg/ports/qtquick3dphysics/vcpkg.json deleted file mode 100644 index 15e4041a35..0000000000 --- a/vcpkg/ports/qtquick3dphysics/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "qtquick3dphysics", - "version": "6.6.2", - "description": "Physics engine integration for Qt Quick 3D", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtquick3d", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtquicktimeline/portfile.cmake b/vcpkg/ports/qtquicktimeline/portfile.cmake deleted file mode 100644 index 5ed735d38c..0000000000 --- a/vcpkg/ports/qtquicktimeline/portfile.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # QML plugin only diff --git a/vcpkg/ports/qtquicktimeline/vcpkg.json b/vcpkg/ports/qtquicktimeline/vcpkg.json deleted file mode 100644 index 76547f1f82..0000000000 --- a/vcpkg/ports/qtquicktimeline/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "qtquicktimeline", - "version": "6.6.2", - "description": "Module for keyframe-based timeline construction.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, - "qtdeclarative" - ] -} diff --git a/vcpkg/ports/qtremoteobjects/portfile.cmake b/vcpkg/ports/qtremoteobjects/portfile.cmake deleted file mode 100644 index f2b31ed8e5..0000000000 --- a/vcpkg/ports/qtremoteobjects/portfile.cmake +++ /dev/null @@ -1,19 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES repc) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtremoteobjects/vcpkg.json b/vcpkg/ports/qtremoteobjects/vcpkg.json deleted file mode 100644 index c57610538a..0000000000 --- a/vcpkg/ports/qtremoteobjects/vcpkg.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "qtremoteobjects", - "version": "6.6.2", - "description": "Qt distributed object system", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtremoteobjects", - "host": true, - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtscxml/portfile.cmake b/vcpkg/ports/qtscxml/portfile.cmake deleted file mode 100644 index 74fa2ed04f..0000000000 --- a/vcpkg/ports/qtscxml/portfile.cmake +++ /dev/null @@ -1,20 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES qscxmlc) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtscxml/vcpkg.json b/vcpkg/ports/qtscxml/vcpkg.json deleted file mode 100644 index 8dea570141..0000000000 --- a/vcpkg/ports/qtscxml/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "qtscxml", - "version": "6.6.2", - "description": "SCXML (state machine notation) compiler and related tools", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtscxml", - "host": true, - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtsensors/portfile.cmake b/vcpkg/ports/qtsensors/portfile.cmake deleted file mode 100644 index 0f5be8a036..0000000000 --- a/vcpkg/ports/qtsensors/portfile.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtsensors/vcpkg.json b/vcpkg/ports/qtsensors/vcpkg.json deleted file mode 100644 index 1905d4a6ed..0000000000 --- a/vcpkg/ports/qtsensors/vcpkg.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "qtsensors", - "version": "6.6.2", - "description": "Qt Sensors", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus" - ] - }, - { - "name": "qtconnectivity", - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtserialbus/portfile.cmake b/vcpkg/ports/qtserialbus/portfile.cmake deleted file mode 100644 index b69e37c31e..0000000000 --- a/vcpkg/ports/qtserialbus/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - - set(TOOL_NAMES - canbusutil - ) - -# Probably not worth the time to make it features: -# qt_configure_add_summary_entry(ARGS "socketcan") # only unix -# qt_configure_add_summary_entry(ARGS "socketcan_fd") # only unix -# qt_configure_add_summary_entry(ARGS "modbus-serialport") - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtserialbus/vcpkg.json b/vcpkg/ports/qtserialbus/vcpkg.json deleted file mode 100644 index 593406239a..0000000000 --- a/vcpkg/ports/qtserialbus/vcpkg.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "qtserialbus", - "version": "6.6.2", - "description": "Support for CAN and potentially other serial buses.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - }, - { - "name": "qtserialbus", - "host": true, - "default-features": false - }, - { - "name": "qtserialport", - "default-features": false - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } -} diff --git a/vcpkg/ports/qtserialport/portfile.cmake b/vcpkg/ports/qtserialport/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtserialport/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtserialport/vcpkg.json b/vcpkg/ports/qtserialport/vcpkg.json deleted file mode 100644 index c3167c10e4..0000000000 --- a/vcpkg/ports/qtserialport/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "qtserialport", - "version": "6.6.2", - "description": "Qt Serial Port support", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!ios", - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtshadertools/portfile.cmake b/vcpkg/ports/qtshadertools/portfile.cmake deleted file mode 100644 index 0311a481a0..0000000000 --- a/vcpkg/ports/qtshadertools/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES qsb) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtshadertools/vcpkg.json b/vcpkg/ports/qtshadertools/vcpkg.json deleted file mode 100644 index 2c7c21042d..0000000000 --- a/vcpkg/ports/qtshadertools/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "qtshadertools", - "version": "6.6.2", - "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtshadertools", - "host": true, - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtspeech/portfile.cmake b/vcpkg/ports/qtspeech/portfile.cmake deleted file mode 100644 index 3b411aac08..0000000000 --- a/vcpkg/ports/qtspeech/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES) - -# Note: none of these features are implemented in the manifest yet -# flite -> Missing port for flite -# speechd -> missing port for speechd -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "flite" FEATURE_flite - "flite-alsa" FEATURE_flite-alsa - "speechd" FEATURE_speechd -INVERTED_FEATURES - "flite" CMAKE_DISABLE_FIND_PACKAGE_Flite - "flite-alsa" CMAKE_DISABLE_FIND_PACKAGE_Alsa - "speechd" CMAKE_DISABLE_FIND_PACKAGE_SpeechDispatcher -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) diff --git a/vcpkg/ports/qtspeech/vcpkg.json b/vcpkg/ports/qtspeech/vcpkg.json deleted file mode 100644 index 04843f1095..0000000000 --- a/vcpkg/ports/qtspeech/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "qtspeech", - "version": "6.6.2", - "description": "Qt Speech support", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!(windows & x86)", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "widgets" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtmultimedia", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtsvg/portfile.cmake b/vcpkg/ports/qtsvg/portfile.cmake deleted file mode 100644 index 975bf122fd..0000000000 --- a/vcpkg/ports/qtsvg/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtsvg/vcpkg.json b/vcpkg/ports/qtsvg/vcpkg.json deleted file mode 100644 index efbf3b7955..0000000000 --- a/vcpkg/ports/qtsvg/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtsvg", - "version": "6.6.2", - "description": "Qt SVG", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] -} diff --git a/vcpkg/ports/qttools/devendor-litehtml.patch b/vcpkg/ports/qttools/devendor-litehtml.patch deleted file mode 100644 index ed3b43a152..0000000000 --- a/vcpkg/ports/qttools/devendor-litehtml.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/src/assistant/qlitehtml/src/CMakeLists.txt -+++ b/src/assistant/qlitehtml/src/CMakeLists.txt -@@ -15,45 +15,11 @@ - set(QLITEHTML_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) - set(QLITEHTML_VERSION_COMPAT ${QLITEHTML_VERSION} CACHE STRING "qlitehtml compat version number.") - --find_package(litehtml QUIET) --if(NOT TARGET litehtml AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/litehtml/CMakeLists.txt) -- set(ORIG_FPIC ${CMAKE_POSITION_INDEPENDENT_CODE}) -- set(ORIG_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) -- if (WIN32) -- set(LITEHTML_UTF8 ON CACHE BOOL "") -- endif() -- set(CMAKE_POSITION_INDEPENDENT_CODE ON) -- set(BUILD_SHARED_LIBS OFF) -- -- add_subdirectory(3rdparty/litehtml EXCLUDE_FROM_ALL) -- -- # suppress compiler warnings from litehtml -- set_target_properties( -- litehtml -- PROPERTIES -- QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON -- ) -- set_target_properties( -- gumbo -- PROPERTIES -- QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON -- ) -- -- set(CMAKE_POSITION_INDEPENDENT_CODE "${ORIG_FPIC}") -- set(BUILD_SHARED_LIBS ${ORIG_BUILD_SHARED_LIBS}) -- # force optimized litehtml even in debug -- if (CMAKE_BUILD_TYPE STREQUAL "Debug") -- # except for windows -- if (NOT WIN32) -- target_compile_options(gumbo PRIVATE -O2) -- target_compile_options(litehtml PRIVATE -O2) -- endif() -- endif() --endif() -+find_package(litehtml CONFIG REQUIRED) - - # TODO error if litehtml was not found? - --if(TARGET litehtml) -+ - set(PUBLIC_HEADERS - container_qpainter.h - container_qpainter_p.h -@@ -155,5 +121,3 @@ - ${_DEVEL_COMPONENT} - OPTIONAL) - endif() -- --endif() -diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt -index 5d2bf2b67c..abd9b513d3 100644 ---- a/src/assistant/CMakeLists.txt -+++ b/src/assistant/CMakeLists.txt -@@ -34,7 +34,7 @@ if(TARGET qlitehtml) - # but found in the system, because they are imported only to the subdirectory scope - # where find_package was called. But that's fine, we wouldn't be able to set compiler flags - # on them anyway. -- if(TARGET litehtml) -+ if(0) - qt_internal_set_exceptions_flags(litehtml OFF) - qt_disable_warnings(litehtml) - endif() diff --git a/vcpkg/ports/qttools/portfile.cmake b/vcpkg/ports/qttools/portfile.cmake deleted file mode 100644 index bb46599a62..0000000000 --- a/vcpkg/ports/qttools/portfile.cmake +++ /dev/null @@ -1,115 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - devendor-litehtml.patch) - -#TODO check features and setup: (means force features!) - -# -- The following OPTIONAL packages have not been found: - - # * Qt6AxContainer - # * Clang - # * WrapLibClang (required version >= 8) - -# Configure summary: - -# Qt Tools: - # Qt Assistant ........................... yes - # QDoc ................................... no - # Clang-based lupdate parser ............. no - # Qt Designer ............................ yes - # Qt Distance Field Generator ............ yes - # kmap2qmap .............................. yes - # Qt Linguist ............................ yes - # Mac Deployment Tool .................... no - # pixeltool .............................. yes - # qdbus .................................. yes - # qev .................................... yes - # Qt Attributions Scanner ................ yes - # qtdiag ................................. yes - # qtpaths ................................ yes - # qtplugininfo ........................... yes - # Windows deployment tool ................ yes - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "assistant" FEATURE_assistant - "designer" FEATURE_designer - "linguist" FEATURE_linguist - "qdbus" FEATURE_qdbus - "qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang - #"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets - "qml" FEATURE_distancefieldgenerator - INVERTED_FEATURES - "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang - "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets - ) - - set(TOOL_NAMES - assistant - designer - lconvert - linguist - lprodump - lrelease-pro - lrelease - lupdate-pro - lupdate - pixeltool - qcollectiongenerator - qdistancefieldgenerator - qhelpgenerator - qtattributionsscanner - qtdiag - qtdiag6 - qtpaths - qtplugininfo - qdbus - qdbusviewer - qdoc - ) -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND TOOL_NAMES windeployqt) -elseif(VCPKG_TARGET_IS_OSX) - list(APPEND TOOL_NAMES macdeployqt) -endif() - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -if(VCPKG_TARGET_IS_OSX) - set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app) - if (FEATURE_qdbus) - message(STATUS "Built qdbusviewer") - list(APPEND OSX_APP_FOLDERS qdbusviewer.app) - endif() - foreach(_appfolder IN LISTS OSX_APP_FOLDERS) - # Folders are only existing in case of native builds - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}") - message(STATUS "Moving: ${_appfolder}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") - endif() - endforeach() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*") -list(LENGTH debug_dir debug_dir_elements) -if(debug_dir_elements EQUAL 0) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -endif() diff --git a/vcpkg/ports/qttools/vcpkg.json b/vcpkg/ports/qttools/vcpkg.json deleted file mode 100644 index 227cc8bb7d..0000000000 --- a/vcpkg/ports/qttools/vcpkg.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "qttools", - "version": "6.6.2", - "description": "Qt Tools", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "litehtml", - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qttools", - "host": true, - "default-features": false, - "features": [ - "assistant", - "linguist" - ] - } - ], - "features": { - "assistant": { - "description": "Build Qt Assistant", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network", - "png", - "sql-sqlite", - "widgets" - ] - } - ] - }, - "designer": { - "description": "Build Qt Designer", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] - }, - "linguist": { - "description": "Build Qt Linguist components", - "dependencies": [ - { - "name": "qttools", - "default-features": false, - "features": [ - "designer" - ] - } - ] - }, - "qdbus": { - "description": "Build qdbusviewer", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus", - "widgets" - ] - } - ] - }, - "qdoc": { - "description": "Build QDoc.", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "clang", - "enable-rtti" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qttools/windeployqt.debug.bat b/vcpkg/ports/qttools/windeployqt.debug.bat deleted file mode 100644 index c0c41e34d8..0000000000 --- a/vcpkg/ports/qttools/windeployqt.debug.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -setlocal enabledelayedexpansion -set mypath=%~dp0 -set mypath=%mypath:~0,-1% -set BAKCD=!CD! -cd /D %mypath%\..\..\..\debug\bin -set PATH=!CD!;%PATH% -"%mypath%\windeployqt.exe" --qmake "%mypath%\qmake.debug.bat" %* -cd %BAKCD% -endlocal diff --git a/vcpkg/ports/qttranslations/portfile.cmake b/vcpkg/ports/qttranslations/portfile.cmake deleted file mode 100644 index f151f0a5b7..0000000000 --- a/vcpkg/ports/qttranslations/portfile.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) - -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # only translation files. -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/vcpkg/ports/qttranslations/vcpkg.json b/vcpkg/ports/qttranslations/vcpkg.json deleted file mode 100644 index c1f9ba9c22..0000000000 --- a/vcpkg/ports/qttranslations/vcpkg.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "qttranslations", - "version": "6.6.2", - "description": "Qt Translations", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qttools", - "default-features": false, - "features": [ - "linguist" - ] - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } -} diff --git a/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch b/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch deleted file mode 100644 index f0d7390ad5..0000000000 --- a/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/plugins/hunspell/module/hunspellworker_p.h b/src/plugins/hunspell/module/hunspellworker_p.h -index b79354429..a843bdfa6 100644 ---- a/src/plugins/hunspell/module/hunspellworker_p.h -+++ b/src/plugins/hunspell/module/hunspellworker_p.h -@@ -50,7 +50,7 @@ - #include - #include - #include --#include -+#include - #include "hunspellwordlist_p.h" - - QT_BEGIN_NAMESPACE -diff --git a/config.tests/hunspell/main.cpp b/config.tests/hunspell/main.cpp -index 76f2cb3df..91906bc48 100644 ---- a/config.tests/hunspell/main.cpp -+++ b/config.tests/hunspell/main.cpp -@@ -1,7 +1,7 @@ - // Copyright (C) 2020 The Qt Company Ltd. - // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - --#include -+#include - - int main(int argc, char** argv) - { -diff --git a/src/plugins/hunspell/module/hunspellwordlist.cpp b/src/plugins/hunspell/module/hunspellwordlist.cpp -index ec55d4d3b..846af4726 100644 ---- a/src/plugins/hunspell/module/hunspellwordlist.cpp -+++ b/src/plugins/hunspell/module/hunspellwordlist.cpp -@@ -3,7 +3,7 @@ - - #include "hunspellwordlist_p.h" - #include --#include -+#include - - QT_BEGIN_NAMESPACE - namespace QtVirtualKeyboard { diff --git a/vcpkg/ports/qtvirtualkeyboard/portfile.cmake b/vcpkg/ports/qtvirtualkeyboard/portfile.cmake deleted file mode 100644 index 555acfb953..0000000000 --- a/vcpkg/ports/qtvirtualkeyboard/portfile.cmake +++ /dev/null @@ -1,31 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES hunspell_include_path_fix.patch) - -if("hunspell" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell:STRING=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell=no) -endif() - -# -# To use t9write, overlay this port with the following line changed to: -# list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write) -# and add t9write as a dependency. -# -list(APPEND FEATURE_OPTIONS - -DINPUT_vkb_handwriting=no - -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrAlphabetic:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrCjk:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CerenceXt9:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_MyScript:BOOL=ON -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - -DINPUT_vkb_style:STRING=default - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG -DFEATURE_vkb_record_trace_input=ON - -DFEATURE_vkb_sensitive_debug=ON - ) diff --git a/vcpkg/ports/qtvirtualkeyboard/vcpkg.json b/vcpkg/ports/qtvirtualkeyboard/vcpkg.json deleted file mode 100644 index 6ad4fb19b6..0000000000 --- a/vcpkg/ports/qtvirtualkeyboard/vcpkg.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "qtvirtualkeyboard", - "version": "6.6.2", - "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtsvg", - "default-features": false - } - ], - "default-features": [ - "default-features", - "hunspell" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "hunspell": { - "description": "Use hunspell", - "dependencies": [ - "hunspell" - ] - } - } -} diff --git a/vcpkg/ports/qtwayland/portfile.cmake b/vcpkg/ports/qtwayland/portfile.cmake deleted file mode 100644 index 54d9d93900..0000000000 --- a/vcpkg/ports/qtwayland/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with -sudo apt install libwayland-dev -on Ubuntu systems.") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES qtwaylandscanner) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwayland/vcpkg.json b/vcpkg/ports/qtwayland/vcpkg.json deleted file mode 100644 index 1caa4dac32..0000000000 --- a/vcpkg/ports/qtwayland/vcpkg.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "qtwayland", - "version": "6.6.2", - "description": "A toolbox for making Qt based Wayland compositors", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!windows", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebchannel/portfile.cmake b/vcpkg/ports/qtwebchannel/portfile.cmake deleted file mode 100644 index f07e0c6e2e..0000000000 --- a/vcpkg/ports/qtwebchannel/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwebchannel/vcpkg.json b/vcpkg/ports/qtwebchannel/vcpkg.json deleted file mode 100644 index 90953b9c0e..0000000000 --- a/vcpkg/ports/qtwebchannel/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "qtwebchannel", - "version": "6.6.2", - "description": "Qt WebChannel", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebengine/clang-cl.patch b/vcpkg/ports/qtwebengine/clang-cl.patch deleted file mode 100644 index 03c87b84df..0000000000 --- a/vcpkg/ports/qtwebengine/clang-cl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/3rdparty/gn/build/build_win.ninja.template b/src/3rdparty/gn/build/build_win.ninja.template -index 7d2704c..b14186b 100644 ---- a/src/3rdparty/gn/build/build_win.ninja.template -+++ b/src/3rdparty/gn/build/build_win.ninja.template -@@ -8,5 +8,5 @@ rule alink_thin - description = LIB $out - - rule link -- command = $ld /nologo $in /link $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs -+ command = $ld /nologo $in $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs - description = LINK $out -diff --git a/src/gn/CMakeLists.txt b/src/gn/CMakeLists.txt -index 0fe3e4e..1e2556f 100644 ---- a/src/gn/CMakeLists.txt -+++ b/src/gn/CMakeLists.txt -@@ -31,7 +31,7 @@ find_package(Ninja 1.7.2 REQUIRED) - - if(WIN32) - set(GN_EXECUTABLE gn.exe) -- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW) -+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW OR MSVC) - # Use lld-link instead of clang-cl. - set(GN_LINKER ${CMAKE_LINKER}) - endif() diff --git a/vcpkg/ports/qtwebengine/portfile.cmake b/vcpkg/ports/qtwebengine/portfile.cmake deleted file mode 100644 index b06fa8be13..0000000000 --- a/vcpkg/ports/qtwebengine/portfile.cmake +++ /dev/null @@ -1,126 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - "clang-cl.patch" -) - -set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "proprietary-codecs" FEATURE_webengine_proprietary_codecs - "spellchecker" FEATURE_webengine_spellchecker - "geolocation" FEATURE_webengine_geolocation - "webchannel" FEATURE_webengine_webchannel - "geolocation" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Positioning - "webchannel" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebChannel -INVERTED_FEATURES - "geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning - "webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel -) - -if(VCPKG_TARGET_IS_OSX AND "spellchecker" IN_LIST FEATRUES) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_native_spellchecker=ON") -endif() - -# webengine-extensions -# webengine-printing-and-pdf -# webengine-pepper-plugins -set(deactivated_features webengine_webrtc_pipewire) -foreach(_feat IN LISTS deactivated_features) - list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF") -endforeach() -set(enabled_features webengine_webrtc) -foreach(_feat IN LISTS enabled_features) - list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=ON") -endforeach() - -if(VCPKG_TARGET_IS_LINUX) - # qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") - # qt_configure_add_summary_entry(ARGS "webengine-system-libpci") - # + ALSA and PULSEAUDIO - set(system_libs re2 icu libwebp opus ffmpeg libvpx snappy glib zlib minizip libevent protobuf libxml libpng libjpeg harfbuzz freetype) - foreach(_sys_lib IN LISTS system_libs) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_system_${_sys_lib}=ON") - endforeach() -endif() - -vcpkg_find_acquire_program(FLEX) -vcpkg_find_acquire_program(BISON) - -#vcpkg_find_acquire_program(GN) # Qt builds its own internal version - -find_program(NODEJS NAMES node PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/node" "bin" NO_DEFAULT_PATHS) -find_program(NODEJS NAMES node) -if(NOT NODEJS) - message(FATAL_ERROR "node not found! Please install it via your system package manager!") -endif() - -get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") -get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${FLEX_DIR}") -get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${BISON_DIR}") - -x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES html5lib OUT_PYTHON_VAR PYTHON3) - -vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") -set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}") - -if(WIN32) # WIN32 HOST probably has win_flex and win_bison! - if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") - file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") - endif() - if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") - file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") - endif() -endif() - -string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length) -# We know that C:/buildrees/${PORT} is to long to build Release. Debug works however. Means 24 length is too much but 23 might work. -if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") - message(WARNING "Buildtree path '${CURRENT_BUILDTREES_DIR}' is too long.\nConsider passing --x-buildtrees-root= to vcpkg!\nTrying to use '${CURRENT_BUILDTREES_DIR}/../tmp'") - set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # activly avoid long path issues in CI. -> Means CI will not return logs - cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) - string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length_new) - if(buildtree_length_new GREATER 22) - message(FATAL_ERROR "Buildtree path is too long. Build will fail! Pass --x-buildtrees-root= to vcpkg!") - endif() - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") -endif() - -##### qt_install_submodule -set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) -set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) - -qt_download_submodule(PATCHES ${${PORT}_PATCHES}) -if(QT_UPDATE_VERSION) - return() -endif() - -qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. - OPTIONS ${FEATURE_OPTIONS} - -DGPerf_EXECUTABLE=${GPERF} - -DBISON_EXECUTABLE=${BISON} - -DFLEX_EXECUTABLE=${FLEX} - -DNodejs_EXECUTABLE=${NODEJS} - -DPython3_EXECUTABLE=${PYTHON3} - -DQT_FEATURE_webengine_jumbo_build=0 - OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) - -qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) - -if(VCPKG_TARGET_IS_WINDOWS) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/QtWebEngineProcessd.exe" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/QtWebEngineProcessd.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/QtWebEngineProcessd.pdb" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/QtWebEngineProcessd.pdb") -endif() - -qt_install_copyright("${SOURCE_PATH}") - -##### qt_install_submodule diff --git a/vcpkg/ports/qtwebengine/vcpkg.json b/vcpkg/ports/qtwebengine/vcpkg.json deleted file mode 100644 index 79c656b2e6..0000000000 --- a/vcpkg/ports/qtwebengine/vcpkg.json +++ /dev/null @@ -1,162 +0,0 @@ -{ - "$comment": "x86-windows is not within the upstream support matrix of Qt6", - "name": "qtwebengine", - "version": "6.6.2", - "description": "Qt WebEngine", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!static & !((x86 | arm) & windows)", - "dependencies": [ - { - "name": "ffmpeg", - "platform": "!windows" - }, - { - "name": "fontconfig", - "platform": "!windows" - }, - { - "name": "freetype", - "platform": "!windows" - }, - { - "name": "glib", - "platform": "!windows" - }, - { - "name": "gperf", - "host": true - }, - { - "name": "harfbuzz", - "platform": "!windows" - }, - { - "name": "icu", - "platform": "!windows" - }, - { - "name": "libevent", - "platform": "!windows" - }, - { - "name": "libjpeg-turbo", - "platform": "!windows" - }, - { - "name": "libpng", - "platform": "!windows" - }, - { - "name": "libvpx", - "platform": "!windows" - }, - { - "name": "libwebp", - "platform": "!windows" - }, - { - "name": "libxml2", - "default-features": false, - "features": [ - "icu" - ], - "platform": "!windows" - }, - { - "name": "minizip", - "platform": "!windows" - }, - "opengl", - { - "name": "opus", - "platform": "!windows" - }, - { - "name": "protobuf", - "platform": "!windows" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "network", - "widgets" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qttools", - "default-features": false - }, - { - "$comment": "Requires GN host tool build by the port itself! (special version check)", - "name": "qtwebengine", - "host": true, - "default-features": false - }, - { - "name": "re2", - "platform": "!windows" - }, - { - "name": "snappy", - "platform": "!windows" - }, - { - "name": "vcpkg-get-python-packages", - "host": true - }, - { - "name": "vcpkg-tool-nodejs", - "host": true - }, - { - "name": "vcpkg-tool-python2", - "host": true - }, - { - "name": "zlib", - "platform": "!windows" - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "geolocation": { - "description": "Build with Geolocation", - "dependencies": [ - { - "name": "qtlocation", - "default-features": false - } - ] - }, - "proprietary-codecs": { - "description": "Enables the use of proprietary codecs such as h.264/h.265 and MP3." - }, - "spellchecker": { - "description": "Provides a spellchecker" - }, - "webchannel": { - "description": "Provides QtWebChannel integration", - "dependencies": [ - { - "name": "qtwebchannel", - "default-features": false, - "features": [ - "qml" - ] - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebsockets/portfile.cmake b/vcpkg/ports/qtwebsockets/portfile.cmake deleted file mode 100644 index f07e0c6e2e..0000000000 --- a/vcpkg/ports/qtwebsockets/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwebsockets/vcpkg.json b/vcpkg/ports/qtwebsockets/vcpkg.json deleted file mode 100644 index 2a364a0a70..0000000000 --- a/vcpkg/ports/qtwebsockets/vcpkg.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "qtwebsockets", - "version": "6.6.2", - "description": "Qt WebSockets", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebview/portfile.cmake b/vcpkg/ports/qtwebview/portfile.cmake deleted file mode 100644 index 23218658c5..0000000000 --- a/vcpkg/ports/qtwebview/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "webengine" CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore -INVERTED_FEATURES - "webengine" CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwebview/vcpkg.json b/vcpkg/ports/qtwebview/vcpkg.json deleted file mode 100644 index b623701b3c..0000000000 --- a/vcpkg/ports/qtwebview/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "qtwebview", - "version": "6.6.2", - "description": "Qt Web View", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ], - "features": { - "webengine": { - "description": "Build with Webengine", - "supports": "!static", - "dependencies": [ - { - "name": "qtwebengine", - "default-features": false - } - ] - } - } -}