diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-09-18 08:03:49 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2023-09-18 08:32:18 +0300 |
| commit | 5695e5a52ea496a2a65c6abc6715e62086aab514 (patch) | |
| tree | e8a22648ff42a3260b3750a1ca21af1760ac4233 | |
| parent | afe07957a5bb4a2ba116416f2370615324d1e53a (diff) | |
Revert "qtwebengine: fix build without DRI"
This reverts commit 9ef6d50fa2267201fcb7270f22bf1b90f8a5501f.
Patch was merged upstream.
Pick-to: dev
Change-Id: I967fe401fe91fdf4776b3a9646c5db98bd6b0f3b
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, 0 insertions, 34 deletions
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 4cb7dc5..caca4d9 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -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" diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch deleted file mode 100644 index 8f933b4..0000000 --- a/recipes-qt/qt6/qtwebengine/chromium/0003-Avoid-using-libdrm.patch +++ /dev/null @@ -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" ] - } |