[meta-efl][PATCH 1/2] evas: upgrade to 1.7.6.1 and drop applied patch

[meta-efl][PATCH 1/2] evas: upgrade to 1.7.6.1 and drop applied patch

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...evas-common_16-add-missing-FRIBIDI_CFLAGS.patch | 39 ----------------------
 meta-efl/recipes-efl/efl/evas_1.7.6.1.bb           | 10 ++++++
 meta-efl/recipes-efl/efl/evas_1.7.6.bb             | 11 ------
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/efl/evas/0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch
 create mode 100644 meta-efl/recipes-efl/efl/evas_1.7.6.1.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas_1.7.6.bb

diff --git a/meta-efl/recipes-efl/efl/evas/0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch b/meta-efl/recipes-efl/efl/evas/0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch
deleted file mode 100644
index 36bbf4a..0000000
--- a/meta-efl/recipes-efl/efl/evas/0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a7ffaed7a67a8cad8bff1134926668f6d01a5ad6 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 5 Apr 2013 11:43:53 +0200
-Subject: [PATCH] evas: common_16: add missing FRIBIDI_CFLAGS
-
-Now with including fribidi.h instead of fribidi/fribidi.h we need
-FRIBIDI_CFLAGS to pass -I/usr/include/fribidi, fixes build issue:
-
-| make[5]: *** [evas_soft16_image_scaled_sampled.lo] Error 1
-| In file included from ../../../../src/lib/include/../engines/common/evas_text_utils.h:15:0,
-|                  from ../../../../src/lib/include/../engines/common/evas_font_ot.h:37,
-|                  from ../../../../src/lib/include/evas_common.h:940,
-|                  from ../../../../src/lib/include/evas_common_soft16.h:4,
-|                  from evas_soft16_rectangle.c:1:
-| ../../../../src/lib/include/../engines/common/language/evas_bidi_utils.h:31:22: fatal error: fribidi.h: No such file or directory
-| compilation terminated.
-| make[5]: *** [evas_soft16_rectangle.lo] Error 1
-| make[5]: Leaving directory `/OE/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/evas/2_1.7.6-r1.0/evas-1.7.6/src/lib/engines/common_16'
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/lib/engines/common_16/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/engines/common_16/Makefile.am b/src/lib/engines/common_16/Makefile.am
-index cfa1347..7f630a9 100644
---- a/src/lib/engines/common_16/Makefile.am
-+++ b/src/lib/engines/common_16/Makefile.am
-@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/src/lib/include \
- @FREETYPE_CFLAGS@ \
- @PIXMAN_CFLAGS@ \
-+@FRIBIDI_CFLAGS@ \
- @VALGRIND_CFLAGS@ \
- @EVAS_GENERAL_CFLAGS@ \
- @EET_CFLAGS@ \
--- 
-1.8.1.5
-
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb b/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb
new file mode 100644
index 0000000..189ad17
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "3ca69922c4291c933243f7f358930522"
+SRC_URI[sha256sum] = "446434074747e53de01e609882ddd72987ba5708cf66750e4335d31a3045986a"
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.6.bb b/meta-efl/recipes-efl/efl/evas_1.7.6.bb
deleted file mode 100644
index d151eb6..0000000
--- a/meta-efl/recipes-efl/efl/evas_1.7.6.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-  file://0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch \
-"
-
-SRC_URI[md5sum] = "4bcd5a4721f565bc7dd974973001ef73"
-SRC_URI[sha256sum] = "793b5bc4795cd26e2c10475e1f1647bbc5e052170f6212936b7eb95b87782608"
-- 
1.8.1.5

[meta-efl][PATCH 2/2] e-wm: upgrade to 1.17.2.1 which correctly sets relname

[Martin Jansa]

* so all modules end in right subdirectory now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/{e-wm_0.17.2.bb => e-wm_0.17.2.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-efl/recipes-efl/e17/{e-wm_0.17.2.bb => e-wm_0.17.2.1.bb} (61%)

diff --git a/meta-efl/recipes-efl/e17/e-wm_0.17.2.bb b/meta-efl/recipes-efl/e17/e-wm_0.17.2.1.bb
similarity index 61%
rename from meta-efl/recipes-efl/e17/e-wm_0.17.2.bb
rename to meta-efl/recipes-efl/e17/e-wm_0.17.2.1.bb
index 05e9cac..ebd5900 100644
--- a/meta-efl/recipes-efl/e17/e-wm_0.17.2.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_0.17.2.1.bb
@@ -12,5 +12,5 @@ SRC_URI = "\
   file://applications.menu \
 "
 
-SRC_URI[md5sum] = "ab15be89ec0ed06271fcca60b221d83b"
-SRC_URI[sha256sum] = "63882b29164497c71b17312cbc5a5c6911475b0ccf989502e179b1e3fee3e3b9"
+SRC_URI[md5sum] = "e78018ba7a4622efbcbebd6d093b7fa4"
+SRC_URI[sha256sum] = "5e7b7f5ec88d0589bb4db8aae2c198dc9fd91049419e2460cbd7631207ebd799"
-- 
1.8.1.5