t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-16 20:21:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: upgrade to 5.15 rc1

Browse Source 
* use latest revisions in 5.15 branches

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2020-05-11 16:41:45 +02:00
parent 288cdf6053
commit 07a54bf2a9
71 changed files with 92 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/qt5/nativesdk-qtbase_git.bb
View File

@@ -196,4 +196,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 = "806bc5fc0559119a2d24d7464a56d5692da91b36"
SRCREV = "538223d10d133d23133db1ec7a50cb2775aca657"

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

@@ -36,6 +36,6 @@ do_configure_prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
SRCREV = "e326d8b7d7c96a628667d0a464f3c1e776d7cf1b"
SRCREV = "e11ffc0d4f2703904355f25ea076bda41e7c4ec2"
BBCLASSEXTEND += "native nativesdk"

2
recipes-qt/qt5/qt5-git.inc
View File

@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
S = "${WORKDIR}/git"
PV = "5.14.99+5.15-beta4+git${SRCPV}"
PV = "5.14.99+5.15-rc1+git${SRCPV}"

2
recipes-qt/qt5/qtbase-native_git.bb
View File

@@ -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 = "806bc5fc0559119a2d24d7464a56d5692da91b36"
SRCREV = "538223d10d133d23133db1ec7a50cb2775aca657"

2
recipes-qt/qt5/qtbase_git.bb
View File

@@ -294,4 +294,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
SRCREV = "806bc5fc0559119a2d24d7464a56d5692da91b36"
SRCREV = "538223d10d133d23133db1ec7a50cb2775aca657"

2
recipes-qt/qt5/qtcharts_git.bb
View File

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
SRCREV = "c8e3bf290551328851cf628ce4a488a06b013ac2"
SRCREV = "7cdded63b5d9d6b81c9d03a2f39d94d7b5230ccb"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/

2
recipes-qt/qt5/qtcoap_git.bb
View File

@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
DEPENDS += "qtbase"
SRCREV = "02dbe3346c414d9c606acd5bc799a79a67ad3c1c"
SRCREV = "27a3aee37e0c972deb04c12feddb49ac59fb9450"

2
recipes-qt/qt5/qtconnectivity_git.bb
View File

@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e"
SRCREV = "ac95e67f071e7ee8fb1d65d1a4fe1b68ceee7c2d"

2
recipes-qt/qt5/qtdatavis3d_git.bb
View File

@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
SRCREV = "407bee91eb83b6ff2df6e5d99366971bf21e2637"
SRCREV = "24c043fbffdbd7c0e060f05f67ad28824ac05e6b"

2
recipes-qt/qt5/qtdeclarative_git.bb
View File

@@ -31,6 +31,6 @@ do_install_append_class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
SRCREV = "6555642db7b3b992335f98dc01863db4beea3fd4"
SRCREV = "8279fb44cba551e139f307217da24d3f26a86c2e"
BBCLASSEXTEND =+ "native nativesdk"

2
recipes-qt/qt5/qtgamepad_git.bb
View File

@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "196713714a63e789b65822e2222208251857359b"
SRCREV = "996ccf5bbacab0d16cbd961987c08385279ad6c5"

2
recipes-qt/qt5/qtgraphicaleffects_git.bb
View File

@@ -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 = "617bb58eb0b381ae6095fe8947bc7f9e25ef85b1"
SRCREV = "7665821bc4baed9c6595d22dcaf2857e2dda77f7"

2
recipes-qt/qt5/qtimageformats_git.bb
View File

@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "7625a06bd7bfcf77e896086d049b334f1b66c75d"
SRCREV = "26c548096b8f77b0e2f0cf0602a64d65e7958d67"

2
recipes-qt/qt5/qtknx_git.bb
View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "5cf641e7c61d12b0542252cd423aec64ae891f0c"
SRCREV = "57ee5205e91d52d40ccc15bb290d07533e761342"

4
recipes-qt/qt5/qtlocation_git.bb
View File

@@ -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 = "eda2a7c286058176e1906d0ddc88d4e2cfbec55e"
SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
SRCREV_qtlocation = "d2d4f180c939929fb324f0e02d4c136e2ca5fcd0"
SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"

