summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc3
-rw-r--r--meta/packages/qemu/qemu-git/06_exit_segfault.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/11_signal_sigaction.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/22_net_tuntap_stall.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/31_syscalls.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/52_ne2000_return.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/63_sparc_build.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/64_ppc_asm_constraints.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/66_tls_ld.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/91-oh-sdl-cursor.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/fix-dirent.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/no-strip.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/qemu-add-gl-host-code.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch)227
-rw-r--r--meta/packages/qemu/qemu-git/qemu-amd64-32b-mapping-0.9.0.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch)0
-rw-r--r--meta/packages/qemu/qemu-git/series (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/series)0
-rw-r--r--meta/packages/qemu/qemu-git/workaround_bad_futex_headers.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch)0
-rw-r--r--meta/packages/qemu/qemu-native_git.bb (renamed from meta/packages/qemu/qemu-native_svn.bb)2
-rw-r--r--meta/packages/qemu/qemu-sdk_git.bb (renamed from meta/packages/qemu/qemu-sdk_svn.bb)2
-rw-r--r--meta/packages/qemu/qemu_git.bb (renamed from meta/packages/qemu/qemu_svn.bb)13
19 files changed, 82 insertions, 165 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index a1f0029673..63895234f7 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -84,7 +84,8 @@ SRCREV_pn-oprofileui ?= "194"
84SRCREV_pn-libowl-av = "398" 84SRCREV_pn-libowl-av = "398"
85SRCREV_pn-owl-video = "394" 85SRCREV_pn-owl-video = "394"
86SRCREV_pn-psplash ?= "420" 86SRCREV_pn-psplash ?= "420"
87QEMUSRCREV = "6477" 87#QEMUSRCREV = "6477"
88QEMUSRCREV = "9e3a7df77c6c456ff58ab9931cb86e3d5983404d"
88SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" 89SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
89SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" 90SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
90SRCREV_pn-qemu ?= "${QEMUSRCREV}" 91SRCREV_pn-qemu ?= "${QEMUSRCREV}"
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch b/meta/packages/qemu/qemu-git/06_exit_segfault.patch
index 06123d0626..06123d0626 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch
+++ b/meta/packages/qemu/qemu-git/06_exit_segfault.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch b/meta/packages/qemu/qemu-git/11_signal_sigaction.patch
index 33c5e8b12d..33c5e8b12d 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch
+++ b/meta/packages/qemu/qemu-git/11_signal_sigaction.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch b/meta/packages/qemu/qemu-git/22_net_tuntap_stall.patch
index f2bfbc9102..f2bfbc9102 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch
+++ b/meta/packages/qemu/qemu-git/22_net_tuntap_stall.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch b/meta/packages/qemu/qemu-git/31_syscalls.patch
index df2aa84bb1..df2aa84bb1 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch
+++ b/meta/packages/qemu/qemu-git/31_syscalls.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch b/meta/packages/qemu/qemu-git/52_ne2000_return.patch
index e4ea33f2c6..e4ea33f2c6 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch
+++ b/meta/packages/qemu/qemu-git/52_ne2000_return.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch b/meta/packages/qemu/qemu-git/63_sparc_build.patch
index 37b38f641b..37b38f641b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch
+++ b/meta/packages/qemu/qemu-git/63_sparc_build.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch b/meta/packages/qemu/qemu-git/64_ppc_asm_constraints.patch
index e4858b79d7..e4858b79d7 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch
+++ b/meta/packages/qemu/qemu-git/64_ppc_asm_constraints.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch b/meta/packages/qemu/qemu-git/66_tls_ld.patch
index 54e02eff8b..54e02eff8b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch
+++ b/meta/packages/qemu/qemu-git/66_tls_ld.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch b/meta/packages/qemu/qemu-git/91-oh-sdl-cursor.patch
index 0d60c1c306..0d60c1c306 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch
+++ b/meta/packages/qemu/qemu-git/91-oh-sdl-cursor.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch b/meta/packages/qemu/qemu-git/fix-dirent.patch
index 575dbfa0c9..575dbfa0c9 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch
+++ b/meta/packages/qemu/qemu-git/fix-dirent.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch b/meta/packages/qemu/qemu-git/no-strip.patch
index fc69b37e16..fc69b37e16 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch
+++ b/meta/packages/qemu/qemu-git/no-strip.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch b/meta/packages/qemu/qemu-git/qemu-add-gl-host-code.patch
index bffd8a62db..25ee379251 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch
+++ b/meta/packages/qemu/qemu-git/qemu-add-gl-host-code.patch
@@ -1,7 +1,7 @@
1Index: trunk/Makefile.target 1Index: git/Makefile.target
2=================================================================== 2===================================================================
3--- trunk.orig/Makefile.target 2009-01-30 11:37:38.000000000 +0000 3--- git.orig/Makefile.target 2009-05-23 11:22:16.000000000 +0100
4+++ trunk/Makefile.target 2009-01-30 11:46:55.000000000 +0000 4+++ git/Makefile.target 2009-05-23 11:59:35.000000000 +0100
5@@ -153,6 +153,12 @@ 5@@ -153,6 +153,12 @@
6 CPPFLAGS+=-I$(SRC_PATH)/fpu 6 CPPFLAGS+=-I$(SRC_PATH)/fpu
7 LIBOBJS+= op_helper.o helper.o 7 LIBOBJS+= op_helper.o helper.o
@@ -37,16 +37,7 @@ Index: trunk/Makefile.target
37 ######################################################### 37 #########################################################
38 # Linux user emulator target 38 # Linux user emulator target
39 39
40@@ -580,7 +601,7 @@ 40@@ -724,7 +745,7 @@
41 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
42 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
43 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
44-CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
45+CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE -DTARGET_OPENGL_OK
46 endif
47 ifeq ($(TARGET_BASE_ARCH), ppc)
48 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
49@@ -717,7 +738,7 @@
50 main.o: CFLAGS+=-p 41 main.o: CFLAGS+=-p
51 endif 42 endif
52 43
@@ -55,10 +46,10 @@ Index: trunk/Makefile.target
55 46
56 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a 47 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
57 $(LINK) 48 $(LINK)
58Index: trunk/hw/vmware_vga.c 49Index: git/hw/vmware_vga.c
59=================================================================== 50===================================================================
60--- trunk.orig/hw/vmware_vga.c 2009-01-30 11:37:36.000000000 +0000 51--- git.orig/hw/vmware_vga.c 2009-05-23 11:22:16.000000000 +0100
61+++ trunk/hw/vmware_vga.c 2009-01-30 11:39:42.000000000 +0000 52+++ git/hw/vmware_vga.c 2009-05-23 11:22:17.000000000 +0100
62@@ -484,6 +484,8 @@ 53@@ -484,6 +484,8 @@
63 54
64 #define CMD(f) le32_to_cpu(s->cmd->f) 55 #define CMD(f) le32_to_cpu(s->cmd->f)
@@ -115,10 +106,10 @@ Index: trunk/hw/vmware_vga.c
115 break; 106 break;
116 } 107 }
117 108
118Index: trunk/kqemu.c 109Index: git/kqemu.c
119=================================================================== 110===================================================================
120--- trunk.orig/kqemu.c 2009-01-21 11:45:11.000000000 +0000 111--- git.orig/kqemu.c 2009-05-23 11:22:16.000000000 +0100
121+++ trunk/kqemu.c 2009-01-30 11:39:42.000000000 +0000 112+++ git/kqemu.c 2009-05-23 11:22:17.000000000 +0100
122@@ -93,6 +93,8 @@ 113@@ -93,6 +93,8 @@
123 int qpi_io_memory; 114 int qpi_io_memory;
124 uint32_t kqemu_comm_base; /* physical address of the QPI communication page */ 115 uint32_t kqemu_comm_base; /* physical address of the QPI communication page */
@@ -151,86 +142,10 @@ Index: trunk/kqemu.c
151 LOG_INT("kqemu: kqemu_cpu_exec: ret=0x%x\n", ret); 142 LOG_INT("kqemu: kqemu_cpu_exec: ret=0x%x\n", ret);
152 if (ret == KQEMU_RET_SYSCALL) { 143 if (ret == KQEMU_RET_SYSCALL) {
153 /* syscall instruction */ 144 /* syscall instruction */
154Index: trunk/sdl.c 145Index: git/target-i386/beginend_funcs.sh
155===================================================================
156--- trunk.orig/sdl.c 2009-01-30 11:39:42.000000000 +0000
157+++ trunk/sdl.c 2009-01-30 11:45:37.000000000 +0000
158@@ -26,6 +26,7 @@
159 #include "sysemu.h"
160
161 #include <SDL.h>
162+#include <SDL_syswm.h>
163
164 #ifndef _WIN32
165 #include <signal.h>
166@@ -52,6 +53,8 @@
167 static int guest_x, guest_y;
168 static SDL_Cursor *guest_sprite = 0;
169
170+extern void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window);
171+
172 static void sdl_update(DisplayState *ds, int x, int y, int w, int h)
173 {
174 SDL_Rect rec;
175@@ -83,6 +86,7 @@
176
177 static void sdl_resize(DisplayState *ds)
178 {
179+ SDL_SysWMinfo info;
180 int flags;
181
182 // printf("resizing to %d %d\n", w, h);
183@@ -93,6 +97,15 @@
184 if (gui_noframe)
185 flags |= SDL_NOFRAME;
186
187+ if (ds_get_data(ds) != NULL) {
188+ SDL_VERSION(&info.version);
189+ SDL_GetWMInfo(&info);
190+ if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display)
191+ opengl_exec_set_parent_window(info.info.x11.display,
192+ RootWindow(info.info.x11.display,
193+ DefaultScreen(info.info.x11.display)));
194+ }
195+
196 width = ds_get_width(ds);
197 height = ds_get_height(ds);
198 real_screen = SDL_SetVideoMode(width, height, 0, flags);
199@@ -101,6 +114,11 @@
200 exit(1);
201 }
202
203+ SDL_VERSION(&info.version);
204+ SDL_GetWMInfo(&info);
205+
206+ opengl_exec_set_parent_window(info.info.x11.display, info.info.x11.window);
207+
208 sdl_setdata(ds);
209 }
210
211@@ -574,6 +592,10 @@
212 line = image;
213 for (x = 0; x < width; x ++, dst ++) {
214 switch (bpp) {
215+ case 32:
216+ src = *(line ++); src |= *(line ++);
217+ src = *(line ++); src |= *(line ++);
218+ break;
219 case 24:
220 src = *(line ++); src |= *(line ++); src |= *(line ++);
221 break;
222@@ -647,6 +669,7 @@
223 dcl->dpy_fill = sdl_fill;
224 ds->mouse_set = sdl_mouse_warp;
225 ds->cursor_define = sdl_mouse_define;
226+ ds->surface->data = NULL;
227 register_displaychangelistener(ds, dcl);
228
229 sdl_update_caption();
230Index: trunk/target-i386/beginend_funcs.sh
231=================================================================== 146===================================================================
232--- /dev/null 1970-01-01 00:00:00.000000000 +0000 147--- /dev/null 1970-01-01 00:00:00.000000000 +0000
233+++ trunk/target-i386/beginend_funcs.sh 2009-01-30 11:39:42.000000000 +0000 148+++ git/target-i386/beginend_funcs.sh 2009-05-23 11:22:17.000000000 +0100
234@@ -0,0 +1,23 @@ 149@@ -0,0 +1,23 @@
235+#! /bin/sh 150+#! /bin/sh
236+# Copyright 2008 (C) Intel Corporation 151+# Copyright 2008 (C) Intel Corporation
@@ -255,10 +170,10 @@ Index: trunk/target-i386/beginend_funcs.sh
255+echo -e MAGIC_MACRO\(glCallList\)\\n 170+echo -e MAGIC_MACRO\(glCallList\)\\n
256+echo -e MAGIC_MACRO\(glCallLists\)\\n 171+echo -e MAGIC_MACRO\(glCallLists\)\\n
257+echo -e MAGIC_MACRO\(glEdgeFlag{,v}\)\\n 172+echo -e MAGIC_MACRO\(glEdgeFlag{,v}\)\\n
258Index: trunk/target-i386/ghash.c 173Index: git/target-i386/ghash.c
259=================================================================== 174===================================================================
260--- /dev/null 1970-01-01 00:00:00.000000000 +0000 175--- /dev/null 1970-01-01 00:00:00.000000000 +0000
261+++ trunk/target-i386/ghash.c 2009-01-30 11:39:42.000000000 +0000 176+++ git/target-i386/ghash.c 2009-05-23 11:22:17.000000000 +0100
262@@ -0,0 +1,347 @@ 177@@ -0,0 +1,347 @@
263+/* This is a modified and simplified version of original ghash.c */ 178+/* This is a modified and simplified version of original ghash.c */
264+ 179+
@@ -607,10 +522,10 @@ Index: trunk/target-i386/ghash.c
607+ hash_node = next; 522+ hash_node = next;
608+ } 523+ }
609+} 524+}
610Index: trunk/target-i386/ghash.h 525Index: git/target-i386/ghash.h
611=================================================================== 526===================================================================
612--- /dev/null 1970-01-01 00:00:00.000000000 +0000 527--- /dev/null 1970-01-01 00:00:00.000000000 +0000
613+++ trunk/target-i386/ghash.h 2009-01-30 11:39:42.000000000 +0000 528+++ git/target-i386/ghash.h 2009-05-23 11:22:17.000000000 +0100
614@@ -0,0 +1,59 @@ 529@@ -0,0 +1,59 @@
615+/* This is a modified and simplified version of original ghash.h */ 530+/* This is a modified and simplified version of original ghash.h */
616+ 531+
@@ -671,10 +586,10 @@ Index: trunk/target-i386/ghash.h
671+ 586+
672+#endif /* __SIMPLE_HASH_H__ */ 587+#endif /* __SIMPLE_HASH_H__ */
673+ 588+
674Index: trunk/target-i386/gl_func_perso.h 589Index: git/target-i386/gl_func_perso.h
675=================================================================== 590===================================================================
676--- /dev/null 1970-01-01 00:00:00.000000000 +0000 591--- /dev/null 1970-01-01 00:00:00.000000000 +0000
677+++ trunk/target-i386/gl_func_perso.h 2009-01-30 11:39:42.000000000 +0000 592+++ git/target-i386/gl_func_perso.h 2009-05-23 11:22:17.000000000 +0100
678@@ -0,0 +1,135 @@ 593@@ -0,0 +1,135 @@
679+/* 594+/*
680+ * Hand-implemented GL/GLX API 595+ * Hand-implemented GL/GLX API
@@ -811,10 +726,10 @@ Index: trunk/target-i386/gl_func_perso.h
811+MAGIC_MACRO(_glGetSelectBuffer_fake), 726+MAGIC_MACRO(_glGetSelectBuffer_fake),
812+MAGIC_MACRO(_glFeedbackBuffer_fake), 727+MAGIC_MACRO(_glFeedbackBuffer_fake),
813+MAGIC_MACRO(_glGetFeedbackBuffer_fake), 728+MAGIC_MACRO(_glGetFeedbackBuffer_fake),
814Index: trunk/target-i386/helper.h 729Index: git/target-i386/helper.h
815=================================================================== 730===================================================================
816--- trunk.orig/target-i386/helper.h 2009-01-05 11:10:06.000000000 +0000 731--- git.orig/target-i386/helper.h 2009-05-23 11:22:16.000000000 +0100
817+++ trunk/target-i386/helper.h 2009-01-30 11:39:42.000000000 +0000 732+++ git/target-i386/helper.h 2009-05-23 11:22:17.000000000 +0100
818@@ -214,4 +214,6 @@ 733@@ -214,4 +214,6 @@
819 DEF_HELPER_2(rcrq, tl, tl, tl) 734 DEF_HELPER_2(rcrq, tl, tl, tl)
820 #endif 735 #endif
@@ -822,10 +737,10 @@ Index: trunk/target-i386/helper.h
822+DEF_HELPER_0(opengl, void) 737+DEF_HELPER_0(opengl, void)
823+ 738+
824 #include "def-helper.h" 739 #include "def-helper.h"
825Index: trunk/target-i386/helper_opengl.c 740Index: git/target-i386/helper_opengl.c
826=================================================================== 741===================================================================
827--- /dev/null 1970-01-01 00:00:00.000000000 +0000 742--- /dev/null 1970-01-01 00:00:00.000000000 +0000
828+++ trunk/target-i386/helper_opengl.c 2009-01-30 11:39:42.000000000 +0000 743+++ git/target-i386/helper_opengl.c 2009-05-23 11:22:17.000000000 +0100
829@@ -0,0 +1,979 @@ 744@@ -0,0 +1,979 @@
830+/* 745+/*
831+ * Host-side implementation of GL/GLX API 746+ * Host-side implementation of GL/GLX API
@@ -1806,10 +1721,10 @@ Index: trunk/target-i386/helper_opengl.c
1806+ doing_opengl = 0; 1721+ doing_opengl = 0;
1807+} 1722+}
1808+#endif 1723+#endif
1809Index: trunk/target-i386/mesa_enums.c 1724Index: git/target-i386/mesa_enums.c
1810=================================================================== 1725===================================================================
1811--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1726--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1812+++ trunk/target-i386/mesa_enums.c 2009-01-30 11:39:42.000000000 +0000 1727+++ git/target-i386/mesa_enums.c 2009-05-23 11:22:17.000000000 +0100
1813@@ -0,0 +1,4890 @@ 1728@@ -0,0 +1,4890 @@
1814+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */ 1729+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */
1815+ 1730+
@@ -6701,10 +6616,10 @@ Index: trunk/target-i386/mesa_enums.c
6701+} 6616+}
6702+ 6617+
6703+ 6618+
6704Index: trunk/target-i386/mesa_get.c 6619Index: git/target-i386/mesa_get.c
6705=================================================================== 6620===================================================================
6706--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6621--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6707+++ trunk/target-i386/mesa_get.c 2009-01-30 11:39:42.000000000 +0000 6622+++ git/target-i386/mesa_get.c 2009-05-23 11:22:17.000000000 +0100
6708@@ -0,0 +1,5563 @@ 6623@@ -0,0 +1,5563 @@
6709+ 6624+
6710+/*** 6625+/***
@@ -12269,10 +12184,10 @@ Index: trunk/target-i386/mesa_get.c
12269+ params[i] = (GLdouble) values[i]; 12184+ params[i] = (GLdouble) values[i];
12270+} 12185+}
12271+ 12186+
12272Index: trunk/target-i386/mesa_gl.h 12187Index: git/target-i386/mesa_gl.h
12273=================================================================== 12188===================================================================
12274--- /dev/null 1970-01-01 00:00:00.000000000 +0000 12189--- /dev/null 1970-01-01 00:00:00.000000000 +0000
12275+++ trunk/target-i386/mesa_gl.h 2009-01-30 11:39:42.000000000 +0000 12190+++ git/target-i386/mesa_gl.h 2009-05-23 11:22:17.000000000 +0100
12276@@ -0,0 +1,2251 @@ 12191@@ -0,0 +1,2251 @@
12277+/* 12192+/*
12278+ * Mesa 3-D graphics library 12193+ * Mesa 3-D graphics library
@@ -14525,10 +14440,10 @@ Index: trunk/target-i386/mesa_gl.h
14525+#endif 14440+#endif
14526+ 14441+
14527+#endif /* __gl_h_ */ 14442+#endif /* __gl_h_ */
14528Index: trunk/target-i386/mesa_glext.h 14443Index: git/target-i386/mesa_glext.h
14529=================================================================== 14444===================================================================
14530--- /dev/null 1970-01-01 00:00:00.000000000 +0000 14445--- /dev/null 1970-01-01 00:00:00.000000000 +0000
14531+++ trunk/target-i386/mesa_glext.h 2009-01-30 11:39:43.000000000 +0000 14446+++ git/target-i386/mesa_glext.h 2009-05-23 11:22:17.000000000 +0100
14532@@ -0,0 +1,7279 @@ 14447@@ -0,0 +1,7279 @@
14533+#ifndef __glext_h_ 14448+#ifndef __glext_h_
14534+#define __glext_h_ 14449+#define __glext_h_
@@ -21809,10 +21724,10 @@ Index: trunk/target-i386/mesa_glext.h
21809+ 21724+
21810+/* ERO */ 21725+/* ERO */
21811+GLAPI void GLAPIENTRY fake_gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *data); 21726+GLAPI void GLAPIENTRY fake_gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *data);
21812Index: trunk/target-i386/mesa_glu.h 21727Index: git/target-i386/mesa_glu.h
21813=================================================================== 21728===================================================================
21814--- /dev/null 1970-01-01 00:00:00.000000000 +0000 21729--- /dev/null 1970-01-01 00:00:00.000000000 +0000
21815+++ trunk/target-i386/mesa_glu.h 2009-01-30 11:39:43.000000000 +0000 21730+++ git/target-i386/mesa_glu.h 2009-05-23 11:22:17.000000000 +0100
21816@@ -0,0 +1,354 @@ 21731@@ -0,0 +1,354 @@
21817+/* 21732+/*
21818+** License Applicability. Except to the extent portions of this file are 21733+** License Applicability. Except to the extent portions of this file are
@@ -22168,10 +22083,10 @@ Index: trunk/target-i386/mesa_glu.h
22168+#endif 22083+#endif
22169+ 22084+
22170+#endif /* __glu_h__ */ 22085+#endif /* __glu_h__ */
22171Index: trunk/target-i386/mesa_glx.h 22086Index: git/target-i386/mesa_glx.h
22172=================================================================== 22087===================================================================
22173--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22088--- /dev/null 1970-01-01 00:00:00.000000000 +0000
22174+++ trunk/target-i386/mesa_glx.h 2009-01-30 11:39:43.000000000 +0000 22089+++ git/target-i386/mesa_glx.h 2009-05-23 11:22:17.000000000 +0100
22175@@ -0,0 +1,510 @@ 22090@@ -0,0 +1,510 @@
22176+/* 22091+/*
22177+ * Mesa 3-D graphics library 22092+ * Mesa 3-D graphics library
@@ -22683,10 +22598,10 @@ Index: trunk/target-i386/mesa_glx.h
22683+#endif 22598+#endif
22684+ 22599+
22685+#endif 22600+#endif
22686Index: trunk/target-i386/mesa_glxext.h 22601Index: git/target-i386/mesa_glxext.h
22687=================================================================== 22602===================================================================
22688--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22603--- /dev/null 1970-01-01 00:00:00.000000000 +0000
22689+++ trunk/target-i386/mesa_glxext.h 2009-01-30 11:39:43.000000000 +0000 22604+++ git/target-i386/mesa_glxext.h 2009-05-23 11:22:17.000000000 +0100
22690@@ -0,0 +1,785 @@ 22605@@ -0,0 +1,785 @@
22691+#ifndef __glxext_h_ 22606+#ifndef __glxext_h_
22692+#define __glxext_h_ 22607+#define __glxext_h_
@@ -23473,10 +23388,10 @@ Index: trunk/target-i386/mesa_glxext.h
23473+#endif 23388+#endif
23474+ 23389+
23475+#endif 23390+#endif
23476Index: trunk/target-i386/mesa_mipmap.c 23391Index: git/target-i386/mesa_mipmap.c
23477=================================================================== 23392===================================================================
23478--- /dev/null 1970-01-01 00:00:00.000000000 +0000 23393--- /dev/null 1970-01-01 00:00:00.000000000 +0000
23479+++ trunk/target-i386/mesa_mipmap.c 2009-01-30 11:39:43.000000000 +0000 23394+++ git/target-i386/mesa_mipmap.c 2009-05-23 11:22:17.000000000 +0100
23480@@ -0,0 +1,824 @@ 23395@@ -0,0 +1,824 @@
23481+ 23396+
23482+/* 23397+/*
@@ -24302,10 +24217,10 @@ Index: trunk/target-i386/mesa_mipmap.c
24302+ 24217+
24303+ return retval; 24218+ return retval;
24304+} 24219+}
24305Index: trunk/target-i386/opengl_exec.c 24220Index: git/target-i386/opengl_exec.c
24306=================================================================== 24221===================================================================
24307--- /dev/null 1970-01-01 00:00:00.000000000 +0000 24222--- /dev/null 1970-01-01 00:00:00.000000000 +0000
24308+++ trunk/target-i386/opengl_exec.c 2009-01-30 11:39:43.000000000 +0000 24223+++ git/target-i386/opengl_exec.c 2009-05-23 11:22:17.000000000 +0100
24309@@ -0,0 +1,3931 @@ 24224@@ -0,0 +1,3931 @@
24310+/* 24225+/*
24311+ * Host-side implementation of GL/GLX API 24226+ * Host-side implementation of GL/GLX API
@@ -28238,10 +28153,10 @@ Index: trunk/target-i386/opengl_exec.c
28238+ 28153+
28239+ return ret_int; 28154+ return ret_int;
28240+} 28155+}
28241Index: trunk/target-i386/opengl_func.h 28156Index: git/target-i386/opengl_func.h
28242=================================================================== 28157===================================================================
28243--- /dev/null 1970-01-01 00:00:00.000000000 +0000 28158--- /dev/null 1970-01-01 00:00:00.000000000 +0000
28244+++ trunk/target-i386/opengl_func.h 2009-01-30 11:39:43.000000000 +0000 28159+++ git/target-i386/opengl_func.h 2009-05-23 11:22:17.000000000 +0100
28245@@ -0,0 +1,1108 @@ 28160@@ -0,0 +1,1108 @@
28246+/* 28161+/*
28247+ * Main header for both host and guest sides 28162+ * Main header for both host and guest sides
@@ -29351,10 +29266,10 @@ Index: trunk/target-i386/opengl_func.h
29351+#error Unsupported ABI 29266+#error Unsupported ABI
29352+#endif 29267+#endif
29353+#endif 29268+#endif
29354Index: trunk/target-i386/opengl_player.c 29269Index: git/target-i386/opengl_player.c
29355=================================================================== 29270===================================================================
29356--- /dev/null 1970-01-01 00:00:00.000000000 +0000 29271--- /dev/null 1970-01-01 00:00:00.000000000 +0000
29357+++ trunk/target-i386/opengl_player.c 2009-01-30 11:39:43.000000000 +0000 29272+++ git/target-i386/opengl_player.c 2009-05-23 11:22:17.000000000 +0100
29358@@ -0,0 +1,1461 @@ 29273@@ -0,0 +1,1461 @@
29359+/* 29274+/*
29360+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server 29275+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server
@@ -30817,10 +30732,10 @@ Index: trunk/target-i386/opengl_player.c
30817+ } 30732+ }
30818+ return 0; 30733+ return 0;
30819+} 30734+}
30820Index: trunk/target-i386/opengl_server.c 30735Index: git/target-i386/opengl_server.c
30821=================================================================== 30736===================================================================
30822--- /dev/null 1970-01-01 00:00:00.000000000 +0000 30737--- /dev/null 1970-01-01 00:00:00.000000000 +0000
30823+++ trunk/target-i386/opengl_server.c 2009-01-30 11:39:43.000000000 +0000 30738+++ git/target-i386/opengl_server.c 2009-05-23 11:22:17.000000000 +0100
30824@@ -0,0 +1,826 @@ 30739@@ -0,0 +1,826 @@
30825+/* 30740+/*
30826+ * TCP/IP OpenGL server 30741+ * TCP/IP OpenGL server
@@ -31648,10 +31563,10 @@ Index: trunk/target-i386/opengl_server.c
31648+ 31563+
31649+ return 0; 31564+ return 0;
31650+} 31565+}
31651Index: trunk/target-i386/opengl_utils.h 31566Index: git/target-i386/opengl_utils.h
31652=================================================================== 31567===================================================================
31653--- /dev/null 1970-01-01 00:00:00.000000000 +0000 31568--- /dev/null 1970-01-01 00:00:00.000000000 +0000
31654+++ trunk/target-i386/opengl_utils.h 2009-01-30 11:39:43.000000000 +0000 31569+++ git/target-i386/opengl_utils.h 2009-05-23 11:22:17.000000000 +0100
31655@@ -0,0 +1,453 @@ 31570@@ -0,0 +1,453 @@
31656+/* 31571+/*
31657+ * Functions used by host & client sides 31572+ * Functions used by host & client sides
@@ -32106,10 +32021,10 @@ Index: trunk/target-i386/opengl_utils.h
32106+} 32021+}
32107+ 32022+
32108+#endif 32023+#endif
32109Index: trunk/target-i386/parse_gl_h.c 32024Index: git/target-i386/parse_gl_h.c
32110=================================================================== 32025===================================================================
32111--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32026--- /dev/null 1970-01-01 00:00:00.000000000 +0000
32112+++ trunk/target-i386/parse_gl_h.c 2009-01-30 11:39:43.000000000 +0000 32027+++ git/target-i386/parse_gl_h.c 2009-05-23 11:22:17.000000000 +0100
32113@@ -0,0 +1,1496 @@ 32028@@ -0,0 +1,1496 @@
32114+/* 32029+/*
32115+ * Parse gl.h et glx.h to auto-generate source code 32030+ * Parse gl.h et glx.h to auto-generate source code
@@ -33607,10 +33522,10 @@ Index: trunk/target-i386/parse_gl_h.c
33607+ 33522+
33608+ return 0; 33523+ return 0;
33609+} 33524+}
33610Index: trunk/target-i386/parse_mesa_get_c.c 33525Index: git/target-i386/parse_mesa_get_c.c
33611=================================================================== 33526===================================================================
33612--- /dev/null 1970-01-01 00:00:00.000000000 +0000 33527--- /dev/null 1970-01-01 00:00:00.000000000 +0000
33613+++ trunk/target-i386/parse_mesa_get_c.c 2009-01-30 11:39:43.000000000 +0000 33528+++ git/target-i386/parse_mesa_get_c.c 2009-05-23 11:22:17.000000000 +0100
33614@@ -0,0 +1,225 @@ 33529@@ -0,0 +1,225 @@
33615+/* 33530+/*
33616+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h" 33531+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h"
@@ -33837,10 +33752,10 @@ Index: trunk/target-i386/parse_mesa_get_c.c
33837+ fclose(outf); 33752+ fclose(outf);
33838+ return 0; 33753+ return 0;
33839+} 33754+}
33840Index: trunk/target-i386/translate.c 33755Index: git/target-i386/translate.c
33841=================================================================== 33756===================================================================
33842--- trunk.orig/target-i386/translate.c 2009-01-21 11:45:03.000000000 +0000 33757--- git.orig/target-i386/translate.c 2009-05-23 11:22:16.000000000 +0100
33843+++ trunk/target-i386/translate.c 2009-01-30 11:39:43.000000000 +0000 33758+++ git/target-i386/translate.c 2009-05-23 11:22:17.000000000 +0100
33844@@ -2592,11 +2592,18 @@ 33759@@ -2592,11 +2592,18 @@
33845 s->is_jmp = 3; 33760 s->is_jmp = 3;
33846 } 33761 }
@@ -33860,35 +33775,35 @@ Index: trunk/target-i386/translate.c
33860 if (s->cc_op != CC_OP_DYNAMIC) 33775 if (s->cc_op != CC_OP_DYNAMIC)
33861 gen_op_set_cc_op(s->cc_op); 33776 gen_op_set_cc_op(s->cc_op);
33862 gen_jmp_im(cur_eip); 33777 gen_jmp_im(cur_eip);
33863Index: trunk/vl.c 33778Index: git/vl.c
33864=================================================================== 33779===================================================================
33865--- trunk.orig/vl.c 2009-01-30 11:37:38.000000000 +0000 33780--- git.orig/vl.c 2009-05-23 11:22:16.000000000 +0100
33866+++ trunk/vl.c 2009-01-30 11:44:27.000000000 +0000 33781+++ git/vl.c 2009-05-23 11:23:18.000000000 +0100
33867@@ -247,6 +247,7 @@ 33782@@ -253,6 +253,7 @@
33868 const char *file; 33783 #endif
33869 char opt[1024]; 33784 int nb_drives_opt;
33870 } drives_opt[MAX_DRIVES]; 33785 struct drive_opt drives_opt[MAX_DRIVES];
33871+extern int enable_gl; 33786+extern int enable_gl;
33872 33787
33873 static CPUState *cur_cpu; 33788 static CPUState *cur_cpu;
33874 static CPUState *next_cpu; 33789 static CPUState *next_cpu;
33875@@ -4144,6 +4145,7 @@ 33790@@ -4214,6 +4215,7 @@
33876 QEMU_OPTION_show_cursor, 33791 QEMU_OPTION_show_cursor,
33877 QEMU_OPTION_semihosting, 33792 QEMU_OPTION_semihosting,
33878 QEMU_OPTION_old_param, 33793 QEMU_OPTION_old_param,
33879+ QEMU_OPTION_enable_gl, 33794+ QEMU_OPTION_enable_gl,
33880 QEMU_OPTION_tb_size, 33795 QEMU_OPTION_tb_size,
33881 QEMU_OPTION_incoming, 33796 QEMU_OPTION_incoming,
33882 }; 33797 QEMU_OPTION_chroot,
33883@@ -4274,6 +4276,7 @@ 33798@@ -4345,6 +4347,7 @@
33884 { "old-param", 0, QEMU_OPTION_old_param }, 33799 { "old-param", 0, QEMU_OPTION_old_param },
33885 #endif 33800 #endif
33886 { "tb-size", HAS_ARG, QEMU_OPTION_tb_size }, 33801 { "tb-size", HAS_ARG, QEMU_OPTION_tb_size },
33887+ { "enable-gl", 0, QEMU_OPTION_enable_gl }, 33802+ { "enable-gl", 0, QEMU_OPTION_enable_gl },
33888 { "incoming", HAS_ARG, QEMU_OPTION_incoming }, 33803 { "incoming", HAS_ARG, QEMU_OPTION_incoming },
33889 { NULL }, 33804 { "chroot", HAS_ARG, QEMU_OPTION_chroot },
33890 }; 33805 { "runas", HAS_ARG, QEMU_OPTION_runas },
33891@@ -5219,6 +5222,11 @@ 33806@@ -5261,6 +5264,11 @@
33892 } 33807 }
33893 } 33808 }
33894 break; 33809 break;
@@ -33900,10 +33815,10 @@ Index: trunk/vl.c
33900 case QEMU_OPTION_tb_size: 33815 case QEMU_OPTION_tb_size:
33901 tb_size = strtol(optarg, NULL, 0); 33816 tb_size = strtol(optarg, NULL, 0);
33902 if (tb_size < 0) 33817 if (tb_size < 0)
33903Index: trunk/hw/opengl_dummy.c 33818Index: git/hw/opengl_dummy.c
33904=================================================================== 33819===================================================================
33905--- /dev/null 1970-01-01 00:00:00.000000000 +0000 33820--- /dev/null 1970-01-01 00:00:00.000000000 +0000
33906+++ trunk/hw/opengl_dummy.c 2009-01-30 11:39:43.000000000 +0000 33821+++ git/hw/opengl_dummy.c 2009-05-23 11:22:17.000000000 +0100
33907@@ -0,0 +1,9 @@ 33822@@ -0,0 +1,9 @@
33908+#include "../qemu-common.h" 33823+#include "../qemu-common.h"
33909+ 33824+
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/qemu-git/qemu-amd64-32b-mapping-0.9.0.patch
index 40ab59c762..40ab59c762 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch
+++ b/meta/packages/qemu/qemu-git/qemu-amd64-32b-mapping-0.9.0.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/series b/meta/packages/qemu/qemu-git/series
index 57d41df4f6..57d41df4f6 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/series
+++ b/meta/packages/qemu/qemu-git/series
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch b/meta/packages/qemu/qemu-git/workaround_bad_futex_headers.patch
index b254b2410a..b254b2410a 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch
+++ b/meta/packages/qemu/qemu-git/workaround_bad_futex_headers.patch
diff --git a/meta/packages/qemu/qemu-native_svn.bb b/meta/packages/qemu/qemu-native_git.bb
index 1e3a4dbbfa..b2343ce8ae 100644
--- a/meta/packages/qemu/qemu-native_svn.bb
+++ b/meta/packages/qemu/qemu-native_git.bb
@@ -1,2 +1,2 @@
1require qemu_svn.bb 1require qemu_git.bb
2require qemu-native.inc 2require qemu-native.inc
diff --git a/meta/packages/qemu/qemu-sdk_svn.bb b/meta/packages/qemu/qemu-sdk_git.bb
index e53dbf3a3c..9819d973ec 100644
--- a/meta/packages/qemu/qemu-sdk_svn.bb
+++ b/meta/packages/qemu/qemu-sdk_git.bb
@@ -1,4 +1,4 @@
1require qemu_svn.bb 1require qemu_git.bb
2require qemu-sdk.inc 2require qemu-sdk.inc
3 3
4PR = "r1" 4PR = "r1"
diff --git a/meta/packages/qemu/qemu_svn.bb b/meta/packages/qemu/qemu_git.bb
index 5db907ff63..fc6d9dc553 100644
--- a/meta/packages/qemu/qemu_svn.bb
+++ b/meta/packages/qemu/qemu_git.bb
@@ -1,12 +1,12 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2DEPENDS = "zlib" 2DEPENDS = "zlib"
3PV = "0.9.1+svnr${SRCREV}" 3PV = "0.10.2+git${SRCREV}"
4PR = "r15" 4PR = "r0"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/" 6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
7 7
8SRC_URI = "\ 8SRC_URI = "\
9 svn://svn.savannah.nongnu.org/qemu;module=trunk \ 9 git://git.sv.gnu.org/qemu.git;protocol=git \
10 file://06_exit_segfault.patch;patch=1;pnum=0 \ 10 file://06_exit_segfault.patch;patch=1;pnum=0 \
11 file://11_signal_sigaction.patch;patch=1;pnum=0 \ 11 file://11_signal_sigaction.patch;patch=1;pnum=0 \
12 file://22_net_tuntap_stall.patch;patch=1;pnum=0 \ 12 file://22_net_tuntap_stall.patch;patch=1;pnum=0 \
@@ -15,13 +15,14 @@ SRC_URI = "\
15 file://63_sparc_build.patch;patch=1;pnum=0 \ 15 file://63_sparc_build.patch;patch=1;pnum=0 \
16 file://66_tls_ld.patch;patch=1;pnum=0 \ 16 file://66_tls_ld.patch;patch=1;pnum=0 \
17 file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \ 17 file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \
18 file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \
19 file://workaround_bad_futex_headers.patch;patch=1 \ 18 file://workaround_bad_futex_headers.patch;patch=1 \
20 file://qemu-add-gl-host-code.patch;patch=1 \ 19 file://qemu-add-gl-host-code.patch;patch=1 \
21 file://no-strip.patch;patch=1 \ 20 file://no-strip.patch;patch=1 \
22 file://fix-dirent.patch;patch=1" 21 file://fix-dirent.patch;patch=1"
23 22
24S = "${WORKDIR}/trunk" 23# file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1
24
25S = "${WORKDIR}/git"
25 26
26#EXTRA_OECONF += "--disable-sdl" 27#EXTRA_OECONF += "--disable-sdl"
27EXTRA_OECONF += "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu" 28EXTRA_OECONF += "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-26 15:41:02 +0000