diff options
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtcoap_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlottie_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch | 46 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
17 files changed, 50 insertions, 28 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4d7fab80..2237ed08 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
196 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
197 | 197 | ||
198 | SRCREV = "d1361b1443578550e5c31c0e52aa237c5e1cc6e0" | 198 | SRCREV = "075d971fea75f48122207dc01fce35cfdbb40daf" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index d94018a3..b3a18a76 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -36,6 +36,6 @@ do_configure_prepend() { | |||
36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
37 | } | 37 | } |
38 | 38 | ||
39 | SRCREV = "9d9305184ea0b19809baac844ae32bf9323d19d2" | 39 | SRCREV = "44fd52b3c7f6630a2b5e7dfe0963abd4a8c075ca" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 16aa8554..bddd01cf 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -142,4 +142,4 @@ do_install() { | |||
142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
143 | } | 143 | } |
144 | 144 | ||
145 | SRCREV = "d1361b1443578550e5c31c0e52aa237c5e1cc6e0" | 145 | SRCREV = "075d971fea75f48122207dc01fce35cfdbb40daf" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index fab0616f..d3a444c0 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -295,4 +295,4 @@ sed -i \ | |||
295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
296 | } | 296 | } |
297 | 297 | ||
298 | SRCREV = "d1361b1443578550e5c31c0e52aa237c5e1cc6e0" | 298 | SRCREV = "075d971fea75f48122207dc01fce35cfdbb40daf" |
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index f0fa7df7..38dd024c 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb | |||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" | |||
11 | 11 | ||
12 | DEPENDS += "qtbase" | 12 | DEPENDS += "qtbase" |
13 | 13 | ||
14 | SRCREV = "4ba91c4d09b8a476c335c8f0725d4a8aba651ae5" | 14 | SRCREV = "196bc2a3db422fd162864feb8e94411cf7428168" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 95dc95c8..6a17e570 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "ac95e67f071e7ee8fb1d65d1a4fe1b68ceee7c2d" | 22 | SRCREV = "2f46485868a5d9f9a9035db7157864a3f5949a8a" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 048b0039..081abbe2 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { | |||
30 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 30 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
31 | } | 31 | } |
32 | 32 | ||
33 | SRCREV = "b52e81856a1d50fc331b99ae533a474a9b4e79c3" | 33 | SRCREV = "0c8e51705ac0bb86c4b123ecd30a11b41fd50b24" |
34 | 34 | ||
35 | BBCLASSEXTEND =+ "native nativesdk" | 35 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index fdddc750..368daa3f 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase qtdeclarative" | 10 | DEPENDS += "qtbase qtdeclarative" |
11 | 11 | ||
12 | SRCREV = "a0918d137c318d8c9cad6f7db1ffca1f18c305c6" | 12 | SRCREV = "43c7e0a05fd350c1bbcd3127307906bba7c12d0b" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index e8013ea7..808fdf88 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -38,7 +38,7 @@ SRC_URI += "\ | |||
38 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 38 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
40 | 40 | ||
41 | SRCREV = "89f92578ece66aaa50e03cacd81434cd18006185" | 41 | SRCREV = "d6076e0963b16ec98c13ce126db1d94a8f2952ca" |
42 | 42 | ||
43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory | 43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory |
44 | do_install_append() { | 44 | do_install_append() { |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 97a0796e..9cc18271 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb | |||
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ | |||
21 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ | 21 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRCREV_qtquick3d = "54d800707808ccdb2d7f17e72f6fd9429573b8fd" | 24 | SRCREV_qtquick3d = "31122e51d3253bf6f3bebc57745f04a3c6941c80" |
25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" | 25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
26 | 26 | ||
27 | SRCREV_FORMAT = "qtquick3d_assimp" | 27 | SRCREV_FORMAT = "qtquick3d_assimp" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c6525399..dbd38e3c 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "7f820ab2949dd6f0595b916192279745aafe4d71" | 13 | SRCREV = "902db8f33298dab3c9b7ae9733432d1a3e2af8e1" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 33f02e6a..4c179b05 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "be49da7ec275e4fbbc678810bf7264197099eeee" | 28 | SRCREV = "0ef507f9cad0f9355f470e129d3dd75c623bc882" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 6d924526..d7901392 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ | |||
49 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ | 49 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ |
50 | " | 50 | " |
51 | 51 | ||
52 | SRCREV = "e1c5282d9f97bc2068107d4625933c7fefb9f0cc" | 52 | SRCREV = "73385a4d45d0b95e3806f78346755d1b008227b4" |
53 | 53 | ||
54 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "native nativesdk" |
55 | 55 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 78c69bc8..78bace92 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
71 | 71 | ||
72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
73 | 73 | ||
74 | SRCREV = "4cf279a5e6ad49720506a6825f008a773f5e951e" | 74 | SRCREV = "a5442ee7e44f8907635709269661d430b4141e37" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index ed825a40..9a758fb4 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu | |||
43 | 43 | ||
44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
45 | 45 | ||
46 | SRCREV = "7a74426e10d209f716114c14d658cc6086f9023a" | 46 | SRCREV = "eaeb21284ab7a3714c735ee8d7c348aa3bc3a07a" |
47 | 47 | ||
48 | BBCLASSEXTEND =+ "native nativesdk" | 48 | BBCLASSEXTEND =+ "native nativesdk" |
49 | 49 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch index ef4855bb..63a775aa 100644 --- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch | |||
@@ -1,26 +1,48 @@ | |||
1 | From ecaf6f335ed3b366ddb76a02c5a7246b5b5643d3 Mon Sep 17 00:00:00 2001 | 1 | From 636d6f4a3df2cf40f52b2245ed09719fdeda3444 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 12 Nov 2019 19:53:59 -0800 | 3 | Date: Tue, 12 Nov 2019 19:53:59 -0800 |
4 | Subject: [PATCH] mkspecs: Allow builds with libc != glibc | 4 | Subject: [PATCH] mkspecs: Allow builds with libc != glibc |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
8 | src/buildtools/config/support.pri | 5 ----- | 8 | src/buildtools/config/support.pri | 4 ---- |
9 | 1 file changed, 5 deletions(-) | 9 | src/buildtools/configure.json | 4 +--- |
10 | 2 files changed, 1 insertion(+), 7 deletions(-) | ||
10 | 11 | ||
11 | diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri | 12 | diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri |
12 | index 8077b12f..aaf4db47 100644 | 13 | index 6768f0a1..1885f1b4 100644 |
13 | --- a/src/buildtools/config/support.pri | 14 | --- a/src/buildtools/config/support.pri |
14 | +++ b/src/buildtools/config/support.pri | 15 | +++ b/src/buildtools/config/support.pri |
15 | @@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) { | 16 | @@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { |
16 | return(false) | ||
17 | } | ||
18 | 17 | ||
18 | defineTest(qtwebengine_checkForGlibc) { | ||
19 | module = $$1 | ||
19 | - !qtConfig(webengine-system-glibc) { | 20 | - !qtConfig(webengine-system-glibc) { |
20 | - qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") | 21 | - qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.") |
21 | - return(false) | 22 | - return(false) |
22 | - } | 23 | - } |
23 | - | 24 | return(true) |
24 | !qtConfig(webengine-system-khr) { | 25 | } |
25 | qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)") | 26 | |
26 | return(false) | 27 | diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json |
28 | index 96727a14..fef8fc5e 100644 | ||
29 | --- a/src/buildtools/configure.json | ||
30 | +++ b/src/buildtools/configure.json | ||
31 | @@ -371,7 +371,6 @@ | ||
32 | && (!config.sanitizer || features.webengine-sanitizer) | ||
33 | && (!config.linux || features.pkg-config) | ||
34 | && (!config.linux || features.webengine-host-pkg-config) | ||
35 | - && (!config.linux || features.webengine-system-glibc) | ||
36 | && (!config.linux || features.webengine-system-khr) | ||
37 | && (!config.linux || features.webengine-system-nss) | ||
38 | && (!config.linux || features.webengine-system-dbus) | ||
39 | @@ -732,8 +731,7 @@ | ||
40 | "webengine-system-fontconfig", | ||
41 | "webengine-system-dbus", | ||
42 | "webengine-system-nss", | ||
43 | - "webengine-system-khr", | ||
44 | - "webengine-system-glibc" | ||
45 | + "webengine-system-khr" | ||
46 | ] | ||
47 | }, | ||
48 | { | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 16958528..74ad7ebf 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -190,7 +190,7 @@ SRC_URI_append_libc-musl = "\ | |||
190 | file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ | 190 | file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ |
191 | " | 191 | " |
192 | 192 | ||
193 | SRCREV_qtwebengine = "f2db8f1988a3767d4f35aa4724d4e168e80dad59" | 193 | SRCREV_qtwebengine = "89d709c422fdca32e0bb0613d7ef4cfad831f706" |
194 | SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04" | 194 | SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04" |
195 | SRCREV = "${SRCREV_qtwebengine}" | 195 | SRCREV = "${SRCREV_qtwebengine}" |
196 | 196 | ||