2
recipes-qt/qt5/qtmqtt_git.bb
View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "6e48bcfd40e9a8a2f6c870e5468ad04de2436506"
SRCREV = "d2806f040c926e500ba19da34b58fd31cdc63394"

2
recipes-qt/qt5/qtmultimedia_git.bb
View File

@@ -38,7 +38,7 @@ 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 = "b7c6c49d8026bebef0c86ee5b686f8519f2e8622"
SRCREV = "541440649aac5488a8cb44f0c867095b18405c49"
# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
do_install_append() {

2
recipes-qt/qt5/qtnetworkauth_git.bb
View File

@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
SRCREV = "72f5b40b00178710b36edc7ed1769321182e7fa6"
SRCREV = "5f9fbc2a6e3f06ae388af259e074b00c491c163d"

2
recipes-qt/qt5/qtopcua_git.bb
View File

@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "0f9692e4dee6ba6471aca405e251a189c9388d1a"
SRCREV = "d18230234ad32aeb96da6ef22c583408d4b23fa6"

2
recipes-qt/qt5/qtpurchasing_git.bb
View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "6ec39500b6cb3ffc274b7c3c0de39beb6cc1ef00"
SRCREV = "c9a2a6dcb858d2de5c908914cfe6564fa0740469"

2
recipes-qt/qt5/qtquick3d_git.bb
View File

@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "5cbcc4f38aa08026d45eff75f2612c6243f0d3f7"
SRCREV_qtquick3d = "2e8515c4e8fe899ba37c32fc82a6abe9778cd068"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"

2
recipes-qt/qt5/qtquickcontrols2_git.bb
View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtdeclarative-native"
SRCREV = "71757283972348971a79c905f9c8b1b42870d876"
SRCREV = "80a1ea20d66dea11c74d0a40e1c75b8a782f38a1"

2
recipes-qt/qt5/qtquickcontrols_git.bb
View File

@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
"
SRCREV = "e9ad3352df0815761c1fde8ea36b040e8431f360"
SRCREV = "83a41de459cd8605878842b4410521410132dcb3"

2
recipes-qt/qt5/qtremoteobjects_git.bb
View File

@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "9ec14db5a9f735eb4286984f934568f089627bd7"
SRCREV = "0b98fb2b3f59143ff8f71f7f53309e153e5af81e"
BBCLASSEXTEND += "native nativesdk"

2
recipes-qt/qt5/qtscript_git.bb
View File

@@ -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 = "36300dd06bb8191800ec93ca5a408f39b1f221eb"
SRCREV = "a5c819cef6efa06c8273c9b5e5e6406a0ae9c469"

2
recipes-qt/qt5/qtscxml_git.bb
View File

@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
SRCREV = "85ef74c296716081b044db5fd9db4692443c229f"
SRCREV = "db8b84e117905b4792524aacddba314ae4a2f7ba"
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14
# 5.14.meta-qt5.1

2
recipes-qt/qt5/qtsensors_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837"
SRCREV = "5acdc122a455bae920e9054bec4f3d769cce105e"

2
recipes-qt/qt5/qtserialbus_git.bb
View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
SRCREV = "1274acb4bf4cdd06781495f5d9f90adb7268c318"
SRCREV = "1d5fa84ed9b450954a0d82e598570ec2107a5953"

2
recipes-qt/qt5/qtserialport_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "ff3fd7b0330cb76772066ce7162320f4dc1a5c28"
SRCREV = "c24fd46221b98eb2e9248765ae32c0fccbebcd35"

2
recipes-qt/qt5/qtsvg_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "2c67415afc2e12bab958e16b18bcab88a537c248"
SRCREV = "a26b32e157e4e7cd8ce90b933c4c45ed5360b388"

2
recipes-qt/qt5/qttools_git.bb
View File

@@ -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 = "d53af222939321fb816d44f86588c3eb8c255e10"
SRCREV = "87a862817ccdabb3f7c0e34a2b27c94663e3a1f8"
BBCLASSEXTEND = "native nativesdk"

2
recipes-qt/qt5/qttranslations_git.bb
View File

@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
"
SRCREV = "b0be8ca652f732439e562f75be372730e2452042"
SRCREV = "9251c2a5d1d3c0a193ea4492f46bb7576f164918"

2
recipes-qt/qt5/qtvirtualkeyboard_git.bb
View File

@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
SRCREV = "b3556c25ffdc64595e41d005b091776035134846"
SRCREV = "a50db98b23526737a4f7680d4e02ccd455309699"

2
recipes-qt/qt5/qtwayland_git.bb
View File

@@ -41,7 +41,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "00b6314f79cf4d8b1ea2ba81dbafe7088c52ae84"
SRCREV = "1a5b7938c1384381a482448cf079bc682395b54b"
BBCLASSEXTEND =+ "native nativesdk"

2
recipes-qt/qt5/qtwebchannel_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
SRCREV = "4af709df207bf7c98ae5ffd699a66d33767d6300"
SRCREV = "e38d01e78530048339722f711d58d1404b2484c0"

2
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
View File

@@ -1,4 +1,4 @@
From 4575335a6a8b0727363afa03336c1762a340d7cf Mon Sep 17 00:00:00 2001
From 934acc13090f1d394a2f81a033d2901b42d3ef97 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 15 Mar 2017 13:53:28 +0200
Subject: [PATCH] Force host toolchain configuration

2
recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
View File

@@ -1,4 +1,4 @@
From ee0700753d1fc3001da7df9e91d7478b60598e96 Mon Sep 17 00:00:00 2001
From 9cc996be660e86b57a2ade820376194f1c04dc1a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 12 Dec 2017 16:06:14 +0200
Subject: [PATCH] musl: don't use pvalloc as it's not available on musl

6
recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
View File

@@ -1,4 +1,4 @@
From 9a99864ceed71eebcbfbbcbc90b877a9ad505b20 Mon Sep 17 00:00:00 2001
From 864b83f827ce39422f588d768961d5ba147f4ea9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 14 Dec 2017 11:28:10 +0200
Subject: [PATCH] musl: link against libexecinfo
@@ -10,10 +10,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index d7e2ab8d..6864a8e6 100644
index 5007012a..56c7ad4a 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -58,7 +58,7 @@ linux {
@@ -57,7 +57,7 @@ linux {
POST_TARGETDEPS += $$NINJA_TARGETDEPS

2
recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
View File

@@ -1,4 +1,4 @@
From 947bba762706f6212b6e44e15364af129c49f8c5 Mon Sep 17 00:00:00 2001
From ecaf6f335ed3b366ddb76a02c5a7246b5b5643d3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 12 Nov 2019 19:53:59 -0800
Subject: [PATCH] mkspecs: Allow builds with libc != glibc

2
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
View File

@@ -1,4 +1,4 @@
From d6b2b2a9cf25009f13fb2bef5eebfdeef471bbb6 Mon Sep 17 00:00:00 2001
From fd83092bd0598f0ecb8160b98f28cab86e1d734e 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

2
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
View File

@@ -1,4 +1,4 @@
From 18af47b85fb13b6e9f1d88a8beb3c01745c75ebb Mon Sep 17 00:00:00 2001
From e5f4b2c275744a0ea37258492755b904bd6c7fa5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 23 Dec 2018 16:58:04 -0800
Subject: [PATCH] chromium: stack pointer clobber

2
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
View File

@@ -1,4 +1,4 @@
From dd5033e3b9a425b3435629d9e8901b8445119fdb Mon Sep 17 00:00:00 2001
From 9452a795feb5891cd099419783a18550c4e03146 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Feb 2019 19:28:59 -0800
Subject: [PATCH] chromium: fix build with clang

2
recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
View File

@@ -1,4 +1,4 @@
From 66d28dccd67ca1095804ef1293d499fd5a2d1d6a Mon Sep 17 00:00:00 2001
From a6750bf44f791a1a56ee9b7a7e7907e9fcd844e5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 5 Feb 2019 14:32:20 -0800
Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm

2
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
View File

@@ -1,4 +1,4 @@
From c820f61ac2e254758e863175423be6387907df81 Mon Sep 17 00:00:00 2001
From bb8021c68c0feddfac6cb0df6242438af45dd58f Mon Sep 17 00:00:00 2001
From: Johannes Pointner <johannes.pointner@br-automation.com>
Date: Fri, 3 May 2019 09:12:38 +0200
Subject: [PATCH] chromium: Do not try to set the guessed values for

2
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
View File

@@ -1,4 +1,4 @@
From 98af1c4ce180f029e6fa1a1dfdf438296eb7dae2 Mon Sep 17 00:00:00 2001
From b2cf9602c7cf81d4671ad77b2279b8370db16558 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Date: Thu, 8 Mar 2018 15:39:55 +0100
Subject: [PATCH] chromium: aarch64 skia build fix

2
recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
View File

@@ -1,4 +1,4 @@
From 3ef0d63778bdafca66017a6d1d5599f5c92f21b3 Mon Sep 17 00:00:00 2001
From c55da5324d49bd0d9b30faa130936fb6a271868f Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 11 Jul 2019 09:35:13 +0200
Subject: [PATCH] chromium: fix build after y2038 changes in glibc

2
recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
View File

@@ -1,4 +1,4 @@
From 172ab111e6d2626780bb4fb22e4c4e74106a802e Mon Sep 17 00:00:00 2001
From 80a64c916371766ba109bf7d8629643d8248557f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 30 Nov 2019 10:07:43 -0800
Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t

17
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
View File

@@ -1,4 +1,4 @@
From e8f23ce32baf1e0d9c2249e50c949c9cd86095e0 Mon Sep 17 00:00:00 2001
From 02d503c9cbd0ab475de00df0b03e209886d5d17e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 25 Dec 2019 15:41:16 -0800
Subject: [PATCH] chromium: Include cstddef for size_t definition
@@ -18,22 +18,9 @@ ccc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
.../third_party/webrtc/modules/video_coding/decoding_state.h | 1 +
2 files changed, 2 insertions(+)
1 file changed, 1 insertion(+)
diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
index 22528c94892..69e624e8b19 100644
--- a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+++ b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
@@ -12,6 +12,7 @@
#define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
#include <array>
+#include <cstddef>
namespace webrtc {
diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
index b87fb2d0345..b3faffcfc79 100644
--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h

2
recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
View File

@@ -1,4 +1,4 @@
From 6211643cff8c828be75f6504ec16246f8746add4 Mon Sep 17 00:00:00 2001
From b30936d56615107fa518d313d9961fcd0c5930af Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 2 Jan 2020 17:13:55 -0800
Subject: [PATCH] chromium: Move CharAllocator definition to a header file

36
recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
View File

@@ -1,4 +1,4 @@
From 75d5b91b202dc2f5ff380cc36fdb9ac50f6c80ca Mon Sep 17 00:00:00 2001
From 52a31894bed50d71e19183fd23b06b03b0272213 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 15 Jan 2020 16:53:46 -0800
Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
@@ -7,37 +7,11 @@ These headers are needed for uintXX_t and size_t definitions
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
chromium/media/cdm/supported_cdm_versions.h | 1 +
.../third_party/perfetto/include/perfetto/base/task_runner.h | 1 +
chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
3 files changed, 3 insertions(+)
chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
index dbe59ba5ea7..5216cfe3ee9 100644
--- a/chromium/media/cdm/supported_cdm_versions.h
+++ b/chromium/media/cdm/supported_cdm_versions.h
@@ -6,6 +6,7 @@
#define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
#include <array>
+#include <cstddef>
#include "media/base/media_export.h"
#include "media/cdm/api/content_decryption_module.h"
diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
index cf60401238f..02658e7139b 100644
--- a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
+++ b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
@@ -18,6 +18,7 @@
#define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
#include <functional>
+#include <cstdint>
#include "perfetto/base/export.h"
diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
index 8ffa4400a9c..a389fc2a574 100644
index 66cc46dc091..e8cadb2bb80 100644
--- a/chromium/third_party/webrtc/call/rtx_receive_stream.h
+++ b/chromium/third_party/webrtc/call/rtx_receive_stream.h
@@ -11,6 +11,7 @@
@@ -46,5 +20,5 @@ index 8ffa4400a9c..a389fc2a574 100644
+#include <cstdint>
#include <map>
#include <stdint.h>
#include "call/rtp_packet_sink_interface.h"

2
recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
View File

@@ -1,4 +1,4 @@
From 7a7008c0705cdea1acdb77eb51dd98003b15f7c4 Mon Sep 17 00:00:00 2001
From 29731cd714c387e1df4ca39c60c9aea9ad671271 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 1 Feb 2020 12:17:23 -0800
Subject: [PATCH] chromium: Link v8 with libatomic on x86

2
recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
View File

@@ -1,4 +1,4 @@
From 85dc2559eab2d6f02c0e09bf5895af4668239294 Mon Sep 17 00:00:00 2001
From e2f7bf491797a3457f0d3dd7fe615aa5ca195345 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:01:12 -0700
Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not

2
recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
View File

@@ -1,4 +1,4 @@
From 06ade5afbcb37a77d8488291f812cc9049fdb55e Mon Sep 17 00:00:00 2001
From f98b9771b8967c32f738d40313ec0ded22151532 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:09:06 -0700
Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux

2
recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch
View File

@@ -1,4 +1,4 @@
From a4ce19d536f36de6f2065bb8bed6aa451a466664 Mon Sep 17 00:00:00 2001
From d8ad7259c5c96a5c62bd760a8c78bc1157da7dde Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:37:49 -0700
Subject: [PATCH] chromium: musl: include fcntl.h for loff_t

2
recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
View File

@@ -1,4 +1,4 @@
From 4ac8cae0c6c23b1d64c405a0c3919465a82c6b47 Mon Sep 17 00:00:00 2001
From 0dc9cbf1e04f94bf4df7c4a7be7b4dd2b3a3099c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:38:37 -0700
Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t

2
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
View File

@@ -1,4 +1,4 @@
From 9819554c2d70a95d9cd418349baa076c10cb5d76 Mon Sep 17 00:00:00 2001
From 28d1045942fb50bbbc792b92dc5cf7e430f23bb4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:54:38 -0700
Subject: [PATCH] chromium: musl: linux != glibc, make the distinction

2
recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
View File

@@ -1,4 +1,4 @@
From c7dcc21ee04718b6852af0ca161451c0d35f3cbc Mon Sep 17 00:00:00 2001
From 157465941dee6ef7865090db5ec06f2b6f26d6f7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:09:02 -0700
Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols

2
recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
View File

@@ -1,4 +1,4 @@
From f9bfe2d381e1ee94ec924d521e57e04661df15c7 Mon Sep 17 00:00:00 2001
From 8f60cdd962c7dd1a651a19af47408c4d91ca76f3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:12:39 -0700
Subject: [PATCH] chromium: musl: Use correct member name __si_fields from

2
recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
View File

@@ -1,4 +1,4 @@
From 7453ddb3c603814e8649df09dbe4ee273da1ca8f Mon Sep 17 00:00:00 2001
From 24cb8e7f43e1c933472e00c114dfde26801133ca Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:27:50 -0700
Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc

2
recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
View File

@@ -1,4 +1,4 @@
From bebaeea8a0025d035190622700421ab45821345c Mon Sep 17 00:00:00 2001
From db5b51e1213a3ef76d77c58bfa7b5f0dbdc434c9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:39:57 -0700
Subject: [PATCH] chromium: musl: Do not define __sbrk on musl

2
recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
View File

@@ -1,4 +1,4 @@
From 146508f20c7008e7b601470e711d322e9b4bde93 Mon Sep 17 00:00:00 2001
From 40f0f10754e0cb774c8680100cad9a3ee91376dc Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 16:41:23 -0700
Subject: [PATCH] chromium: musl: Adjust default pthread stack size

2
recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
View File

@@ -1,4 +1,4 @@
From 42251b50702ea76c12cb57327e34c0cf40cbd510 Mon Sep 17 00:00:00 2001
From dfaa011e34f75f2010dbc76c133fcf12f0a5c986 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 25 Sep 2018 12:35:07 -0700
Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on

2
recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
View File

@@ -1,4 +1,4 @@
From 6469bf2b401f1cce1d4258ba8cae0746b8559300 Mon Sep 17 00:00:00 2001
From 70bc20954952684e918175943ffe4c6a177592b4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 25 Sep 2018 12:59:05 -0700
Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get

2
recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
View File

@@ -1,4 +1,4 @@
From feceed2ff7bb63d5d9b1d1fcf3207fc8c91b87ed Mon Sep 17 00:00:00 2001
From 1e4759f3ecdd8c6d3cdb526881486bd80f3f76bf Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 23 Dec 2018 16:58:04 -0800
Subject: [PATCH] chromium: musl: pread pwrite

12
recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-portable-msghdr.patch → recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
View File

@@ -1,3 +1,8 @@
From 80ee78bdb91db3625b62b9d5d5955cf9d2de4504 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 10 May 2020 08:16:01 -0700
Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner
initialize msghdr in a compatible manner
msghdr stuct from socket.h is not same between musl and glibc
@@ -15,10 +20,15 @@ structure
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
chromium/net/socket/udp_socket_posix.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc
index 572472a6993..504fdb5d5c6 100644
--- a/chromium/net/socket/udp_socket_posix.cc
+++ b/chromium/net/socket/udp_socket_posix.cc
@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::Interna
@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
for (auto& buffer : buffers)
msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
msgvec->reserve(buffers.size());

8
recipes-qt/qt5/qtwebengine_git.bb
View File

@@ -145,7 +145,7 @@ RDEPENDS_${PN}-examples += " \
QT_MODULE_BRANCH_CHROMIUM = "80-based"
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
# 5.15.meta-qt5.5
# 5.15.meta-qt5.6
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
file://0001-Force-host-toolchain-configuration.patch \
@@ -187,11 +187,11 @@ SRC_URI_append_libc-musl = "\
file://chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
file://chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
file://chromium/0026-chromium-musl-portable-msghdr.patch;patchdir=src/3rdparty \
file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
"
SRCREV_qtwebengine = "9e56f570e31a0ef18e544bb21dfddebfe43ec2d0"
SRCREV_chromium = "6564891efb850d344d852c1d941ed4e9c2a732c1"
SRCREV_qtwebengine = "58cd21c0aa7a9dc5a18ea411dcf462a2ee8193f6"
SRCREV_chromium = "e941f2bda154c226bd2a1fd75efc8b1b7cee6a08"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"

2
recipes-qt/qt5/qtwebglplugin_git.bb
View File

@@ -18,4 +18,4 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "ab0d58ef0a2cd21eab7dc612004e416d3d55a78e"
SRCREV = "219abce4c8fcfbbae13b66c142ee0fd1afd04313"

2
recipes-qt/qt5/qtwebsockets_git.bb
View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "37203fab746060edaccea8abcddc181611ab0555"
SRCREV = "593466b4b902536743050e088a0e4eee9f007c76"

2
recipes-qt/qt5/qtwebview_git.bb
View File

@@ -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 = "d47cad5ca5c3788fedc0a53930e47efb869f9315"
SRCREV = "a15f2b83c42286ab7f4b4c406e4795b6a1a9a13e"

2
recipes-qt/qt5/qtx11extras_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "8136ffdfe8ec8fe1b005fc5e72d66e0fd160b583"
SRCREV = "e05196b4648e8ea28bbeea3491754c1c6db4a60c"

2
recipes-qt/qt5/qtxmlpatterns_git.bb
View File

@@ -25,6 +25,6 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "0964e5c37395d7d5f6c50d1e659d3bc8f2707711"
SRCREV = "fe5abadda4ed0cfe7401ac8cfde29736c52a022e"
BBCLASSEXTEND =+ "native nativesdk"