diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index f87d96e8..6ba8ba4a 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -23,6 +23,8 @@ DEPENDS += " \ | |||
23 | qtlocation \ | 23 | qtlocation \ |
24 | libdrm fontconfig pixman openssl pango cairo pciutils nss \ | 24 | libdrm fontconfig pixman openssl pango cairo pciutils nss \ |
25 | libcap \ | 25 | libcap \ |
26 | jpeg-native \ | ||
27 | freetype-native \ | ||
26 | gperf-native \ | 28 | gperf-native \ |
27 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ | 29 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ |
28 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ | 30 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ |
@@ -43,7 +45,7 @@ SECURITY_STRINGFORMAT = "" | |||
43 | 45 | ||
44 | # To use system ffmpeg you need to enable also libwebp, opus, vpx | 46 | # To use system ffmpeg you need to enable also libwebp, opus, vpx |
45 | # Only depenedencies available in oe-core are enabled by default | 47 | # Only depenedencies available in oe-core are enabled by default |
46 | PACKAGECONFIG ??= "libwebp libevent libpng \ | 48 | PACKAGECONFIG ??= "libevent libpng \ |
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 49 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |
48 | 50 | ||
49 | PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu" | 51 | PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu" |
@@ -142,7 +144,7 @@ RDEPENDS_${PN}-examples += " \ | |||
142 | qtdeclarative-qmlplugins \ | 144 | qtdeclarative-qmlplugins \ |
143 | " | 145 | " |
144 | 146 | ||
145 | QT_MODULE_BRANCH_CHROMIUM = "80-based" | 147 | QT_MODULE_BRANCH_CHROMIUM = "83-based" |
146 | 148 | ||
147 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc | 149 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc |
148 | # 5.15-glibc.meta-qt5.8 | 150 | # 5.15-glibc.meta-qt5.8 |
@@ -165,7 +167,7 @@ SRC_URI += " \ | |||
165 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ | 167 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ |
166 | file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ | 168 | file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ |
167 | file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ | 169 | file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ |
168 | file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ | 170 | file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \ |
169 | file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ | 171 | file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ |
170 | file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ |
171 | file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ | 173 | file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ |
@@ -173,7 +175,6 @@ SRC_URI += " \ | |||
173 | file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ | 175 | file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ |
174 | file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \ | 176 | file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \ |
175 | file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ | 177 | file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ |
176 | file://chromium/0013-chromium-Fix-bison-3.7.patch;patchdir=src/3rdparty \ | ||
177 | file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ | 178 | file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ |
178 | file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ | 179 | file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ |
179 | file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \ | 180 | file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \ |
@@ -188,7 +189,6 @@ SRC_URI_append_libc-musl = "\ | |||
188 | file://chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ | 189 | file://chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ |
189 | file://chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ | 190 | file://chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ |
190 | file://chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 191 | file://chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ |
191 | file://chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ | ||
192 | file://chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 192 | file://chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
193 | file://chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | 193 | file://chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ |
194 | file://chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 194 | file://chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
@@ -198,8 +198,8 @@ SRC_URI_append_libc-musl = "\ | |||
198 | file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ | 198 | file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ |
199 | " | 199 | " |
200 | 200 | ||
201 | SRCREV_qtwebengine = "f5268555099a1a96f8730035a40f04a473dd396e" | 201 | SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc" |
202 | SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04" | 202 | SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759" |
203 | SRCREV = "${SRCREV_qtwebengine}" | 203 | SRCREV = "${SRCREV_qtwebengine}" |
204 | 204 | ||
205 | SRCREV_FORMAT = "qtwebengine_chromium" | 205 | SRCREV_FORMAT = "qtwebengine_chromium" |