diff options
| author | Roman I Khimov <khimov@altell.ru> | 2009-05-19 19:18:15 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2009-05-21 17:14:30 +0400 |
| commit | 247515aec9c7b69239bbbc09a3604c5e4e17d01d (patch) | |
| tree | c86fb34923bcd440bf4c36b5e3c63bdbd7834c01 /recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch | |
| parent | ccab93e06e6b3fc9a58a000fce97270d99911780 (diff) | |
qemu 0.10.3: port OE patches, make preferable version
Fixes binary locale generation broken by
6065fa491c009118ae282ae933215649cccfcd24.
Tested to work on ARM OABI (simpad), ARM EABI (qemuarm), PowerPC (efika)
and i686 (x86-prescott).
Acked-by: Philipp Zabel <philipp.zabel@gmail.com>
Diffstat (limited to 'recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch')
| -rw-r--r-- | recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch b/recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch new file mode 100644 index 0000000000..a2eb438ed9 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch @@ -0,0 +1,30 @@ +Index: trunk/hw/baum.c +=================================================================== +--- trunk.orig/hw/baum.c 2008-11-29 05:12:40.418390606 +0300 ++++ trunk/hw/baum.c 2008-11-29 05:13:11.498378426 +0300 +@@ -569,8 +569,10 @@ CharDriverState *chr_baum_init(void) + CharDriverState *chr; + brlapi_handle_t *handle; + #ifdef CONFIG_SDL ++#ifdef SDL_VIDEO_DRIVER_X11 + SDL_SysWMinfo info; + #endif ++#endif + int tty; + + baum = qemu_mallocz(sizeof(BaumDriverState)); +@@ -605,12 +607,14 @@ CharDriverState *chr_baum_init(void) + } + + #ifdef CONFIG_SDL ++#ifdef SDL_VIDEO_DRIVER_X11 + memset(&info, 0, sizeof(info)); + SDL_VERSION(&info.version); + if (SDL_GetWMInfo(&info)) + tty = info.info.x11.wmwindow; + else + #endif ++#endif + tty = BRLAPI_TTY_DEFAULT; + + if (brlapi__enterTtyMode(handle, tty, NULL) == -1) { |