diff options
Diffstat (limited to 'meta-efl/recipes-efl/efl')
-rw-r--r-- | meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch | 41 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch | 24 |
2 files changed, 53 insertions, 12 deletions
diff --git a/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch new file mode 100644 index 000000000..a2ce28526 --- /dev/null +++ b/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 29 Oct 2011 00:16:55 +0200 | ||
4 | Subject: [PATCH] ecore-fb: fix ts init | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | The whole ecore-fb init logic is somewhat flawed; with this patch we | ||
9 | get at least a working touchscreen w/ tslib again. | ||
10 | |||
11 | Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> | ||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | src/lib/ecore_fb/ecore_fb.c | 4 ++++ | ||
15 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
16 | |||
17 | diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c | ||
18 | index ca7d73d..5b99989 100644 | ||
19 | --- a/src/lib/ecore_fb/ecore_fb.c | ||
20 | +++ b/src/lib/ecore_fb/ecore_fb.c | ||
21 | @@ -39,6 +39,9 @@ ecore_fb_init(const char *name __UNUSED__) | ||
22 | if (!ecore_fb_vt_init()) | ||
23 | return --_ecore_fb_init_count; | ||
24 | |||
25 | + if (!ecore_fb_ts_init()) | ||
26 | + return --_ecore_fb_init_count; | ||
27 | + | ||
28 | _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h); | ||
29 | |||
30 | return _ecore_fb_init_count; | ||
31 | @@ -59,6 +62,7 @@ ecore_fb_shutdown(void) | ||
32 | if (--_ecore_fb_init_count != 0) | ||
33 | return _ecore_fb_init_count; | ||
34 | |||
35 | + ecore_fb_ts_shutdown(); | ||
36 | ecore_fb_vt_shutdown(); | ||
37 | |||
38 | return _ecore_fb_init_count; | ||
39 | -- | ||
40 | 1.7.7.1 | ||
41 | |||
diff --git a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch index a2ce28526..55773a3b9 100644 --- a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch +++ b/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001 | 1 | From 657571197c9d369e12ae31b6777a1929fe3680ef Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 29 Oct 2011 00:16:55 +0200 | 3 | Date: Sat, 29 Oct 2011 00:16:55 +0200 |
4 | Subject: [PATCH] ecore-fb: fix ts init | 4 | Subject: [PATCH] ecore-fb: fix ts init |
@@ -11,31 +11,31 @@ get at least a working touchscreen w/ tslib again. | |||
11 | Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> | 11 | Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> |
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
13 | --- | 13 | --- |
14 | src/lib/ecore_fb/ecore_fb.c | 4 ++++ | 14 | ecore/src/lib/ecore_fb/ecore_fb.c | 4 ++++ |
15 | 1 files changed, 4 insertions(+), 0 deletions(-) | 15 | 1 files changed, 4 insertions(+), 0 deletions(-) |
16 | 16 | ||
17 | diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c | 17 | diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c |
18 | index ca7d73d..5b99989 100644 | 18 | index 5b2b84b..a1904b3 100644 |
19 | --- a/src/lib/ecore_fb/ecore_fb.c | 19 | --- a/src/lib/ecore_fb/ecore_fb.c |
20 | +++ b/src/lib/ecore_fb/ecore_fb.c | 20 | +++ b/src/lib/ecore_fb/ecore_fb.c |
21 | @@ -39,6 +39,9 @@ ecore_fb_init(const char *name __UNUSED__) | 21 | @@ -46,6 +46,9 @@ ecore_fb_init(const char *name __UNUSED__) |
22 | if (!ecore_fb_vt_init()) | 22 | if (!ecore_fb_vt_init()) |
23 | return --_ecore_fb_init_count; | 23 | return --_ecore_fb_init_count; |
24 | 24 | ||
25 | + if (!ecore_fb_ts_init()) | 25 | + if (!ecore_fb_ts_init()) |
26 | + return --_ecore_fb_init_count; | 26 | + return --_ecore_fb_init_count; |
27 | + | 27 | + |
28 | _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h); | 28 | if (!oldhand) |
29 | 29 | { | |
30 | return _ecore_fb_init_count; | 30 | oldhand = signal(SIGINT, nosigint); |
31 | @@ -59,6 +62,7 @@ ecore_fb_shutdown(void) | 31 | @@ -77,6 +80,7 @@ ecore_fb_shutdown(void) |
32 | if (--_ecore_fb_init_count != 0) | 32 | oldhand = NULL; |
33 | return _ecore_fb_init_count; | 33 | } |
34 | 34 | ||
35 | + ecore_fb_ts_shutdown(); | 35 | + ecore_fb_ts_shutdown(); |
36 | ecore_fb_vt_shutdown(); | 36 | ecore_fb_vt_shutdown(); |
37 | 37 | ||
38 | return _ecore_fb_init_count; | 38 | return _ecore_fb_init_count; |
39 | -- | 39 | -- |
40 | 1.7.7.1 | 40 | 1.7.8.6 |
41 | 41 | ||