diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-25 17:25:43 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-20 10:43:29 +0200 |
| commit | d5836e6a0008c0d78324368a822f16a5c2f6efb8 (patch) | |
| tree | cf040494f4063c7a871659893a249cdd9115861e /meta-efl/recipes-efl/efl/elementary | |
| parent | 6f1b5c555d7a28da9ba85812d8239a9378cb64b1 (diff) | |
| download | meta-openembedded-contrib-d5836e6a0008c0d78324368a822f16a5c2f6efb8.tar.gz | |
efl: upgrade to 1.9.0
* announcement:
http://sourceforge.net/mailarchive/message.php?msg_id=32024303
* emotion-generic-players and evas-generic-loaders LIC_FILES_CHKSUM
change is just copyright update
< Copyright (C) 2011-2011 Carsten Haitzler and various contributors (see AUTHORS)
---
> Copyright (C) 2011-2014 Carsten Haitzler and various contributors (see AUTHORS)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl/efl/elementary')
2 files changed, 29 insertions, 61 deletions
diff --git a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch new file mode 100644 index 0000000000..9524c70d7d --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch @@ -0,0 +1,29 @@ +From 75d104d105aa03dd9d446fa7d84fa95e0f566cf9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 11 Jan 2014 12:55:59 +0100 +Subject: [PATCH] Makefile: Use elementary_codegen defined in configure + +* using binaries from top_buildir doesn't work when cross-compiling elementary + where we need to pass native binaries in configure params + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am +index fc35c75..1e10b0b 100644 +--- a/src/examples/Makefile.am ++++ b/src/examples/Makefile.am +@@ -29,7 +29,7 @@ LDADD = \ + @ELEMENTARY_X_LIBS@ \ + $(top_builddir)/src/lib/libelementary.la + +-ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ ++ELEMENTARY_CODEGEN = @elementary_codegen@ + ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example + + SRCS = \ +-- +1.9.0 + diff --git a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch deleted file mode 100644 index e3fba9b28f..0000000000 --- a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 53c7046933d1b622a7f99e70a08a0bf46e38369f Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 11 Jan 2014 12:55:59 +0100 -Subject: [PATCH] Makefile: Use elm_prefs_cc and elementary_codegen defined in - configure - -* using binaries from top_buildir doesn't work when cross-compiling elementary - where we need to pass native binaries in configure params - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - data/objects/Makefile.am | 2 +- - doc/widgets/Makefile.am | 2 +- - src/examples/Makefile.am | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am -index c6a775d..88c4f1a 100644 ---- a/data/objects/Makefile.am -+++ b/data/objects/Makefile.am -@@ -11,7 +11,7 @@ filesdir = $(datadir)/elementary/objects - - files_DATA = test.edj test_external.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_custom.edj - --ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ -+ELM_PREFS_CC = @elm_prefs_cc@ - - EXTRA_DIST = \ - test.edc \ -diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am -index c1508b8..c0544f9 100644 ---- a/doc/widgets/Makefile.am -+++ b/doc/widgets/Makefile.am -@@ -19,7 +19,7 @@ AM_CPPFLAGS = \ - @ELEMENTARY_EWEATHER_CFLAGS@ \ - @ELEMENTARY_EMAP_CFLAGS@ - --ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ -+ELM_PREFS_CC = @elm_prefs_cc@ - - noinst_DATA = widget_preview_prefs.epb - -diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am -index 7184ca1..ce80a46 100644 ---- a/src/examples/Makefile.am -+++ b/src/examples/Makefile.am -@@ -33,9 +33,9 @@ EDJE_FLAGS_VERBOSE_0 = - EDJE_FLAGS_VERBOSE_1 = -v - EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) - --ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ -+ELM_PREFS_CC = @elm_prefs_cc@ - --ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ -+ELEMENTARY_CODEGEN = @elementary_codegen@ - ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example - - SRCS = \ --- -1.8.5.2 - |