summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-05 23:30:14 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-09 21:34:16 +0200
commitb00c23b27ec6c03b89860bd023b19c401d890801 (patch)
treee6a6453a6099ab379e7dfcab104ae8ab2db57302 /meta-efl
parent45369526f580ed441b06a565d9cf1b242f29c4cb (diff)
downloadmeta-openembedded-b00c23b27ec6c03b89860bd023b19c401d890801.tar.gz
evas: upgrade to 1.7.6.1 and drop applied patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/efl/evas/0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch39
-rw-r--r--meta-efl/recipes-efl/efl/evas_1.7.6.1.bb10
-rw-r--r--meta-efl/recipes-efl/efl/evas_1.7.6.bb11
3 files changed, 10 insertions, 50 deletions
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 36bbf4a7b..000000000
--- a/meta-efl/recipes-efl/efl/evas/0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From a7ffaed7a67a8cad8bff1134926668f6d01a5ad6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 5 Apr 2013 11:43:53 +0200
4Subject: [PATCH] evas: common_16: add missing FRIBIDI_CFLAGS
5
6Now with including fribidi.h instead of fribidi/fribidi.h we need
7FRIBIDI_CFLAGS to pass -I/usr/include/fribidi, fixes build issue:
8
9| make[5]: *** [evas_soft16_image_scaled_sampled.lo] Error 1
10| In file included from ../../../../src/lib/include/../engines/common/evas_text_utils.h:15:0,
11| from ../../../../src/lib/include/../engines/common/evas_font_ot.h:37,
12| from ../../../../src/lib/include/evas_common.h:940,
13| from ../../../../src/lib/include/evas_common_soft16.h:4,
14| from evas_soft16_rectangle.c:1:
15| ../../../../src/lib/include/../engines/common/language/evas_bidi_utils.h:31:22: fatal error: fribidi.h: No such file or directory
16| compilation terminated.
17| make[5]: *** [evas_soft16_rectangle.lo] Error 1
18| 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'
19
20Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21---
22 src/lib/engines/common_16/Makefile.am | 1 +
23 1 file changed, 1 insertion(+)
24
25diff --git a/src/lib/engines/common_16/Makefile.am b/src/lib/engines/common_16/Makefile.am
26index cfa1347..7f630a9 100644
27--- a/src/lib/engines/common_16/Makefile.am
28+++ b/src/lib/engines/common_16/Makefile.am
29@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
30 -I$(top_srcdir)/src/lib/include \
31 @FREETYPE_CFLAGS@ \
32 @PIXMAN_CFLAGS@ \
33+@FRIBIDI_CFLAGS@ \
34 @VALGRIND_CFLAGS@ \
35 @EVAS_GENERAL_CFLAGS@ \
36 @EET_CFLAGS@ \
37--
381.8.1.5
39
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 000000000..189ad1775
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb
@@ -0,0 +1,10 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7"
8
9SRC_URI[md5sum] = "3ca69922c4291c933243f7f358930522"
10SRC_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 d151eb64c..000000000
--- a/meta-efl/recipes-efl/efl/evas_1.7.6.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI = "\
6 ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
7 file://0001-evas-common_16-add-missing-FRIBIDI_CFLAGS.patch \
8"
9
10SRC_URI[md5sum] = "4bcd5a4721f565bc7dd974973001ef73"
11SRC_URI[sha256sum] = "793b5bc4795cd26e2c10475e1f1647bbc5e052170f6212936b7eb95b87782608"