summaryrefslogtreecommitdiffstats
path: root/meta/packages/qemu
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/06_exit_segfault.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/11_signal_sigaction.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/22_net_tuntap_stall.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/31_syscalls.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/52_ne2000_return.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/63_sparc_build.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/64_ppc_asm_constraints.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/66_tls_ld.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/91-oh-sdl-cursor.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/fix-dirent.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/no-strip.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-add-gl-host-code.patch)129
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-amd64-32b-mapping-0.9.0.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/series (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/series)0
-rw-r--r--meta/packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch (renamed from meta/packages/qemu/qemu-0.9.1+svnr6374/workaround_bad_futex_headers.patch)0
15 files changed, 65 insertions, 64 deletions
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/06_exit_segfault.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch
index 06123d0626..06123d0626 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/06_exit_segfault.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/06_exit_segfault.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/11_signal_sigaction.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch
index 33c5e8b12d..33c5e8b12d 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/11_signal_sigaction.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/11_signal_sigaction.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/22_net_tuntap_stall.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch
index f2bfbc9102..f2bfbc9102 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/22_net_tuntap_stall.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/22_net_tuntap_stall.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/31_syscalls.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch
index df2aa84bb1..df2aa84bb1 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/31_syscalls.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/31_syscalls.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/52_ne2000_return.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch
index e4ea33f2c6..e4ea33f2c6 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/52_ne2000_return.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/52_ne2000_return.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/63_sparc_build.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch
index 37b38f641b..37b38f641b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/63_sparc_build.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/63_sparc_build.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/64_ppc_asm_constraints.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch
index e4858b79d7..e4858b79d7 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/64_ppc_asm_constraints.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/64_ppc_asm_constraints.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/66_tls_ld.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch
index 54e02eff8b..54e02eff8b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/66_tls_ld.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/66_tls_ld.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/91-oh-sdl-cursor.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch
index 0d60c1c306..0d60c1c306 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/91-oh-sdl-cursor.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/91-oh-sdl-cursor.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/fix-dirent.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch
index 575dbfa0c9..575dbfa0c9 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/fix-dirent.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/fix-dirent.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/no-strip.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch
index fc69b37e16..fc69b37e16 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/no-strip.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/no-strip.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-add-gl-host-code.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch
index 3a36a18303..bffd8a62db 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-add-gl-host-code.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-add-gl-host-code.patch
@@ -1,8 +1,8 @@
1Index: trunk/Makefile.target 1Index: trunk/Makefile.target
2=================================================================== 2===================================================================
3--- trunk.orig/Makefile.target 2009-01-21 13:34:48.000000000 +0000 3--- trunk.orig/Makefile.target 2009-01-30 11:37:38.000000000 +0000
4+++ trunk/Makefile.target 2009-01-21 13:55:54.000000000 +0000 4+++ trunk/Makefile.target 2009-01-30 11:46:55.000000000 +0000
5@@ -194,6 +194,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
8 8
@@ -15,9 +15,9 @@ Index: trunk/Makefile.target
15 ifeq ($(TARGET_BASE_ARCH), arm) 15 ifeq ($(TARGET_BASE_ARCH), arm)
16 LIBOBJS+= neon_helper.o iwmmxt_helper.o 16 LIBOBJS+= neon_helper.o iwmmxt_helper.o
17 endif 17 endif
18@@ -272,6 +278,21 @@ 18@@ -224,6 +230,21 @@
19 cpu-exec.o: cpu-exec.c 19
20 $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< 20 cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
21 21
22+parse_gl_h: parse_gl_h.c 22+parse_gl_h: parse_gl_h.c
23+ $(CC) -g -o $@ $< 23+ $(CC) -g -o $@ $<
@@ -37,7 +37,7 @@ Index: trunk/Makefile.target
37 ######################################################### 37 #########################################################
38 # Linux user emulator target 38 # Linux user emulator target
39 39
40@@ -631,7 +652,7 @@ 40@@ -580,7 +601,7 @@
41 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o 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 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 43 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
@@ -46,19 +46,19 @@ Index: trunk/Makefile.target
46 endif 46 endif
47 ifeq ($(TARGET_BASE_ARCH), ppc) 47 ifeq ($(TARGET_BASE_ARCH), ppc)
48 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE 48 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
49@@ -769,7 +790,7 @@ 49@@ -717,7 +738,7 @@
50 main.o: CFLAGS+=-p
50 endif 51 endif
51 52
52 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a 53-$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
53- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) 54+$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) -lGL -lGLU
54+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) -lGL -lGLU
55
56 endif # !CONFIG_USER_ONLY
57 55
56 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
57 $(LINK)
58Index: trunk/hw/vmware_vga.c 58Index: trunk/hw/vmware_vga.c
59=================================================================== 59===================================================================
60--- trunk.orig/hw/vmware_vga.c 2009-01-21 13:34:48.000000000 +0000 60--- trunk.orig/hw/vmware_vga.c 2009-01-30 11:37:36.000000000 +0000
61+++ trunk/hw/vmware_vga.c 2009-01-21 13:34:49.000000000 +0000 61+++ trunk/hw/vmware_vga.c 2009-01-30 11:39:42.000000000 +0000
62@@ -484,6 +484,8 @@ 62@@ -484,6 +484,8 @@
63 63
64 #define CMD(f) le32_to_cpu(s->cmd->f) 64 #define CMD(f) le32_to_cpu(s->cmd->f)
@@ -117,8 +117,8 @@ Index: trunk/hw/vmware_vga.c
117 117
118Index: trunk/kqemu.c 118Index: trunk/kqemu.c
119=================================================================== 119===================================================================
120--- trunk.orig/kqemu.c 2009-01-21 13:34:48.000000000 +0000 120--- trunk.orig/kqemu.c 2009-01-21 11:45:11.000000000 +0000
121+++ trunk/kqemu.c 2009-01-21 13:34:49.000000000 +0000 121+++ trunk/kqemu.c 2009-01-30 11:39:42.000000000 +0000
122@@ -93,6 +93,8 @@ 122@@ -93,6 +93,8 @@
123 int qpi_io_memory; 123 int qpi_io_memory;
124 uint32_t kqemu_comm_base; /* physical address of the QPI communication page */ 124 uint32_t kqemu_comm_base; /* physical address of the QPI communication page */
@@ -153,8 +153,8 @@ Index: trunk/kqemu.c
153 /* syscall instruction */ 153 /* syscall instruction */
154Index: trunk/sdl.c 154Index: trunk/sdl.c
155=================================================================== 155===================================================================
156--- trunk.orig/sdl.c 2009-01-21 13:34:49.000000000 +0000 156--- trunk.orig/sdl.c 2009-01-30 11:39:42.000000000 +0000
157+++ trunk/sdl.c 2009-01-21 13:59:10.000000000 +0000 157+++ trunk/sdl.c 2009-01-30 11:45:37.000000000 +0000
158@@ -26,6 +26,7 @@ 158@@ -26,6 +26,7 @@
159 #include "sysemu.h" 159 #include "sysemu.h"
160 160
@@ -180,7 +180,7 @@ Index: trunk/sdl.c
180 int flags; 180 int flags;
181 181
182 // printf("resizing to %d %d\n", w, h); 182 // printf("resizing to %d %d\n", w, h);
183@@ -93,12 +97,26 @@ 183@@ -93,6 +97,15 @@
184 if (gui_noframe) 184 if (gui_noframe)
185 flags |= SDL_NOFRAME; 185 flags |= SDL_NOFRAME;
186 186
@@ -193,9 +193,10 @@ Index: trunk/sdl.c
193+ DefaultScreen(info.info.x11.display))); 193+ DefaultScreen(info.info.x11.display)));
194+ } 194+ }
195+ 195+
196 real_screen = SDL_SetVideoMode(ds_get_width(ds), ds_get_height(ds), 0, flags); 196 width = ds_get_width(ds);
197 if (!real_screen) { 197 height = ds_get_height(ds);
198 fprintf(stderr, "Could not open SDL display\n"); 198 real_screen = SDL_SetVideoMode(width, height, 0, flags);
199@@ -101,6 +114,11 @@
199 exit(1); 200 exit(1);
200 } 201 }
201 202
@@ -207,7 +208,7 @@ Index: trunk/sdl.c
207 sdl_setdata(ds); 208 sdl_setdata(ds);
208 } 209 }
209 210
210@@ -570,6 +588,10 @@ 211@@ -574,6 +592,10 @@
211 line = image; 212 line = image;
212 for (x = 0; x < width; x ++, dst ++) { 213 for (x = 0; x < width; x ++, dst ++) {
213 switch (bpp) { 214 switch (bpp) {
@@ -218,7 +219,7 @@ Index: trunk/sdl.c
218 case 24: 219 case 24:
219 src = *(line ++); src |= *(line ++); src |= *(line ++); 220 src = *(line ++); src |= *(line ++); src |= *(line ++);
220 break; 221 break;
221@@ -643,6 +665,7 @@ 222@@ -647,6 +669,7 @@
222 dcl->dpy_fill = sdl_fill; 223 dcl->dpy_fill = sdl_fill;
223 ds->mouse_set = sdl_mouse_warp; 224 ds->mouse_set = sdl_mouse_warp;
224 ds->cursor_define = sdl_mouse_define; 225 ds->cursor_define = sdl_mouse_define;
@@ -229,7 +230,7 @@ Index: trunk/sdl.c
229Index: trunk/target-i386/beginend_funcs.sh 230Index: trunk/target-i386/beginend_funcs.sh
230=================================================================== 231===================================================================
231--- /dev/null 1970-01-01 00:00:00.000000000 +0000 232--- /dev/null 1970-01-01 00:00:00.000000000 +0000
232+++ trunk/target-i386/beginend_funcs.sh 2009-01-21 13:34:49.000000000 +0000 233+++ trunk/target-i386/beginend_funcs.sh 2009-01-30 11:39:42.000000000 +0000
233@@ -0,0 +1,23 @@ 234@@ -0,0 +1,23 @@
234+#! /bin/sh 235+#! /bin/sh
235+# Copyright 2008 (C) Intel Corporation 236+# Copyright 2008 (C) Intel Corporation
@@ -257,7 +258,7 @@ Index: trunk/target-i386/beginend_funcs.sh
257Index: trunk/target-i386/ghash.c 258Index: trunk/target-i386/ghash.c
258=================================================================== 259===================================================================
259--- /dev/null 1970-01-01 00:00:00.000000000 +0000 260--- /dev/null 1970-01-01 00:00:00.000000000 +0000
260+++ trunk/target-i386/ghash.c 2009-01-21 13:34:49.000000000 +0000 261+++ trunk/target-i386/ghash.c 2009-01-30 11:39:42.000000000 +0000
261@@ -0,0 +1,347 @@ 262@@ -0,0 +1,347 @@
262+/* This is a modified and simplified version of original ghash.c */ 263+/* This is a modified and simplified version of original ghash.c */
263+ 264+
@@ -609,7 +610,7 @@ Index: trunk/target-i386/ghash.c
609Index: trunk/target-i386/ghash.h 610Index: trunk/target-i386/ghash.h
610=================================================================== 611===================================================================
611--- /dev/null 1970-01-01 00:00:00.000000000 +0000 612--- /dev/null 1970-01-01 00:00:00.000000000 +0000
612+++ trunk/target-i386/ghash.h 2009-01-21 13:34:49.000000000 +0000 613+++ trunk/target-i386/ghash.h 2009-01-30 11:39:42.000000000 +0000
613@@ -0,0 +1,59 @@ 614@@ -0,0 +1,59 @@
614+/* This is a modified and simplified version of original ghash.h */ 615+/* This is a modified and simplified version of original ghash.h */
615+ 616+
@@ -673,7 +674,7 @@ Index: trunk/target-i386/ghash.h
673Index: trunk/target-i386/gl_func_perso.h 674Index: trunk/target-i386/gl_func_perso.h
674=================================================================== 675===================================================================
675--- /dev/null 1970-01-01 00:00:00.000000000 +0000 676--- /dev/null 1970-01-01 00:00:00.000000000 +0000
676+++ trunk/target-i386/gl_func_perso.h 2009-01-21 13:34:49.000000000 +0000 677+++ trunk/target-i386/gl_func_perso.h 2009-01-30 11:39:42.000000000 +0000
677@@ -0,0 +1,135 @@ 678@@ -0,0 +1,135 @@
678+/* 679+/*
679+ * Hand-implemented GL/GLX API 680+ * Hand-implemented GL/GLX API
@@ -812,8 +813,8 @@ Index: trunk/target-i386/gl_func_perso.h
812+MAGIC_MACRO(_glGetFeedbackBuffer_fake), 813+MAGIC_MACRO(_glGetFeedbackBuffer_fake),
813Index: trunk/target-i386/helper.h 814Index: trunk/target-i386/helper.h
814=================================================================== 815===================================================================
815--- trunk.orig/target-i386/helper.h 2009-01-21 13:34:48.000000000 +0000 816--- trunk.orig/target-i386/helper.h 2009-01-05 11:10:06.000000000 +0000
816+++ trunk/target-i386/helper.h 2009-01-21 13:34:49.000000000 +0000 817+++ trunk/target-i386/helper.h 2009-01-30 11:39:42.000000000 +0000
817@@ -214,4 +214,6 @@ 818@@ -214,4 +214,6 @@
818 DEF_HELPER_2(rcrq, tl, tl, tl) 819 DEF_HELPER_2(rcrq, tl, tl, tl)
819 #endif 820 #endif
@@ -824,7 +825,7 @@ Index: trunk/target-i386/helper.h
824Index: trunk/target-i386/helper_opengl.c 825Index: trunk/target-i386/helper_opengl.c
825=================================================================== 826===================================================================
826--- /dev/null 1970-01-01 00:00:00.000000000 +0000 827--- /dev/null 1970-01-01 00:00:00.000000000 +0000
827+++ trunk/target-i386/helper_opengl.c 2009-01-21 13:34:49.000000000 +0000 828+++ trunk/target-i386/helper_opengl.c 2009-01-30 11:39:42.000000000 +0000
828@@ -0,0 +1,979 @@ 829@@ -0,0 +1,979 @@
829+/* 830+/*
830+ * Host-side implementation of GL/GLX API 831+ * Host-side implementation of GL/GLX API
@@ -1808,7 +1809,7 @@ Index: trunk/target-i386/helper_opengl.c
1808Index: trunk/target-i386/mesa_enums.c 1809Index: trunk/target-i386/mesa_enums.c
1809=================================================================== 1810===================================================================
1810--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1811--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1811+++ trunk/target-i386/mesa_enums.c 2009-01-21 13:34:49.000000000 +0000 1812+++ trunk/target-i386/mesa_enums.c 2009-01-30 11:39:42.000000000 +0000
1812@@ -0,0 +1,4890 @@ 1813@@ -0,0 +1,4890 @@
1813+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */ 1814+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */
1814+ 1815+
@@ -6703,7 +6704,7 @@ Index: trunk/target-i386/mesa_enums.c
6703Index: trunk/target-i386/mesa_get.c 6704Index: trunk/target-i386/mesa_get.c
6704=================================================================== 6705===================================================================
6705--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6706--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6706+++ trunk/target-i386/mesa_get.c 2009-01-21 13:34:49.000000000 +0000 6707+++ trunk/target-i386/mesa_get.c 2009-01-30 11:39:42.000000000 +0000
6707@@ -0,0 +1,5563 @@ 6708@@ -0,0 +1,5563 @@
6708+ 6709+
6709+/*** 6710+/***
@@ -12271,7 +12272,7 @@ Index: trunk/target-i386/mesa_get.c
12271Index: trunk/target-i386/mesa_gl.h 12272Index: trunk/target-i386/mesa_gl.h
12272=================================================================== 12273===================================================================
12273--- /dev/null 1970-01-01 00:00:00.000000000 +0000 12274--- /dev/null 1970-01-01 00:00:00.000000000 +0000
12274+++ trunk/target-i386/mesa_gl.h 2009-01-21 13:34:49.000000000 +0000 12275+++ trunk/target-i386/mesa_gl.h 2009-01-30 11:39:42.000000000 +0000
12275@@ -0,0 +1,2251 @@ 12276@@ -0,0 +1,2251 @@
12276+/* 12277+/*
12277+ * Mesa 3-D graphics library 12278+ * Mesa 3-D graphics library
@@ -14527,7 +14528,7 @@ Index: trunk/target-i386/mesa_gl.h
14527Index: trunk/target-i386/mesa_glext.h 14528Index: trunk/target-i386/mesa_glext.h
14528=================================================================== 14529===================================================================
14529--- /dev/null 1970-01-01 00:00:00.000000000 +0000 14530--- /dev/null 1970-01-01 00:00:00.000000000 +0000
14530+++ trunk/target-i386/mesa_glext.h 2009-01-21 13:34:49.000000000 +0000 14531+++ trunk/target-i386/mesa_glext.h 2009-01-30 11:39:43.000000000 +0000
14531@@ -0,0 +1,7279 @@ 14532@@ -0,0 +1,7279 @@
14532+#ifndef __glext_h_ 14533+#ifndef __glext_h_
14533+#define __glext_h_ 14534+#define __glext_h_
@@ -21811,7 +21812,7 @@ Index: trunk/target-i386/mesa_glext.h
21811Index: trunk/target-i386/mesa_glu.h 21812Index: trunk/target-i386/mesa_glu.h
21812=================================================================== 21813===================================================================
21813--- /dev/null 1970-01-01 00:00:00.000000000 +0000 21814--- /dev/null 1970-01-01 00:00:00.000000000 +0000
21814+++ trunk/target-i386/mesa_glu.h 2009-01-21 13:34:49.000000000 +0000 21815+++ trunk/target-i386/mesa_glu.h 2009-01-30 11:39:43.000000000 +0000
21815@@ -0,0 +1,354 @@ 21816@@ -0,0 +1,354 @@
21816+/* 21817+/*
21817+** License Applicability. Except to the extent portions of this file are 21818+** License Applicability. Except to the extent portions of this file are
@@ -22170,7 +22171,7 @@ Index: trunk/target-i386/mesa_glu.h
22170Index: trunk/target-i386/mesa_glx.h 22171Index: trunk/target-i386/mesa_glx.h
22171=================================================================== 22172===================================================================
22172--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22173--- /dev/null 1970-01-01 00:00:00.000000000 +0000
22173+++ trunk/target-i386/mesa_glx.h 2009-01-21 13:34:49.000000000 +0000 22174+++ trunk/target-i386/mesa_glx.h 2009-01-30 11:39:43.000000000 +0000
22174@@ -0,0 +1,510 @@ 22175@@ -0,0 +1,510 @@
22175+/* 22176+/*
22176+ * Mesa 3-D graphics library 22177+ * Mesa 3-D graphics library
@@ -22685,7 +22686,7 @@ Index: trunk/target-i386/mesa_glx.h
22685Index: trunk/target-i386/mesa_glxext.h 22686Index: trunk/target-i386/mesa_glxext.h
22686=================================================================== 22687===================================================================
22687--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22688--- /dev/null 1970-01-01 00:00:00.000000000 +0000
22688+++ trunk/target-i386/mesa_glxext.h 2009-01-21 13:34:49.000000000 +0000 22689+++ trunk/target-i386/mesa_glxext.h 2009-01-30 11:39:43.000000000 +0000
22689@@ -0,0 +1,785 @@ 22690@@ -0,0 +1,785 @@
22690+#ifndef __glxext_h_ 22691+#ifndef __glxext_h_
22691+#define __glxext_h_ 22692+#define __glxext_h_
@@ -23475,7 +23476,7 @@ Index: trunk/target-i386/mesa_glxext.h
23475Index: trunk/target-i386/mesa_mipmap.c 23476Index: trunk/target-i386/mesa_mipmap.c
23476=================================================================== 23477===================================================================
23477--- /dev/null 1970-01-01 00:00:00.000000000 +0000 23478--- /dev/null 1970-01-01 00:00:00.000000000 +0000
23478+++ trunk/target-i386/mesa_mipmap.c 2009-01-21 13:34:49.000000000 +0000 23479+++ trunk/target-i386/mesa_mipmap.c 2009-01-30 11:39:43.000000000 +0000
23479@@ -0,0 +1,824 @@ 23480@@ -0,0 +1,824 @@
23480+ 23481+
23481+/* 23482+/*
@@ -24304,7 +24305,7 @@ Index: trunk/target-i386/mesa_mipmap.c
24304Index: trunk/target-i386/opengl_exec.c 24305Index: trunk/target-i386/opengl_exec.c
24305=================================================================== 24306===================================================================
24306--- /dev/null 1970-01-01 00:00:00.000000000 +0000 24307--- /dev/null 1970-01-01 00:00:00.000000000 +0000
24307+++ trunk/target-i386/opengl_exec.c 2009-01-21 13:34:49.000000000 +0000 24308+++ trunk/target-i386/opengl_exec.c 2009-01-30 11:39:43.000000000 +0000
24308@@ -0,0 +1,3931 @@ 24309@@ -0,0 +1,3931 @@
24309+/* 24310+/*
24310+ * Host-side implementation of GL/GLX API 24311+ * Host-side implementation of GL/GLX API
@@ -28240,7 +28241,7 @@ Index: trunk/target-i386/opengl_exec.c
28240Index: trunk/target-i386/opengl_func.h 28241Index: trunk/target-i386/opengl_func.h
28241=================================================================== 28242===================================================================
28242--- /dev/null 1970-01-01 00:00:00.000000000 +0000 28243--- /dev/null 1970-01-01 00:00:00.000000000 +0000
28243+++ trunk/target-i386/opengl_func.h 2009-01-21 13:34:49.000000000 +0000 28244+++ trunk/target-i386/opengl_func.h 2009-01-30 11:39:43.000000000 +0000
28244@@ -0,0 +1,1108 @@ 28245@@ -0,0 +1,1108 @@
28245+/* 28246+/*
28246+ * Main header for both host and guest sides 28247+ * Main header for both host and guest sides
@@ -29353,7 +29354,7 @@ Index: trunk/target-i386/opengl_func.h
29353Index: trunk/target-i386/opengl_player.c 29354Index: trunk/target-i386/opengl_player.c
29354=================================================================== 29355===================================================================
29355--- /dev/null 1970-01-01 00:00:00.000000000 +0000 29356--- /dev/null 1970-01-01 00:00:00.000000000 +0000
29356+++ trunk/target-i386/opengl_player.c 2009-01-21 13:34:49.000000000 +0000 29357+++ trunk/target-i386/opengl_player.c 2009-01-30 11:39:43.000000000 +0000
29357@@ -0,0 +1,1461 @@ 29358@@ -0,0 +1,1461 @@
29358+/* 29359+/*
29359+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server 29360+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server
@@ -30819,7 +30820,7 @@ Index: trunk/target-i386/opengl_player.c
30819Index: trunk/target-i386/opengl_server.c 30820Index: trunk/target-i386/opengl_server.c
30820=================================================================== 30821===================================================================
30821--- /dev/null 1970-01-01 00:00:00.000000000 +0000 30822--- /dev/null 1970-01-01 00:00:00.000000000 +0000
30822+++ trunk/target-i386/opengl_server.c 2009-01-21 13:34:49.000000000 +0000 30823+++ trunk/target-i386/opengl_server.c 2009-01-30 11:39:43.000000000 +0000
30823@@ -0,0 +1,826 @@ 30824@@ -0,0 +1,826 @@
30824+/* 30825+/*
30825+ * TCP/IP OpenGL server 30826+ * TCP/IP OpenGL server
@@ -31650,7 +31651,7 @@ Index: trunk/target-i386/opengl_server.c
31650Index: trunk/target-i386/opengl_utils.h 31651Index: trunk/target-i386/opengl_utils.h
31651=================================================================== 31652===================================================================
31652--- /dev/null 1970-01-01 00:00:00.000000000 +0000 31653--- /dev/null 1970-01-01 00:00:00.000000000 +0000
31653+++ trunk/target-i386/opengl_utils.h 2009-01-21 13:34:49.000000000 +0000 31654+++ trunk/target-i386/opengl_utils.h 2009-01-30 11:39:43.000000000 +0000
31654@@ -0,0 +1,453 @@ 31655@@ -0,0 +1,453 @@
31655+/* 31656+/*
31656+ * Functions used by host & client sides 31657+ * Functions used by host & client sides
@@ -32108,7 +32109,7 @@ Index: trunk/target-i386/opengl_utils.h
32108Index: trunk/target-i386/parse_gl_h.c 32109Index: trunk/target-i386/parse_gl_h.c
32109=================================================================== 32110===================================================================
32110--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32111--- /dev/null 1970-01-01 00:00:00.000000000 +0000
32111+++ trunk/target-i386/parse_gl_h.c 2009-01-21 13:34:49.000000000 +0000 32112+++ trunk/target-i386/parse_gl_h.c 2009-01-30 11:39:43.000000000 +0000
32112@@ -0,0 +1,1496 @@ 32113@@ -0,0 +1,1496 @@
32113+/* 32114+/*
32114+ * Parse gl.h et glx.h to auto-generate source code 32115+ * Parse gl.h et glx.h to auto-generate source code
@@ -33609,7 +33610,7 @@ Index: trunk/target-i386/parse_gl_h.c
33609Index: trunk/target-i386/parse_mesa_get_c.c 33610Index: trunk/target-i386/parse_mesa_get_c.c
33610=================================================================== 33611===================================================================
33611--- /dev/null 1970-01-01 00:00:00.000000000 +0000 33612--- /dev/null 1970-01-01 00:00:00.000000000 +0000
33612+++ trunk/target-i386/parse_mesa_get_c.c 2009-01-21 13:34:49.000000000 +0000 33613+++ trunk/target-i386/parse_mesa_get_c.c 2009-01-30 11:39:43.000000000 +0000
33613@@ -0,0 +1,225 @@ 33614@@ -0,0 +1,225 @@
33614+/* 33615+/*
33615+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h" 33616+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h"
@@ -33838,8 +33839,8 @@ Index: trunk/target-i386/parse_mesa_get_c.c
33838+} 33839+}
33839Index: trunk/target-i386/translate.c 33840Index: trunk/target-i386/translate.c
33840=================================================================== 33841===================================================================
33841--- trunk.orig/target-i386/translate.c 2009-01-21 13:34:48.000000000 +0000 33842--- trunk.orig/target-i386/translate.c 2009-01-21 11:45:03.000000000 +0000
33842+++ trunk/target-i386/translate.c 2009-01-21 13:34:49.000000000 +0000 33843+++ trunk/target-i386/translate.c 2009-01-30 11:39:43.000000000 +0000
33843@@ -2592,11 +2592,18 @@ 33844@@ -2592,11 +2592,18 @@
33844 s->is_jmp = 3; 33845 s->is_jmp = 3;
33845 } 33846 }
@@ -33861,9 +33862,9 @@ Index: trunk/target-i386/translate.c
33861 gen_jmp_im(cur_eip); 33862 gen_jmp_im(cur_eip);
33862Index: trunk/vl.c 33863Index: trunk/vl.c
33863=================================================================== 33864===================================================================
33864--- trunk.orig/vl.c 2009-01-21 13:34:48.000000000 +0000 33865--- trunk.orig/vl.c 2009-01-30 11:37:38.000000000 +0000
33865+++ trunk/vl.c 2009-01-21 13:34:49.000000000 +0000 33866+++ trunk/vl.c 2009-01-30 11:44:27.000000000 +0000
33866@@ -251,6 +251,7 @@ 33867@@ -247,6 +247,7 @@
33867 const char *file; 33868 const char *file;
33868 char opt[1024]; 33869 char opt[1024];
33869 } drives_opt[MAX_DRIVES]; 33870 } drives_opt[MAX_DRIVES];
@@ -33871,23 +33872,23 @@ Index: trunk/vl.c
33871 33872
33872 static CPUState *cur_cpu; 33873 static CPUState *cur_cpu;
33873 static CPUState *next_cpu; 33874 static CPUState *next_cpu;
33874@@ -4097,6 +4098,7 @@ 33875@@ -4144,6 +4145,7 @@
33876 QEMU_OPTION_show_cursor,
33877 QEMU_OPTION_semihosting,
33875 QEMU_OPTION_old_param, 33878 QEMU_OPTION_old_param,
33876 QEMU_OPTION_clock,
33877 QEMU_OPTION_startdate,
33878+ QEMU_OPTION_enable_gl, 33879+ QEMU_OPTION_enable_gl,
33879 QEMU_OPTION_tb_size, 33880 QEMU_OPTION_tb_size,
33880 QEMU_OPTION_icount, 33881 QEMU_OPTION_incoming,
33881 QEMU_OPTION_uuid, 33882 };
33882@@ -4219,6 +4221,7 @@ 33883@@ -4274,6 +4276,7 @@
33884 { "old-param", 0, QEMU_OPTION_old_param },
33883 #endif 33885 #endif
33884 { "clock", HAS_ARG, QEMU_OPTION_clock },
33885 { "startdate", HAS_ARG, QEMU_OPTION_startdate },
33886+ { "enable-gl", 0, QEMU_OPTION_enable_gl },
33887 { "tb-size", HAS_ARG, QEMU_OPTION_tb_size }, 33886 { "tb-size", HAS_ARG, QEMU_OPTION_tb_size },
33888 { "icount", HAS_ARG, QEMU_OPTION_icount }, 33887+ { "enable-gl", 0, QEMU_OPTION_enable_gl },
33889 { "incoming", HAS_ARG, QEMU_OPTION_incoming }, 33888 { "incoming", HAS_ARG, QEMU_OPTION_incoming },
33890@@ -5166,6 +5169,11 @@ 33889 { NULL },
33890 };
33891@@ -5219,6 +5222,11 @@
33891 } 33892 }
33892 } 33893 }
33893 break; 33894 break;
@@ -33902,7 +33903,7 @@ Index: trunk/vl.c
33902Index: trunk/hw/opengl_dummy.c 33903Index: trunk/hw/opengl_dummy.c
33903=================================================================== 33904===================================================================
33904--- /dev/null 1970-01-01 00:00:00.000000000 +0000 33905--- /dev/null 1970-01-01 00:00:00.000000000 +0000
33905+++ trunk/hw/opengl_dummy.c 2009-01-21 14:03:41.000000000 +0000 33906+++ trunk/hw/opengl_dummy.c 2009-01-30 11:39:43.000000000 +0000
33906@@ -0,0 +1,9 @@ 33907@@ -0,0 +1,9 @@
33907+#include "../qemu-common.h" 33908+#include "../qemu-common.h"
33908+ 33909+
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch
index 40ab59c762..40ab59c762 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/qemu-amd64-32b-mapping-0.9.0.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/qemu-amd64-32b-mapping-0.9.0.patch
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/series b/meta/packages/qemu/qemu-0.9.1+svnr6477/series
index 57d41df4f6..57d41df4f6 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/series
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/series
diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6374/workaround_bad_futex_headers.patch b/meta/packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch
index b254b2410a..b254b2410a 100644
--- a/meta/packages/qemu/qemu-0.9.1+svnr6374/workaround_bad_futex_headers.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6477/workaround_bad_futex_headers.patch
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 12:31:19 +0000