[oe-commits] Dmitry Baryshkov : qemu-svn: fix hw/baum.c compilation

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8ad80633a45048351695897162f5a2bd94057c8f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8ad80633a45048351695897162f5a2bd94057c8f

Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date:   Mon Dec  1 04:31:52 2008 +0300

qemu-svn: fix hw/baum.c compilation

The SDL code in hw/baum.c assumes that SDL is compiled with X11 driver
If that is not the case, compilation will fail. Fix that by explicitly
checking for SDL_VIDEO_DRIVER_X11

Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>

---

 .../qemu-0.9.1+svn/fix_baum_c_compilation.patch    |   30 ++++++++++++++++++++
 packages/qemu/qemu_svn.bb                          |    3 +-
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch b/packages/qemu/qemu-0.9.1+svn/fix_baum_c_compilation.patch
new file mode 100644
index 0000000..a2eb438
--- /dev/null
+++ b/packages/qemu/qemu-0.9.1+svn/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) {
diff --git a/packages/qemu/qemu_svn.bb b/packages/qemu/qemu_svn.bb
index e8d9883..b4acae7 100644
--- a/packages/qemu/qemu_svn.bb
+++ b/packages/qemu/qemu_svn.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
 PV = "0.9.1+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/"
 
@@ -34,6 +34,7 @@ SRC_URI = "\
     file://fix_protection_bits.patch;patch=1 \
     file://revert_arm_tcg.patch.gz;patch=1;minrev=4242 \
     file://qemu-n800-support.patch;patch=1 \
+    file://fix_baum_c_compilation.patch;patch=1 \
     file://fix_dirent_h_include.patch;patch=1"
 
 S = "${WORKDIR}/trunk"