helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-01 07:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

e-base: bump EFL_SRCREV and refresh patches and elementary version

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2011-10-21 10:52:39 +02:00
parent 56a5dd99ba
commit 776cb915ff
5 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-efl/classes/e-base.bbclass
View File

@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
SRCNAME ?= "${BPN}" SRCNAME ?= "${BPN}"
# usually tracks svn trunk HEAD # usually tracks svn trunk HEAD
EFL_SRCREV ?= "64150" EFL_SRCREV ?= "64506"
# revision when 1.0.0 was released, for recipes which don't need rebuild so often # revision when 1.0.0 was released, for recipes which don't need rebuild so often
EFL_SRCREV_1.0.0 ?= "56356" EFL_SRCREV_1.0.0 ?= "56356"

12
meta-efl/recipes-efl/efl/ecore/exit_uclibc.patch
View File

@ -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);

44
meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch
View File

@ -1,25 +1,34 @@
# From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001
# The whole ecore-fb init logic is somewhat flawed; with this patch we From: Martin Jansa <Martin.Jansa@gmail.com>
# get at least a working touchscreen w/ tslib again. Date: Sat, 29 Oct 2011 00:16:55 +0200
# Subject: [PATCH] ecore-fb: fix ts init
# Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de>
#
diff --git ecore.old/src/lib/ecore_fb/ecore_fb.c ecore/src/lib/ecore_fb/ecore_fb.c Upstream-Status: Pending
index 77071e3..a4e1c5d 100644
--- ecore.old/src/lib/ecore_fb/ecore_fb.c The whole ecore-fb init logic is somewhat flawed; with this patch we
+++ ecore/src/lib/ecore_fb/ecore_fb.c get at least a working touchscreen w/ tslib again.
@@ -46,6 +46,9 @@ ecore_fb_init(const char *name __UNUSED__)
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()) if (!ecore_fb_vt_init())
return --_ecore_fb_init_count; return --_ecore_fb_init_count;
+ if (!ecore_fb_ts_init()) + 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_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h);
ECORE_FB_EVENT_KEY_UP = ecore_event_type_new();
ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new(); return _ecore_fb_init_count;
@@ -72,6 +75,7 @@ ecore_fb_shutdown(void) @@ -59,6 +62,7 @@ ecore_fb_shutdown(void)
if (--_ecore_fb_init_count != 0) if (--_ecore_fb_init_count != 0)
return _ecore_fb_init_count; return _ecore_fb_init_count;
@ -27,3 +36,6 @@ index 77071e3..a4e1c5d 100644
ecore_fb_vt_shutdown(); ecore_fb_vt_shutdown();
return _ecore_fb_init_count; return _ecore_fb_init_count;
--
1.7.7.1

1
meta-efl/recipes-efl/efl/ecore_svn.bb
View File

@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
SRC_URI = "\ SRC_URI = "\
${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \ ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
file://exit_uclibc.patch \
file://fix-ecore-fb-initialization.patch \ file://fix-ecore-fb-initialization.patch \
" "
S = "${WORKDIR}/${SRCNAME}" S = "${WORKDIR}/${SRCNAME}"

3
meta-efl/recipes-efl/efl/elementary_svn.bb
View File

@ -2,8 +2,7 @@ DESCRIPTION = "EFL based widget set for mobile devices"
LICENSE = "LGPLv2.1" LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=cdc6c12b238ccd62635a7517dfe89438" LIC_FILES_CHKSUM = "file://COPYING;md5=cdc6c12b238ccd62635a7517dfe89438"
DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb" DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb"
PV = "0.7.0+svnr${SRCPV}" PV = "0.8.0+svnr${SRCPV}"
PR = "r12"
SRCREV = "${EFL_SRCREV}" SRCREV = "${EFL_SRCREV}"
inherit efl gettext inherit efl gettext