summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/qemu/files/init-info.patch
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-10 10:08:13 +0200
committerSaul Wold <sgw@linux.intel.com>2012-12-11 20:27:26 -0800
commit7622c4f6c050f26f252066a0fcaacdbf340dcefa (patch)
treefff0958e0ea5f68f440ea0977a4d16a85d08066f /meta/recipes-devtools/qemu/files/init-info.patch
parentb41e55a7ee226a0ae4efdd633cab94e1cc846525 (diff)
downloadopenembedded-core-7622c4f6c050f26f252066a0fcaacdbf340dcefa.tar.gz
openembedded-core-7622c4f6c050f26f252066a0fcaacdbf340dcefa.tar.bz2
openembedded-core-7622c4f6c050f26f252066a0fcaacdbf340dcefa.zip
qemu: upgrade to 1.3.0
remove-hardcoded-libexec.patch: removed - included in the new version qemu-vmware-vga-depth.patch: removed - doesn't apply anymore - the problem addressed by the patch is fixed by reverting commit 1f202568e0553b416483e5993f1bde219c22cf72 Revert-vmware_vga-Add-back-some-info-in-local-state-.patch: - VMware VGA requires that the depth presented to the guest to be the same as the Display Surface depth in order to do not corrupt the display - do not cache the DS depth (the depth might change) - revert commit 1f202568 - QEMU now uses pixman (DEPENDS += "pixman") - rearrange the recipe in order to mimic the bitbake flow - update both variants (.tar.bz2, git) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/qemu/files/init-info.patch')
-rw-r--r--meta/recipes-devtools/qemu/files/init-info.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/files/init-info.patch b/meta/recipes-devtools/qemu/files/init-info.patch
new file mode 100644
index 0000000000..2250444a2b
--- /dev/null
+++ b/meta/recipes-devtools/qemu/files/init-info.patch
@@ -0,0 +1,18 @@
+# This is a workaround to the crashes seen on Ubuntu. Setting info to zero
+# makes info.info.x11.display zero and avoids the calls to
+# opengl_exec_set_parent_window, one of which is crashing.
+
+Upstream-Status: Pending
+
+Index: qemu-0.14.0/ui/sdl.c
+===================================================================
+--- qemu-0.14.0.orig/ui/sdl.c
++++ qemu-0.14.0/ui/sdl.c
+@@ -863,6 +863,7 @@ void sdl_display_init(DisplayState *ds,
+ vi = SDL_GetVideoInfo();
+ host_format = *(vi->vfmt);
+
++ bzero(&info, sizeof(info));
+ SDL_GetWMInfo(&info);
+ if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display)
+ opengl_exec_set_parent_window(info.info.x11.display,