summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJeff Dike <jdike@linux.intel.com>2010-06-03 15:39:57 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-07 16:10:19 +0100
commitbf59d217a8c6376f90832927ad3254fbbbbf48f3 (patch)
treebc80642371198d9cb8f80b39a2c99369a37e2711 /meta
parentfc81ca7d2d4c2a17967af53f82422892da32fb80 (diff)
downloadpoky-bf59d217a8c6376f90832927ad3254fbbbbf48f3.tar.gz
qemu: Update to 0.12.4
Renamed the recipe to 0.12.4. Moved the patches directory to qemu-0.12.4 - when it was named qemu-0.12, bitbake silently ignored the patches, and only failed when it came time to apply them. Added a FILESDIR to the git recipe and changed its PV to 0.12.4 so it can use the same patches as the normal recipe for now. Removed the series file - it wasn't needed. Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/qemu/qemu-0.12.4/fix-dirent.patch (renamed from meta/packages/qemu/qemu-0.12/fix-dirent.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.12.4/fix-nogl.patch (renamed from meta/packages/qemu/qemu-0.12/fix-nogl.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.12.4/glflags.patch (renamed from meta/packages/qemu/qemu-0.12/glflags.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.12.4/no-strip.patch (renamed from meta/packages/qemu/qemu-0.12/no-strip.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.12.4/qemu-git-qemugl-host.patch (renamed from meta/packages/qemu/qemu-0.12/qemu-git-qemugl-host.patch)232
-rw-r--r--meta/packages/qemu/qemu-0.12.4/qemugl-allow-glxcontext-release.patch (renamed from meta/packages/qemu/qemu-0.12/qemugl-allow-glxcontext-release.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.12.4/workaround_bad_futex_headers.patch (renamed from meta/packages/qemu/qemu-0.12/workaround_bad_futex_headers.patch)0
-rw-r--r--meta/packages/qemu/qemu-0.12/series13
-rw-r--r--meta/packages/qemu/qemu_0.12.4.bb (renamed from meta/packages/qemu/qemu_0.12.0.bb)2
-rw-r--r--meta/packages/qemu/qemu_git.bb7
10 files changed, 121 insertions, 133 deletions
diff --git a/meta/packages/qemu/qemu-0.12/fix-dirent.patch b/meta/packages/qemu/qemu-0.12.4/fix-dirent.patch
index 8bbfa0e88e..8bbfa0e88e 100644
--- a/meta/packages/qemu/qemu-0.12/fix-dirent.patch
+++ b/meta/packages/qemu/qemu-0.12.4/fix-dirent.patch
diff --git a/meta/packages/qemu/qemu-0.12/fix-nogl.patch b/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch
index 68efab3a1f..68efab3a1f 100644
--- a/meta/packages/qemu/qemu-0.12/fix-nogl.patch
+++ b/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch
diff --git a/meta/packages/qemu/qemu-0.12/glflags.patch b/meta/packages/qemu/qemu-0.12.4/glflags.patch
index 0a27c2dee1..0a27c2dee1 100644
--- a/meta/packages/qemu/qemu-0.12/glflags.patch
+++ b/meta/packages/qemu/qemu-0.12.4/glflags.patch
diff --git a/meta/packages/qemu/qemu-0.12/no-strip.patch b/meta/packages/qemu/qemu-0.12.4/no-strip.patch
index 8a95a688b3..8a95a688b3 100644
--- a/meta/packages/qemu/qemu-0.12/no-strip.patch
+++ b/meta/packages/qemu/qemu-0.12.4/no-strip.patch
diff --git a/meta/packages/qemu/qemu-0.12/qemu-git-qemugl-host.patch b/meta/packages/qemu/qemu-0.12.4/qemu-git-qemugl-host.patch
index 7ec491daed..ab31476218 100644
--- a/meta/packages/qemu/qemu-0.12/qemu-git-qemugl-host.patch
+++ b/meta/packages/qemu/qemu-0.12.4/qemu-git-qemugl-host.patch
@@ -1,7 +1,7 @@
1Index: qemu/Makefile.target 1Index: qemu-0.12.4/Makefile.target
2=================================================================== 2===================================================================
3--- qemu.orig/Makefile.target 2010-05-11 18:05:22.955784896 -0400 3--- qemu-0.12.4.orig/Makefile.target
4+++ qemu/Makefile.target 2010-05-14 13:34:07.721301429 -0400 4+++ qemu-0.12.4/Makefile.target
5@@ -46,6 +46,7 @@ libobj-$(CONFIG_SOFTFLOAT) += fpu/softfl 5@@ -46,6 +46,7 @@ libobj-$(CONFIG_SOFTFLOAT) += fpu/softfl
6 libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o 6 libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
7 libobj-y += op_helper.o helper.o 7 libobj-y += op_helper.o helper.o
@@ -52,10 +52,10 @@ Index: qemu/Makefile.target
52 ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) 52 ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
53 53
54 endif # CONFIG_SOFTMMU 54 endif # CONFIG_SOFTMMU
55Index: qemu/hw/pixel_ops.h 55Index: qemu-0.12.4/hw/pixel_ops.h
56=================================================================== 56===================================================================
57--- qemu.orig/hw/pixel_ops.h 2010-05-11 18:05:22.959804376 -0400 57--- qemu-0.12.4.orig/hw/pixel_ops.h
58+++ qemu/hw/pixel_ops.h 2010-05-12 12:10:40.092908994 -0400 58+++ qemu-0.12.4/hw/pixel_ops.h
59@@ -4,6 +4,12 @@ static inline unsigned int rgb_to_pixel8 59@@ -4,6 +4,12 @@ static inline unsigned int rgb_to_pixel8
60 return ((r >> 5) << 5) | ((g >> 5) << 2) | (b >> 6); 60 return ((r >> 5) << 5) | ((g >> 5) << 2) | (b >> 6);
61 } 61 }
@@ -69,10 +69,10 @@ Index: qemu/hw/pixel_ops.h
69 static inline unsigned int rgb_to_pixel15(unsigned int r, unsigned int g, 69 static inline unsigned int rgb_to_pixel15(unsigned int r, unsigned int g,
70 unsigned int b) 70 unsigned int b)
71 { 71 {
72Index: qemu/hw/vmware_vga.c 72Index: qemu-0.12.4/hw/vmware_vga.c
73=================================================================== 73===================================================================
74--- qemu.orig/hw/vmware_vga.c 2010-05-11 18:05:22.959804376 -0400 74--- qemu-0.12.4.orig/hw/vmware_vga.c
75+++ qemu/hw/vmware_vga.c 2010-05-12 12:10:40.124785891 -0400 75+++ qemu-0.12.4/hw/vmware_vga.c
76@@ -489,6 +489,8 @@ static inline void vmsvga_cursor_define( 76@@ -489,6 +489,8 @@ static inline void vmsvga_cursor_define(
77 77
78 #define CMD(f) le32_to_cpu(s->cmd->f) 78 #define CMD(f) le32_to_cpu(s->cmd->f)
@@ -120,7 +120,7 @@ Index: qemu/hw/vmware_vga.c
120 case SVGA_CMD_UPDATE: 120 case SVGA_CMD_UPDATE:
121 case SVGA_CMD_UPDATE_VERBOSE: 121 case SVGA_CMD_UPDATE_VERBOSE:
122 x = vmsvga_fifo_read(s); 122 x = vmsvga_fifo_read(s);
123@@ -617,7 +626,7 @@ static void vmsvga_fifo_run(struct vmsvg 123@@ -624,7 +633,7 @@ static void vmsvga_fifo_run(struct vmsvg
124 while (args --) 124 while (args --)
125 vmsvga_fifo_read(s); 125 vmsvga_fifo_read(s);
126 printf("%s: Unknown command 0x%02x in SVGA command FIFO\n", 126 printf("%s: Unknown command 0x%02x in SVGA command FIFO\n",
@@ -129,7 +129,7 @@ Index: qemu/hw/vmware_vga.c
129 break; 129 break;
130 } 130 }
131 131
132@@ -1136,6 +1145,12 @@ static void vmsvga_init(struct vmsvga_st 132@@ -1143,6 +1152,12 @@ static void vmsvga_init(struct vmsvga_st
133 133
134 vga_init_vbe(&s->vga); 134 vga_init_vbe(&s->vga);
135 135
@@ -142,11 +142,11 @@ Index: qemu/hw/vmware_vga.c
142 rom_add_vga(VGABIOS_FILENAME); 142 rom_add_vga(VGABIOS_FILENAME);
143 143
144 vmsvga_reset(s); 144 vmsvga_reset(s);
145Index: qemu/qemu-char.c 145Index: qemu-0.12.4/qemu-char.c
146=================================================================== 146===================================================================
147--- qemu.orig/qemu-char.c 2010-05-11 18:05:22.955784896 -0400 147--- qemu-0.12.4.orig/qemu-char.c
148+++ qemu/qemu-char.c 2010-05-12 17:20:54.280909040 -0400 148+++ qemu-0.12.4/qemu-char.c
149@@ -2232,6 +2232,69 @@ static CharDriverState *qemu_chr_open_so 149@@ -2235,6 +2235,69 @@ static CharDriverState *qemu_chr_open_so
150 return NULL; 150 return NULL;
151 } 151 }
152 152
@@ -216,7 +216,7 @@ Index: qemu/qemu-char.c
216 QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) 216 QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename)
217 { 217 {
218 char host[65], port[33], width[8], height[8]; 218 char host[65], port[33], width[8], height[8];
219@@ -2352,6 +2415,10 @@ QemuOpts *qemu_chr_parse_compat(const ch 219@@ -2353,6 +2416,10 @@ QemuOpts *qemu_chr_parse_compat(const ch
220 qemu_opt_set(opts, "path", filename); 220 qemu_opt_set(opts, "path", filename);
221 return opts; 221 return opts;
222 } 222 }
@@ -226,7 +226,7 @@ Index: qemu/qemu-char.c
226+ } 226+ }
227 227
228 fail: 228 fail:
229 fprintf(stderr, "%s: fail on \"%s\"\n", __FUNCTION__, filename); 229 qemu_opts_del(opts);
230@@ -2368,6 +2435,7 @@ static const struct { 230@@ -2368,6 +2435,7 @@ static const struct {
231 { .name = "udp", .open = qemu_chr_open_udp }, 231 { .name = "udp", .open = qemu_chr_open_udp },
232 { .name = "msmouse", .open = qemu_chr_open_msmouse }, 232 { .name = "msmouse", .open = qemu_chr_open_msmouse },
@@ -235,10 +235,10 @@ Index: qemu/qemu-char.c
235 #ifdef _WIN32 235 #ifdef _WIN32
236 { .name = "file", .open = qemu_chr_open_win_file_out }, 236 { .name = "file", .open = qemu_chr_open_win_file_out },
237 { .name = "pipe", .open = qemu_chr_open_win_pipe }, 237 { .name = "pipe", .open = qemu_chr_open_win_pipe },
238Index: qemu/sdl.c 238Index: qemu-0.12.4/sdl.c
239=================================================================== 239===================================================================
240--- qemu.orig/sdl.c 2010-05-11 18:05:22.959804376 -0400 240--- qemu-0.12.4.orig/sdl.c
241+++ qemu/sdl.c 2010-05-12 12:10:40.128783931 -0400 241+++ qemu-0.12.4/sdl.c
242@@ -58,6 +58,8 @@ static uint8_t allocator; 242@@ -58,6 +58,8 @@ static uint8_t allocator;
243 static SDL_PixelFormat host_format; 243 static SDL_PixelFormat host_format;
244 static int scaling_active = 0; 244 static int scaling_active = 0;
@@ -302,7 +302,7 @@ Index: qemu/sdl.c
302 } else if (absolute_enabled) { 302 } else if (absolute_enabled) {
303 sdl_show_cursor(); 303 sdl_show_cursor();
304 absolute_enabled = 0; 304 absolute_enabled = 0;
305@@ -760,7 +773,8 @@ static void sdl_mouse_warp(int x, int y, 305@@ -761,7 +774,8 @@ static void sdl_mouse_warp(int x, int y,
306 if (!guest_cursor) 306 if (!guest_cursor)
307 sdl_show_cursor(); 307 sdl_show_cursor();
308 if (gui_grab || kbd_mouse_is_absolute() || absolute_enabled) { 308 if (gui_grab || kbd_mouse_is_absolute() || absolute_enabled) {
@@ -312,7 +312,7 @@ Index: qemu/sdl.c
312 if (!kbd_mouse_is_absolute() && !absolute_enabled) 312 if (!kbd_mouse_is_absolute() && !absolute_enabled)
313 SDL_WarpMouse(x, y); 313 SDL_WarpMouse(x, y);
314 } 314 }
315@@ -814,7 +828,7 @@ static void sdl_mouse_define(int width, 315@@ -815,7 +829,7 @@ static void sdl_mouse_define(int width,
316 } 316 }
317 guest_sprite = SDL_CreateCursor(sprite, mask, width, height, hot_x, hot_y); 317 guest_sprite = SDL_CreateCursor(sprite, mask, width, height, hot_x, hot_y);
318 318
@@ -321,7 +321,7 @@ Index: qemu/sdl.c
321 (gui_grab || kbd_mouse_is_absolute() || absolute_enabled)) 321 (gui_grab || kbd_mouse_is_absolute() || absolute_enabled))
322 SDL_SetCursor(guest_sprite); 322 SDL_SetCursor(guest_sprite);
323 } 323 }
324@@ -831,6 +845,7 @@ void sdl_display_init(DisplayState *ds, 324@@ -832,6 +846,7 @@ void sdl_display_init(DisplayState *ds,
325 int flags; 325 int flags;
326 uint8_t data = 0; 326 uint8_t data = 0;
327 DisplayAllocator *da; 327 DisplayAllocator *da;
@@ -329,7 +329,7 @@ Index: qemu/sdl.c
329 const SDL_VideoInfo *vi; 329 const SDL_VideoInfo *vi;
330 330
331 #if defined(__APPLE__) 331 #if defined(__APPLE__)
332@@ -855,6 +870,12 @@ void sdl_display_init(DisplayState *ds, 332@@ -856,6 +871,12 @@ void sdl_display_init(DisplayState *ds,
333 vi = SDL_GetVideoInfo(); 333 vi = SDL_GetVideoInfo();
334 host_format = *(vi->vfmt); 334 host_format = *(vi->vfmt);
335 335
@@ -342,7 +342,7 @@ Index: qemu/sdl.c
342 dcl = qemu_mallocz(sizeof(DisplayChangeListener)); 342 dcl = qemu_mallocz(sizeof(DisplayChangeListener));
343 dcl->dpy_update = sdl_update; 343 dcl->dpy_update = sdl_update;
344 dcl->dpy_resize = sdl_resize; 344 dcl->dpy_resize = sdl_resize;
345@@ -890,4 +911,9 @@ void sdl_display_init(DisplayState *ds, 345@@ -891,4 +912,9 @@ void sdl_display_init(DisplayState *ds,
346 gui_fullscreen_initial_grab = 1; 346 gui_fullscreen_initial_grab = 1;
347 sdl_grab_start(); 347 sdl_grab_start();
348 } 348 }
@@ -352,10 +352,10 @@ Index: qemu/sdl.c
352+ opengl_exec_set_parent_window(info.info.x11.display, 352+ opengl_exec_set_parent_window(info.info.x11.display,
353+ info.info.x11.window); 353+ info.info.x11.window);
354 } 354 }
355Index: qemu/slirp/udp.c 355Index: qemu-0.12.4/slirp/udp.c
356=================================================================== 356===================================================================
357--- qemu.orig/slirp/udp.c 2010-05-11 18:05:22.955784896 -0400 357--- qemu-0.12.4.orig/slirp/udp.c
358+++ qemu/slirp/udp.c 2010-05-12 12:10:40.129784123 -0400 358+++ qemu-0.12.4/slirp/udp.c
359@@ -40,6 +40,7 @@ 359@@ -40,6 +40,7 @@
360 360
361 #include <slirp.h> 361 #include <slirp.h>
@@ -376,10 +376,10 @@ Index: qemu/slirp/udp.c
376 if (slirp->restricted) { 376 if (slirp->restricted) {
377 goto bad; 377 goto bad;
378 } 378 }
379Index: qemu/sysemu.h 379Index: qemu-0.12.4/sysemu.h
380=================================================================== 380===================================================================
381--- qemu.orig/sysemu.h 2010-05-11 18:05:22.959804376 -0400 381--- qemu-0.12.4.orig/sysemu.h
382+++ qemu/sysemu.h 2010-05-12 12:10:40.129784123 -0400 382+++ qemu-0.12.4/sysemu.h
383@@ -141,6 +141,7 @@ extern int semihosting_enabled; 383@@ -141,6 +141,7 @@ extern int semihosting_enabled;
384 extern int old_param; 384 extern int old_param;
385 extern int boot_menu; 385 extern int boot_menu;
@@ -388,10 +388,10 @@ Index: qemu/sysemu.h
388 388
389 #define MAX_NODES 64 389 #define MAX_NODES 64
390 extern int nb_numa_nodes; 390 extern int nb_numa_nodes;
391Index: qemu/target-i386/beginend_funcs.sh 391Index: qemu-0.12.4/target-i386/beginend_funcs.sh
392=================================================================== 392===================================================================
393--- /dev/null 1970-01-01 00:00:00.000000000 +0000 393--- /dev/null
394+++ qemu/target-i386/beginend_funcs.sh 2010-05-12 12:10:40.129784123 -0400 394+++ qemu-0.12.4/target-i386/beginend_funcs.sh
395@@ -0,0 +1,23 @@ 395@@ -0,0 +1,23 @@
396+#! /bin/sh 396+#! /bin/sh
397+# Copyright 2008 (C) Intel Corporation 397+# Copyright 2008 (C) Intel Corporation
@@ -416,10 +416,10 @@ Index: qemu/target-i386/beginend_funcs.sh
416+echo -e MAGIC_MACRO\(glCallList\)\\n 416+echo -e MAGIC_MACRO\(glCallList\)\\n
417+echo -e MAGIC_MACRO\(glCallLists\)\\n 417+echo -e MAGIC_MACRO\(glCallLists\)\\n
418+echo -e MAGIC_MACRO\(glEdgeFlag{,v}\)\\n 418+echo -e MAGIC_MACRO\(glEdgeFlag{,v}\)\\n
419Index: qemu/target-i386/ghash.c 419Index: qemu-0.12.4/target-i386/ghash.c
420=================================================================== 420===================================================================
421--- /dev/null 1970-01-01 00:00:00.000000000 +0000 421--- /dev/null
422+++ qemu/target-i386/ghash.c 2010-05-12 12:10:40.130781590 -0400 422+++ qemu-0.12.4/target-i386/ghash.c
423@@ -0,0 +1,347 @@ 423@@ -0,0 +1,347 @@
424+/* This is a modified and simplified version of original ghash.c */ 424+/* This is a modified and simplified version of original ghash.c */
425+ 425+
@@ -768,10 +768,10 @@ Index: qemu/target-i386/ghash.c
768+ hash_node = next; 768+ hash_node = next;
769+ } 769+ }
770+} 770+}
771Index: qemu/target-i386/ghash.h 771Index: qemu-0.12.4/target-i386/ghash.h
772=================================================================== 772===================================================================
773--- /dev/null 1970-01-01 00:00:00.000000000 +0000 773--- /dev/null
774+++ qemu/target-i386/ghash.h 2010-05-12 12:10:40.130781590 -0400 774+++ qemu-0.12.4/target-i386/ghash.h
775@@ -0,0 +1,59 @@ 775@@ -0,0 +1,59 @@
776+/* This is a modified and simplified version of original ghash.h */ 776+/* This is a modified and simplified version of original ghash.h */
777+ 777+
@@ -832,10 +832,10 @@ Index: qemu/target-i386/ghash.h
832+ 832+
833+#endif /* __SIMPLE_HASH_H__ */ 833+#endif /* __SIMPLE_HASH_H__ */
834+ 834+
835Index: qemu/target-i386/gl_func_perso.h 835Index: qemu-0.12.4/target-i386/gl_func_perso.h
836=================================================================== 836===================================================================
837--- /dev/null 1970-01-01 00:00:00.000000000 +0000 837--- /dev/null
838+++ qemu/target-i386/gl_func_perso.h 2010-05-12 12:10:40.130781590 -0400 838+++ qemu-0.12.4/target-i386/gl_func_perso.h
839@@ -0,0 +1,135 @@ 839@@ -0,0 +1,135 @@
840+/* 840+/*
841+ * Hand-implemented GL/GLX API 841+ * Hand-implemented GL/GLX API
@@ -972,11 +972,11 @@ Index: qemu/target-i386/gl_func_perso.h
972+MAGIC_MACRO(_glGetSelectBuffer_fake), 972+MAGIC_MACRO(_glGetSelectBuffer_fake),
973+MAGIC_MACRO(_glFeedbackBuffer_fake), 973+MAGIC_MACRO(_glFeedbackBuffer_fake),
974+MAGIC_MACRO(_glGetFeedbackBuffer_fake), 974+MAGIC_MACRO(_glGetFeedbackBuffer_fake),
975Index: qemu/target-i386/helper.c 975Index: qemu-0.12.4/target-i386/helper.c
976=================================================================== 976===================================================================
977--- qemu.orig/target-i386/helper.c 2010-05-11 18:05:22.955784896 -0400 977--- qemu-0.12.4.orig/target-i386/helper.c
978+++ qemu/target-i386/helper.c 2010-05-12 12:10:40.131781711 -0400 978+++ qemu-0.12.4/target-i386/helper.c
979@@ -1433,7 +1433,7 @@ target_phys_addr_t cpu_get_phys_page_deb 979@@ -1435,7 +1435,7 @@ target_phys_addr_t cpu_get_phys_page_deb
980 } 980 }
981 981
982 page_offset = (addr & TARGET_PAGE_MASK) & (page_size - 1); 982 page_offset = (addr & TARGET_PAGE_MASK) & (page_size - 1);
@@ -985,10 +985,10 @@ Index: qemu/target-i386/helper.c
985 return paddr; 985 return paddr;
986 } 986 }
987 987
988Index: qemu/target-i386/helper.h 988Index: qemu-0.12.4/target-i386/helper.h
989=================================================================== 989===================================================================
990--- qemu.orig/target-i386/helper.h 2010-05-11 18:05:22.956804503 -0400 990--- qemu-0.12.4.orig/target-i386/helper.h
991+++ qemu/target-i386/helper.h 2010-05-12 12:10:40.131781711 -0400 991+++ qemu-0.12.4/target-i386/helper.h
992@@ -217,4 +217,6 @@ DEF_HELPER_2(rclq, tl, tl, tl) 992@@ -217,4 +217,6 @@ DEF_HELPER_2(rclq, tl, tl, tl)
993 DEF_HELPER_2(rcrq, tl, tl, tl) 993 DEF_HELPER_2(rcrq, tl, tl, tl)
994 #endif 994 #endif
@@ -996,10 +996,10 @@ Index: qemu/target-i386/helper.h
996+DEF_HELPER_0(opengl, void) 996+DEF_HELPER_0(opengl, void)
997+ 997+
998 #include "def-helper.h" 998 #include "def-helper.h"
999Index: qemu/target-i386/helper_opengl.c 999Index: qemu-0.12.4/target-i386/helper_opengl.c
1000=================================================================== 1000===================================================================
1001--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1001--- /dev/null
1002+++ qemu/target-i386/helper_opengl.c 2010-05-12 12:10:40.132781622 -0400 1002+++ qemu-0.12.4/target-i386/helper_opengl.c
1003@@ -0,0 +1,1207 @@ 1003@@ -0,0 +1,1207 @@
1004+/* 1004+/*
1005+ * Host-side implementation of GL/GLX API 1005+ * Host-side implementation of GL/GLX API
@@ -2208,11 +2208,11 @@ Index: qemu/target-i386/helper_opengl.c
2208+ io_register(); 2208+ io_register();
2209+} 2209+}
2210+#endif 2210+#endif
2211Index: qemu/target-i386/kvm.c 2211Index: qemu-0.12.4/target-i386/kvm.c
2212=================================================================== 2212===================================================================
2213--- qemu.orig/target-i386/kvm.c 2010-05-11 18:05:22.956804503 -0400 2213--- qemu-0.12.4.orig/target-i386/kvm.c
2214+++ qemu/target-i386/kvm.c 2010-05-12 12:10:40.132781622 -0400 2214+++ qemu-0.12.4/target-i386/kvm.c
2215@@ -528,7 +528,7 @@ static int kvm_get_fpu(CPUState *env) 2215@@ -529,7 +529,7 @@ static int kvm_get_fpu(CPUState *env)
2216 return 0; 2216 return 0;
2217 } 2217 }
2218 2218
@@ -2221,10 +2221,10 @@ Index: qemu/target-i386/kvm.c
2221 { 2221 {
2222 struct kvm_sregs sregs; 2222 struct kvm_sregs sregs;
2223 uint32_t hflags; 2223 uint32_t hflags;
2224Index: qemu/target-i386/mesa_enums.c 2224Index: qemu-0.12.4/target-i386/mesa_enums.c
2225=================================================================== 2225===================================================================
2226--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2226--- /dev/null
2227+++ qemu/target-i386/mesa_enums.c 2010-05-12 12:10:40.163783695 -0400 2227+++ qemu-0.12.4/target-i386/mesa_enums.c
2228@@ -0,0 +1,4890 @@ 2228@@ -0,0 +1,4890 @@
2229+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */ 2229+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */
2230+ 2230+
@@ -7116,10 +7116,10 @@ Index: qemu/target-i386/mesa_enums.c
7116+} 7116+}
7117+ 7117+
7118+ 7118+
7119Index: qemu/target-i386/mesa_get.c 7119Index: qemu-0.12.4/target-i386/mesa_get.c
7120=================================================================== 7120===================================================================
7121--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7121--- /dev/null
7122+++ qemu/target-i386/mesa_get.c 2010-05-12 12:10:40.171781452 -0400 7122+++ qemu-0.12.4/target-i386/mesa_get.c
7123@@ -0,0 +1,5563 @@ 7123@@ -0,0 +1,5563 @@
7124+ 7124+
7125+/*** 7125+/***
@@ -12684,10 +12684,10 @@ Index: qemu/target-i386/mesa_get.c
12684+ params[i] = (GLdouble) values[i]; 12684+ params[i] = (GLdouble) values[i];
12685+} 12685+}
12686+ 12686+
12687Index: qemu/target-i386/mesa_gl.h 12687Index: qemu-0.12.4/target-i386/mesa_gl.h
12688=================================================================== 12688===================================================================
12689--- /dev/null 1970-01-01 00:00:00.000000000 +0000 12689--- /dev/null
12690+++ qemu/target-i386/mesa_gl.h 2010-05-12 12:10:40.173780926 -0400 12690+++ qemu-0.12.4/target-i386/mesa_gl.h
12691@@ -0,0 +1,2251 @@ 12691@@ -0,0 +1,2251 @@
12692+/* 12692+/*
12693+ * Mesa 3-D graphics library 12693+ * Mesa 3-D graphics library
@@ -14940,10 +14940,10 @@ Index: qemu/target-i386/mesa_gl.h
14940+#endif 14940+#endif
14941+ 14941+
14942+#endif /* __gl_h_ */ 14942+#endif /* __gl_h_ */
14943Index: qemu/target-i386/mesa_glext.h 14943Index: qemu-0.12.4/target-i386/mesa_glext.h
14944=================================================================== 14944===================================================================
14945--- /dev/null 1970-01-01 00:00:00.000000000 +0000 14945--- /dev/null
14946+++ qemu/target-i386/mesa_glext.h 2010-05-12 12:10:40.180780867 -0400 14946+++ qemu-0.12.4/target-i386/mesa_glext.h
14947@@ -0,0 +1,7279 @@ 14947@@ -0,0 +1,7279 @@
14948+#ifndef __glext_h_ 14948+#ifndef __glext_h_
14949+#define __glext_h_ 14949+#define __glext_h_
@@ -22224,10 +22224,10 @@ Index: qemu/target-i386/mesa_glext.h
22224+ 22224+
22225+/* ERO */ 22225+/* ERO */
22226+GLAPI void GLAPIENTRY fake_gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *data); 22226+GLAPI void GLAPIENTRY fake_gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *data);
22227Index: qemu/target-i386/mesa_glu.h 22227Index: qemu-0.12.4/target-i386/mesa_glu.h
22228=================================================================== 22228===================================================================
22229--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22229--- /dev/null
22230+++ qemu/target-i386/mesa_glu.h 2010-05-12 12:10:40.181781686 -0400 22230+++ qemu-0.12.4/target-i386/mesa_glu.h
22231@@ -0,0 +1,354 @@ 22231@@ -0,0 +1,354 @@
22232+/* 22232+/*
22233+** License Applicability. Except to the extent portions of this file are 22233+** License Applicability. Except to the extent portions of this file are
@@ -22583,10 +22583,10 @@ Index: qemu/target-i386/mesa_glu.h
22583+#endif 22583+#endif
22584+ 22584+
22585+#endif /* __glu_h__ */ 22585+#endif /* __glu_h__ */
22586Index: qemu/target-i386/mesa_glx.h 22586Index: qemu-0.12.4/target-i386/mesa_glx.h
22587=================================================================== 22587===================================================================
22588--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22588--- /dev/null
22589+++ qemu/target-i386/mesa_glx.h 2010-05-12 12:10:40.181781686 -0400 22589+++ qemu-0.12.4/target-i386/mesa_glx.h
22590@@ -0,0 +1,510 @@ 22590@@ -0,0 +1,510 @@
22591+/* 22591+/*
22592+ * Mesa 3-D graphics library 22592+ * Mesa 3-D graphics library
@@ -23098,10 +23098,10 @@ Index: qemu/target-i386/mesa_glx.h
23098+#endif 23098+#endif
23099+ 23099+
23100+#endif 23100+#endif
23101Index: qemu/target-i386/mesa_glxext.h 23101Index: qemu-0.12.4/target-i386/mesa_glxext.h
23102=================================================================== 23102===================================================================
23103--- /dev/null 1970-01-01 00:00:00.000000000 +0000 23103--- /dev/null
23104+++ qemu/target-i386/mesa_glxext.h 2010-05-12 12:10:40.182781668 -0400 23104+++ qemu-0.12.4/target-i386/mesa_glxext.h
23105@@ -0,0 +1,785 @@ 23105@@ -0,0 +1,785 @@
23106+#ifndef __glxext_h_ 23106+#ifndef __glxext_h_
23107+#define __glxext_h_ 23107+#define __glxext_h_
@@ -23888,10 +23888,10 @@ Index: qemu/target-i386/mesa_glxext.h
23888+#endif 23888+#endif
23889+ 23889+
23890+#endif 23890+#endif
23891Index: qemu/target-i386/mesa_mipmap.c 23891Index: qemu-0.12.4/target-i386/mesa_mipmap.c
23892=================================================================== 23892===================================================================
23893--- /dev/null 1970-01-01 00:00:00.000000000 +0000 23893--- /dev/null
23894+++ qemu/target-i386/mesa_mipmap.c 2010-05-12 12:10:40.183781579 -0400 23894+++ qemu-0.12.4/target-i386/mesa_mipmap.c
23895@@ -0,0 +1,824 @@ 23895@@ -0,0 +1,824 @@
23896+ 23896+
23897+/* 23897+/*
@@ -24717,10 +24717,10 @@ Index: qemu/target-i386/mesa_mipmap.c
24717+ 24717+
24718+ return retval; 24718+ return retval;
24719+} 24719+}
24720Index: qemu/target-i386/opengl_exec.c 24720Index: qemu-0.12.4/target-i386/opengl_exec.c
24721=================================================================== 24721===================================================================
24722--- /dev/null 1970-01-01 00:00:00.000000000 +0000 24722--- /dev/null
24723+++ qemu/target-i386/opengl_exec.c 2010-05-14 13:34:05.506295624 -0400 24723+++ qemu-0.12.4/target-i386/opengl_exec.c
24724@@ -0,0 +1,3931 @@ 24724@@ -0,0 +1,3931 @@
24725+/* 24725+/*
24726+ * Host-side implementation of GL/GLX API 24726+ * Host-side implementation of GL/GLX API
@@ -28653,10 +28653,10 @@ Index: qemu/target-i386/opengl_exec.c
28653+ 28653+
28654+ return ret_int; 28654+ return ret_int;
28655+} 28655+}
28656Index: qemu/target-i386/opengl_func.h 28656Index: qemu-0.12.4/target-i386/opengl_func.h
28657=================================================================== 28657===================================================================
28658--- /dev/null 1970-01-01 00:00:00.000000000 +0000 28658--- /dev/null
28659+++ qemu/target-i386/opengl_func.h 2010-05-12 12:10:40.187781086 -0400 28659+++ qemu-0.12.4/target-i386/opengl_func.h
28660@@ -0,0 +1,1108 @@ 28660@@ -0,0 +1,1108 @@
28661+/* 28661+/*
28662+ * Main header for both host and guest sides 28662+ * Main header for both host and guest sides
@@ -29766,10 +29766,10 @@ Index: qemu/target-i386/opengl_func.h
29766+#error Unsupported ABI 29766+#error Unsupported ABI
29767+#endif 29767+#endif
29768+#endif 29768+#endif
29769Index: qemu/target-i386/opengl_player.c 29769Index: qemu-0.12.4/target-i386/opengl_player.c
29770=================================================================== 29770===================================================================
29771--- /dev/null 1970-01-01 00:00:00.000000000 +0000 29771--- /dev/null
29772+++ qemu/target-i386/opengl_player.c 2010-05-12 12:10:40.188781627 -0400 29772+++ qemu-0.12.4/target-i386/opengl_player.c
29773@@ -0,0 +1,1461 @@ 29773@@ -0,0 +1,1461 @@
29774+/* 29774+/*
29775+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server 29775+ * Plays a sequence of OpenGL calls recorded either under qemu or with opengl_server
@@ -31232,10 +31232,10 @@ Index: qemu/target-i386/opengl_player.c
31232+ } 31232+ }
31233+ return 0; 31233+ return 0;
31234+} 31234+}
31235Index: qemu/target-i386/opengl_server.c 31235Index: qemu-0.12.4/target-i386/opengl_server.c
31236=================================================================== 31236===================================================================
31237--- /dev/null 1970-01-01 00:00:00.000000000 +0000 31237--- /dev/null
31238+++ qemu/target-i386/opengl_server.c 2010-05-12 12:10:40.188781627 -0400 31238+++ qemu-0.12.4/target-i386/opengl_server.c
31239@@ -0,0 +1,826 @@ 31239@@ -0,0 +1,826 @@
31240+/* 31240+/*
31241+ * TCP/IP OpenGL server 31241+ * TCP/IP OpenGL server
@@ -32063,10 +32063,10 @@ Index: qemu/target-i386/opengl_server.c
32063+ 32063+
32064+ return 0; 32064+ return 0;
32065+} 32065+}
32066Index: qemu/target-i386/opengl_utils.h 32066Index: qemu-0.12.4/target-i386/opengl_utils.h
32067=================================================================== 32067===================================================================
32068--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32068--- /dev/null
32069+++ qemu/target-i386/opengl_utils.h 2010-05-12 12:10:40.189781608 -0400 32069+++ qemu-0.12.4/target-i386/opengl_utils.h
32070@@ -0,0 +1,453 @@ 32070@@ -0,0 +1,453 @@
32071+/* 32071+/*
32072+ * Functions used by host & client sides 32072+ * Functions used by host & client sides
@@ -32521,10 +32521,10 @@ Index: qemu/target-i386/opengl_utils.h
32521+} 32521+}
32522+ 32522+
32523+#endif 32523+#endif
32524Index: qemu/target-i386/parse_gl_h.c 32524Index: qemu-0.12.4/target-i386/parse_gl_h.c
32525=================================================================== 32525===================================================================
32526--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32526--- /dev/null
32527+++ qemu/target-i386/parse_gl_h.c 2010-05-12 12:10:40.190781520 -0400 32527+++ qemu-0.12.4/target-i386/parse_gl_h.c
32528@@ -0,0 +1,1496 @@ 32528@@ -0,0 +1,1496 @@
32529+/* 32529+/*
32530+ * Parse gl.h et glx.h to auto-generate source code 32530+ * Parse gl.h et glx.h to auto-generate source code
@@ -34022,10 +34022,10 @@ Index: qemu/target-i386/parse_gl_h.c
34022+ 34022+
34023+ return 0; 34023+ return 0;
34024+} 34024+}
34025Index: qemu/target-i386/parse_mesa_get_c.c 34025Index: qemu-0.12.4/target-i386/parse_mesa_get_c.c
34026=================================================================== 34026===================================================================
34027--- /dev/null 1970-01-01 00:00:00.000000000 +0000 34027--- /dev/null
34028+++ qemu/target-i386/parse_mesa_get_c.c 2010-05-12 12:10:40.190781520 -0400 34028+++ qemu-0.12.4/target-i386/parse_mesa_get_c.c
34029@@ -0,0 +1,225 @@ 34029@@ -0,0 +1,225 @@
34030+/* 34030+/*
34031+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h" 34031+ * Parse the "get.c" from mesa source tree to generate "glgetv_cst.h"
@@ -34252,10 +34252,10 @@ Index: qemu/target-i386/parse_mesa_get_c.c
34252+ fclose(outf); 34252+ fclose(outf);
34253+ return 0; 34253+ return 0;
34254+} 34254+}
34255Index: qemu/target-i386/translate.c 34255Index: qemu-0.12.4/target-i386/translate.c
34256=================================================================== 34256===================================================================
34257--- qemu.orig/target-i386/translate.c 2010-05-11 18:05:22.957804134 -0400 34257--- qemu-0.12.4.orig/target-i386/translate.c
34258+++ qemu/target-i386/translate.c 2010-05-12 12:10:40.192781553 -0400 34258+++ qemu-0.12.4/target-i386/translate.c
34259@@ -743,6 +743,8 @@ static void gen_check_io(DisasContext *s 34259@@ -743,6 +743,8 @@ static void gen_check_io(DisasContext *s
34260 int state_saved; 34260 int state_saved;
34261 target_ulong next_eip; 34261 target_ulong next_eip;
@@ -34284,10 +34284,10 @@ Index: qemu/target-i386/translate.c
34284 if (s->cc_op != CC_OP_DYNAMIC) 34284 if (s->cc_op != CC_OP_DYNAMIC)
34285 gen_op_set_cc_op(s->cc_op); 34285 gen_op_set_cc_op(s->cc_op);
34286 gen_jmp_im(cur_eip); 34286 gen_jmp_im(cur_eip);
34287Index: qemu/vl.c 34287Index: qemu-0.12.4/vl.c
34288=================================================================== 34288===================================================================
34289--- qemu.orig/vl.c 2010-05-11 18:05:22.959804376 -0400 34289--- qemu-0.12.4.orig/vl.c
34290+++ qemu/vl.c 2010-05-12 17:10:46.174909450 -0400 34290+++ qemu-0.12.4/vl.c
34291@@ -238,6 +238,7 @@ int semihosting_enabled = 0; 34291@@ -238,6 +238,7 @@ int semihosting_enabled = 0;
34292 #ifdef TARGET_ARM 34292 #ifdef TARGET_ARM
34293 int old_param = 0; 34293 int old_param = 0;
@@ -34304,7 +34304,7 @@ Index: qemu/vl.c
34304 34304
34305 int nb_numa_nodes; 34305 int nb_numa_nodes;
34306 uint64_t node_mem[MAX_NODES]; 34306 uint64_t node_mem[MAX_NODES];
34307@@ -4418,6 +4420,8 @@ static void select_vgahw (const char *p) 34307@@ -4432,6 +4434,8 @@ static void select_vgahw (const char *p)
34308 } else if (strstart(p, "xenfb", &opts)) { 34308 } else if (strstart(p, "xenfb", &opts)) {
34309 vga_interface_type = VGA_XENFB; 34309 vga_interface_type = VGA_XENFB;
34310 } else if (!strstart(p, "none", &opts)) { 34310 } else if (!strstart(p, "none", &opts)) {
@@ -34313,7 +34313,7 @@ Index: qemu/vl.c
34313 invalid_vga: 34313 invalid_vga:
34314 fprintf(stderr, "Unknown vga type: %s\n", p); 34314 fprintf(stderr, "Unknown vga type: %s\n", p);
34315 exit(1); 34315 exit(1);
34316@@ -5540,6 +5544,9 @@ int main(int argc, char **argv, char **e 34316@@ -5563,6 +5567,9 @@ int main(int argc, char **argv, char **e
34317 old_param = 1; 34317 old_param = 1;
34318 break; 34318 break;
34319 #endif 34319 #endif
@@ -34323,7 +34323,7 @@ Index: qemu/vl.c
34323 case QEMU_OPTION_clock: 34323 case QEMU_OPTION_clock:
34324 configure_alarms(optarg); 34324 configure_alarms(optarg);
34325 break; 34325 break;
34326@@ -5554,6 +5561,12 @@ int main(int argc, char **argv, char **e 34326@@ -5577,6 +5584,12 @@ int main(int argc, char **argv, char **e
34327 } 34327 }
34328 configure_rtc(opts); 34328 configure_rtc(opts);
34329 break; 34329 break;
@@ -34336,7 +34336,7 @@ Index: qemu/vl.c
34336 case QEMU_OPTION_tb_size: 34336 case QEMU_OPTION_tb_size:
34337 tb_size = strtol(optarg, NULL, 0); 34337 tb_size = strtol(optarg, NULL, 0);
34338 if (tb_size < 0) 34338 if (tb_size < 0)
34339@@ -5907,6 +5920,14 @@ int main(int argc, char **argv, char **e 34339@@ -5933,6 +5946,14 @@ int main(int argc, char **argv, char **e
34340 } 34340 }
34341 } 34341 }
34342 } 34342 }
@@ -34351,11 +34351,11 @@ Index: qemu/vl.c
34351 34351
34352 if (foreach_device_config(DEV_SERIAL, serial_parse) < 0) 34352 if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)
34353 exit(1); 34353 exit(1);
34354Index: qemu/qemu-options.hx 34354Index: qemu-0.12.4/qemu-options.hx
34355=================================================================== 34355===================================================================
34356--- qemu.orig/qemu-options.hx 2010-05-11 18:05:22.959804376 -0400 34356--- qemu-0.12.4.orig/qemu-options.hx
34357+++ qemu/qemu-options.hx 2010-05-12 17:18:10.420907903 -0400 34357+++ qemu-0.12.4/qemu-options.hx
34358@@ -1783,6 +1783,18 @@ many timer interrupts were not processed 34358@@ -1789,6 +1789,18 @@ many timer interrupts were not processed
34359 re-inject them. 34359 re-inject them.
34360 ETEXI 34360 ETEXI
34361 34361
diff --git a/meta/packages/qemu/qemu-0.12/qemugl-allow-glxcontext-release.patch b/meta/packages/qemu/qemu-0.12.4/qemugl-allow-glxcontext-release.patch
index 43acc361a0..43acc361a0 100644
--- a/meta/packages/qemu/qemu-0.12/qemugl-allow-glxcontext-release.patch
+++ b/meta/packages/qemu/qemu-0.12.4/qemugl-allow-glxcontext-release.patch
diff --git a/meta/packages/qemu/qemu-0.12/workaround_bad_futex_headers.patch b/meta/packages/qemu/qemu-0.12.4/workaround_bad_futex_headers.patch
index 7727a39f37..7727a39f37 100644
--- a/meta/packages/qemu/qemu-0.12/workaround_bad_futex_headers.patch
+++ b/meta/packages/qemu/qemu-0.12.4/workaround_bad_futex_headers.patch
diff --git a/meta/packages/qemu/qemu-0.12/series b/meta/packages/qemu/qemu-0.12/series
deleted file mode 100644
index 57d41df4f6..0000000000
--- a/meta/packages/qemu/qemu-0.12/series
+++ /dev/null
@@ -1,13 +0,0 @@
106_exit_segfault.patch -p0
211_signal_sigaction.patch -p0
322_net_tuntap_stall.patch -p0
431_syscalls.patch -p0
552_ne2000_return.patch -p1
663_sparc_build.patch -p0
764_ppc_asm_constraints.patch -p1
866_tls_ld.patch -p0
991-oh-sdl-cursor.patch -p0
10qemu-amd64-32b-mapping-0.9.0.patch -p1
11workaround_bad_futex_headers.patch -p1
12no-strip.patch -p1
13fix-dirent.patch -p1
diff --git a/meta/packages/qemu/qemu_0.12.0.bb b/meta/packages/qemu/qemu_0.12.4.bb
index 343b60536c..43a40c2a27 100644
--- a/meta/packages/qemu/qemu_0.12.0.bb
+++ b/meta/packages/qemu/qemu_0.12.4.bb
@@ -1,6 +1,6 @@
1require qemu.inc 1require qemu.inc
2 2
3PR = "r10" 3PR = "r13"
4 4
5FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 5FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
6FILESDIR = "${WORKDIR}" 6FILESDIR = "${WORKDIR}"
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/packages/qemu/qemu_git.bb
index 346e9a3947..8f39f5b6f8 100644
--- a/meta/packages/qemu/qemu_git.bb
+++ b/meta/packages/qemu/qemu_git.bb
@@ -1,9 +1,10 @@
1require qemu.inc 1require qemu.inc
2 2
3PV = "0.12.0+git${SRCREV}" 3PV = "0.12.4"
4PR = "r6" 4PR = "r7"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/:${FILE_DIRNAME}/qemu-0.12/" 6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
7FILESDIR = "${WORKDIR}"
7 8
8SRC_URI = "\ 9SRC_URI = "\
9 git://git.sv.gnu.org/qemu.git;protocol=git \ 10 git://git.sv.gnu.org/qemu.git;protocol=git \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 21:05:55 +0000