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

Revert "qtwebengine: fix build without DRI"

Browse Source 
This reverts commit 9ef6d50fa2.
Patch was merged upstream.

Change-Id: I967fe401fe91fdf4776b3a9646c5db98bd6b0f3b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 5695e5a52e)
This commit is contained in:
Samuli Piippo 2023-09-18 08:03:49 +03:00
parent 1a9717d38b
commit 4ffdbd1dd6
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@ SRC_URI += " \
file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
file://chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch;patchdir=src/3rdparty \
file://chromium/0003-Avoid-using-libdrm.patch;patchdir=src/3rdparty \
"
SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"

33
recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch
View File

@ -1,33 +0,0 @@
From 77583a82ac534ed646ea7eb9156a681a4a44adbc Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 16 Aug 2023 13:25:36 +0000
Subject: [PATCH] Avoid using libdrm
Fixes: QTBUG-116152
Change-Id: Iac97f11ea0d39f16b60c3ebec1de35db23181b1a
Upstream-Status: Submitted
---
chromium/media/gpu/sandbox/BUILD.gn | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chromium/media/gpu/sandbox/BUILD.gn b/chromium/media/gpu/sandbox/BUILD.gn
index cfcb7fa80ef..13d6b310d50 100644
--- a/chromium/media/gpu/sandbox/BUILD.gn
+++ b/chromium/media/gpu/sandbox/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/chromeos/ui_mode.gni")
import("//media/gpu/args.gni")
+import("//build/config/features.gni")
source_set("sandbox") {
sources = []
@@ -31,7 +32,7 @@ source_set("sandbox") {
deps += [ "//media/gpu/v4l2" ]
}
if (current_cpu != "s390x" && current_cpu != "ppc64" && is_linux &&
- !is_castos) {
+ !is_castos && !is_qtwebengine) {
# For DRI_DRIVER_DIR.
configs += [ "//build/config/linux/dri" ]
}