Christophe Marin
2024-10-13 18:11:04 +00:00
committed by Git OBS Bridge
parent fa678e4b0a
commit f671112101
3 changed files with 26 additions and 0 deletions

View File

@@ -0,0 +1,19 @@
Don't use xnnpack on ARM with QtWebEngine 6.8.0
Bug ref: https://bugreports.qt.io/browse/QTBUG-129985
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index fe4f2c3f1..729d4d3e9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -544,6 +544,10 @@ foreach(arch ${archs})
)
endif()
endif()
+ if(cpu MATCHES "arm.*")
+ # https://bugreports.qt.io/browse/QTBUG-129985
+ list(APPEND gnArgArg build_webnn_with_xnnpack=false)
+ endif()
unset(cpu)
endif()

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Oct 13 16:56:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add patch to avoid a build failure on ARM (QTBUG-129985):
* QtWebEngine_6.8_skip_xnnpack.patch
-------------------------------------------------------------------
Tue Oct 8 09:29:57 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@@ -54,6 +54,7 @@ Source99: qt6-webengine-rpmlintrc
# Patches 0-100 are upstream patches #
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
Patch100: rtc-dont-use-h264.patch
Patch101: QtWebEngine_6.8_skip_xnnpack.patch
#
# Chromium/blink don't support PowerPC and zSystems and build fails on
# 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143)