[meta-efl][PATCH 0/2] Pull request #5

[meta-efl][PATCH 0/2] Pull request #5

[Martin Jansa]

Pull URL: git://gitorious.org/shr/meta-openembedded.git
  Branch: jama/meta-efl
  Browse: http://gitorious.org/shr/meta-openembedded/commits/jama/meta-efl

Thanks,
    Martin Jansa <Martin.Jansa@gmail.com>
---


Martin Jansa (2):
  e-base: bump SRCREV and update fix-ecore-fb-initialization.patch
    patch for ecore_svn
  embryo, epdf: fix LICENSE, from oe.dev

 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 ++++++-----
 meta-efl/recipes-efl/efl/embryo.inc                |    7 +++--
 meta-efl/recipes-efl/efl/epdf_svn.bb               |   10 ++++---
 5 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch

-- 
1.7.5.rc3

[meta-efl][PATCH 1/2] e-base: bump SRCREV and update fix-ecore-fb-initialization.patch patch for ecore_svn

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 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

diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index b25ddf2..936a20d 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 0000000..cd74c7e
--- /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 <mlauer@vanille-media.de>
+#
+
+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 cd74c7e..216b5a5 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 <mlauer@vanille-media.de>
 #
 
-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;
  
-- 
1.7.5.rc3

[meta-efl][PATCH 2/2] embryo, epdf: fix LICENSE, from oe.dev

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/embryo.inc  |    7 ++++---
 meta-efl/recipes-efl/efl/epdf_svn.bb |   10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/meta-efl/recipes-efl/efl/embryo.inc b/meta-efl/recipes-efl/efl/embryo.inc
index ab02905..8bb8b6f 100644
--- a/meta-efl/recipes-efl/efl/embryo.inc
+++ b/meta-efl/recipes-efl/efl/embryo.inc
@@ -1,11 +1,12 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
-LICENSE = "MIT BSD & CompuPhase"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6aa45e26c1ed178da910fd76b306a875"
 
 inherit efl
 
+LICENSE = "MIT BSD CompuPhase"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6aa45e26c1ed178da910fd76b306a875"
+
 BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
 
 # Some upgrade path tweaking
 AUTO_LIBNAME_PKGS = ""
diff --git a/meta-efl/recipes-efl/efl/epdf_svn.bb b/meta-efl/recipes-efl/efl/epdf_svn.bb
index 1f37629..490b3ce 100644
--- a/meta-efl/recipes-efl/efl/epdf_svn.bb
+++ b/meta-efl/recipes-efl/efl/epdf_svn.bb
@@ -1,8 +1,4 @@
 DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
-LICENSE = "GPLv2 & LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \
-"
 
 DEPENDS = "poppler evas ecore"
 PV = "0.1.0+svnr${SRCPV}"
@@ -10,6 +6,12 @@ PR = "r4"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl
+
+LICENSE = "GPLv2 LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \
+"
+
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 
-- 
1.7.5.rc3

Re: [meta-efl][PATCH 0/2] Pull request #5

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10-05-11 13:34, Martin Jansa wrote:
> 
> Pull URL: git://gitorious.org/shr/meta-openembedded.git
>   Branch: jama/meta-efl
>   Browse: http://gitorious.org/shr/meta-openembedded/commits/jama/meta-efl

Thanks, applied

> 
> Thanks,
>     Martin Jansa <Martin.Jansa@gmail.com>
> ---
> 
> 
> Martin Jansa (2):
>   e-base: bump SRCREV and update fix-ecore-fb-initialization.patch
>     patch for ecore_svn
>   embryo, epdf: fix LICENSE, from oe.dev
> 
>  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 ++++++-----
>  meta-efl/recipes-efl/efl/embryo.inc                |    7 +++--
>  meta-efl/recipes-efl/efl/epdf_svn.bb               |   10 ++++---
>  5 files changed, 48 insertions(+), 16 deletions(-)
>  create mode 100644 meta-efl/recipes-efl/efl/ecore-1.0.0/fix-ecore-fb-initialization.patch
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNySetMkyGM64RGpERAgsMAJ96n5AxLMROdUwXcCZMtZffK9yYpQCgomME
SN3s0+RAGu83vZsbhYBrk68=
=LxVa
-----END PGP SIGNATURE-----