mirror of
https://git.yoctoproject.org/poky
synced 2026-05-05 20:27:58 +02:00
qemu: add a patch to avoid a missing definition error
| In file included from /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/include/ui/egl-context.h:5, | from /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/ui/egl-context.c:3: | /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/include/ui/egl-helpers.h:46:55: error: unknown type name 'Window'; did you mean 'minor'? | EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); | ^~~~~~ | minor (From OE-Core rev: 01324f5e741a106cdb4b2989379f71b0b727a224) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
8beb4ad997
commit
13d956813d
@@ -0,0 +1,65 @@
|
||||
From eb1a215a4f86dde4493c3e22ad9f6d698850915e Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 20 Dec 2018 18:06:29 +0100
|
||||
Subject: [PATCH] egl-helpers.h: do not depend on X11 Window type, use
|
||||
EGLNativeWindowType
|
||||
|
||||
It was assumed that mesa provides the necessary X11 includes,
|
||||
but it is not always the case, as it can be configured without x11 support.
|
||||
|
||||
Upstream-Status: Submitted [http://lists.nongnu.org/archive/html/qemu-devel/2019-01/msg03706.html]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
include/ui/egl-helpers.h | 2 +-
|
||||
ui/egl-helpers.c | 4 ++--
|
||||
ui/gtk-egl.c | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
|
||||
index 9db7293b..3fc656a7 100644
|
||||
--- a/include/ui/egl-helpers.h
|
||||
+++ b/include/ui/egl-helpers.h
|
||||
@@ -43,7 +43,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf);
|
||||
|
||||
#endif
|
||||
|
||||
-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win);
|
||||
+EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win);
|
||||
|
||||
int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode);
|
||||
int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode);
|
||||
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
|
||||
index 4f475142..5e115b3f 100644
|
||||
--- a/ui/egl-helpers.c
|
||||
+++ b/ui/egl-helpers.c
|
||||
@@ -273,14 +273,14 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf)
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win)
|
||||
+EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win)
|
||||
{
|
||||
EGLSurface esurface;
|
||||
EGLBoolean b;
|
||||
|
||||
esurface = eglCreateWindowSurface(qemu_egl_display,
|
||||
qemu_egl_config,
|
||||
- (EGLNativeWindowType)win, NULL);
|
||||
+ win, NULL);
|
||||
if (esurface == EGL_NO_SURFACE) {
|
||||
error_report("egl: eglCreateWindowSurface failed");
|
||||
return NULL;
|
||||
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
|
||||
index 5420c236..1f941162 100644
|
||||
--- a/ui/gtk-egl.c
|
||||
+++ b/ui/gtk-egl.c
|
||||
@@ -54,7 +54,7 @@ void gd_egl_init(VirtualConsole *vc)
|
||||
}
|
||||
|
||||
vc->gfx.ectx = qemu_egl_init_ctx();
|
||||
- vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, x11_window);
|
||||
+ vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, (EGLNativeWindowType)x11_window);
|
||||
|
||||
assert(vc->gfx.esurface);
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
From 091a16100a7e1e9e6493663392c5ba2884b99723 Mon Sep 17 00:00:00 2001
|
||||
From d3e0b8dac7c2eb20d7fcff747bc98b981f4398ef Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Tue, 12 Mar 2013 09:54:06 +0800
|
||||
Subject: [PATCH] fix libcap header issue on some distro
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3eeeaa45dd12c9f3942cfc8647a08c93fffe19ea Mon Sep 17 00:00:00 2001
|
||||
From 861c522df7791d7e93743d5641f3ef2a5a3c4632 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
|
||||
Date: Wed, 12 Aug 2015 15:11:30 -0500
|
||||
Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails.
|
||||
|
||||
@@ -21,6 +21,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
|
||||
file://0009-apic-fixup-fallthrough-to-PIC.patch \
|
||||
file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
|
||||
file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \
|
||||
file://0001-Add-a-missing-X11-include.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user