CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v6.5.4-lts' into 6.5

Browse Source 
meta-qt6 v6.5.4-lts release

Change-Id: I1b96cf84ac97e1aefc6aab4caabd513b9f72bce8
This commit is contained in:
Mikko Gronoff 2025-01-13 13:27:10 +02:00
commit 3689882a23
51 changed files with 96 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -23,6 +23,7 @@ the LAYERSERIES_COMPAT (c).
| Yocto \ Qt | 6.5 | 6.4 | 6.3 | 6.2 |
| ---------- |:---:|:---:|:---:|:---:|
| master | x | | | |
| nanbield | x | | | |
| mickledore | x | x | | |
| langdale | c | x | | |
| kirkstone | x | x | x | x |

6
coin/module_config.yaml
View File

@ -17,7 +17,7 @@ machine_type:
#
# [target1] [target2] [target3] [target4] [target5]
# [machine] qemuarm64 qemux86 qemuarm qemux86-64 qemuarm64
# [yocto] kirkstone master mickledore dunfell master
# [yocto] nanbield master mickledore dunfell kirkstone
# [X11] no no yes yes no
# [mingw] no yes no no no
# [static] no no no no yes
@ -31,7 +31,7 @@ target1: &target1
variableValue: qemuarm64
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: kirkstone.xml
variableValue: nanbield.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs wayland
@ -95,7 +95,7 @@ target5: &target5
variableValue: qemuarm64
- type: EnvironmentVariable
variableName: MANIFEST
variableValue: master.xml
variableValue: kirkstone.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs wayland static no-webengine

3
recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-commercial.bb
View File

@ -1,6 +1,9 @@
DESCRIPTION = "Qt6 development host commercial packages"
LICENSE = "MIT"
# disable sanity check for allarch packagegroup
PACKAGE_ARCH = ""
inherit packagegroup nativesdk
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

2
recipes-qt/qt6/qmlcompilerplus_git.bb
View File

@ -11,6 +11,4 @@ include recipes-qt/qt6/qt6-commercial.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qmlcompilerplus-native"
PTEST_ENABLED = "0"
BBCLASSEXTEND = "native nativesdk"

27
recipes-qt/qt6/qt3d/0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch
View File

@ -1,27 +0,0 @@
From 6e377e36c9cab72b858f4149aed88e2090d9ff4d Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@gmail.com>
Date: Tue, 9 Aug 2022 01:51:30 +0300
Subject: [PATCH] Use unqualified uint32_t everywhere in FBXBinaryTokenizer
The use of qualified std::uint32_t requires including <cstdint> instead
of <stdint.h> on some implementations, and that breaks the build of Qt 6
on GCC 13. Just use the unqualified name everywhere.
---
Upstream-Status: Backport [v5.2.5 commit 253f8bfa621a9fa6cd2c36291cdaa8c60c99322c]
code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
index 348812054..120e47a76 100644
--- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
}
catch (const DeadlyImportError& e)
{
- if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
+ if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
}
throw;

2
recipes-qt/qt6/qt3d_git.bb
View File

@ -19,13 +19,13 @@ inherit features_check
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ASSIMP_BRANCH = "qt6_assimp"
SRC_URI += " \
${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
file://0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch;patchdir=src/3rdparty/assimp/src \
"
DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtshadertools qtshadertools-native"

1
recipes-qt/qt6/qt5compat_git.bb
View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ENABLE_QMLCOMPILER = "0"

1
recipes-qt/qt6/qt6-commercial.inc
View File

