summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch65
-rw-r--r--meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu_3.1.0.bb1
4 files changed, 68 insertions, 2 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 @@
1From eb1a215a4f86dde4493c3e22ad9f6d698850915e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 20 Dec 2018 18:06:29 +0100
4Subject: [PATCH] egl-helpers.h: do not depend on X11 Window type, use
5 EGLNativeWindowType
6
7It was assumed that mesa provides the necessary X11 includes,
8but it is not always the case, as it can be configured without x11 support.
9
10Upstream-Status: Submitted [http://lists.nongnu.org/archive/html/qemu-devel/2019-01/msg03706.html]
11Signed-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
19diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
20index 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);
32diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
33index 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;
53diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
54index 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 }
diff --git a/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch
index 690d2717f1..9cbe838811 100644
--- a/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch
+++ b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch
@@ -1,4 +1,4 @@
1From 091a16100a7e1e9e6493663392c5ba2884b99723 Mon Sep 17 00:00:00 2001 1From d3e0b8dac7c2eb20d7fcff747bc98b981f4398ef Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 12 Mar 2013 09:54:06 +0800 3Date: Tue, 12 Mar 2013 09:54:06 +0800
4Subject: [PATCH] fix libcap header issue on some distro 4Subject: [PATCH] fix libcap header issue on some distro
diff --git a/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
index 2232cb80e2..27e508c5a3 100644
--- a/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
+++ b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
@@ -1,4 +1,4 @@
1From 3eeeaa45dd12c9f3942cfc8647a08c93fffe19ea Mon Sep 17 00:00:00 2001 1From 861c522df7791d7e93743d5641f3ef2a5a3c4632 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> 2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Wed, 12 Aug 2015 15:11:30 -0500 3Date: Wed, 12 Aug 2015 15:11:30 -0500
4Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails. 4Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails.
diff --git a/meta/recipes-devtools/qemu/qemu_3.1.0.bb b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
index 67cebcc830..cd7cd67a3f 100644
--- a/meta/recipes-devtools/qemu/qemu_3.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
21 file://0009-apic-fixup-fallthrough-to-PIC.patch \ 21 file://0009-apic-fixup-fallthrough-to-PIC.patch \
22 file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ 22 file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
23 file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ 23 file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \
24 file://0001-Add-a-missing-X11-include.patch \
24 " 25 "
25UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 26UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
26 27