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

qtwebengine: update chromium branch & patches

Browse Source 
Updated to 126-based & remove patch.

Change-Id: Icac66263e4889d0bad21ce3a1067df8b7b89de1b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
This commit is contained in:
Mikko Gronoff 2024-10-02 11:34:48 +03:00
parent 62e968c760
commit 1cc5fdb50d
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ def gettext_oeconf(d):
return ""
QT_MODULE = "qtwebengine"
QT_MODULE_BRANCH_CHROMIUM = "122-based"
QT_MODULE_BRANCH_CHROMIUM = "126-based"
FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
@ -36,6 +36,5 @@ SRC_URI += " \
SRC_URI += " \
file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
file://chromium/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch;patchdir=src/3rdparty \
file://chromium/0003-Do-not-build-webnn-with-xnnpack.patch;patchdir=src/3rdparty \
"
SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"

34
recipes-qt/qt6/qtwebengine/chromium/0003-Do-not-build-webnn-with-xnnpack.patch
View File

@ -1,34 +0,0 @@
From e7f11f7135104d1b05fb26637502ec3d19e4c2cd Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 14 Aug 2024 13:40:31 +0200
Subject: [PATCH] Do not build webnn with xnnpack for arm64
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Change-Id: Ib23b6da98eddc8319fa79e8c1365b4e67d21086d
---
.../third_party/blink/renderer/modules/ml/webnn/features.gni | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni b/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni
index 941740db3e3..50e139dc1af 100644
--- a/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni
+++ b/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni
@@ -3,12 +3,13 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
+import("//build/config/features.gni")
declare_args() {
# This enables building WebNN with XNNPACK. Currently only available for
# Windows, macOS and Linux on x64, x86 and arm64.
build_webnn_with_xnnpack = (is_linux || is_win || is_mac) &&
(current_cpu == "x64" || current_cpu == "x86" ||
- (current_cpu == "arm64" && !is_win))
+ (current_cpu == "arm64" && !is_win && !is_qtwebengine))
# This build flag enables WebNN to access hardware acceleration using TFLite
# via the ModelLoader mojo interface.
--
2.43.2