@ -6,3 +6,4 @@ python() {
QT_GIT = "${QT_COMMERCIAL_GIT}"
QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
QT_MODULE = "tqtc-${BPN}"
QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"

94
recipes-qt/qt6/qt6-git.inc
View File

@ -16,53 +16,53 @@ PV = "${QT_VERSION}"
SRCREV = "${SRCREV_${QT_MODULE}}"
SRCREV_tqtc-qmlcompilerplus = "8783e851444bbb41501198a1a05948c0d83f649a"
SRCREV_tqtc-qtinsighttracker = "8b5b4bd115b17a4e97792df843bd53edc30df08c"
SRCREV_tqtc-qtvncserver = "19050f07c2d1e2fdf14e0bb4c08b144015283ebf"
SRCREV_qt3d = "ade72c57fb1b7672a5ba3053b96ab823718bf8ab"
SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
SRCREV_qt5compat = "39ada26234cb9f10bb55c2b4f2833749a95f9af7"
SRCREV_qtbase = "419950004f5ee09bbc83e1437e8e105f02bd2dff"
SRCREV_qtapplicationmanager = "ef53c4d673ed8e814155d178be7021babd49ffba"
SRCREV_qtcharts = "cabb6bcc5f81ff772b51693c4388256db435675d"
SRCREV_qtcoap = "b01fbb671b681250d6c726a9c8f24ebf75c6e852"
SRCREV_qtconnectivity = "a0986269c016fb207f0d612a75580c086ac38a4a"
SRCREV_qtdatavis3d = "a470ac933de67c9bf2d8a808fd48fe7140fdfe95"
SRCREV_qtdeclarative = "d7ba66128eb7e542ce6f2f1582b45e0149159d7f"
SRCREV_qtdeviceutilities = "2b0ccf5bada5dae37b0281e3d56501ceb5c4ec2c"
SRCREV_qtgrpc = "e32083e0ab777dff158133fc2829a1fbd96d3d28"
SRCREV_qthttpserver = "e7ca70e5f76e5f4d88d018e3f744cb453b54cf89"
SRCREV_qtimageformats = "5ef0115a3dfad3da2ceb311df574d5f1d90a45dd"
SRCREV_qtinterfaceframework = "ef03c253d9f9d516049e54e5c0f1a9dc8de90794"
SRCREV_qtlanguageserver = "56c8f1a6cad66b0e5cdd6b22bdb382e9156cd9b2"
SRCREV_qtlocation = "9fefabd49236e6b585729c0fa9981136f7bc7365"
SRCREV_qtlottie = "fd6367d7211ec1e973c81d1485b609cc419e99bf"
SRCREV_qtmqtt = "4a791594418cf9355e918517aba7a854374cf948"
SRCREV_qtmultimedia = "9d0f05dc234879b294c304c1a2dcff7e9fbc9153"
SRCREV_qtnetworkauth = "b0e551058655157f330c3a08b9bde6c6e5a0e367"
SRCREV_qtopcua = "00796b2250e5f0e2b184a436e41db502ded5d17a"
SRCREV_qtpositioning = "b9db9ab1ae59f6639fdf388d349c68609287c498"
SRCREV_qtquick3d = "51e600c51d061b37b2bbdb7d2096adffc49d0dae"
SRCREV_tqtc-qmlcompilerplus = "5199c5da2f70315d055713650e3c3367a546afc7"
SRCREV_tqtc-qtinsighttracker = "8ffb18a8f3d0a267b847556be223890fa4078677"
SRCREV_tqtc-qtvncserver = "118df2b225877cebe35c3b240cf208c64073815a"
SRCREV_qt3d = "1b618897b64af230687486e6d02a9744362e1dd5"
SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
SRCREV_qt5compat = "f9a7836d2830503c17560226c775fa212a0679d9"
SRCREV_qtbase = "4a727c376366e74520cf751de81052dae7b18782"
SRCREV_qtapplicationmanager = "5afc7275471245e66a3a7168c54359a414e3c714"
SRCREV_qtcharts = "33e70b05cd4bc33c6c68edf2d63b9e0aadc92a06"
SRCREV_qtcoap = "1a539f6718dd2f1baf554faa633809c9136ec88d"
SRCREV_qtconnectivity = "7ea679d1be0f581090ae1f0d5f904c698361f5f9"
SRCREV_qtdatavis3d = "3dce52ce02bb88120a94c32be692cefabc8b41f5"
SRCREV_qtdeclarative = "533a9a8afcc56635bed5da93102028e01fa708c0"
SRCREV_qtdeviceutilities = "4d2e84c4e0696112a96c8aa06735332f54f9e186"
SRCREV_qtgrpc = "830e48bd3b3e8e208402c1fc19fc6bd645527e19"
SRCREV_qthttpserver = "0348ecd76acd75510b13313c6eb986429beeb1aa"
SRCREV_qtimageformats = "27dd710b71f0415b78445ffa8c268e7a9452bc66"
SRCREV_qtinterfaceframework = "6503ff4e9899475d49ee2b7bbfd2d808f193a6a1"
SRCREV_qtlanguageserver = "f7f76cd719414a2d17eef54705238ae788238abd"
SRCREV_qtlocation = "bed7276aaed03bbf28bcfad3374c74ccbb0ce355"
SRCREV_qtlottie = "93e54a3da73c2d36aeb4e12de4de7a426403042e"
SRCREV_qtmqtt = "92468a8042838181362832ccf6b57f43732f7c52"
SRCREV_qtmultimedia = "1a927735bc49846bf9903e387418c6435807c66d"
SRCREV_qtnetworkauth = "2ca0cbce0c99b4c0f1c32478be5b9558909b8f89"
SRCREV_qtopcua = "99c1002fbb87200dc54ee02502b8217d21451e96"
SRCREV_qtpositioning = "a619623a4949071ddf7392d26b916890a751e965"
SRCREV_qtquick3d = "fd560ec34ed1ac81293b83f855925383fc77253c"
SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0"
SRCREV_qtquick3dphysics = "859a72f09454a34d1c4fdb361c74de6cdaef6ed7"
SRCREV_qtquickdesigner-components = "62998be504e483575b8b54586851b26f38773aaa"
SRCREV_qtquicktimeline = "66102475c790653259b26729b23c0553bf7b5277"
SRCREV_qtremoteobjects = "5267f9e7f50c110fb1f4ffd97bcf8797e4c5a175"
SRCREV_qtscxml = "b44a616418616e314cae2399db3a9382262ae16e"
SRCREV_qtsensors = "2a4c91382ef48b1533c9e882c8117ea2bfc66dd0"
SRCREV_qtserialbus = "43e20c0916fd34b5d7569a8f2b39c4d67c394cef"
SRCREV_qtserialport = "0ad4049a9477886790cc059710674d389fda5203"
SRCREV_qtshadertools = "4287f536f1fb95a2609421a730b74b5a52f534ac"
SRCREV_qtspeech = "f8750fbddf3f92ca6685cf13abe70bf294b06a8d"
SRCREV_qtsvg = "5c8ad8e0c26f6ce15ee5f9be469b3f84059e1e03"
SRCREV_qttools = "9712de2e27b0124fb79110a1075e54f4a986a85e"
SRCREV_qtquick3dphysics = "5ff8367b75fa0ecabf1cf7751e995f2f714749b8"
SRCREV_qtquickdesigner-components = "5736952b4b0c8aab4ae56b622ea9a53ae718b60a"
SRCREV_qtquicktimeline = "1bbd52db37b2252ff8f63024c46751ba338a338a"
SRCREV_qtremoteobjects = "553009b3123b5da9aec9487064387f11532a6fad"
SRCREV_qtscxml = "58833bc32956e6c17352a13b8cb888d3f607f186"
SRCREV_qtsensors = "545be9b8bb7c8fe0036ce5527b92f7c6d68d364c"
SRCREV_qtserialbus = "5876f32bc63a3cebed9843affac563d12822cf10"
SRCREV_qtserialport = "f476b3b95447c4c6168c3f510ebe34a27af6e232"
SRCREV_qtshadertools = "0733c88e07579a834694cd48513f973fb69b951a"
SRCREV_qtspeech = "1ff5a4aa426038b7c8f3711b0fe5cb0ac94b677c"
SRCREV_qtsvg = "11bf3030c05e77de9313fc71c383dd1a17ec40f7"
SRCREV_qttools = "8be3e6cff9903e7db610c185aad1b598cce0368c"
SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2"
SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737"
SRCREV_qttranslations = "5b6742f33be42074d5845cabeb977d49403ec0b7"
SRCREV_qtvirtualkeyboard = "67dcef4f7f48a007d1922a6539286afde8ae4179"
SRCREV_qtwayland = "623ff4913fff6af96fd88794ecfe28753a5e341e"
SRCREV_qtwebchannel = "3e1a553f77d1fc412e13355274aabd504dc91d38"
SRCREV_qtwebengine = "76d917304a447e3b61b5dae6352956789633b2a7"
SRCREV_qtwebengine-chromium = "ef090c47d08c734ae2b3c1db508982aca0f3ee1e"
SRCREV_qtwebsockets = "d070b92a0b8f493bc07f7bbe39787bdee981ed80"
SRCREV_qtwebview = "62091a1d9700758dfe5b2837cccea278aee8c056"
SRCREV_qttranslations = "252cad448b809c8d9e081865134272e458898b90"
SRCREV_qtvirtualkeyboard = "ae086beb7c9118a46c5da47927ac9f5989c1aeb9"
SRCREV_qtwayland = "a6527d381c8a6e3333b43ff5d9704dea0ab09a6d"
SRCREV_qtwebchannel = "c772de714a2e8dec516c380a222ec58ad92459fc"
SRCREV_qtwebengine = "824be6fd525f415488c6117db8b03e1a90cabf05"
SRCREV_qtwebengine-chromium = "21bb29b9b730cc215ee7dfb3cf343139a9be9522"
SRCREV_qtwebsockets = "d30ba737bff9c7815421c0f384a421aa7c82d23a"
SRCREV_qtwebview = "4481bfbc0d3a42ff24e86aa7a09667a5b15c5e1c"

1
recipes-qt/qt6/qtapplicationmanager_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"

1
recipes-qt/qt6/qtbase_git.bb
View File

@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/conan.inc

1
recipes-qt/qt6/qtcharts_git.bb
View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtcoap_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

4
recipes-qt/qt6/qtconnectivity_git.bb
View File

@ -12,11 +12,9 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
# QTBUG-93565
PTEST_ENABLED = "0"
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"

1
recipes-qt/qt6/qtdatavis3d_git.bb
View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtdeclarative_git.bb
View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver"

1
recipes-qt/qt6/qtdeviceutilities_git.bb
View File

@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
inherit qt6-cmake
include recipes-qt/qt6/qt6.inc
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
RDEPENDS:${PN} = "connman"

1
recipes-qt/qt6/qtgrpc_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"

1
recipes-qt/qt6/qthttpserver_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtimageformats_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtinterfaceframework_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
# Default build and package these

1
recipes-qt/qt6/qtlanguageserver_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtlocation_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtpositioning"

1
recipes-qt/qt6/qtlottie_git.bb
View File

@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtmqtt_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtmultimedia_git.bb
View File

@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtshadertools qtshadertools-native"

1
recipes-qt/qt6/qtnetworkauth_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtopcua_git.bb
View File

@ -18,6 +18,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
PACKAGECONFIG ?= "qml"

1
recipes-qt/qt6/qtpositioning_git.bb
View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtquick3d_git.bb
View File

@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
ASSIMP_BRANCH = "qt6_assimp"

1
recipes-qt/qt6/qtquick3dphysics_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
COMPATIBLE_MACHINE = "(-)"

1
recipes-qt/qt6/qtquicktimeline_git.bb
View File

@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtremoteobjects_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"

1
recipes-qt/qt6/qtscxml_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtscxml-native"

1
recipes-qt/qt6/qtsensors_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtserialbus_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtserialport_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtshadertools_git.bb
View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtshadertools-native"

1
recipes-qt/qt6/qtspeech_git.bb
View File

@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qtsvg_git.bb
View File

@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

1
recipes-qt/qt6/qttools_git.bb
View File

@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += " \

1
recipes-qt/qt6/qttranslations_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qttools qttools-native"

1
recipes-qt/qt6/qtvirtualkeyboard_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
# To enabled Nuance T9 Write support, you need to provide the licensed components

1
recipes-qt/qt6/qtwayland_git.bb
View File

@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
SRC_URI +="\

1
recipes-qt/qt6/qtwebchannel_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"

4
recipes-qt/qt6/qtwebengine.inc
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
inherit gettext
@ -35,8 +36,5 @@ SRC_URI += " \
SRC_URI += " \
file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
file://chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch;patchdir=src/3rdparty \
"
SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"

43
recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
View File

@ -1,43 +0,0 @@
From 358e7b51c205521dc9eac8a8cf676412078fe014 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 30 Mar 2017 11:37:24 +0300
Subject: [PATCH] chromium: workaround for too long .rps file name
Ninja may fail when the build directory is too long:
ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
le.rsp): Unable to create file. File name too long
Task-number: QTBUG-59769
Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
Upstream-Status: Inappropriate [OE Specific]
---
gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gn/src/gn/ninja_action_target_writer.cc b/gn/src/gn/ninja_action_target_writer.cc
index 2ceac904a3c..8496e309cec 100644
--- a/gn/src/gn/ninja_action_target_writer.cc
+++ b/gn/src/gn/ninja_action_target_writer.cc
@@ -122,9 +122,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
// strictly necessary for regular one-shot actions, but it's easier to
// just always define unique_name.
std::string rspfile = custom_rule_name;
+
+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
+ //please note ".$unique_name" is not used at the moment
+ int pos = 0;
+ std::string delimiter("_");
+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
+ rspfile = rspfile.substr(0,pos);
+
if (!target_->sources().empty())
rspfile += ".$unique_name";
rspfile += ".rsp";
+
out_ << " rspfile = " << rspfile << std::endl;
// Response file contents.

