diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-08-16 13:32:51 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2023-08-17 06:31:38 +0000 |
| commit | 9ef6d50fa2267201fcb7270f22bf1b90f8a5501f (patch) | |
| tree | 2fc49a13b238c23e8893c1c84ffe46171ff5eb19 | |
| parent | 65e052b18756d3b016c8300f3ac8ee5ed800e4da (diff) | |
qtwebengine: fix build without DRIv6.6.0-beta3
Task-number: QTBUG-116152
Change-Id: Idfdf639edf3dd09928f865dafd3f73ffcef1fa7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | recipes-qt/qt6/qtwebengine.inc | 1 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch | 33 |
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 23594d2..83414f9 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -36,6 +36,7 @@ SRC_URI += " \ 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-Avoid-using-libdrm.patch;patchdir=src/3rdparty \ " SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium" diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch new file mode 100644 index 0000000..8f933b4 --- /dev/null +++ b/recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch @@ -0,0 +1,33 @@ +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" ] + } |