From 601886e3f6be733b325d3e346e050aeddb8e0641 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 18 Apr 2011 09:12:04 +0200 Subject: e-base: bump SRCREV and update fix-ecore-fb-initialization.patch patch for ecore_svn Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- .../ecore-1.0.0/fix-ecore-fb-initialization.patch | 28 ++++++++++++++++++++++ .../efl/ecore/fix-ecore-fb-initialization.patch | 17 ++++++------- 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch (limited to 'meta-efl') diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index b25ddf22c0..936a20d644 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" # usually tracks svn trunk HEAD -EFL_SRCREV ?= "58429" +EFL_SRCREV ?= "59242" # revision when 1.0.0 was released, for recipes which don't need rebuild so often EFL_SRCREV_1.0.0 ?= "56356" diff --git a/meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch new file mode 100644 index 0000000000..cd74c7ebd4 --- /dev/null +++ b/meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch @@ -0,0 +1,28 @@ +# +# 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 +# + +diff -uNr ecore.orig//src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c +--- ecore.orig//src/lib/ecore_fb/ecore_fb.c 2010-09-21 12:40:06.000000000 +0200 ++++ ecore/src/lib/ecore_fb/ecore_fb.c 2010-09-24 18:42:02.000000000 +0200 +@@ -39,6 +39,9 @@ + + if (!ecore_fb_vt_init()) + return --_ecore_fb_init_count; ++ ++ if (!ecore_fb_ts_init()) ++ return --_ecore_fb_init_count; + + ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); + ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); +@@ -63,6 +66,7 @@ + if (--_ecore_fb_init_count != 0) + return _ecore_fb_init_count; + ++ ecore_fb_ts_shutdown(); + ecore_fb_vt_shutdown(); + + return _ecore_fb_init_count; 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 cd74c7ebd4..216b5a5bb7 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 @@ -5,20 +5,21 @@ # Signed-off-by: Michael 'Mickey' Lauer # -diff -uNr ecore.orig//src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c ---- ecore.orig//src/lib/ecore_fb/ecore_fb.c 2010-09-21 12:40:06.000000000 +0200 -+++ ecore/src/lib/ecore_fb/ecore_fb.c 2010-09-24 18:42:02.000000000 +0200 -@@ -39,6 +39,9 @@ - +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__) if (!ecore_fb_vt_init()) return --_ecore_fb_init_count; -+ + + if (!ecore_fb_ts_init()) + return --_ecore_fb_init_count; - ++ ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); -@@ -63,6 +66,7 @@ + ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new(); +@@ -72,6 +75,7 @@ ecore_fb_shutdown(void) if (--_ecore_fb_init_count != 0) return _ecore_fb_init_count; -- cgit 1.2.3-korg