74
recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
View File

@ -1,74 +0,0 @@
From 7894d0d905c61200eb2eb3df1eeeb780e72f3e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 16 Jul 2023 18:18:02 +0300
Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
instructions within inline assembly
Fixes assembling with binutil as >= 2.41
Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb]
Signed-off-by: James Almer <jamrial@gmail.com>
---
.../ffmpeg/libavcodec/x86/mathops.h | 26 ++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
index 6298f5ed198..ca7e2dffc10 100644
--- a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+++ b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
@@ -35,12 +35,20 @@
static av_always_inline av_const int MULL(int a, int b, unsigned shift)
{
int rt, dummy;
+ if (__builtin_constant_p(shift))
__asm__ (
"imull %3 \n\t"
"shrdl %4, %%edx, %%eax \n\t"
:"=a"(rt), "=d"(dummy)
- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
);
+ else
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
+ );
return rt;
}
@@ -113,19 +121,31 @@ __asm__ volatile(\
// avoid +32 for shift optimization (gcc should do that ...)
#define NEG_SSR32 NEG_SSR32
static inline int32_t NEG_SSR32( int32_t a, int8_t s){
+ if (__builtin_constant_p(s))
__asm__ ("sarl %1, %0\n\t"
: "+r" (a)
- : "ic" ((uint8_t)(-s))
+ : "i" (-s & 0x1F)
);
+ else
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+ : "c" ((uint8_t)(-s))
+ );
return a;
}
#define NEG_USR32 NEG_USR32
static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
+ if (__builtin_constant_p(s))
__asm__ ("shrl %1, %0\n\t"
: "+r" (a)
- : "ic" ((uint8_t)(-s))
+ : "i" (-s & 0x1F)
);
+ else
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+ : "c" ((uint8_t)(-s))
+ );
return a;
}

2
recipes-qt/qt6/qtwebengine_git.bb
View File

@ -83,8 +83,6 @@ FILES:${PN}-tools = ""
# when proprietary-codecs is enabled
INSANE_SKIP:${PN} += "textrel"
QT_PTEST_ENABLED = "0"
# QTBUG-109565 workaround: Disable GCC -O2 on armv7a-neon due to stack alignment issue
FULL_OPTIMIZATION:remove:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '-O2', '', d)}"
FULL_OPTIMIZATION:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', ' -O1', '', d)}"

1
recipes-qt/qt6/qtwebsockets_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

1
recipes-qt/qt6/qtwebview_git.bb
View File

@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6-lts.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebengine"