diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake index 268f9830ba..b5f66e6bc6 100644 --- a/ports/egl-registry/portfile.cmake +++ b/ports/egl-registry/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/EGL-Registry - REF 992aa3914f8fea801b1034c992db389911d9f3c3 - SHA512 75524ed23066e856f080f6551a6c7b6573d13ff7b4555594e2987e1e6a38ba13042d5037d56d656048e83c0b4ff002b5badacf9224516f9f5e521d4af653805a + REF af97e2c27b49a090a335fc6ed5040c780ad9fec8 + SHA512 89f29608702cb85c5280a7d86ef2cd1c77ed746d4a2577ea143767828ea41ef28cf038d2d86fe1eccc03db08ad27258cb04dadb92233ed9acc10548d93537a80 HEAD_REF master ) @@ -25,4 +25,3 @@ file( RENAME copyright ) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/egl-registry/vcpkg-cmake-wrapper.cmake b/ports/egl-registry/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 43895a2b9d..0000000000 --- a/ports/egl-registry/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,8 +0,0 @@ -if(UNIX) - _find_package(OpenGL COMPONENTS EGL) - if(OPENGL_egl_LIBRARY) # Only defined for Linux with GLVND - set(EGL_LIBRARY "${OPENGL_egl_LIBRARY}" CACHE STRING "") - set(EGL_INCLUDE_DIR "${OPENGL_EGL_INCLUDE_DIRS}" CACHE STRING "") - endif() -endif() -_find_package(${ARGS}) diff --git a/ports/egl-registry/vcpkg.json b/ports/egl-registry/vcpkg.json index d12710197c..b72250480d 100644 --- a/ports/egl-registry/vcpkg.json +++ b/ports/egl-registry/vcpkg.json @@ -1,7 +1,6 @@ { "name": "egl-registry", - "version-date": "2021-11-23", - "port-version": 1, + "version-date": "2022-09-20", "description": "the EGL API and Extension Registry", "homepage": "https://github.com/KhronosGroup/EGL-Registry" } diff --git a/ports/egl/egl.pc.in b/ports/egl/egl.pc.in new file mode 100644 index 0000000000..3556a2cda7 --- /dev/null +++ b/ports/egl/egl.pc.in @@ -0,0 +1,10 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: EGL +Description: EGL library and headers. +Version: @VERSION@ +Requires: zlib opengl # angle +Libs: -L${libdir} -llibEGL -llibGLESv2 -llibANGLE -lD3d9 -ldxguid -lDXGI +Cflags: -I${includedir} @KHRONOS_STATIC@ diff --git a/ports/egl/portfile.cmake b/ports/egl/portfile.cmake new file mode 100644 index 0000000000..4dc3e4c832 --- /dev/null +++ b/ports/egl/portfile.cmake @@ -0,0 +1,14 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY) + +if(VCPKG_TARGET_IS_WINDOWS) + set(KHRONOS_STATIC "") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(KHRONOS_STATIC "-DKHRONOS_STATIC") + endif() + configure_file("${CMAKE_CURRENT_LIST_DIR}/egl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/egl.pc" @ONLY) + if (NOT VCPKG_BUILD_TYPE) + configure_file("${CMAKE_CURRENT_LIST_DIR}/egl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/egl.pc" @ONLY) + endif() +endif() diff --git a/ports/egl/vcpkg-cmake-wrapper.cmake b/ports/egl/vcpkg-cmake-wrapper.cmake new file mode 100644 index 0000000000..9044e8399b --- /dev/null +++ b/ports/egl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,55 @@ +if(UNIX) + find_package(OpenGL COMPONENTS EGL) + if(OPENGL_egl_LIBRARY) + set(EGL_LIBRARY "${OPENGL_egl_LIBRARY}" CACHE STRING "") + set(EGL_INCLUDE_DIR "${OPENGL_EGL_INCLUDE_DIRS}" CACHE STRING "") + endif() +endif() + +set(VCPKG_SETUP_EGL OFF) +if(NOT TARGET EGL::EGL) + set(VCPKG_SETUP_EGL ON) +endif() + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND WIN32) + include(SelectLibraryConfigurations) + find_library(GLESv2_LIBRARY_DEBUG NAMES libGLESv2 GLESv2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(GLESv2_LIBRARY_RELEASE NAMES libGLESv2 GLESv2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + select_library_configurations(GLESv2) + find_library(ANGLE_LIBRARY_DEBUG NAMES libANGLE ANGLE NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(ANGLE_LIBRARY_RELEASE NAMES libANGLE ANGLE NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + select_library_configurations(ANGLE) + if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]") + list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY_DEBUG}" "${ANGLE_LIBRARY_DEBUG}" ZLIB::ZLIB D3d9.lib dxguid.lib DXGI.lib) + else() + list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY_RELEASE}" "${ANGLE_LIBRARY_RELEASE}" ZLIB::ZLIB D3d9.lib dxguid.lib DXGI.lib) + endif() + list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DKHRONOS_STATIC") + find_package(ZLIB REQUIRED) + set(VCPKG_BACKUP_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") + set(VCPKG_BACKUP_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") +endif() + +_find_package(${ARGS}) + +if(VCPKG_SETUP_EGL AND TARGET EGL::EGL AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND WIN32) + if(GLESv2_LIBRARY_DEBUG) + set_property(TARGET EGL::EGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${GLESv2_LIBRARY_DEBUG}>") + endif() + if(ANGLE_LIBRARY_DEBUG) + set_property(TARGET EGL::EGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${ANGLE_LIBRARY_DEBUG}>") + endif() + if(GLESv2_LIBRARY_RELEASE) + set_property(TARGET EGL::EGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$>:${GLESv2_LIBRARY_RELEASE}>") + endif() + if(ANGLE_LIBRARY_RELEASE) + set_property(TARGET EGL::EGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$>:${ANGLE_LIBRARY_RELEASE}>") + endif() + set_property(TARGET EGL::EGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ZLIB::ZLIB;D3d9.lib;dxguid.lib;DXGI.lib") + set(CMAKE_REQUIRED_LIBRARIES "${VCPKG_BACKUP_CMAKE_REQUIRED_LIBRARIES}") + set(CMAKE_REQUIRED_DEFINITIONS "${VCPKG_BACKUP_CMAKE_REQUIRED_DEFINITIONS}") + unset(VCPKG_BACKUP_CMAKE_REQUIRED_LIBRARIES) + unset(VCPKG_BACKUP_CMAKE_REQUIRED_DEFINITIONS) +endif() + +unset(VCPKG_SETUP_EGL) diff --git a/ports/egl/vcpkg.json b/ports/egl/vcpkg.json new file mode 100644 index 0000000000..71b021accb --- /dev/null +++ b/ports/egl/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "egl", + "version-date": "2022-09-20", + "description": "EGL is an interface between Khronos rendering APIs (such as OpenGL, OpenGL ES or OpenVG) and the underlying native platform windowing system.", + "license": null, + "dependencies": [ + { + "$comment": "alternativly this can be supplied by mesa; angle translates to Direct 3D", + "name": "angle", + "platform": "windows" + }, + "opengl" + ] +} diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 716e44240d..d9379e00a7 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -164,7 +164,9 @@ if(VCPKG_TARGET_IS_WINDOWS) set(PLUGIN_BASE_WIN -Dgst-plugins-base:xvideo=disabled -Dgst-plugins-base:xshm=disabled - -Dgst-plugins-base:gl_winsys=win32) + -Dgst-plugins-base:gl_winsys=win32 + -Dgst-plugins-base:gl_platform=wgl) + # TODO: gstreamer has a lot of 'auto' options which probably should be controlled by vcpkg! endif() # @@ -321,6 +323,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gstconfig.h" "!defined(GST_STATIC_COMPILATION)" "0") endif() if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 154f8d7af2..81e9e3c9f5 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 10, + "port-version": 11, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -29,7 +29,7 @@ "libnice", "libxml2", { - "name": "opengl-registry", + "name": "opengl", "platform": "windows | osx" }, "openssl", diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake index 15dcf2a5ef..f99443dc02 100644 --- a/ports/opengl-registry/portfile.cmake +++ b/ports/opengl-registry/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenGL-Registry - REF a48c224a2db6edc4f4c610025b529d1c31ee9445 - SHA512 30cfb1f8979676298e72604898879dae31953839acffc203027165fc131e74dafcf827fdeb07e64021fb8e8318bca38fa4d8656d8248f7bfba76e01d24895818 + REF 5bae8738b23d06968e7c3a41308568120943ae77 + SHA512 3f8c58474627ded85d95f8a4d86329ec4f55b179eb2df393983462d42088e9496eef1a5980481f4b085e6ffb749cd5dd3b312a1e2b7b8189d9723a673ec65b0d HEAD_REF master ) diff --git a/ports/opengl-registry/vcpkg.json b/ports/opengl-registry/vcpkg.json index a5809f6ecd..62079567e0 100644 --- a/ports/opengl-registry/vcpkg.json +++ b/ports/opengl-registry/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opengl-registry", - "version-date": "2021-11-17", + "version-date": "2022-09-29", "description": "the API and Extension registries for the OpenGL family APIs", "homepage": "https://github.com/KhronosGroup/OpenGL-Registry", "dependencies": [ diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake index cd209dbb28..7bd5bc7869 100644 --- a/ports/opengl/portfile.cmake +++ b/ports/opengl/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_get_windows_sdk(WINDOWS_SDK) if (WINDOWS_SDK MATCHES "10.") diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index ea5e3d1c85..32a530d625 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -1,7 +1,9 @@ { "name": "opengl", - "version-date": "2022-03-14", - "port-version": 1, + "version-date": "2022-10-08", "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.", - "license": null + "license": null, + "dependencies": [ + "opengl-registry" + ] } diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 02ef113ab4..6fa5995025 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt", - "version": "6.3.2", - "port-version": 1, + "version": "6.4.0", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, @@ -85,7 +84,16 @@ "features": [ "gstreamer" ], - "platform": "!(static & windows)" + "platform": "!windows" + }, + { + "name": "qtmultimedia", + "default-features": false, + "features": [ + "ffmpeg", + "gstreamer" + ], + "platform": "windows & !static" }, "qtnetworkauth", { diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index c4b8b4249f..9c3b0cd423 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 66374a8a8c..fb02449a09 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.3.2", + "version": "6.4.0", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index 56ecfc6a17..cc69167750 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.3.2", + "version": "6.4.0", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 2193463a91..2a9e77ca64 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -25,6 +25,7 @@ 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 diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 929401f5be..bf4dfebcc9 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/GLIB2-static.patch b/ports/qtbase/GLIB2-static.patch new file mode 100644 index 0000000000..15fec756a5 --- /dev/null +++ b/ports/qtbase/GLIB2-static.patch @@ -0,0 +1,71 @@ +diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +index 24a194c..91c8e41 100644 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +@@ -95,6 +95,18 @@ find_library(GLIB2_GIO_LIBRARIES + HINTS ${PC_GIO_LIBDIR} + ) + ++pkg_check_modules(PC_GMODULE QUIET gmodule-2.0) ++ ++find_path(GLIB2_GMODULE_INCLUDE_DIRS ++ NAMES gmodule.h ++ HINTS ${PC_GMODULE} ++ PATH_SUFFIXES glib-2.0) ++ ++find_library(GLIB2_GMODULE_LIBRARIES ++ NAMES gmodule-2.0 ++ HINTS ${PC_GMODULE} ++) ++ + # search the glibconfig.h include dir under the same root where the library is found + get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) + +@@ -126,6 +138,11 @@ if(GLIB2_GIO_LIBRARIES AND GLIB2_GIO_INCLUDE_DIRS) + set(GLIB2_GIO_FOUND TRUE) + endif() + ++if(GLIB2_GMODULE_LIBRARIES AND GLIB2_GMODULE_INCLUDE_DIRS) ++ set(GLIB2_GMODULE_FOUND TRUE) ++endif() ++ ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(GLIB2 + REQUIRED_VARS GLIB2_LIBRARIES GTHREAD2_LIBRARIES GLIB2_INCLUDE_DIRS +@@ -137,6 +154,12 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2) + IMPORTED_LOCATION "${GLIB2_LIBRARIES}" + INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}") ++ #vcpkg specific ++ find_package(WrapPCRE2) ++ target_link_libraries(GLIB2::GLIB2 INTERFACE WrapPCRE2::WrapPCRE2) ++ find_package(Iconv) ++ find_package(Intl) ++ target_link_libraries(GLIB2::GLIB2 INTERFACE Intl::Intl Iconv::Iconv) + endif() + + if(GLIB2_GOBJECT_FOUND AND NOT TARGET GLIB2::GOBJECT) +@@ -153,12 +176,21 @@ if(GLIB2_GIO_FOUND AND NOT TARGET GLIB2::GIO) + INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_GIO_INCLUDE_DIRS}") + endif() + ++if(GLIB2_GMODULE_FOUND AND NOT TARGET GLIB2::GMODULE) ++ add_library(GLIB2::GMODULE UNKNOWN IMPORTED) ++ set_target_properties(GLIB2::GMODULE PROPERTIES ++ IMPORTED_LOCATION "${GLIB2_GMODULE_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_GMODULE_INCLUDE_DIRS}") ++endif() ++ ++ + mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_INCLUDE_DIR + GLIB2_LIBRARIES GLIB2_LIBRARY + GLIB2_GOBJECT_INCLUDE_DIRS GLIB2_GOBJECT_INCLUDE_DIR + GLIB2_GOBJECT_LIBRARIES GLIB2_GOBJECT_LIBRARY + GLIB2_GIO_INCLUDE_DIRS GLIB2_GIO_INCLUDE_DIR +- GLIB2_GIO_LIBRARIES GLIB2_GIO_LIBRARY) ++ GLIB2_GIO_LIBRARIES GLIB2_GIO_LIBRARY ++ GLIB2_GMODULE_LIBRARIES GLIB2_GMODULE_INCLUDE_DIRS) + + include(FeatureSummary) + set_package_properties(GLIB2 PROPERTIES diff --git a/ports/qtbase/cb2a812.diff b/ports/qtbase/cb2a812.diff new file mode 100644 index 0000000000..1392bf90a2 --- /dev/null +++ b/ports/qtbase/cb2a812.diff @@ -0,0 +1,22 @@ +From cb2a81225f49dc7da511767e63d5a00b39438eb1 Mon Sep 17 00:00:00 2001 +From: Liang Qi +Date: Wed, 07 Sep 2022 13:08:10 +0200 +Subject: [PATCH] xcb: fix the build of native painting + +Fixes: QTBUG-106374 +Pick-to: 6.4 6.3 6.2 5.15 +Change-Id: I91871078a0e09cdda8db4afd236a9746c72007f7 +--- + +diff --git a/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp b/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp +index ecc21eb..7b00940 100644 +--- a/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp ++++ b/src/plugins/platforms/xcb/nativepainting/qtessellator.cpp +@@ -5,6 +5,7 @@ + + #include + #include ++#include + #include + + #include diff --git a/ports/qtbase/clang-cl_QGADGET_fix.diff b/ports/qtbase/clang-cl_QGADGET_fix.diff index 709aa9cab8..37bec5f9fc 100644 --- a/ports/qtbase/clang-cl_QGADGET_fix.diff +++ b/ports/qtbase/clang-cl_QGADGET_fix.diff @@ -2,8 +2,9 @@ diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e40cd85..ba68a01 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h -@@ -18,5 +18,6 @@ +@@ -18,6 +18,7 @@ #endif + #include +#include #include diff --git a/ports/qtbase/cmake/qt_install_copyright.cmake b/ports/qtbase/cmake/qt_install_copyright.cmake index 18db16c896..8ec395fe62 100644 --- a/ports/qtbase/cmake/qt_install_copyright.cmake +++ b/ports/qtbase/cmake/qt_install_copyright.cmake @@ -16,5 +16,12 @@ function(qt_install_copyright SOURCE_PATH) elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL") set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL") endif() - file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + if(LICENSE_PATH) + file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + elseif(EXISTS "${SOURCE_PATH}/LICENSES") + file(GLOB LICENSES "${SOURCE_PATH}/LICENSES/*") + vcpkg_install_copyright(FILE_LIST ${LICENSES}) + else() + message(WARNING "No license/copyright file found!") + endif() endfunction() diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index eb5c923800..7a553973e3 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -23,6 +23,37 @@ function(qt_download_submodule_impl) REF "${${_qarg_SUBMODULE}_REF}" PATCHES ${_qarg_PATCHES} ) + if(PORT STREQUAL "qttools") # Keep this for beta & rc's + vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML + URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git + REF "${${PORT}_qlitehtml_REF}" + FETCH_REF master + HEAD_REF master + ) + # port 'litehtml' is not in vcpkg! + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_LITEHTML + REPO litehtml/litehtml + REF "${${PORT}_litehtml_REF}" + SHA512 "${${PORT}_litehtml_HASH}" + HEAD_REF master + ) + file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml") + file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml") + elseif(PORT STREQUAL "qtwebengine") + vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE + URL git://code.qt.io/qt/qtwebengine-chromium.git + REF "${${PORT}_chromium_REF}" + ) + if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") + file(RENAME "${SOURCE_PATH_WEBENGINE}/chromium" "${SOURCE_PATH}/src/3rdparty/chromium") + endif() + if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") + file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") + endif() + endif() else() if(VCPKG_USE_HEAD_VERSION) set(sha512 SKIP_SHA512) @@ -219,15 +250,13 @@ function(qt_fixup_and_cleanup) vcpkg_replace_string("${_debug_target}" "{_IMPORT_PREFIX}/${qt_qmldir}" "{_IMPORT_PREFIX}/debug/${qt_qmldir}") endforeach() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(GLOB_RECURSE STATIC_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/Qt6Qml/QmlPlugins/*.cmake") - foreach(_plugin_target IN LISTS STATIC_CMAKE_TARGETS) - # restore a single get_filename_component which was remove by vcpkg_cmake_config_fixup - vcpkg_replace_string("${_plugin_target}" - [[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)]] - "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)") - endforeach() - endif() + file(GLOB_RECURSE STATIC_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/Qt6Qml/QmlPlugins/*.cmake") + foreach(_plugin_target IN LISTS STATIC_CMAKE_TARGETS) + # restore a single get_filename_component which was remove by vcpkg_cmake_config_fixup + vcpkg_replace_string("${_plugin_target}" + [[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)]] + "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)") + endforeach() set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") set(qt_searchdir "${CURRENT_PACKAGES_DIR}/bin") @@ -241,7 +270,7 @@ function(qt_fixup_and_cleanup) if(_qarg_TOOL_NAMES) set(tool_names ${_qarg_TOOL_NAMES}) vcpkg_copy_tools(TOOL_NAMES ${tool_names} SEARCH_DIR "${qt_searchdir}" DESTINATION "${qt_tooldest}" AUTO_CLEAN) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${qt_plugindir}") + if(EXISTS "${CURRENT_PACKAGES_DIR}/${qt_plugindir}" AND NOT PORT STREQUAL "qtdeclarative") #qmllint conflict file(COPY "${CURRENT_PACKAGES_DIR}/${qt_plugindir}/" DESTINATION "${qt_tooldest}") endif() endif() diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index 027c84144a..668ef321e9 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,39 +1,49 @@ -set(qtbase_HASH "e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822") -set(qttools_HASH "ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1") -set(qtdeclarative_HASH "4929bd1e5ff16475847ddd75322353afc35c7a06688d32e6186649b38a08d88f435a134fdcfbb4f9fe588f9cd317eb8c0fb6aa0f08416b900064156f3af926af") -set(qtsvg_HASH "2238f1eb3d325b2e17b7e64de5c7f55d1f6129fab7b123ff4c3290307b586d1e894d07a71faaa7f4cb30c1d28e2cc11b11705e03fa5e83c6baebe056a6b3c751") -set(qt5compat_HASH "12407b27871a3972e3400d9832e454ea221fd18f6c5ce19be8084d085c148d70097b5de8fcedf2a53777b38ce9511f215e56dc145a618e472ceb2caf584c689e") -set(qtshadertools_HASH "8394b5467a391fb2b87d22a4b4a2b5b8c0b5d6eb9ea4273aa115fd9b3cab6d955473ed0dc66858390df3d9b6655977baa47b52762cef5c6e95e44330f9040b8a") -set(qtquicktimeline_HASH "fb1807c80bf0af34514aa8db76f167fec75e0e9604c266dba6bf1a560a61ee1395d440fee25457a2a3913708e6fca6b708ccf6a62002b03a0880e5256fba2bed") -set(qtquick3d_HASH "ffe2ff5f64278640c1cc543737cf4fe3d814630fef24602ffd1d166e32dee5d5e929d029abb7573cb28502bd00e1b6217998dc54a3ab4606d053809ff12acf20") -set(qttranslations_HASH "81d0273a99a025b62b1995c2ddbc8cf3b82361ba27ba090c7de1185f6d6a00ead7de0f4f97c34a49bd75b778c0ef8e052a2bf69e67a8513f2bbba575809a720b") -set(qtwayland_HASH "475ba168bacb2d35a5962b27542f43420e3baf42d2026699b272174076ee6a26f8c3663ba8e44508f2011c5b7a2e4b3086390264cdf621b393c79fe89265bd03") -set(qtdoc_HASH "6a6881df8f79ec722ca1c70ff32e586dc1821aa7df969fecd0125cd935fa0d7e88fff0fa65f769c222d72f42da677855710e892b414aa705d92b83b7338f76b4") -set(qtcoap_HASH "0689e1315fe2fa37c26a3f67ae8b30cbe9c9a4ea80c74cfa10cf5b5dbd58b123efdc5487ef7d9cfef56fbf3e3036a2b2b0010471e140f3778cdd4bc04bcc25ba") -set(qtopcua_HASH "4203c1504bf9566452698d30acab474586498dec03546644dea292bd1b266de065592d0651c1953dff7a60d19f87792cbdcf6aa1bd01c3e4c6ce56164a7e178c") -set(qtimageformats_HASH "5964c1f0e5fc4032495641268881f2288f90f361cb5a7e4953e05005ea907033ef634192ef26e1b0343e09c1a0306f83bef88ad4a5dba4665387001290dccc77") -set(qtmqtt_HASH "2d74f0dfde99f2263c8ac61aa787c80afb62c3db0694b37c15d526273bda4c0519b8c06a7f0f66e37eae0df307c4b65d2b0486112dc7e887a40ac32f60e885c4") -set(qtnetworkauth_HASH "dfe52c4ce02d07181293f80ebffe9ff7060f5f63f7c9a6d38c7e13aa131ab5ef4d51e07a16303458f85b04bd6b1bfe3878614d05d1936877c1ce1f6b34da2fe0") -set(qtactiveqt_HASH "ec8590ada67df9e2db280713b1a1b6832f610882f9a2eaffe924efaddade184f380ff6caeeda6ee807fc74635bd4f4f57a7530bb1a9dd08aae57b049d6b1332b") -set(qtdatavis3d_HASH "58a68c27f08cceb735309c018398b8ea6b6805e2ad78604fd445ea44749809f7f41209257d59ea211446328ceb216470b6c4159ea7434d19f4b635da80606ffa") -set(qtdeviceutilities_HASH "392b6a08cbcbe6494c6497e3028d3b62467156b293b4db50cd1e3fc1b57e699cf43052fd8937e27ba61736ef5693b55077c8ba40b69fc1eb733db2364f772bf1") -set(qtlottie_HASH "973ecf403cb1944e24176f4b021b17e0eb7d06a188b92d71e3ae41cd59a668f57e7fd135607b428a9822af0daa7f18bf84b4f8436d0e1c4587797d3735ae2088") -set(qtscxml_HASH "64f8cf91ac14364ed52ff032071b21f5f905693e6e66451751981bbd50e209246c6e3ce29c26e1dbb6559146e7ba867896f0a92f8936c4a124882bee42cd7f45") -set(qtvirtualkeyboard_HASH "be2974a22637c757b500246aff76037fea47b00c5a1fabf0811c2b752868cfd16c9e23457043457cde4354343e583b67984cdf27349e1de031721a0ddbb9642a") -set(qtcharts_HASH "7e04a4cbce66ddb1055d8e399bbb06b6a7ab5b8a0f80de315f20c4c0f2971911128ec386752818c7a07cd6dfe326e62e4c2e6a0e92e2bc97498e49babed2af50") -set(qtconnectivity_HASH "fae73921e8f8573e98d189f22cc07368300cfb509b3f3f49ffa8f35c52f0a986102c8d5705a112dab51c6d4c209d893f2ec641de74f861f1cd5b3390d66d0c09") -set(qtpositioning_HASH "0b65ca2157bf38f5a5b716c921f13cafadb4b98ba30d34893ea587b82dff9fbead2dd03af6ef6d1c75fd57dce85f8bae2b2b0b79f66ff2abb6b660f45a039df7") -set(qtmultimedia_HASH "d6b31aad99a71096cac0655da99245553efdeabb67f6625893d23a31ce7c8b7e15219558933174a6577913ef903092b3230f211dd36b29ecfac782d7f358df27") -set(qtremoteobjects_HASH "59b32ca733de3d10aa98f5d0304ce30acb6911434ef24e43de357e66310707180c596cf5a2af3c746c69ff9f4de98cccb46a94d1e5f0ed65e990e11addcdcac5") -set(qtsensors_HASH "f6cb6b523bba0fb928a1fe12b149c6a5aeeeae55bfcf95baf33d4aff68e197e01ced8de6da5c7dc313c4f75ce1bd201587c4cb0fefd9eaed1c47805c56b8e41b") -set(qtserialbus_HASH "4507944f39f3060742d26bec153929e933abd38803eeac95f317ba94aa14e1a555b5d3b4158591ec113b51f56451ba8cb133be0301ffec9df09408e245b7ac59") -set(qtserialport_HASH "d71ca3b004133eb86fbfc4e8e22daa1d6317b4dab8a7b8bf252509a226477b28647c20ad01368fb7b5b4d2fc1007606a287a3d38ca904e722efda7dfb7cec2ab") -set(qtwebchannel_HASH "83de9a61d25bcf8346ff46417173ecffe15cff9802db524def1afbce4367f3d414b10e8042d45db36555945544dfe1c1d081e4ec33756250afca7ad58975c9d9") -set(qtwebengine_HASH "deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a") -set(qtwebsockets_HASH "b57621b00d0919c57ced9eabd553a624585b16f9b061366af53abdd00c5ca6b203ed01323728d8de61b2dee7c905a20be3c31baf73780afe1cce4d5f0308483d") -set(qtwebview_HASH "39cb4bf67818e4d462fbdd180a802052b3637578a8b99a943359749f15b721f2e0b0354d90ceaaff99a57eba1c57c1ee271e4fd0a553d42c8093c665b9192688") -set(qtinterfaceframework_REF a83bc81486891170750a3048e6b58d15903e6f9c) -set(qtapplicationmanager_HASH "79a8e7588ec168d6cbccd921bc46b48a25512591b65e1602dd7cf461a7692472498301eea299808a08b7ed7f5efaa69f9a0b9ab86f9ea8f18cb4421c562c3f20") -set(qt3d_HASH "1856aaf3ae7f91129b7eb0524497b0505f7ba9e1a7cbfee5eec26400d8ea36f88115f8d49ad93b3ef94c09f1ee11246482d6ab0416972a56431bd084cab44aa8") +set(qtbase_HASH "7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3") +set(qttools_HASH "ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44") +set(qtdeclarative_HASH "6d43c09a14e2ca236fc50166ed477e37084e89a67a04d914f30f31662a18a4e6d0433cb9b2f0654ba9ffcbcd7abcb5dadcb7b12f0ef5928fc11b10925ee6f41e") +set(qtsvg_HASH "f3a6b3bda1c0a3395528f99b5f7b9647a19aeeda0f97dc96bfb551b9c134a50166d1d58d7d63a411a84bcb482580c6907b2c231d570794a482f42126cec9dd89") +set(qt5compat_HASH "d14ebf4ed6061b7154fdd67ac71849bcfb109c9911dcc9279c01bf07b6f58cf26a882f16be6228040e6465345259a16be2296481c2129c88710fa7b4da747ba5") +set(qtshadertools_HASH "80f00b623e546786a2019c979fe8cc54f982665bf3f2d122db1b4d437c847f749a68ed7e316100a853d59ddf04dd10147cad55252a40cd9ff3511db963f3212b") +set(qtquicktimeline_HASH "3818056b6f1b16ec443e895ce07582717331b768c036d073735c52b7ce385d8b53a93a9748eaa915885916e9267de7c4e731a5b01dfd5d643b0a594ed58ca577") +set(qtquick3d_HASH "4fb9e4e40355a83dd19970fc6e942a3a510ce68becd7df92a19ffad7cb4eb6f0bd9b826bde9e0040776018802b756e20978092a6ea4a4d8cc38e7862529610d3") +set(qttranslations_HASH "076d0b9b1ab65013105a36875eccd57a9150e9098e2031042baa55238e19e13016ea9df1bdb669133489b42f9d9440cd35c51f545931c3b3ede523246ede43be") +set(qtwayland_HASH "745fcc84c936c3f2fa7382291b5013679f9e57d6c680f1d352b0a132ba7cbaaea1495211f8fc4f1af85a81c711794987e4e05284d3ac06c94e92e9b601dae924") +set(qtdoc_HASH "2821b4a3407e559cfb5add5d3ed71e48a9a3b90dbeb4d2f3dd0d3d73797cccf36bf6ca935e744b06e792d3fe1e0dd669512c849e424351830491b1707413bd5a") +set(qtcoap_HASH "296c1076c908d42d54380d06c93f964cd8b5a2981a08f607d861a2a45aac749b645bb0278a9ea9085c1600aaac77be8da0f780136741bdc07e5ef280ba4420bc") +set(qtopcua_HASH "2412afec0d973b77630e3b370e99a3cb0d49a6125b3bf7536da21912e04dadd36c199584ba376d7c1f202768c35e5a1031192e6ed466842f3e015644f02cc46d") +set(qtimageformats_HASH "3a7302cfbe9187ffb753c7171c62bbf43223c9c876bb0df20de8b593d51ef775bffeff124d269ed8d4ce7e1fb3d55790acd75bce0b5d5bfa223e5e83dfb41f01") +set(qtmqtt_HASH "4ccbb558b0731fca4461f09510e85aa1b8794a6ad4c000237125e8f756c54b0d9fbf0a590a8b567d4a5e060f4100ab633adf8f857f76fa0b555ff69f5de42e16") +set(qtnetworkauth_HASH "fdefb6ec3477f8da9e78419414f850d94baddfa83b7252c402cde91dabee7cdc51eeee6e761bbadb07d37cef4525131adfd4bdeadb25e977934d4be1a85d8d57") +set(qt3d_HASH "c057b85877e7bb54ef5287311be3a3ba1bafcd9c2436f37663d43c997b028720d52541731327151b5534063c12ab496887251ec50944fdbe3946f1bbcb00a582") +set(qtactiveqt_HASH "cf333519683caf9df82b28f7d1b32eb8616aa1f9996ecbb4f365f7e7f91c5a51f1d92960aa54fb5309977c777fe74136eb0470b6b47f9bf6d10cdc785246ce63") +set(qtdatavis3d_HASH "10b2fdef39a57c873a4741804277b621e04123eaff93617438c4590b4308408457cbee9fe76f2f9b619ffc2d776def853dbce9bdf2c7d3b51fd6500dd519c7cd") +set(qtdeviceutilities_HASH "e9b3f00f28178f21bc37c08ea7cf785f9c73d26b09bfd52cc8d6f11b3dd160e34d896fbc8437ae4159951e7a2ec71ca639751374aa12ca7dc7985921b243864c") +set(qtlottie_HASH "3fb3d35b289fc47f5eecf9052f419142f3e91504b7bc92786bf0f56f84273db81f9fbd8477937d2e04c7cdf3e46764f9fa7ac09240ceae6a641617906631e0fc") +set(qtscxml_HASH "0b8ca6beb459469eab949b6465f74c042da987111dd32a21dfd9df68034e375dc6e33f95f95435e66e8c894246ba72e89bc851a6ab030555ea758b4c43c4c2ad") +set(qtvirtualkeyboard_HASH "b520106ebd548c27cec9bb483602edf0ac0e37019bbc43410aeec91070ce77188d52d0f9fa2edb6fbd507977eda712f963553463c59b7cd4a4d0e809526818a4") +set(qtcharts_HASH "63f231d553fad0f5801c4abeeae0864dba3160c703e49be2ef49e7484d979621b27544408c59c903e8ac89bdf5aae6472f9e8b1d49f50951db257b52c5e60947") +set(qtconnectivity_HASH "bb1083f643d0a50af917e9f9f3e67d25e0dd7423fd8abb41d6297229e2683141adc298b83e8fdd5fcad86f739d4e8748423675fe24360c99bcedca2bc876dd88") +set(qtpositioning_HASH "298c484ed3e5f4d11c0e865005f8c0ddf422c8bbe9ff725fe01a8960403c55cfbc96ded62e77af4b14e549349501b7555f169e7a4b99435cecfc4b57b5a2b5cb") +set(qtmultimedia_HASH "fd5f0d73374290ecf70d30395b2ddbb05439979a29b5e6b37a1ac40338ffe602ea62b7bb8f3c053b2da35fa9c4101bd6e0a12ee9479c04bb2d63c527c77cb685") +set(qtremoteobjects_HASH "17a76b78ce22277f46d28631dc205080bff4ca3cc93161de2f6a372f19cbd3351766be9c8754c7c51ec64771ef090792ffda0e73f47007a54c6fd8fcaab4a50f") +set(qtsensors_HASH "2ad7b670954194d6abc38889bb5b82fbd072abff56c29b074d89509f3007dc5d3dab1555f06ce14c890a1ccf985a3a0695b24ece94524db8ead5776c55706741") +set(qtserialbus_HASH "dd1f8555ece3b34238270a18992f80ee0dc6478ef971ed47dadc58a67b236fbc5642a0aa9f489251abc363182b6d5a668daeb16ca896eabbb3bc741915875912") +set(qtserialport_HASH "b2e78302f9ec55b52dfab6f8086a63444f0c6d8ac8dd3b5b39a32c24c8e01d4799b5539144f6e9f4a376c36bcfe4f15c0b9eb5933d45ccc4433e881b9e15b182") +set(qtwebchannel_HASH "5e668869646e9a4a115680004180948777c9cc2b4e6cc3afb4be74e298ec1e7338f61643ac1f46649d39f65e3f50de05d2b635d77bf211105e91dd0d5324fff6") +set(qtwebengine_HASH "a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7") +set(qtwebsockets_HASH "dc2e86332a7c493afa66c3844443c3a5dbe830786f1127a0eac66594bb254ba1294389c24221d1984044caddc4afa1e4f9832382b403c7c9a8bf5c9dd21d53d0") +set(qtwebview_HASH "af103e2c768aff78d01a941c71c981129fc6b8fb0b4cdbd3e64c6c09b718be8e5401caa5f26dbfa5efadd33679cbc2c2d4904df5b88aff3ce480f820b7d976d5") +set(qtinterfaceframework_REF 6a3f50b461b07930aa9e81608393436cdbc87c4a) +set(qtapplicationmanager_HASH "dc67c87b23ade43d4410cfe9c251361215060bb177fa833a5e37ff6ab51d1f0c60e1c78b70f4c7bb75fc3630d9f30c3b16e0e64c7e0cc623287b97172bc3de70") +set(qthttpserver_REF 447ca05990419474d77dde91c8694add2c69b242) +set(qthttpserver_HASH "6aa703a135e75a9a33c22ed7d689e3fe7ecfd6242737f61f65c91b8cd704772d3c4495de8bc5387c77a2176e121bad355a5554bcdf93e29f270944a0774da96c") # get hash from CI +set(qtquick3dphysics_REF ebedcefad484f995a060afd0068539900f341ca6) +# Not in newer releases set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629") + +# Keep for beta/rc +#set(qttools_qlitehtml_REF 0) +#set(qttools_litehtml_REF 0) +#set(qttools_litehtml_HASH 0) +#set(qtwebengine_chromium_REF 0) \ No newline at end of file diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 860a645aa4..c34869b756 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -7,7 +7,8 @@ ## 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.3.2) +set(QT_VERSION 6.4.0) + set(QT_UPDATE_VERSION 0) if(PORT MATCHES "(qtquickcontrols2)") @@ -73,14 +74,22 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.2.2) qtinterfaceframework qtapplicationmanager) endif() - +if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0) + list(APPEND QT_PORTS + ## New in 6.4.0 + qthttpserver + qtquick3dphysics) +endif() # 1. By default, modules come from the official release # 2. These modules are mirrored to github and have tags matching the release -set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager) +set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager qthttpserver) # 3. These modules are mirrored to github and have branches matching the release set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation) # 4. These modules are not mirrored to github and not part of the release -set(QT_FROM_QT_GIT qtinterfaceframework) +set(QT_FROM_QT_GIT qtinterfaceframework qtquick3dphysics) +# For beta releases uncomment the next two lines and comment the lines with QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, QT_FROM_QT_GIT +#set(QT_FROM_QT_GIT ${QT_PORTS}) +#list(POP_FRONT QT_FROM_QT_GIT) function(qt_get_url_filename qt_port out_url out_filename) if("${qt_port}" IN_LIST QT_FROM_GITHUB) diff --git a/ports/qtbase/fix_egl_2.patch b/ports/qtbase/fix_egl_2.patch new file mode 100644 index 0000000000..016ae2b4ec --- /dev/null +++ b/ports/qtbase/fix_egl_2.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake +index db48f79b9..4b1686132 100644 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake +@@ -116,7 +116,7 @@ if(EGL_INCLUDE_DIR) + unset(_EGL_version_lines) + endif() + +-cmake_push_check_state(RESET) ++cmake_push_check_state() # To be able to fix the compile check in vcpkg-cmake-wrapper + list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${EGL_INCLUDE_DIR}") + list(APPEND CMAKE_REQUIRED_DEFINITIONS "${EGL_DEFINITIONS}") +@@ -134,5 +134,5 @@ if(EGL_INCLUDE_DIR) + }" HAVE_EGL) +- ++file(COPY "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log" DESTINATION "${CMAKE_BINARY_DIR}/..") + cmake_pop_check_state() + + set(required_vars EGL_INCLUDE_DIR HAVE_EGL) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 98084e056f..30c356f8fa 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -15,8 +15,11 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch + fix_egl_2.patch clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. installed_dir.patch + cb2a812.diff + GLIB2-static.patch # alternative is to force pkg-config ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -138,7 +141,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS "fontconfig" FEATURE_fontconfig # NOT WINDOWS "jpeg" FEATURE_jpeg "png" FEATURE_png - #"opengl" INPUT_opengl=something + "opengl" FEATURE_opengl "xlib" FEATURE_xlib "xkb" FEATURE_xkbcommon "xcb" FEATURE_xcb @@ -148,7 +151,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS "xrender" FEATURE_xcb_native_painting # experimental "gles2" FEATURE_opengles2 #"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan - #"egl" CMAKE_REQUIRE_FIND_PACKAGE_EGL + "egl" FEATURE_egl #"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig #"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz #"jpeg" CMAKE_REQUIRE_FIND_PACKAGE_JPEG @@ -161,9 +164,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS #"xrender" CMAKE_REQUIRE_FIND_PACKAGE_XRender INVERTED_FEATURES "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan + "opengl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenGL "egl" CMAKE_DISABLE_FIND_PACKAGE_EGL "gles2" CMAKE_DISABLE_FIND_PACKAGE_GLESv2 - "gles2" FEATURE_opengl_desktop "fontconfig" CMAKE_DISABLE_FIND_PACKAGE_Fontconfig #"freetype" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated "harfbuzz" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz @@ -178,6 +181,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS # There are more X features but I am unsure how to safely disable them! Most of them seem to be found automaticall with find_package(X11) ) +if( "gles2" IN_LIST FEATURES) + list(APPEND FEATURE_GUI_OPTIONS -DINPUT_opengl='es2') + list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengl_desktop=OFF) +endif() + +if(NOT "opengl" IN_LIST FEATURES AND NOT "gles2" IN_LIST FEATURES) + list(APPEND FEATURE_GUI_OPTIONS -DINPUT_opengl='no') + list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengl_desktop=OFF) + list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengl_dynamic=OFF) +endif() + if("xcb" IN_LIST FEATURES) list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xcb=yes) else() @@ -207,19 +221,19 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS FEATURES "sql-sqlite" FEATURE_system_sqlite "sql-odbc" FEATURE_sql_odbc + "sql-mysql" FEATURE_sql_mysql + "sql-oci" FEATURE_sql_oci #"sql-psql" CMAKE_REQUIRE_FIND_PACKAGE_PostgreSQL #"sql-sqlite" CMAKE_REQUIRE_FIND_PACKAGE_SQLite3 INVERTED_FEATURES "sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL "sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3 "sql-odbc" CMAKE_DISABLE_FIND_PACKAGE_ODBC - # "sql-db2" FEATURE_sql-db2 - # "sql-ibase" FEATURE_sql-ibase - # "sql-mysql" FEATURE_sql-mysql - # "sql-oci" FEATURE_sql-oci + "sql-mysql" CMAKE_DISABLE_FIND_PACKAGE_MySQL + "sql-oci" CMAKE_DISABLE_FIND_PACKAGE_Oracle ) -set(DB_LIST DB2 MySQL Oracle) +set(DB_LIST DB2 Interbase) foreach(_db IN LISTS DB_LIST) list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON) endforeach() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index d01943a2de..70887ea54d 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,13 +1,11 @@ { "name": "qtbase", - "version": "6.3.2", - "port-version": 3, + "version": "6.4.0", "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, "supports": "!uwp", "dependencies": [ - "freetype", { "name": "libb2", "platform": "!windows" @@ -56,6 +54,7 @@ "icu", "jpeg", "network", + "opengl", "openssl", "pcre2", "png", @@ -141,8 +140,9 @@ }, "egl": { "description": "EGL", + "supports": "linux", "dependencies": [ - "egl-registry" + "egl" ] }, "fontconfig": { @@ -173,7 +173,16 @@ }, "gles2": { "description": "OpenGL ES 2.0", - "supports": "!windows" + "supports": "!windows", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] }, "glib": { "description": "GLib", @@ -184,6 +193,7 @@ "gui": { "description": "Qt Gui", "dependencies": [ + "opengl", { "name": "qtbase", "default-features": false, @@ -236,6 +246,19 @@ "network": { "description": "Qt Network" }, + "opengl": { + "description": "OpenGL", + "dependencies": [ + "opengl", + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] + }, "openssl": { "description": "Enable OpenSSL", "dependencies": [ @@ -280,6 +303,32 @@ } ] }, + "sql-mysql": { + "description": "Enable SQL Driver MySQL", + "dependencies": [ + "libmysql", + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql" + ] + } + ] + }, + "sql-oci": { + "description": "Enable SQL Driver Oracle OCI", + "dependencies": [ + "ocilib", + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql" + ] + } + ] + }, "sql-odbc": { "description": "Enable SQL Driver odbc", "supports": "windows", diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 3e700962bf..7c1a6e3e94 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.3.2", + "version": "6.4.0", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 4985db892b..77cf34b0e1 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index dcb9ddb1b4..e8bc259dc4 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 283e597c05..7df0ab3496 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index 9589d6284b..1fe7864d8f 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -25,8 +25,3 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) - -# remove `${SOURCE_PATH}` from the front of `#line` directives -if(NOT QT_UPDATE_VERSION) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtQml/${QT_VERSION}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") -endif() diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 94126999e8..dea6e6e570 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, @@ -9,6 +9,7 @@ "name": "qtbase", "default-features": false, "features": [ + "network", "testlib" ] }, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 81793c82e0..3ddfad4d0e 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.3.2", + "version": "6.4.0", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 9b571c6e97..0b3ff985a8 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qthttpserver/portfile.cmake b/ports/qthttpserver/portfile.cmake new file mode 100644 index 0000000000..975bf122fd --- /dev/null +++ b/ports/qthttpserver/portfile.cmake @@ -0,0 +1,13 @@ +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/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json new file mode 100644 index 0000000000..ccb311f2bc --- /dev/null +++ b/ports/qthttpserver/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "qthttpserver", + "version": "6.4.0", + "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/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 7da325a234..6ee33ec6b9 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.3.2", + "version": "6.4.0", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index bc1b74da8b..0a76f2969d 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -45,7 +45,7 @@ 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(NOT VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endif() diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 9792a3d3ec..476ced220c 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.3.2", - "port-version": 1, + "version": "6.4.0", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 840d188366..22f58985a5 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/portfile.cmake b/ports/qtlottie/portfile.cmake index f07e0c6e2e..2bffdc7d9e 100644 --- a/ports/qtlottie/portfile.cmake +++ b/ports/qtlottie/portfile.cmake @@ -3,14 +3,6 @@ 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 diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index c297a2c6be..a2f5eafe64 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.3.2", + "version": "6.4.0", "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, @@ -11,17 +11,15 @@ "features": [ "gui" ] + }, + { + "name": "qtdeclarative", + "default-features": false } ], "features": { "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] + "description": "(deprecated since Qt 6.4)" } } } diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 48177144e0..6c7967f937 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/fix_windows_header_include.patch b/ports/qtmultimedia/fix_windows_header_include.patch deleted file mode 100644 index 6e06e5c4a9..0000000000 --- a/ports/qtmultimedia/fix_windows_header_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h -index 23e349e02..233a816d4 100644 ---- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h -+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h -@@ -56,7 +56,7 @@ - #include - #include - #include --#include -+#include - - struct IMMDeviceEnumerator; - diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index c7eda56cc5..f18f90fb4d 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -1,8 +1,10 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES fix_windows_header_include.patch +set(${PORT}_PATCHES remove_unistd.patch + remove_export_macro.patch + static_find_modules.patch ) #Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added @@ -25,19 +27,48 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick "widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets - #"gstreamer" CMAKE_REQUIRE_FIND_PACKAGE_GStreamer 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: + "avfoundation" CMAKE_DISABLE_FIND_PACKAGE_AVFoundation # not in vcpkg + "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() +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) + 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") @@ -47,3 +78,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} 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() \ No newline at end of file diff --git a/ports/qtmultimedia/remove_export_macro.patch b/ports/qtmultimedia/remove_export_macro.patch new file mode 100644 index 0000000000..03800f222c --- /dev/null +++ b/ports/qtmultimedia/remove_export_macro.patch @@ -0,0 +1,204 @@ +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/qgstutils_p.h b/src/plugins/multimedia/gstreamer/common/qgstutils_p.h +index 809505868..02daf1474 100644 +--- a/src/plugins/multimedia/gstreamer/common/qgstutils_p.h ++++ b/src/plugins/multimedia/gstreamer/common/qgstutils_p.h +@@ -35,14 +35,14 @@ class QImage; + class QVideoFrameFormat; + + namespace QGstUtils { +- Q_MULTIMEDIA_EXPORT QAudioFormat audioFormatForSample(GstSample *sample); ++ QAudioFormat audioFormatForSample(GstSample *sample); + QAudioFormat audioFormatForCaps(QGstCaps caps); +- Q_MULTIMEDIA_EXPORT QGstMutableCaps capsForAudioFormat(const QAudioFormat &format); ++ QGstMutableCaps capsForAudioFormat(const QAudioFormat &format); + + void setFrameTimeStamps(QVideoFrame *frame, GstBuffer *buffer); + } + +-Q_MULTIMEDIA_EXPORT GList *qt_gst_video_sinks(); ++ GList *qt_gst_video_sinks(); + + QT_END_NAMESPACE + +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/ports/qtmultimedia/remove_unistd.patch b/ports/qtmultimedia/remove_unistd.patch index 0f6d3ab15c..906bbefdb8 100644 --- a/ports/qtmultimedia/remove_unistd.patch +++ b/ports/qtmultimedia/remove_unistd.patch @@ -1,19 +1,19 @@ -diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp +diff --git a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosink.cpp b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiosink.cpp index d4806b23a..f985a973b 100644 ---- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp -+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp +--- 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/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp + #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/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp -+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp +--- 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" diff --git a/ports/qtmultimedia/static_find_modules.patch b/ports/qtmultimedia/static_find_modules.patch new file mode 100644 index 0000000000..2efe191585 --- /dev/null +++ b/ports/qtmultimedia/static_find_modules.patch @@ -0,0 +1,118 @@ +diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake +index 47d8769..46a5c9b 100644 +--- a/cmake/FindFFmpeg.cmake ++++ b/cmake/FindFFmpeg.cmake +@@ -228,7 +228,7 @@ endfunction() + # message(STATUS "Libs: ${${_component}_LIBRARIES} | ${PC_${_component}_LIBRARIES}") + + # message(STATUS "Required component ${_component} present.") +- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${_component}_LIBRARY} ${${_component}_LIBRARIES}) ++ set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${_component}_LIBRARY}) + set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS}) + + list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS}) +@@ -240,8 +240,8 @@ endfunction() + set_target_properties(FFmpeg::${_lowerComponent} PROPERTIES + INTERFACE_COMPILE_OPTIONS "${${_component}_DEFINITIONS}" + INTERFACE_INCLUDE_DIRECTORIES ${${_component}_INCLUDE_DIRS} +- INTERFACE_LINK_LIBRARIES "${${_component}_LIBRARIES}" +- INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIRS}" ++ IMPORTED_LOCATION "${${_component}_LIBRARY}" ++ #INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIRS}" + ) + if(__ffmpeg_is_static) + __ffmpeg_internal_set_dependencies(${_lowerComponent}) +@@ -250,6 +250,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() + else() + # message(STATUS "Required component ${_component} missing.") +@@ -274,14 +277,21 @@ endfunction() + + #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() + + # Now set the noncached _FOUND vars for the components. +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/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 5ecbe77888..e4d2390109 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtmultimedia", - "version": "6.3.2", - "port-version": 1, + "version": "6.4.0", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, @@ -10,13 +9,13 @@ "name": "qtbase", "default-features": false, "features": [ + "concurrent", "gui", "network" ] }, { "name": "qtshadertools", - "host": true, "default-features": false } ], @@ -24,13 +23,28 @@ "widgets" ], "features": { - "gstreamer": { - "description": "Build with gstreamer", + "ffmpeg": { + "description": "Build with ffmpeg", + "supports": "!(windows & static)", "dependencies": [ { - "name": "angle", - "platform": "windows" - }, + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avdevice", + "avformat", + "swresample", + "swscale" + ] + } + ] + }, + "gstreamer": { + "description": "Build with gstreamer", + "supports": "!(windows & static)", + "dependencies": [ + "egl", "gstreamer" ] }, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 657286be12..f7f75c0d5b 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 5fcb033770..0ff4d3a850 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 185544c21c..68fa5e424a 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 330341f429..2435769da7 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.3.2", + "version": "6.4.0", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/portfile.cmake b/ports/qtquick3dphysics/portfile.cmake new file mode 100644 index 0000000000..975bf122fd --- /dev/null +++ b/ports/qtquick3dphysics/portfile.cmake @@ -0,0 +1,13 @@ +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/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json new file mode 100644 index 0000000000..7eb509762c --- /dev/null +++ b/ports/qtquick3dphysics/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qtquick3dphysics", + "version": "6.4.0", + "description": "Physics engine integration for Qt Quick 3D", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtquick3d", + "default-features": false + } + ] +} diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 042940e4f2..8db0032f71 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.3.2", + "version": "6.4.0", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 8e610414aa..ce2d7045bd 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index ad42ddbaef..76c52c5e30 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.3.2", + "version": "6.4.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 14359d2ea0..42a0b3a6ff 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index ceceb6578b..7b55783218 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.3.2", + "version": "6.4.0", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index 957c59b1a1..4b4cf6964e 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index fe7cfc7a1d..43f1c974f0 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.3.2", + "version": "6.4.0", "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, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 8c3cb4e520..e1cd28d0db 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index b13766cef0..0525885a72 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -39,11 +39,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "linguist" FEATURE_linguist "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 ) diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index f19f23a42c..611cca19ad 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, @@ -28,7 +28,9 @@ "default-features": false, "features": [ "network", - "sql-sqlite" + "png", + "sql-sqlite", + "widgets" ] } ] diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 4699899d0f..d5b374a43b 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch b/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch index 7c92d6a89b..f0d7390ad5 100644 --- a/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch +++ b/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch @@ -1,26 +1,39 @@ -diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp -index 8ee4d7503..0fb4461d2 100644 ---- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp -+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp -@@ -29,7 +29,7 @@ - - #include - #include --#include -+#include - #include - #include - #include -diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h +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/hunspellinputmethod/hunspellworker_p.h -+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h +--- 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 + #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/ports/qtvirtualkeyboard/portfile.cmake b/ports/qtvirtualkeyboard/portfile.cmake index 528a0a4de2..bbe2bea69d 100644 --- a/ports/qtvirtualkeyboard/portfile.cmake +++ b/ports/qtvirtualkeyboard/portfile.cmake @@ -3,12 +3,6 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES hunspell_include_path_fix.patch) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - "xcb" CMAKE_DISABLE_FIND_PACKAGE_XCB - ) - - if("hunspell" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell:STRING=system) else() diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index f898bf1725..d4d8bbc678 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.3.2", + "version": "6.4.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, @@ -40,9 +40,6 @@ "dependencies": [ "t9write" ] - }, - "xcb": { - "description": "XCB integration" } } } diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index f9ae6ee2eb..33bbfe684a 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.3.2", + "version": "6.4.0", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index e7cc923d56..a965344abd 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index a2fe4c0e5a..cc85c3e308 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.3.2", - "port-version": 1, + "version": "6.4.0", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, @@ -64,7 +63,7 @@ "name": "minizip", "platform": "!windows" }, - "opengl-registry", + "opengl", { "name": "opus", "platform": "!windows" diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 33c774c354..7d49dfa67a 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 92468d4392..224059ce62 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.3.2", + "version": "6.4.0", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 3a1a947ceb..948eaa34a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2128,9 +2128,13 @@ "baseline": "2020-06-08", "port-version": 3 }, + "egl": { + "baseline": "2022-09-20", + "port-version": 0 + }, "egl-registry": { - "baseline": "2021-11-23", - "port-version": 1 + "baseline": "2022-09-20", + "port-version": 0 }, "eigen3": { "baseline": "3.4.0", @@ -2786,7 +2790,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 10 + "port-version": 11 }, "gtest": { "baseline": "1.12.1", @@ -5477,11 +5481,11 @@ "port-version": 0 }, "opengl": { - "baseline": "2022-03-14", - "port-version": 1 + "baseline": "2022-10-08", + "port-version": 0 }, "opengl-registry": { - "baseline": "2021-11-17", + "baseline": "2022-09-29", "port-version": 0 }, "openh264": { @@ -6045,15 +6049,15 @@ "port-version": 1 }, "qt": { - "baseline": "6.3.2", - "port-version": 1 + "baseline": "6.4.0", + "port-version": 0 }, "qt-advanced-docking-system": { "baseline": "3.8.2", "port-version": 2 }, "qt3d": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qt5": { @@ -6229,7 +6233,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qt6betablock": { @@ -6237,52 +6241,56 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtbase": { - "baseline": "6.3.2", - "port-version": 3 + "baseline": "6.4.0", + "port-version": 0 }, "qtcharts": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.3.2", + "baseline": "6.4.0", + "port-version": 0 + }, + "qthttpserver": { + "baseline": "6.4.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.3.2", - "port-version": 1 + "baseline": "6.4.0", + "port-version": 0 }, "qtkeychain": { "baseline": "0.13.2", @@ -6293,35 +6301,39 @@ "port-version": 1 }, "qtlocation": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtlottie": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.3.2", - "port-version": 1 + "baseline": "6.4.0", + "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtpositioning": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.3.2", + "baseline": "6.4.0", + "port-version": 0 + }, + "qtquick3dphysics": { + "baseline": "6.4.0", "port-version": 0 }, "qtquickcontrols2": { @@ -6329,67 +6341,67 @@ "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtsensors": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtserialbus": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtserialport": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtsvg": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qttools": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qttranslations": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtwebengine": { - "baseline": "6.3.2", - "port-version": 1 + "baseline": "6.4.0", + "port-version": 0 }, "qtwebsockets": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "qtwebview": { - "baseline": "6.3.2", + "baseline": "6.4.0", "port-version": 0 }, "quadtree": { diff --git a/versions/e-/egl-registry.json b/versions/e-/egl-registry.json index 743fd86c7f..0d53ea7878 100644 --- a/versions/e-/egl-registry.json +++ b/versions/e-/egl-registry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e596b6c29ad16da764aab6f2fef830a3a884f14b", + "version-date": "2022-09-20", + "port-version": 0 + }, { "git-tree": "43e62391cc7413e33585df55584769bcb69bf563", "version-date": "2021-11-23", diff --git a/versions/e-/egl.json b/versions/e-/egl.json new file mode 100644 index 0000000000..e31f440214 --- /dev/null +++ b/versions/e-/egl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b1bc1e659623b2aa81e403d4812debfa1920030e", + "version-date": "2022-09-20", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 2ddd4e4fa9..bc79d01f6e 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f54f9f904091fc4fd931e018b82af777defb455c", + "version": "1.19.2", + "port-version": 11 + }, { "git-tree": "889e1cc23dfa9161bf793ff4f22fd6bc8e7c137f", "version": "1.19.2", diff --git a/versions/o-/opengl-registry.json b/versions/o-/opengl-registry.json index 4d482df6ba..2f696cba73 100644 --- a/versions/o-/opengl-registry.json +++ b/versions/o-/opengl-registry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3456b7358048ad983b423973eca86e19d7939bd4", + "version-date": "2022-09-29", + "port-version": 0 + }, { "git-tree": "7f4a1e05a6cfbd923a2eaf9d32da22bde0742a15", "version-date": "2021-11-17", diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json index 2459fe648a..baed0aec4f 100644 --- a/versions/o-/opengl.json +++ b/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea1726ace2d45bcfda85af4b7ef80c579bbbccca", + "version-date": "2022-10-08", + "port-version": 0 + }, { "git-tree": "1c402a05f67513fe35a8991b8865db4db6181ec7", "version-date": "2022-03-14", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 9f6ce7842f..d7a01a08a5 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d75a733a2c3757b28d6fe110144870ebe98bd130", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "3d1f292c90218f1cf71b84cfba2ec4b8a741b90b", "version": "6.3.2", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 902afd8ecc..0f52d203ab 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af75766b005ecc88ec170a30939d2c31ee87e81b", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "8d2cabd2615053a8dcf800f29065e0cf9769a241", "version": "6.3.2", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 053fcb7b7a..6ae2366400 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a78145140138d7712b29f2ef8526f93cc1bb1df9", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "489933bcd5868bf6310ed40d5044c9bba7ab6010", "version": "6.3.2", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index a15d6b1d52..dd2f56b07c 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9211a265ccfab56872d58ce9c6fbda31b8dee0a1", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "465d2e5e0439ba13fb1f7e86d76be47aa146ab28", "version": "6.3.2", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 666fac0cb4..7a93bdae12 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e19d7c213f846257a30bb3b21c9683295258651d", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "6be65136ec1e0356c284a37a5908f6bcf78215d9", "version": "6.3.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 5025ac569d..48820797a6 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6228295c86670a28e170daab903f9b1a4026068", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "e279c6fed17e9d572a061c482ee73906ffd3e54e", "version": "6.3.2", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 4d9b5a584c..f3aab0569c 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d69d84b7c9b3c446e3c1b71c18d74af542c7f5c5", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "748f1d3bee95e095d18eb8cf86840bcdab5b1f0e", "version": "6.3.2", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 139fe60126..bfa11d950b 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d16e79f03752b6d2d7a039799b180aa42359d328", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "c4d1e5ebb1598edbb9861dce84997b10e66fc769", "version": "6.3.2", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index d25cde68d5..497c3dc670 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23cc7cf6910939ecce51eb8b746421fb17d0579f", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "df953810cdfbfa1516ad5f7a03d0577f97de03e6", "version": "6.3.2", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 4b4540a3df..0a4581b227 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "788640e0e41f175b6cd2c38e4ae995b2190998db", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "88f09be59dad78b84bd41c01520f9fcfb5052b46", "version": "6.3.2", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 9c75806446..ae2df87b92 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44e74372f9beed1d7972dee205b8bf748e5ab9d7", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "0f10c6273faf539ccacefdd271f80f71d37426ff", "version": "6.3.2", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index a8e9c7943c..7c1b8c5100 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7598efa19aebd639f97f24d802fa7b4d524185b8", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "a1651713cf1f37a37a03d0d9a49c589dc0328363", "version": "6.3.2", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 1f16ae3743..31daaab488 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c471262a8121335b3b73f26b86efc9c5ff2446d4", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "7bb265a825524a2184d6f0d9ee81bc258a5dd7f4", "version": "6.3.2", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json new file mode 100644 index 0000000000..15035fd67d --- /dev/null +++ b/versions/q-/qthttpserver.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ac4d04c2f3bd5830b342635865fbb74f85c31988", + "version": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index addeace8fd..33f156e734 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a03e734c78d46ccba5469388c681ffa8b3015724", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "b124b9d71de95557c5024f6ba1d3328b553ce35f", "version": "6.3.2", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index c544bea723..53ab68789d 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a7bd6ad1e0a93754ff96e78d37d5839919ff7f7", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "887770433b2654dd335178a68b7f0910e28198cc", "version": "6.3.2", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 6e7450a064..6c9b1b6e54 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "863fd0c60bfecb0cfcdd2dfc099caf429f8821a6", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "66543e50c8d248760af29f9d0389b317718cf77d", "version": "6.3.2", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index bd4d4e83d0..66797f468c 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58709735d7c6b84bc3904587f2f6b3be65749918", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "c4cec2002c75d7f5ccee8a209145070ec41d4683", "version": "6.3.2", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 2839a41b6d..34cdb3979f 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91e11dc38cd0f3af2a32f5a98403d8087e9a36a2", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "32ec622f0241df9bb4fd5aaf31525fb3a1046167", "version": "6.3.2", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index ff878d4bf4..a5fed66f28 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a4ea2c483963a30577be41058658dc9226cc51b", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "953f717e1c02b90674da0910b204ce4f556a8673", "version": "6.3.2", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 83e604cc5d..40c711010b 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01650c3adb46bd155bcf35fdbbc08d7300f189fc", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "dfe2f0d819c3e2f405710056f692d2a72675a26a", "version": "6.3.2", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 968ef56791..881b1e71b4 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "067c20b6e43964f296253504d1aa044b7ccf570a", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "83f22dc97ea1097dc2aab93b0b468de4cd5927a4", "version": "6.3.2", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 1f1ea42da9..6c8f468205 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d6b0362e3f037c3496991a4372d65d82476ec50", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "917a949915180a1c09998f917a44a3026f721889", "version": "6.3.2", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 0abd95cff0..bb8d044d63 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "929becc24f15df87b5e541f0101952697721a4de", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "250c2b1d8bb5d0dbecc4ecceb6269f2c50a6b0f5", "version": "6.3.2", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json new file mode 100644 index 0000000000..776d58b254 --- /dev/null +++ b/versions/q-/qtquick3dphysics.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "14fbb983e686e619664b6a402ee743a14ae92055", + "version": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 2369b8a91c..d78475ea04 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99dd16135ecad104a55488f860101cf96c59aa23", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "33432efb529b2a9452488d400e63bd15785a1382", "version": "6.3.2", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 2cd716b00e..48f1c38ead 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6aab466bc31f3e17accfe4762165cb952281eb8", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "8d720b92e53f722ebf9f0624f5c4ba8a8ba465cf", "version": "6.3.2", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 534a68351e..571593b082 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "956489e37b3c31150cd96c42f91cdd5b691ed11c", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "f694bf4523736b0a8871468d2f890c0170eadf0d", "version": "6.3.2", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index a946bb7057..ab3b8827f5 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f28cbeef917fe03900eb25f1c046f8bfd1bacd50", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "2005a1cbf056aab0a5919d2c0b184ff25a289fe4", "version": "6.3.2", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 025c369340..9b6f323505 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0632263dc036f0760e3ac2451acd43d0b9a7c692", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "d08e9a633ec502000dcd1c0a31b31b5fd85cdab7", "version": "6.3.2", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 85f4c036ba..749f77ab4f 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbbdef8b6fef511e4606e6671a3c418845638509", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "b7442cfd0d14aa6ef8e7614aa28a340c509848d1", "version": "6.3.2", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index a4192fdede..1ef2e12664 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7468457146a0c525d6b8d44bf5eabf3965d9df59", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "7358894ceda32f4d35603e4d525e1fbd805fbc60", "version": "6.3.2", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index b48d099370..7c46306eb6 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0875c12bcc029cd61d31964d36dae1682103e772", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "8a331df9dc56e835f16c8266d9b6eabb94ac2c86", "version": "6.3.2", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index af2642d3b6..7ce9495aec 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eceebf276520a58384f7622cace1b41cedc1d2c9", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "6ca68dc3285690ce0de5a23ce4d9d664310d1626", "version": "6.3.2", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 1a45c80371..db9ce52525 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3d14a05bc340edf5890b7a6f1c6b057b872d42c", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "34380b3429538f411c5742822674328365697ef3", "version": "6.3.2", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 906c6f8ac9..12cd360a69 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae9c8eb401331cdb05120629714065880152b1b3", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "8fbd6f4e78576ea2a3bf3389d36a400ebf8fff1f", "version": "6.3.2", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 76ee45f852..82dbe17659 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "335e0f0435f6e751c156fbb7596886bd00d99c6b", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "8618a325913a4e94ea4d9ae25aae993211a049a3", "version": "6.3.2", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 24dac10b56..b1a85382e5 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8b79fc26b0a39b1da1a679ddfa1b64a7ebec2e4", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "530a2818778c7e6a7a89aa960f725d024983f85a", "version": "6.3.2", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index bbaf432913..ec963af023 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06385099cee48df733743655a3a7be54360042d3", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "6a9606ce3a5531467f484accb11a2fe6e69f09a3", "version": "6.3.2", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 5b60039742..092c14c76c 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bdd83c004ad6c8d80d4493741cd8dfe208ce473", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "e5294e25b8339515231c57b5e4bf7b429a6d21e1", "version": "6.3.2", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 7af7dc26e6..7d1c771474 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00e0ddf20dd73813cfa1f4f61e5f97fa9b890678", + "version": "6.4.0", + "port-version": 0 + }, { "git-tree": "8e93248b1057ff1e417b25871fe37775a3714f25", "version": "6.3.2",