4 files changed, 29 insertions, 31 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 3d04453eb..000000000
--- 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 216b5a5bb..a2ce28526 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
+
diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb
index 99fb3e208..c71c1b9ec 100644
--- a/meta-efl/recipes-efl/efl/ecore_svn.bb
+++ b/meta-efl/recipes-efl/efl/ecore_svn.bb
@@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
-  file://exit_uclibc.patch \
   file://fix-ecore-fb-initialization.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index 1034e0f8e..6162abda2 100644
--- a/meta-efl/recipes-efl/efl/elementary_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary_svn.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cdc6c12b238ccd62635a7517dfe89438"
 DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb"
-PV = "0.7.0+svnr${SRCPV}"
-PR = "r12"
+PV = "0.8.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl gettext