mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-17 04:31:54 +02:00
qt5: upgrade to latest revisions in 5.15 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
|
||||
do_generate_qt_environment_file[umask] = "022"
|
||||
addtask generate_qt_environment_file after do_install before do_package
|
||||
|
||||
SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd"
|
||||
SRCREV = "36325f9d86249a4f17f7efbbc1122c462708d909"
|
||||
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "aa7c8a5cb1111d46289e6b370dcd5b1d3f66c80d"
|
||||
SRCREV = "8b122b9b53687285953140b2130be6541a938737"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -143,4 +143,4 @@ do_install() {
|
||||
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
|
||||
}
|
||||
|
||||
SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd"
|
||||
SRCREV = "36325f9d86249a4f17f7efbbc1122c462708d909"
|
||||
|
||||
@@ -294,4 +294,4 @@ sed -i \
|
||||
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
|
||||
}
|
||||
|
||||
SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd"
|
||||
SRCREV = "36325f9d86249a4f17f7efbbc1122c462708d909"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "41bdefce20be3ebbeebaba215402211664a29c79"
|
||||
SRCREV = "c8e3bf290551328851cf628ce4a488a06b013ac2"
|
||||
|
||||
# The same issue as in qtbase:
|
||||
# http://errors.yoctoproject.org/Errors/Details/152641/
|
||||
|
||||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "8d3da74a5828b4c09847342bc45855d0889ede7d"
|
||||
SRCREV = "02dbe3346c414d9c606acd5bc799a79a67ad3c1c"
|
||||
|
||||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "79702f744e4906155736967dea1af5433355c71a"
|
||||
SRCREV = "35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "9ba8b807d002e0b93afe5e08221cf6c38b0055fb"
|
||||
SRCREV = "407bee91eb83b6ff2df6e5d99366971bf21e2637"
|
||||
|
||||
@@ -31,6 +31,6 @@ do_install_append_class-nativesdk() {
|
||||
rm -rf ${D}${OE_QMAKE_PATH_QML}
|
||||
}
|
||||
|
||||
SRCREV = "b3ff342d327dc00d99281dca4fbfe6c4300aa6c6"
|
||||
SRCREV = "5bcb2ff883f9f8ceb42ed6de298aa3036d6413b3"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "3c91ce46a69449a0350b63a17c79cd69090ffcc0"
|
||||
SRCREV = "196713714a63e789b65822e2222208251857359b"
|
||||
|
||||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
|
||||
# http://errors.yoctoproject.org/Errors/Build/44912/
|
||||
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
|
||||
SRCREV = "20f436e045bc4636af6acecfa11478f926d4be42"
|
||||
SRCREV = "617bb58eb0b381ae6095fe8947bc7f9e25ef85b1"
|
||||
|
||||
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "d89c6be6f28182111cabe9547d10e31d8a7cd05f"
|
||||
SRCREV = "5a1a12b0e135eb49f7b232c729859583b76bd507"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "e4b624f9af5eab253c75a8800e497662b57648c7"
|
||||
SRCREV = "5cf641e7c61d12b0542252cd423aec64ae891f0c"
|
||||
|
||||
@@ -35,7 +35,7 @@ SRC_URI += " \
|
||||
${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
|
||||
"
|
||||
|
||||
SRCREV_qtlocation = "47391b2d74f65ea3a3a67c0a5359499582d6cfdb"
|
||||
SRCREV_qtlocation = "0a074c7164f562417b2667c175d4e20d63415b48"
|
||||
SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "d8ef5280d7d0773ac0b415994e6978e96fe228cc"
|
||||
SRCREV = "7467bbdc843afeee748eff38f741e2417357de7a"
|
||||
|
||||
@@ -38,4 +38,4 @@ SRC_URI += "\
|
||||
# http://errors.yoctoproject.org/Errors/Build/44914/
|
||||
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
|
||||
SRCREV = "70f5eb4f707ce84cbf153899d33d6bd8656be682"
|
||||
SRCREV = "69837e6e04ae125186a8deaac59d82607fcd6d1a"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "3e3f047e59db88e806b3c1fd94c4a996f5317b68"
|
||||
SRCREV = "1afc99397bd35fc3cd24913f5dc10743de1833dc"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "3ef91292426c4aa56989e843e1c675a7ba6ac1c9"
|
||||
SRCREV = "6ec39500b6cb3ffc274b7c3c0de39beb6cc1ef00"
|
||||
|
||||
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
|
||||
"
|
||||
|
||||
SRCREV_qtquick3d = "6f5ec4832188db5e9b5e7e4b5ea5e939b9f4b690"
|
||||
SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9"
|
||||
SRCREV_qtquick3d = "f45dd1261fd9a3343742cc528d63a27e60c90205"
|
||||
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
|
||||
|
||||
SRCREV_FORMAT = "qtquick3d_assimp"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtdeclarative-native"
|
||||
|
||||
SRCREV = "35afc8d21b2f705463ec56d3e11679efb798b757"
|
||||
SRCREV = "8a442c3b7709424c768a99b304bdbdbac81f8011"
|
||||
|
||||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
SRCREV = "7a806347167607172ee38c60d30808b298224a8b"
|
||||
SRCREV = "eb554a20ec5c48643784ce7b29f97ccfb31e7f89"
|
||||
|
||||
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "09838389f3b9eaf67ad2e0b02a85a62a63fbfc38"
|
||||
SRCREV = "15e437e870279937b15674c32783c776512ca20d"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
|
||||
# http://errors.yoctoproject.org/Errors/Build/44915/
|
||||
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
|
||||
SRCREV = "3a358430efe797fe1c0f1aa7f701f9139a642d6f"
|
||||
SRCREV = "36300dd06bb8191800ec93ca5a408f39b1f221eb"
|
||||
|
||||
@@ -10,7 +10,7 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "bae669b37d3828eb73e78e7c77f0a5fccf8e3150"
|
||||
SRCREV = "85ef74c296716081b044db5fd9db4692443c229f"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "63c972ad9e15b673779147c4c263ed2ac5312a28"
|
||||
SRCREV = "3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRCREV = "a3aa54e27094b80feae4e42c5f7e22c3d4022b49"
|
||||
SRCREV = "3653815f3cd12291790180456fe18df9e95f82ab"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "f48bf0293a682aef90e6e5b16cf5a9a06b7a32d2"
|
||||
SRCREV = "8dbfbe633ee7cd1853354830872fc1c60f9e2139"
|
||||
|
||||
@@ -49,6 +49,6 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "d8a971b8475035f61e1ad3baaef6a8c49556c42d"
|
||||
SRCREV = "ee49537f31aff32fa674292d3d413d8d40f661a7"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "9d7437583d7475aa069ec5aa786fa9c5aa36253b"
|
||||
SRCREV = "fc73b5dbf6d7719dca652a1cf3aa71ba5d58f8ce"
|
||||
|
||||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "39a3c50f6f3d3aff52853510543388638a2524d5"
|
||||
SRCREV = "95be4f1e3945f88adc9d55fa06371665254a1127"
|
||||
|
||||
@@ -41,7 +41,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "cfc4043626e05649e51607a92ceb87d31e0d1b06"
|
||||
SRCREV = "f195b7db8a206a6aad7734db24d611b8f9594aa1"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "facf59c1eae3958b8c2972c167cede215219c814"
|
||||
SRCREV = "1f793c887773f9b7477a73467aa1e2497ffef25c"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "127d475324c2133b8d7e2f4712e71d14fa84c560"
|
||||
SRCREV = "ad75d2712a838787488e817eec318fc27bae1786"
|
||||
|
||||
@@ -23,4 +23,4 @@ python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
|
||||
}
|
||||
SRCREV = "3de65bf9daf1d0e61300cdfe44d3eca51636d438"
|
||||
SRCREV = "04b529214db0f20cce4d229a6035825390048217"
|
||||
|
||||
@@ -25,6 +25,6 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "2dfdd4f0bdd6647c104470712f0e463021488e43"
|
||||
SRCREV = "837fe1627fce599bfb9a906d33d14df34648ba89"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
Reference in New Issue
Block a user