t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-17 04:31:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtwayland: Backport fix for newer mesa

Browse Source 
The qtwayland fails to build without this patch with newer Mesa 20.0.y,
add the backport to permit the build to pass.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Marek Vasut
2020-04-06 21:59:21 +02:00
committed by Martin Jansa
parent b6767f3b20
commit 852e279a45
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
recipes-qt/qt5/qtwayland/0002-Fix-compilation-of-linuxdmabuf-compositor-plugin.patch Normal file
View File

@@ -0,0 +1,32 @@
From 7514d07ef6ccccde9cbfd466113943098591ff03 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 8 Nov 2019 13:58:04 +0100
Subject: [PATCH] Fix compilation of linuxdmabuf compositor plugin
Mesa's eglext.h no longer includes eglmesaext.h, so copy over the typedefs we need.
Fixes: QTBUG-79709
Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0
Upstream-Status: Backport [c2105d8b7e16cc934b886537968228f6300bf4bc]
---
.../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
index 2abc2ce6..f9188588 100644
--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
@@ -68,6 +68,10 @@
#define DRM_FORMAT_MOD_INVALID fourcc_mod_code(NONE, DRM_FORMAT_RESERVED)
#endif
+// Copied from eglmesaext.h
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+
QT_BEGIN_NAMESPACE
class QWaylandCompositor;
--
2.24.0

5
recipes-qt/qt5/qtwayland_git.bb
View File

@@ -13,7 +13,10 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
SRC_URI += "file://0001-tst_seatv4-Include-array.patch"
SRC_URI += " \
file://0001-tst_seatv4-Include-array.patch \
file://0002-Fix-compilation-of-linuxdmabuf-compositor-plugin.patch \
"
PACKAGECONFIG ?= " \
wayland-client \