summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-20 11:20:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-20 16:53:15 +0100
commit0b0db813a5cd549d4c82a27c440e268845c18cc5 (patch)
tree4bc5f1a2bb512fe44f2cc5bb1f40e31ad1044035 /meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch
parent91ece5d5668ee1adb5c5e3d757426a0d5187bd84 (diff)
downloadpoky-0b0db813a5cd549d4c82a27c440e268845c18cc5.tar.gz
qemu-0.15: Drop GL passthrough support
These patches are a maintenance nightmare and impacting our abaility to keep up to date with qemu. They are also a source of various bugs. Remove them until someone is willing to step up and maintain them, or upstream gains GL support. (From OE-Core rev: e9a6df98458d9147227659d3888eff01589f2f76) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch
deleted file mode 100644
index e73bb7bfe9..0000000000
--- a/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -u -r qemu-0.14.0/Makefile.target qemu-0.14.0-fixed/Makefile.target
4--- qemu-0.14.0/Makefile.target 2011-04-26 21:22:17.627637741 -0700
5+++ qemu-0.14.0-fixed/Makefile.target 2011-04-26 21:23:02.767637747 -0700
6@@ -82,8 +82,10 @@
7 libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
8 libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
9 else
10+ifdef CONFIG_SDL
11 libobj-$(TARGET_I386) += dummygl.o
12 libobj-$(TARGET_X86_64) += dummygl.o
13+endif
14 endif #CONFIG_LINUX_USER
15 libobj-$(TARGET_ARM) += dummygl.o
16 libobj-$(TARGET_MIPS) += dummygl.o
17Only in qemu-0.14.0-fixed: config.log
18diff -u -r qemu-0.14.0/target-i386/helper.h qemu-0.14.0-fixed/target-i386/helper.h
19--- qemu-0.14.0/target-i386/helper.h 2011-04-26 21:22:11.418637742 -0700
20+++ qemu-0.14.0-fixed/target-i386/helper.h 2011-04-26 21:23:02.539637747 -0700
21@@ -217,6 +217,9 @@
22 DEF_HELPER_2(rcrq, tl, tl, tl)
23 #endif
24
25+#ifdef CONFIG_SDL
26 DEF_HELPER_0(opengl, void)
27+#endif
28+
29
30 #include "def-helper.h"
31diff -u -r qemu-0.14.0/target-i386/translate.c qemu-0.14.0-fixed/target-i386/translate.c
32--- qemu-0.14.0/target-i386/translate.c 2011-04-26 21:22:21.600637743 -0700
33+++ qemu-0.14.0-fixed/target-i386/translate.c 2011-04-26 21:23:02.538637747 -0700
34@@ -2659,7 +2659,7 @@
35 static void gen_interrupt(DisasContext *s, int intno,
36 target_ulong cur_eip, target_ulong next_eip)
37 {
38-#if !defined(CONFIG_USER_ONLY)
39+#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_SDL)
40 if (enable_gl && intno == 0x99) {
41 gen_helper_opengl();
42 return;
43