diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch b/meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch new file mode 100644 index 0000000000..192936e1e7 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From eb1a215a4f86dde4493c3e22ad9f6d698850915e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 20 Dec 2018 18:06:29 +0100 | ||
4 | Subject: [PATCH] egl-helpers.h: do not depend on X11 Window type, use | ||
5 | EGLNativeWindowType | ||
6 | |||
7 | It was assumed that mesa provides the necessary X11 includes, | ||
8 | but it is not always the case, as it can be configured without x11 support. | ||
9 | |||
10 | Upstream-Status: Submitted [http://lists.nongnu.org/archive/html/qemu-devel/2019-01/msg03706.html] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | |||
13 | --- | ||
14 | include/ui/egl-helpers.h | 2 +- | ||
15 | ui/egl-helpers.c | 4 ++-- | ||
16 | ui/gtk-egl.c | 2 +- | ||
17 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
18 | |||
19 | diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h | ||
20 | index 9db7293b..3fc656a7 100644 | ||
21 | --- a/include/ui/egl-helpers.h | ||
22 | +++ b/include/ui/egl-helpers.h | ||
23 | @@ -43,7 +43,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); | ||
24 | |||
25 | #endif | ||
26 | |||
27 | -EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); | ||
28 | +EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win); | ||
29 | |||
30 | int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode); | ||
31 | int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode); | ||
32 | diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c | ||
33 | index 4f475142..5e115b3f 100644 | ||
34 | --- a/ui/egl-helpers.c | ||
35 | +++ b/ui/egl-helpers.c | ||
36 | @@ -273,14 +273,14 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf) | ||
37 | |||
38 | /* ---------------------------------------------------------------------- */ | ||
39 | |||
40 | -EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win) | ||
41 | +EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win) | ||
42 | { | ||
43 | EGLSurface esurface; | ||
44 | EGLBoolean b; | ||
45 | |||
46 | esurface = eglCreateWindowSurface(qemu_egl_display, | ||
47 | qemu_egl_config, | ||
48 | - (EGLNativeWindowType)win, NULL); | ||
49 | + win, NULL); | ||
50 | if (esurface == EGL_NO_SURFACE) { | ||
51 | error_report("egl: eglCreateWindowSurface failed"); | ||
52 | return NULL; | ||
53 | diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c | ||
54 | index 5420c236..1f941162 100644 | ||
55 | --- a/ui/gtk-egl.c | ||
56 | +++ b/ui/gtk-egl.c | ||
57 | @@ -54,7 +54,7 @@ void gd_egl_init(VirtualConsole *vc) | ||
58 | } | ||
59 | |||
60 | vc->gfx.ectx = qemu_egl_init_ctx(); | ||
61 | - vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, x11_window); | ||
62 | + vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, (EGLNativeWindowType)x11_window); | ||
63 | |||
64 | assert(vc->gfx.esurface); | ||
65 | } | ||