summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-04-18 09:12:04 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-05-10 13:30:24 +0200
commit601886e3f6be733b325d3e346e050aeddb8e0641 (patch)
tree62fda487d92a6106947e9ebb1dfa8ef37512c634 /meta-efl
parent5f81a7d2bc3c6dbafbcd9a7ae965ffb51c9d7ab9 (diff)
downloadmeta-openembedded-601886e3f6be733b325d3e346e050aeddb8e0641.tar.gz
e-base: bump SRCREV and update fix-ecore-fb-initialization.patch patch for ecore_svn
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/classes/e-base.bbclass2
-rw-r--r--meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch28
-rw-r--r--meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch17
3 files changed, 38 insertions, 9 deletions
diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index b25ddf22c..936a20d64 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
2SRCNAME ?= "${BPN}" 2SRCNAME ?= "${BPN}"
3 3
4# usually tracks svn trunk HEAD 4# usually tracks svn trunk HEAD
5EFL_SRCREV ?= "58429" 5EFL_SRCREV ?= "59242"
6# revision when 1.0.0 was released, for recipes which don't need rebuild so often 6# revision when 1.0.0 was released, for recipes which don't need rebuild so often
7EFL_SRCREV_1.0.0 ?= "56356" 7EFL_SRCREV_1.0.0 ?= "56356"
8 8
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 000000000..cd74c7ebd
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch
@@ -0,0 +1,28 @@
1#
2# The whole ecore-fb init logic is somewhat flawed; with this patch we
3# get at least a working touchscreen w/ tslib again.
4#
5# Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de>
6#
7
8diff -uNr ecore.orig//src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c
9--- ecore.orig//src/lib/ecore_fb/ecore_fb.c 2010-09-21 12:40:06.000000000 +0200
10+++ ecore/src/lib/ecore_fb/ecore_fb.c 2010-09-24 18:42:02.000000000 +0200
11@@ -39,6 +39,9 @@
12
13 if (!ecore_fb_vt_init())
14 return --_ecore_fb_init_count;
15+
16+ if (!ecore_fb_ts_init())
17+ return --_ecore_fb_init_count;
18
19 ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new();
20 ECORE_FB_EVENT_KEY_UP = ecore_event_type_new();
21@@ -63,6 +66,7 @@
22 if (--_ecore_fb_init_count != 0)
23 return _ecore_fb_init_count;
24
25+ ecore_fb_ts_shutdown();
26 ecore_fb_vt_shutdown();
27
28 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 cd74c7ebd..216b5a5bb 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 @@
5# Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> 5# Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de>
6# 6#
7 7
8diff -uNr ecore.orig//src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c 8diff --git ecore.old/src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c
9--- ecore.orig//src/lib/ecore_fb/ecore_fb.c 2010-09-21 12:40:06.000000000 +0200 9index 77071e3..a4e1c5d 100644
10+++ ecore/src/lib/ecore_fb/ecore_fb.c 2010-09-24 18:42:02.000000000 +0200 10--- ecore.old/src/lib/ecore_fb/ecore_fb.c
11@@ -39,6 +39,9 @@ 11+++ ecore/src/lib/ecore_fb/ecore_fb.c
12 12@@ -46,6 +46,9 @@ ecore_fb_init(const char *name __UNUSED__)
13 if (!ecore_fb_vt_init()) 13 if (!ecore_fb_vt_init())
14 return --_ecore_fb_init_count; 14 return --_ecore_fb_init_count;
15+ 15
16+ if (!ecore_fb_ts_init()) 16+ if (!ecore_fb_ts_init())
17+ return --_ecore_fb_init_count; 17+ return --_ecore_fb_init_count;
18 18+
19 ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); 19 ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new();
20 ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); 20 ECORE_FB_EVENT_KEY_UP = ecore_event_type_new();
21@@ -63,6 +66,7 @@ 21 ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new();
22@@ -72,6 +75,7 @@ ecore_fb_shutdown(void)
22 if (--_ecore_fb_init_count != 0) 23 if (--_ecore_fb_init_count != 0)
23 return _ecore_fb_init_count; 24 return _ecore_fb_init_count;
24 25