diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-21 10:52:39 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-11-01 09:57:03 +0100 |
| commit | 776cb915ff4123a55eb1a03fa11c705339118da3 (patch) | |
| tree | 4874b720be03674c2bbeef9a2f6f172baaa38df5 /meta-efl/recipes-efl/efl/ecore | |
| parent | 56a5dd99ba764baa91e561c96aa413aa1a312c2e (diff) | |
| download | meta-openembedded-776cb915ff4123a55eb1a03fa11c705339118da3.tar.gz | |
e-base: bump EFL_SRCREV and refresh patches and elementary version
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl/efl/ecore')
| -rw-r--r-- | meta-efl/recipes-efl/efl/ecore/exit_uclibc.patch | 12 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch | 44 |
2 files changed, 28 insertions, 28 deletions
diff --git a/meta-efl/recipes-efl/efl/ecore/exit_uclibc.patch b/meta-efl/recipes-efl/efl/ecore/exit_uclibc.patch deleted file mode 100644 index 3d04453eb8..0000000000 --- a/meta-efl/recipes-efl/efl/ecore/exit_uclibc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr ecore.orig//src/lib/ecore_con/ecore_con_info.c ecore/src/lib/ecore_con/ecore_con_info.c ---- ecore.orig//src/lib/ecore_con/ecore_con_info.c 2010-08-13 14:31:18.000000000 +0200 -+++ ecore/src/lib/ecore_con/ecore_con_info.c 2010-08-13 14:49:37.000000000 +0200 -@@ -283,7 +283,7 @@ - - err = write(fd[1], "", 1); - close(fd[1]); --#ifdef __USE_ISOC99 -+#if defined(__USE_ISOC99) && !defined(__UCLIBC__) - _Exit(0); - #else - _exit(0); 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 216b5a5bb7..a2ce285266 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,25 +1,34 @@ -# -# The whole ecore-fb init logic is somewhat flawed; with this patch we -# get at least a working touchscreen w/ tslib again. -# -# Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# +From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 29 Oct 2011 00:16:55 +0200 +Subject: [PATCH] ecore-fb: fix ts init -diff --git ecore.old/src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c -index 77071e3..a4e1c5d 100644 ---- ecore.old/src/lib/ecore_fb/ecore_fb.c -+++ ecore/src/lib/ecore_fb/ecore_fb.c -@@ -46,6 +46,9 @@ ecore_fb_init(const char *name __UNUSED__) +Upstream-Status: Pending + +The whole ecore-fb init logic is somewhat flawed; with this patch we +get at least a working touchscreen w/ tslib again. + +Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/lib/ecore_fb/ecore_fb.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c +index ca7d73d..5b99989 100644 +--- a/src/lib/ecore_fb/ecore_fb.c ++++ b/src/lib/ecore_fb/ecore_fb.c +@@ -39,6 +39,9 @@ ecore_fb_init(const char *name __UNUSED__) if (!ecore_fb_vt_init()) return --_ecore_fb_init_count; + if (!ecore_fb_ts_init()) -+ return --_ecore_fb_init_count; ++ return --_ecore_fb_init_count; + - ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); - ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); - ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new(); -@@ -72,6 +75,7 @@ ecore_fb_shutdown(void) + _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h); + + return _ecore_fb_init_count; +@@ -59,6 +62,7 @@ ecore_fb_shutdown(void) if (--_ecore_fb_init_count != 0) return _ecore_fb_init_count; @@ -27,3 +36,6 @@ index 77071e3..a4e1c5d 100644 ecore_fb_vt_shutdown(); return _ecore_fb_init_count; +-- +1.7.7.1 + |