summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2013-10-05 12:11:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-07 09:37:33 +0100
commit0b9c3393c10030e14ca9716d7c51940e95c0c173 (patch)
tree57b656b1631ca667e92287190fd13f2872854a52
parentabeea1be5f7cda164a7b6df741a4e1a14b1bb67e (diff)
downloadpoky-0b9c3393c10030e14ca9716d7c51940e95c0c173.tar.gz
qemu: fix nativesdk build without x11
when x11 is not defined in DISTRO_FEATURES, there are no x11 headers so True is not defined leading to : | ui/sdl.c:62:8: warning: type defaults to 'int' in declaration of 'doing_grabs' [-Wimplicit-int] | static doing_grabs = True; | ^ | ui/sdl.c:62:22: error: 'True' undeclared here (not in a function) | static doing_grabs = True; | ^ (From OE-Core rev: d3d5ccd3275196fb9e4cb8f49d3c087b97c20ed6) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/files/disable-grabs.patch19
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-devtools/qemu/files/disable-grabs.patch b/meta/recipes-devtools/qemu/files/disable-grabs.patch
index 99ad00b2e3..41726b1c87 100644
--- a/meta/recipes-devtools/qemu/files/disable-grabs.patch
+++ b/meta/recipes-devtools/qemu/files/disable-grabs.patch
@@ -13,30 +13,33 @@ the current grabbing behaviour for everyone else.
13Upstream-Status: Pending 13Upstream-Status: Pending
14Signed-off-by: Ross Burton <ross.burton@intel.com> 14Signed-off-by: Ross Burton <ross.burton@intel.com>
15 15
16
17From 4b1988ecb01a178269ec0513a75f2ec620c7ef6a Mon Sep 17 00:00:00 2001 16From 4b1988ecb01a178269ec0513a75f2ec620c7ef6a Mon Sep 17 00:00:00 2001
18From: Ross Burton <ross.burton@intel.com> 17From: Ross Burton <ross.burton@intel.com>
19Date: Wed, 18 Sep 2013 14:04:54 +0100 18Date: Wed, 18 Sep 2013 14:04:54 +0100
20Subject: [PATCH] sdl.c: allow user to disable pointer grabs 19Subject: [PATCH] sdl.c: allow user to disable pointer grabs
21 20
22Signed-off-by: Ross Burton <ross.burton@intel.com> 21Signed-off-by: Ross Burton <ross.burton@intel.com>
22Signed-off-by: Eric Bénard <eric@eukrea.com>
23--- 23---
24 ui/sdl.c | 9 +++++++-- 24 ui/sdl.c | 12 ++++++++++--
25 1 file changed, 7 insertions(+), 2 deletions(-) 25 1 file changed, 10 insertions(+), 2 deletions(-)
26 26
27diff --git a/ui/sdl.c b/ui/sdl.c 27diff --git a/ui/sdl.c b/ui/sdl.c
28index 39a42d6..6095aa6 100644 28index 39a42d6..9b8abe5 100644
29--- a/ui/sdl.c 29--- a/ui/sdl.c
30+++ b/ui/sdl.c 30+++ b/ui/sdl.c
31@@ -59,6 +59,7 @@ static SDL_Cursor *guest_sprite = NULL; 31@@ -59,6 +59,10 @@ static SDL_Cursor *guest_sprite = NULL;
32 static SDL_PixelFormat host_format; 32 static SDL_PixelFormat host_format;
33 static int scaling_active = 0; 33 static int scaling_active = 0;
34 static Notifier mouse_mode_notifier; 34 static Notifier mouse_mode_notifier;
35+#ifndef True
36+#define True 1
37+#endif
35+static doing_grabs = True; 38+static doing_grabs = True;
36 39
37 static void sdl_update(DisplayChangeListener *dcl, 40 static void sdl_update(DisplayChangeListener *dcl,
38 int x, int y, int w, int h) 41 int x, int y, int w, int h)
39@@ -384,14 +385,16 @@ static void sdl_grab_start(void) 42@@ -384,14 +388,16 @@ static void sdl_grab_start(void)
40 SDL_WarpMouse(guest_x, guest_y); 43 SDL_WarpMouse(guest_x, guest_y);
41 } else 44 } else
42 sdl_hide_cursor(); 45 sdl_hide_cursor();
@@ -55,7 +58,7 @@ index 39a42d6..6095aa6 100644
55 gui_grab = 0; 58 gui_grab = 0;
56 sdl_show_cursor(); 59 sdl_show_cursor();
57 sdl_update_caption(); 60 sdl_update_caption();
58@@ -909,6 +912,8 @@ void sdl_display_init(DisplayState *ds, 61@@ -909,6 +915,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
59 * This requires SDL >= 1.2.14. */ 62 * This requires SDL >= 1.2.14. */
60 setenv("SDL_DISABLE_LOCK_KEYS", "1", 1); 63 setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
61 64
@@ -65,5 +68,5 @@ index 39a42d6..6095aa6 100644
65 if (SDL_Init (flags)) { 68 if (SDL_Init (flags)) {
66 fprintf(stderr, "Could not initialize SDL(%s) - exiting\n", 69 fprintf(stderr, "Could not initialize SDL(%s) - exiting\n",
67-- 70--
681.7.10.4 711.8.3.1
69 72