* [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9*
@ 2014-03-06 16:48 Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 1/6] efl: upgrade to 1.9.0 Martin Jansa
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Martin Jansa @ 2014-03-06 16:48 UTC (permalink / raw)
To: openembedded-devel
Just WIP, because it's not properly tested in runtime yet.
The changes from 1.8 aren't so big as in 1.7 -> 1.8 upgrade so I plan
to finish this soon(ish).
The following changes since commit 279ebafb9dfcc3bd5095f4880e16a2e9401e38f7:
systemd: Rename .bbappend to match any version (2014-03-05 18:40:03 +0100)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/efl
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/efl
Martin Jansa (6):
efl: upgrade to 1.9.0
webkit-efl: upgrade to new snapshot r164189
e-wm: upgrade to 0.18.4 and drop old 0.17.5
e-tasks: Migrate to eldbus
python-efl: upgrade to 1.9.0
eve: restrict for armv7a, because upstream dropped support in
webkit-efl
meta-efl/recipes-devtools/python/python-efl.inc | 2 +-
.../recipes-devtools/python/python-efl_1.8.1.bb | 4 -
.../recipes-devtools/python/python-efl_1.9.0.bb | 4 +
.../0001-dbus-stuff-Convert-to-eldbus.patch | 204 ++++++++
meta-efl/recipes-efl/e17/e-tasks_git.bb | 4 +-
.../0001-remove-another-elm-1.8-requirement.patch | 25 +
meta-efl/recipes-efl/e17/e-wm_0.17.5.bb | 26 -
.../e17/{e-wm_0.18.3.bb => e-wm_0.18.4.bb} | 5 +-
meta-efl/recipes-efl/e17/eve_svn.bb | 6 +
meta-efl/recipes-efl/efl/efl.inc | 18 +-
.../recipes-efl/efl/{efl_1.8.5.bb => efl_1.9.0.bb} | 6 +-
meta-efl/recipes-efl/efl/elementary.inc | 2 +-
...e-elementary_codegen-defined-in-configure.patch | 29 ++
...e-elm_prefs_cc-and-elementary_codegen-def.patch | 61 ---
.../{elementary_1.8.4.bb => elementary_1.9.0.bb} | 6 +-
.../recipes-efl/efl/emotion-generic-players.inc | 4 +-
...s_1.8.1.bb => emotion-generic-players_1.9.0.bb} | 4 +-
meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +-
...yers_1.8.1.bb => evas-generic-loaders_1.9.0.bb} | 4 +-
...bkit-efl_2.3.2+svnr159807.bb => webkit-efl.inc} | 31 +-
...lines.h-remove-indexingHeader-preCapacity.patch | 27 -
...KitHelpers.cmake-Add-Wno-error-cast-align.patch | 25 +-
...include-Element.h-for-hasTagName-function.patch | 58 ---
...r.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch | 80 +++
.../webkit/webkit-efl/0003-Fix-linking-issue.patch | 63 +++
.../recipes-efl/webkit/webkit-efl/bison-2.6.patch | 558 ---------------------
.../webkit/webkit-efl/gcc-4.8.2.fix.patch | 15 -
.../webkit/webkit-efl_2.3.4+svnr164189.bb | 12 +
meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 35 +-
29 files changed, 504 insertions(+), 816 deletions(-)
delete mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
create mode 100644 meta-efl/recipes-devtools/python/python-efl_1.9.0.bb
create mode 100644 meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch
create mode 100644 meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch
delete mode 100644 meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
rename meta-efl/recipes-efl/e17/{e-wm_0.18.3.bb => e-wm_0.18.4.bb} (68%)
rename meta-efl/recipes-efl/efl/{efl_1.8.5.bb => efl_1.9.0.bb} (77%)
create mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch
delete mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch
rename meta-efl/recipes-efl/efl/{elementary_1.8.4.bb => elementary_1.9.0.bb} (47%)
rename meta-efl/recipes-efl/efl/{evas-generic-loaders_1.8.1.bb => emotion-generic-players_1.9.0.bb} (41%)
rename meta-efl/recipes-efl/efl/{emotion-generic-players_1.8.1.bb => evas-generic-loaders_1.9.0.bb} (41%)
rename meta-efl/recipes-efl/webkit/{webkit-efl_2.3.2+svnr159807.bb => webkit-efl.inc} (52%)
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
--
1.9.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-efl][WIP][PATCH 1/6] efl: upgrade to 1.9.0
2014-03-06 16:48 [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9* Martin Jansa
@ 2014-03-06 16:48 ` Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 2/6] webkit-efl: upgrade to new snapshot r164189 Martin Jansa
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2014-03-06 16:48 UTC (permalink / raw)
To: openembedded-devel
* 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>
---
meta-efl/recipes-efl/efl/efl.inc | 18 +++++--
.../recipes-efl/efl/{efl_1.8.5.bb => efl_1.9.0.bb} | 6 +--
meta-efl/recipes-efl/efl/elementary.inc | 2 +-
...e-elementary_codegen-defined-in-configure.patch | 29 ++++++++++
...e-elm_prefs_cc-and-elementary_codegen-def.patch | 61 ----------------------
.../{elementary_1.8.4.bb => elementary_1.9.0.bb} | 6 +--
.../recipes-efl/efl/emotion-generic-players.inc | 4 +-
...s_1.8.1.bb => emotion-generic-players_1.9.0.bb} | 4 +-
meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +-
...yers_1.8.1.bb => evas-generic-loaders_1.9.0.bb} | 4 +-
10 files changed, 59 insertions(+), 77 deletions(-)
rename meta-efl/recipes-efl/efl/{efl_1.8.5.bb => efl_1.9.0.bb} (77%)
create mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch
delete mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch
rename meta-efl/recipes-efl/efl/{elementary_1.8.4.bb => elementary_1.9.0.bb} (47%)
rename meta-efl/recipes-efl/efl/{evas-generic-loaders_1.8.1.bb => emotion-generic-players_1.9.0.bb} (41%)
rename meta-efl/recipes-efl/efl/{emotion-generic-players_1.8.1.bb => evas-generic-loaders_1.9.0.bb} (41%)
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc
index 4e25389..56b3cd2 100644
--- a/meta-efl/recipes-efl/efl/efl.inc
+++ b/meta-efl/recipes-efl/efl/efl.inc
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD LGPL-2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130"
DEPENDS_class-native = "lua5.1-native freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native"
-DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 lua5.1 dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native"
+DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 luajit dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native"
inherit efl gettext pkgconfig
@@ -12,8 +12,14 @@ BBCLASSEXTEND = "native"
PROVIDES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus"
# we don't have bullet for physics
+# You have chosen to disable physics support. This disables lots of
+# core functionality and is effectively never tested. You are going
+# to find features that suddenly don't work and as a result cause
+# a series of breakages. This is simply not tested so you are on
+# your own in terms of ensuring everything works if you do this
EXTRA_OECONF = " \
--disable-physics \
+ --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa \
"
EXTRA_OECONF_append_class-target = " \
--with-bin-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
@@ -36,16 +42,19 @@ EXTRA_OECONF_append_class-native = " \
--disable-image-loader-xpm \
"
-PACKAGECONFIG ??= "opengl-es"
+PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio"
PACKAGECONFIG_class-native = ""
# sort of tri-state
PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl"
PACKAGECONFIG[opengl-es] = "--with-opengl=es,,virtual/libgles2"
PACKAGECONFIG[opengl-none] = "--with-opengl=none,,"
-# used only in ecore examples and supports only 0.10 now
PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer"
+PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base"
PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
+# we don't have luajit-native now, so use old lua for -native
+PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit"
# new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need
do_configure_prepend_class-native() {
@@ -175,6 +184,7 @@ FILES_eet = " \
"
FILES_emotion = " \
${datadir}/emotion \
+ ${libdir}/emotion/modules/gstreamer1/*/module.so \
"
FILES_embryo-tests = " \
${datadir}/embryo/ \
@@ -234,6 +244,7 @@ FILES_${PN}-dbg += " \
${libdir}/edje/utils/*/.debug \
${libdir}/ethumb/*/*/*/.debug \
${libdir}/ethumb_client/utils/*/.debug \
+ ${libdir}/emotion/modules/gstreamer1/*/.debug \
"
FILES_${PN}-dev += " \
${libdir}/cmake \
@@ -242,6 +253,7 @@ FILES_${PN}-dev += " \
${libdir}/ethumb*/*/*/*/module.la \
${libdir}/eeze*/*/*/*/*/module.la \
${libdir}/edje*/*/*/*/module.la \
+ ${libdir}/emotion/modules/gstreamer1/*/module.la \
${datadir}/gdb/auto-load \
${datadir}/eo/gdb \
${bindir}/eldbus-codegen \
diff --git a/meta-efl/recipes-efl/efl/efl_1.8.5.bb b/meta-efl/recipes-efl/efl/efl_1.9.0.bb
similarity index 77%
rename from meta-efl/recipes-efl/efl/efl_1.8.5.bb
rename to meta-efl/recipes-efl/efl/efl_1.9.0.bb
index cacae5f..b6aa77f 100644
--- a/meta-efl/recipes-efl/efl/efl_1.8.5.bb
+++ b/meta-efl/recipes-efl/efl/efl_1.9.0.bb
@@ -4,14 +4,14 @@ SRC_URI = "\
${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
"
-SRC_URI[md5sum] = "3d2c3ca2ff1a072b72ffab40ff598dfb"
-SRC_URI[sha256sum] = "7e514c0a972feea1c44c9074a4b58c14821d93dc91ff6f51066528f12ab42fe5"
+SRC_URI[md5sum] = "f5d0c61db951cb6a5434a30672975dd1"
+SRC_URI[sha256sum] = "fd4703edb56c01b713f92849fb15f6ca3d866227ce4abff2d90b08244cd99a99"
# Temporary disable until error like the one following are fixed
# efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated
# collect2: error: ld returned 1 exit status
# x86_64-linux-libtool: install: error: relink `modules/evas/savers/tiff/module.la' with the above command before installing it
# Makefile:11031: recipe for target 'install-savertiffpkgLTLIBRARIES' failed
-PARALLEL_MAKE = ""
+PARALLEL_MAKE_class-native = ""
SRC_URI += "file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch"
diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc
index 8d95967..6de749a 100644
--- a/meta-efl/recipes-efl/efl/elementary.inc
+++ b/meta-efl/recipes-efl/efl/elementary.inc
@@ -1,6 +1,6 @@
DESCRIPTION = "EFL based widget set for mobile devices"
LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ae1a906a61040d01df137a6b2c6acb68"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a173054a93896e933df53e3382d472c2"
DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb poppler eio"
DEPENDS_class-native = "efl-native"
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 0000000..9524c70
--- /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 e3fba9b..0000000
--- 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
-
diff --git a/meta-efl/recipes-efl/efl/elementary_1.8.4.bb b/meta-efl/recipes-efl/efl/elementary_1.9.0.bb
similarity index 47%
rename from meta-efl/recipes-efl/efl/elementary_1.8.4.bb
rename to meta-efl/recipes-efl/efl/elementary_1.9.0.bb
index 7208210..e7cbb5b 100644
--- a/meta-efl/recipes-efl/efl/elementary_1.8.4.bb
+++ b/meta-efl/recipes-efl/efl/elementary_1.9.0.bb
@@ -6,7 +6,7 @@ SRC_URI = "\
# only for target, because configure doesn't default to sane default when
# these paths aren't passed in -native build
-SRC_URI_append_class-target = " file://0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch"
+SRC_URI_append_class-target = " file://0001-Makefile-Use-elementary_codegen-defined-in-configure.patch"
-SRC_URI[md5sum] = "898d0ee0e18078640948fa5d04d56efe"
-SRC_URI[sha256sum] = "129b8a015c34df3e8633b5b65aa3bcdd77ed101992948cb096389fed3f3a4244"
+SRC_URI[md5sum] = "408b61a080f51731eeed81968d3cc7f5"
+SRC_URI[sha256sum] = "95cb9ade6c1f135b673555d927d13b5e06986353047178125346abdf6c2b4d82"
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players.inc b/meta-efl/recipes-efl/efl/emotion-generic-players.inc
index 5c16802..4ab89ae 100644
--- a/meta-efl/recipes-efl/efl/emotion-generic-players.inc
+++ b/meta-efl/recipes-efl/efl/emotion-generic-players.inc
@@ -1,6 +1,8 @@
DESCRIPTION = "Emotion generic players"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a0f11eedf8706bf6d4d6639fb67eb8ae"
+
+DEPENDS = "emotion"
inherit efl
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.9.0.bb
similarity index 41%
rename from meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
rename to meta-efl/recipes-efl/efl/emotion-generic-players_1.9.0.bb
index 21e57f9..0337751 100644
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
+++ b/meta-efl/recipes-efl/efl/emotion-generic-players_1.9.0.bb
@@ -4,5 +4,5 @@ SRC_URI = "\
${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
"
-SRC_URI[md5sum] = "2f39de031a236e53d251beefb4f6fcfd"
-SRC_URI[sha256sum] = "fa5d40324367b2e126853ba70f6522552fff9e80f6dd91566b2dacc4b0ffebc0"
+SRC_URI[md5sum] = "dc897ba540560fce0787bbff8455c022"
+SRC_URI[sha256sum] = "d26546adf61db7521f9d46f2baedcb645af72497fc259e93907026970d42d794"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
index 904527c..e64fa88 100644
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
@@ -1,6 +1,6 @@
DESCRIPTION = "Evas generic loaders"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f86abf15f4d911ae87092e90222d0ef3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f3877fbaaa46306051a559814451883c"
DEPENDS = "eina poppler librsvg cairo"
inherit efl
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.1.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.9.0.bb
similarity index 41%
rename from meta-efl/recipes-efl/efl/emotion-generic-players_1.8.1.bb
rename to meta-efl/recipes-efl/efl/evas-generic-loaders_1.9.0.bb
index 9fc50a7..38d0518 100644
--- a/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.1.bb
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.9.0.bb
@@ -4,5 +4,5 @@ SRC_URI = "\
${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
"
-SRC_URI[md5sum] = "895d8057fb5cdcadd9ed1f710a460b4e"
-SRC_URI[sha256sum] = "d3221726df583b3d5d43192e4909c08ac4dbf7ff35b81568ac339d7dbaf84d36"
+SRC_URI[md5sum] = "bec6d27fc4afd2f5e4829da5aeccdc0b"
+SRC_URI[sha256sum] = "9447839047b087b0293b2ed6c453249919f66e5c4f62e252a7b7e4f996c2ac5f"
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-efl][WIP][PATCH 2/6] webkit-efl: upgrade to new snapshot r164189
2014-03-06 16:48 [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9* Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 1/6] efl: upgrade to 1.9.0 Martin Jansa
@ 2014-03-06 16:48 ` Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 3/6] e-wm: upgrade to 0.18.4 and drop old 0.17.5 Martin Jansa
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2014-03-06 16:48 UTC (permalink / raw)
To: openembedded-devel
* update webkit-efl_svn to point to the same source and old isn't
compatible with new efl
http://sourceforge.net/p/enlightenment/mailman/message/32002633/
* restrict for armv7a, because upstream dropped support
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...bkit-efl_2.3.2+svnr159807.bb => webkit-efl.inc} | 31 +-
| 27 -
...KitHelpers.cmake-Add-Wno-error-cast-align.patch | 25 +-
...include-Element.h-for-hasTagName-function.patch | 58 ---
...r.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch | 80 +++
.../webkit/webkit-efl/0003-Fix-linking-issue.patch | 63 +++
.../recipes-efl/webkit/webkit-efl/bison-2.6.patch | 558 ---------------------
.../webkit/webkit-efl/gcc-4.8.2.fix.patch | 15 -
.../webkit/webkit-efl_2.3.4+svnr164189.bb | 12 +
meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 35 +-
10 files changed, 199 insertions(+), 705 deletions(-)
rename meta-efl/recipes-efl/webkit/{webkit-efl_2.3.2+svnr159807.bb => webkit-efl.inc} (52%)
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch
delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb b/meta-efl/recipes-efl/webkit/webkit-efl.inc
similarity index 52%
rename from meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
rename to meta-efl/recipes-efl/webkit/webkit-efl.inc
index 879ff1f..44ef9d4 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl.inc
@@ -13,15 +13,15 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
ruby-native"
SRC_URI = "\
- ${E_RELEASES}/libs/webkit-efl/webkit-efl-159807.tar.xz \
- file://gcc-4.8.2.fix.patch \
+ ${E_RELEASES}/libs/webkit-efl/webkit-efl-164189.tar.xz \
file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
- file://0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch \
+ file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
+ file://0003-Fix-linking-issue.patch \
"
-SRC_URI[md5sum] = "3e1377d976460dd14db0dd3cd39b8e48"
-SRC_URI[sha256sum] = "a99531299e41ba4671b32bbf46c3efc4d65960c9c87949a87f76e622c284f178"
+SRC_URI[md5sum] = "731513fc042ec8e03840bc1ab6a66771"
+SRC_URI[sha256sum] = "660aefd65c0e5c6494eaec30539cda5f40fbdff17f28e7e83d341b245227cccd"
-S = "${WORKDIR}/${BPN}"
+S = "${WORKDIR}/efl-webkit"
inherit cmake lib_package pkgconfig perlnative pythonnative
@@ -37,6 +37,25 @@ EXTRA_OECMAKE = " \
-DENABLE_ACCESSIBILITY=Off \
-DENABLE_BATTERY_STATUS=Off \
"
+# generated ASM code isn't compatible with armv[45]
+# it was removed from macro assembler in upstream commit 121885
+# https://bugs.webkit.org/show_bug.cgi?id=90198
+EXTRA_OECMAKE_append_armv4 = " -DENABLE_LLINT=Off -DENABLE_JIT=Off -DENABLE_DFG_JIT=Off -DENABLE_FTL_JIT=Off"
+EXTRA_OECMAKE_append_armv5 = " -DENABLE_LLINT=Off -DENABLE_JIT=Off -DENABLE_DFG_JIT=Off -DENABLE_FTL_JIT=Off"
+
+# hack it in OptionsEfl.cmake because that overrules -DENABLE_LLINT=Off
+do_configure_prepend_armv4() {
+ sed -i 's/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT OFF)/g' ${S}/Source/cmake/OptionsEfl.cmake
+}
+do_configure_prepend_armv5() {
+ sed -i 's/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT OFF)/g' ${S}/Source/cmake/OptionsEfl.cmake
+}
+
+# and disabled LLINT currently isn't supported, so restrict to armv7a and x86*
+COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE_i586 = "(.*)"
+COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE_armv7a = "(.*)"
LEAD_SONAME = "libewebkit.so"
PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector"
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
deleted file mode 100644
index 003a1d1..0000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5b9bbf9c056e3690e2872cc74a8962ec6a21a020 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 13 Jan 2014 19:00:46 +0100
-Subject: [PATCH] ButterflyInlines.h: remove
- !indexingHeader()->preCapacity(oldStructure)
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- Source/JavaScriptCore/runtime/ButterflyInlines.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/JavaScriptCore/runtime/ButterflyInlines.h b/Source/JavaScriptCore/runtime/ButterflyInlines.h
-index f5439bb..d5c828f 100644
---- a/Source/JavaScriptCore/runtime/ButterflyInlines.h
-+++ b/Source/JavaScriptCore/runtime/ButterflyInlines.h
-@@ -128,7 +128,7 @@ inline Butterfly* Butterfly::growArrayRight(
- bool hadIndexingHeader, size_t oldIndexingPayloadSizeInBytes,
- size_t newIndexingPayloadSizeInBytes)
- {
-- ASSERT_UNUSED(oldStructure, !indexingHeader()->preCapacity(oldStructure));
-+// ASSERT_UNUSED(oldStructure, !indexingHeader()->preCapacity(oldStructure));
- ASSERT_UNUSED(oldStructure, hadIndexingHeader == oldStructure->hasIndexingHeader(intendedOwner));
- void* theBase = base(0, propertyCapacity);
- size_t oldSize = totalSize(0, propertyCapacity, hadIndexingHeader, oldIndexingPayloadSizeInBytes);
---
-1.8.5.2
-
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
index 5df0f8a..864b9c9 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
@@ -1,29 +1,30 @@
-From bfabbcab5dc4fe29bc91bbfbd9c9a404a3e2538b Mon Sep 17 00:00:00 2001
+From b37711ca03ea9410e795f29398069fed9e9c2d30 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 13 Jan 2014 17:21:25 +0100
-Subject: [PATCH] WebKitHelpers.cmake: Add -Wno-error=cast-align
+Subject: [PATCH 1/3] WebKitHelpers.cmake: Add -Wno-error=cast-align
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- Source/cmake/WebKitHelpers.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ Source/cmake/WebKitHelpers.cmake | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
-index 1e51ebc..d813117 100644
+index 409931c..345b346 100644
--- a/Source/cmake/WebKitHelpers.cmake
+++ b/Source/cmake/WebKitHelpers.cmake
-@@ -42,7 +42,10 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
+@@ -44,7 +44,11 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
# Enable errors on warning
if (OPTION_ENABLE_WERROR)
- set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter ${OLD_COMPILE_FLAGS}")
-+ # /OE/build/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/WebCore/platform/graphics/GlyphPage.h: In member function 'void WebCore::OpenTypeVerticalData::substituteWithVerticalGlyphs(const WebCore::SimpleFontData*, WebCore::GlyphPage*, unsigned int, unsigned int) const': /OE/build/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/WebCore/platform/graphics/GlyphPage.h:120:30: error: array subscript is above array bounds [-Werror=array-bounds]
-+ # | /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:13:50: error: 'GType soup_proxy_uri_resolver_get_type()' is deprecated (declared at /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:48) [-Werror=deprecated-declarations]
-+ # | /OE/build/shr-core/tmp-eglibc/work/cortexa8-vfp-neon-oe-linux-gnueabi/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp:120:133: error: cast from 'uint8_t* {aka unsigned char*}' to 'JSC::IntegralTypedArrayAdaptor<short int, JSC::GenericTypedArrayView<JSC::Int16Adaptor>, JSC::JSGenericTypedArrayView<JSC::Int16Adaptor>, (JSC::TypedArrayType)4u>::Type* {aka short int*}' increases required alignment of target type [-Werror=cast-align]
-+ set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=array-bounds -Wno-error=deprecated-declarations -Wno-error=cast-align ${OLD_COMPILE_FLAGS}")
++ # FIXME: When we use -fno-tree-dce to support the jsCStack branch merge, build error occurs due to the uninitialization. Temporarily we set
++ # uninitialized as build warning in order to support the jsCStack merge. https://bugs.webkit.org/show_bug.cgi?id=127777.
++ set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=uninitialized ${OLD_COMPILE_FLAGS}")
++ # | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp:161:104: error: cast from 'uint8_t* {aka unsigned char*}' to 'JSC::FloatTypedArrayAdaptor<double, JSC::GenericTypedArrayView<JSC::Float64Adaptor>, JSC::JSGenericTypedArrayView<JSC::Float64Adaptor>, (JSC::TypedArrayType)9u>::Type* {aka double*}' increases required alignment of target type [-Werror=cast-align]
++ set(OLD_COMPILE_FLAGS "-Wno-error=cast-align -Wno-error=array-bounds -Wno-error=deprecated-declarations ${OLD_COMPILE_FLAGS}")
endif ()
- # Disable C++0x compat warnings for GCC >= 4.6.0 until we build
+ set_target_properties(${_target} PROPERTIES
--
-1.8.5.2
+1.9.0
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch
deleted file mode 100644
index 153097b..0000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a5a5eeb10b56ad1f98899a02281ea825e3cd1202 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sat, 1 Jun 2013 19:23:54 +0200
-Subject: [PATCH] ewk: include Element.h for hasTagName function
-
-* ewebkit build fails like gtk in http://trac.webkit.org/changeset/72745
- | ../../../lib/libwebcore_efl.so.0.1.0: undefined reference to `WebCore::Node::hasTagName(WebCore::QualifiedName const&) const'
- | collect2: error: ld returned 1 exit status
- | make[2]: *** [bin/DumpRenderTree] Error 1
-* SDL port has similar issue:
- https://bugs.webkit.org/show_bug.cgi?id=88536
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- Source/WebCore/css/CSSStyleSheet.cpp | 1 +
- Source/WebKit/efl/ewk/ewk_frame.cpp | 1 +
- Source/WebKit/efl/ewk/ewk_view.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/Source/WebCore/css/CSSStyleSheet.cpp b/Source/WebCore/css/CSSStyleSheet.cpp
-index 00b2d91..1d03c2e 100644
---- a/Source/WebCore/css/CSSStyleSheet.cpp
-+++ b/Source/WebCore/css/CSSStyleSheet.cpp
-@@ -29,6 +29,7 @@
- #include "CSSStyleRule.h"
- #include "CachedCSSStyleSheet.h"
- #include "Document.h"
-+#include "Element.h"
- #include "ExceptionCode.h"
- #include "HTMLNames.h"
- #include "MediaList.h"
-diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
-index fd1ffd2..c86601a 100644
---- a/Source/WebKit/efl/ewk/ewk_frame.cpp
-+++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
-@@ -32,6 +32,7 @@
- #include "FocusController.h"
- #include "FrameLoaderClientEfl.h"
- #include "FrameView.h"
-+#include "Element.h"
- #include "HTMLCollection.h"
- #include "HTMLHeadElement.h"
- #include "HTMLImageElement.h"
-diff --git a/Source/WebKit/efl/ewk/ewk_view.cpp b/Source/WebKit/efl/ewk/ewk_view.cpp
-index 9798e94..7a5da60 100644
---- a/Source/WebKit/efl/ewk/ewk_view.cpp
-+++ b/Source/WebKit/efl/ewk/ewk_view.cpp
-@@ -36,6 +36,7 @@
- #include "FocusController.h"
- #include "FrameLoaderClientEfl.h"
- #include "FrameView.h"
-+#include "Element.h"
- #include "GraphicsContext.h"
- #include "HTMLElement.h"
- #include "HTMLInputElement.h"
---
-1.8.2.1
-
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch
new file mode 100644
index 0000000..9f005bc
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch
@@ -0,0 +1,80 @@
+From e284e92da00011e55d8f79383034e0c9c1a8a106 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 27 Feb 2014 13:40:43 +0100
+Subject: [PATCH 2/3] ARMAssembler.h: Don't generate BKPT and BLX for armv4*
+
+* I haven't tested it in runtime yet, but it's better than to wait for asm failure later:
+ {standard input}: Assembler messages:
+ {standard input}:35: Error: selected processor does not support ARM mode `bkpt #0'
+ {standard input}:62: Error: selected processor does not support ARM mode `blx llint_throw_stack_overflow_error'
+ ...
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Source/JavaScriptCore/assembler/ARMAssembler.h | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/Source/JavaScriptCore/assembler/ARMAssembler.h b/Source/JavaScriptCore/assembler/ARMAssembler.h
+index 087d31c..1b40ded 100644
+--- a/Source/JavaScriptCore/assembler/ARMAssembler.h
++++ b/Source/JavaScriptCore/assembler/ARMAssembler.h
+@@ -211,7 +211,9 @@ namespace JSC {
+ LDMIA = 0x08b00000,
+ B = 0x0a000000,
+ BL = 0x0b000000,
++#if WTF_ARM_ARCH_AT_LEAST(5)
+ BX = 0x012fff10,
++#endif
+ VMOV_VFP64 = 0x0c400a10,
+ VMOV_ARM64 = 0x0c500a10,
+ VMOV_VFP32 = 0x0e000a10,
+@@ -223,8 +225,10 @@ namespace JSC {
+ VCVT_F64_F32 = 0x0eb70ac0,
+ VMRS_APSR = 0x0ef1fa10,
+ CLZ = 0x016f0f10,
++#if WTF_ARM_ARCH_AT_LEAST(5)
+ BKPT = 0xe1200070,
+ BLX = 0x012fff30,
++#endif
+ #if WTF_ARM_ARCH_AT_LEAST(7)
+ MOVW = 0x03000000,
+ MOVT = 0x03400000,
+@@ -689,7 +693,11 @@ namespace JSC {
+
+ void bkpt(ARMWord value)
+ {
++#if WTF_ARM_ARCH_AT_LEAST(5)
+ m_buffer.putInt(BKPT | ((value & 0xff0) << 4) | (value & 0xf));
++#else
++ // BKPT is available in ARMv5T and above, skip it here
++#endif
+ }
+
+ void nop()
+@@ -704,12 +712,23 @@ namespace JSC {
+
+ void bx(int rm, Condition cc = AL)
+ {
++#if WTF_ARM_ARCH_AT_LEAST(5)
+ emitInstruction(toARMWord(cc) | BX, 0, 0, RM(rm));
++#else
++ // BX is available in ARMv5T and above.
++ emitInstruction(toARMWord(cc) | MOV, ARMRegisters::pc, ARMRegisters::lr, 0);
++#endif
+ }
+
+ AssemblerLabel blx(int rm, Condition cc = AL)
+ {
++#if WTF_ARM_ARCH_AT_LEAST(5)
+ emitInstruction(toARMWord(cc) | BLX, 0, 0, RM(rm));
++#else
++ // BLX is available in ARMv5T and above.
++ emitInstruction(toARMWord(cc) | MOV, ARMRegisters::lr, ARMRegisters::pc, 0);
++ emitInstruction(toARMWord(cc) | MOV, ARMRegisters::pc, RM(rm), 0);
++#endif
+ return m_buffer.label();
+ }
+
+--
+1.9.0
+
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch
new file mode 100644
index 0000000..ce1c687
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch
@@ -0,0 +1,63 @@
+From 09088da56f3de17ab1cc537627cda6bf808eaf4c Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 27 Feb 2014 14:17:29 +0100
+Subject: [PATCH 3/3] Fix linking issue
+
+* inline function is sometimes not included soon enough
+
+ Partialy taken from:
+ https://bugs.webkit.org/show_bug.cgi?id=124152
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Source/JavaScriptCore/llint/LLIntEntrypoint.cpp | 3 +++
+ Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp | 3 +++
+ Source/JavaScriptCore/runtime/SymbolTable.cpp | 4 ++++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
+index 5d91be6..73cba31 100644
+--- a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
++++ b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
+@@ -31,6 +31,9 @@
+ #include "CodeBlock.h"
+ #include "JITCode.h"
+ #include "JSObject.h"
++#include "JSCellInlines.h"
++#include "JSDestructibleObject.h"
++#include "SlotVisitorInlines.h"
+ #include "LLIntThunks.h"
+ #include "LowLevelInterpreter.h"
+ #include "MaxFrameExtentForSlowPathCall.h"
+diff --git a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
+index d0583fc..4be5ec3 100644
+--- a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
++++ b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
+@@ -25,6 +25,9 @@
+
+ #include "config.h"
+ #include "FunctionExecutableDump.h"
++#include "JSCellInlines.h"
++#include "JSDestructibleObject.h"
++#include "SlotVisitorInlines.h"
+
+ #include "CodeBlock.h"
+
+diff --git a/Source/JavaScriptCore/runtime/SymbolTable.cpp b/Source/JavaScriptCore/runtime/SymbolTable.cpp
+index 6eb0239..21450df 100644
+--- a/Source/JavaScriptCore/runtime/SymbolTable.cpp
++++ b/Source/JavaScriptCore/runtime/SymbolTable.cpp
+@@ -33,6 +33,10 @@
+ #include "JSCInlines.h"
+ #include "SlotVisitorInlines.h"
+
++#include "JSCellInlines.h"
++#include "JSDestructibleObject.h"
++#include "SlotVisitorInlines.h"
++
+ namespace JSC {
+
+ const ClassInfo SymbolTable::s_info = { "SymbolTable", 0, 0, 0, CREATE_METHOD_TABLE(SymbolTable) };
+--
+1.9.0
+
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch b/meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch
deleted file mode 100644
index d4aa674..0000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch
+++ /dev/null
@@ -1,558 +0,0 @@
-Upstream-Status: Backport
-http://trac.webkit.org/changeset/124099
-
-Subversion Revision: 123651
-diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
-index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
---- a/Source/WebCore/css/CSSGrammar.y
-+++ b/Source/WebCore/css/CSSGrammar.y
-@@ -53,14 +53,13 @@ using namespace HTMLNames;
- #define YYMAXDEPTH 10000
- #define YYDEBUG 0
-
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
-
- %pure_parser
-
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-+
- %union {
- bool boolean;
- char character;
-@@ -89,7 +88,7 @@ using namespace HTMLNames;
-
- %{
-
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
- return 1;
- }
-diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
-index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
---- a/Source/WebCore/css/CSSParser.cpp
-+++ b/Source/WebCore/css/CSSParser.cpp
-@@ -114,7 +114,7 @@
- extern int cssyydebug;
- #endif
-
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
-
- using namespace std;
- using namespace WTF;
-diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
-index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
---- a/Source/WebCore/xml/XPathGrammar.y
-+++ b/Source/WebCore/xml/XPathGrammar.y
-@@ -34,6 +34,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-
-@@ -44,8 +45,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
-
- using namespace WebCore;
- using namespace XPath;
-@@ -53,6 +52,7 @@ using namespace XPath;
- %}
-
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
-
- %union
- {
-@@ -71,7 +71,7 @@ using namespace XPath;
- %{
-
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-
- %}
-
-@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
- Expr:
- OrExpr
- {
-- PARSER->m_topExpr = $1;
-+ parser->m_topExpr = $1;
- }
- ;
-
-@@ -138,7 +138,7 @@ AbsoluteLocationPath:
- '/'
- {
- $$ = new LocationPath;
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- '/' RelativeLocationPath
-@@ -150,7 +150,7 @@ AbsoluteLocationPath:
- {
- $$ = $2;
- $$->insertFirstStep($1);
-- PARSER->unregisterParseNode($1);
-+ parser->unregisterParseNode($1);
- }
- ;
-
-@@ -159,22 +159,22 @@ RelativeLocationPath:
- {
- $$ = new LocationPath;
- $$->appendStep($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerParseNode($$);
- }
- |
- RelativeLocationPath '/' Step
- {
- $$->appendStep($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- |
- RelativeLocationPath DescendantOrSelf Step
- {
- $$->appendStep($2);
- $$->appendStep($3);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -183,58 +183,58 @@ Step:
- {
- if ($2) {
- $$ = new Step(Step::ChildAxis, *$1, *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, *$1);
-- PARSER->deleteNodeTest($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($1);
-+ parser->registerParseNode($$);
- }
- |
- NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($2) {
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NodeTest OptionalPredicateList
- {
- if ($3) {
- $$ = new Step($1, *$2, *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, *$2);
-- PARSER->deleteNodeTest($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($2);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($3) {
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($2);
-+ parser->registerParseNode($$);
- }
- |
- AbbreviatedStep
-@@ -259,23 +259,23 @@ NodeTest:
- else if (*$1 == "comment")
- $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
-
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' LITERAL ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
-- PARSER->deleteString($1);
-- PARSER->deleteString($3);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->deleteString($3);
-+ parser->registerNodeTest($$);
- }
- ;
-
-@@ -293,14 +293,14 @@ PredicateList:
- {
- $$ = new Vector<Predicate*>;
- $$->append(new Predicate($1));
-- PARSER->unregisterParseNode($1);
-- PARSER->registerPredicateVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerPredicateVector($$);
- }
- |
- PredicateList Predicate
- {
- $$->append(new Predicate($2));
-- PARSER->unregisterParseNode($2);
-+ parser->unregisterParseNode($2);
- }
- ;
-
-@@ -315,7 +315,7 @@ DescendantOrSelf:
- SLASHSLASH
- {
- $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -323,13 +323,13 @@ AbbreviatedStep:
- '.'
- {
- $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- DOTDOT
- {
- $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -337,8 +337,8 @@ PrimaryExpr:
- VARIABLEREFERENCE
- {
- $$ = new VariableReference(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- '(' Expr ')'
-@@ -349,15 +349,15 @@ PrimaryExpr:
- LITERAL
- {
- $$ = new StringExpression(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- NUMBER
- {
- $$ = new Number($1->toDouble());
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FunctionCall
-@@ -369,8 +369,8 @@ FunctionCall:
- $$ = createFunction(*$1);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FUNCTIONNAME '(' ArgumentList ')'
-@@ -378,9 +378,9 @@ FunctionCall:
- $$ = createFunction(*$1, *$3);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->deleteExpressionVector($3);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->deleteExpressionVector($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -389,14 +389,14 @@ ArgumentList:
- {
- $$ = new Vector<Expression*>;
- $$->append($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerExpressionVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerExpressionVector($$);
- }
- |
- ArgumentList ',' Argument
- {
- $$->append($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -412,9 +412,9 @@ UnionExpr:
- $$ = new Union;
- $$->addSubExpression($1);
- $$->addSubExpression($3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -430,9 +430,9 @@ PathExpr:
- {
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -440,10 +440,10 @@ PathExpr:
- $3->insertFirstStep($2);
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -453,9 +453,9 @@ FilterExpr:
- PrimaryExpr PredicateList
- {
- $$ = new Filter($1, *$2);
-- PARSER->unregisterParseNode($1);
-- PARSER->deletePredicateVector($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->deletePredicateVector($2);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -465,9 +465,9 @@ OrExpr:
- OrExpr OR AndExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -477,9 +477,9 @@ AndExpr:
- AndExpr AND EqualityExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -489,9 +489,9 @@ EqualityExpr:
- EqualityExpr EQOP RelationalExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -501,9 +501,9 @@ RelationalExpr:
- RelationalExpr RELOP AdditiveExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -513,17 +513,17 @@ AdditiveExpr:
- AdditiveExpr PLUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- AdditiveExpr MINUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -533,9 +533,9 @@ MultiplicativeExpr:
- MultiplicativeExpr MULOP UnaryExpr
- {
- $$ = new NumericOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -546,8 +546,8 @@ UnaryExpr:
- {
- $$ = new Negative;
- $$->addSubExpression($2);
-- PARSER->unregisterParseNode($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($2);
-+ parser->registerParseNode($$);
- }
- ;
-
-diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
-index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
---- a/Source/WebCore/xml/XPathParser.cpp
-+++ b/Source/WebCore/xml/XPathParser.cpp
-@@ -32,24 +32,21 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
-
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
-+using namespace XPath;
-
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
-
- Parser* Parser::currentParser = 0;
--
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
-
- typedef HashMap<String, Step::Axis> AxisNamesMap;
-@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
- delete t;
- }
-
--}
--}
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch b/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch
deleted file mode 100644
index 635c1cb..0000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport http://trac.webkit.org/changeset/160834
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Index: a/Source/WTF/wtf/dtoa/double-conversion.cc
-===================================================================
---- a/Source/WTF/wtf/dtoa/double-conversion.cc (revision 160833)
-+++ b/Source/WTF/wtf/dtoa/double-conversion.cc (revision 160834)
-@@ -447,5 +447,5 @@
- const int kBufferSize = kMaxSignificantDigits + 10;
- char buffer[kBufferSize]; // NOLINT: size is known at compile time.
-- int buffer_pos = 0;
-+ unsigned buffer_pos = 0;
-
- // Exponent will be adjusted if insignificant digits of the integer part
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
new file mode 100644
index 0000000..65418ca
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/webkit-efl/webkit-efl-164189.tar.xz \
+ file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
+ file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
+ file://0003-Fix-linking-issue.patch \
+"
+SRC_URI[md5sum] = "731513fc042ec8e03840bc1ab6a66771"
+SRC_URI[sha256sum] = "660aefd65c0e5c6494eaec30539cda5f40fbdff17f28e7e83d341b245227cccd"
+
+S = "${WORKDIR}/efl-webkit"
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 617c056..e50139c 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -1,18 +1,7 @@
-SUMMARY = "Webkit browser engine, EFL edition"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \
- file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \
- file://Source/WebKit/efl/ewk/EWebKit.h;endline=20;md5=55ea170b1582797d2c69712de850f2fa \
-"
-
-DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
- libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
- libxml2 pango eina ecore evas edje edbus gstreamer gst-plugins-base"
+require ${BPN}.inc
-# 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2
-SRCREV = "120144"
-PV = "1.9.3+svnr${SRCPV}"
-PR = "r3"
+SRCREV = "164189"
+PV = "2.3.4+svnr${SRCPV}"
SRCREV_FORMAT = "source"
@@ -20,9 +9,10 @@ SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
- file://0001-ewk-include-Element.h-for-hasTagName-function.patch \
file://CMakeLists.txt \
- file://bison-2.6.patch \
+ file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
+ file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
+ file://0003-Fix-linking-issue.patch \
"
S = "${WORKDIR}/src"
@@ -30,16 +20,3 @@ S = "${WORKDIR}/src"
do_configure_prepend() {
cp ${WORKDIR}/CMakeLists.txt ${S};
}
-
-inherit cmake lib_package pkgconfig perlnative pythonnative
-
-ARM_INSTRUCTION_SET = "arm"
-
-EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=On -DENABLE_DRAG_SUPPORT=On"
-
-LEAD_SONAME = "libewebkit.so"
-PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
-
-FILES_${PN} += "${datadir}/webkit-1.0/theme/default.edj ${datadir}/ewebkit-0/themes/default.edj"
-FILES_${PN}launcher = "${bindir}/EWebLauncher"
-FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher"
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-efl][WIP][PATCH 3/6] e-wm: upgrade to 0.18.4 and drop old 0.17.5
2014-03-06 16:48 [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9* Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 1/6] efl: upgrade to 1.9.0 Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 2/6] webkit-efl: upgrade to new snapshot r164189 Martin Jansa
@ 2014-03-06 16:48 ` Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 4/6] e-tasks: Migrate to eldbus Martin Jansa
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2014-03-06 16:48 UTC (permalink / raw)
To: openembedded-devel
* fix building e17 modules with elementary-1.9
* remove 0.17 version, because that one isn't going to be tested enough
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../0001-remove-another-elm-1.8-requirement.patch | 25 +++++++++++++++++++++
meta-efl/recipes-efl/e17/e-wm_0.17.5.bb | 26 ----------------------
.../e17/{e-wm_0.18.3.bb => e-wm_0.18.4.bb} | 5 +++--
3 files changed, 28 insertions(+), 28 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch
delete mode 100644 meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
rename meta-efl/recipes-efl/e17/{e-wm_0.18.3.bb => e-wm_0.18.4.bb} (68%)
diff --git a/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch b/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch
new file mode 100644
index 0000000..f4f034a
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-wm/0001-remove-another-elm-1.8-requirement.patch
@@ -0,0 +1,25 @@
+From dd1406e40700df60a055db24d7358480b1fbc5bf Mon Sep 17 00:00:00 2001
+From: Mike Blumenkrantz <zmike@samsung.com>
+Date: Mon, 3 Mar 2014 17:38:55 -0500
+Subject: [PATCH] remove another elm 1.8 requirement
+
+Upstream-Status: backport dd1406e40700df60a055db24d7358480b1fbc5bf
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 999df79..26f6775 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -579,7 +579,6 @@ eina >= ${efl_version} \
+ eldbus >= ${efl_version} \
+ eio >= ${efl_version} \
+ elementary >= ${elm_version} \
+-elementary < 1.8.99 \
+ emotion >= ${efl_version} \
+ $udisks_mount \
+ $eeze_mount \
+--
+1.9.0
+
diff --git a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb b/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
deleted file mode 100644
index d374680..0000000
--- a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-require ${BPN}.inc
-
-SRCNAME = "enlightenment"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
- file://enlightenment_start.oe \
- file://applications.menu \
-"
-
-SRC_URI[md5sum] = "5aefb55df0b1a0a0ae0cf9d0610cf7c7"
-SRC_URI[sha256sum] = "25d4967277cf27d4efb474a9b8eceb1200aa813a51c248b61cc23f69291bff0f"
-
-do_install_append() {
- install -d ${D}/${datadir}/applications/
- install -m 644 ${S}/src/modules/fileman/module.desktop ${D}/${datadir}/applications/efm.desktop
- sed "s#Type=Link#Type=Application#g" -i ${D}/${datadir}/applications/efm.desktop
- echo "Exec=enlightenment_remote -efm-open-dir" >> ${D}/${datadir}/applications/efm.desktop
- echo "Terminal=false" >> ${D}/${datadir}/applications/efm.desktop
- echo "Categories=Application;" >> ${D}/${datadir}/applications/efm.desktop
- echo "StartupNotify=true" >> ${D}/${datadir}/applications/efm.desktop
- install -d ${D}/${datadir}/icons/
- install -m 644 ${S}/data/themes/img/O/icon_icon_theme.png ${D}/${datadir}/icons/e-module-fileman.png
-}
diff --git a/meta-efl/recipes-efl/e17/e-wm_0.18.3.bb b/meta-efl/recipes-efl/e17/e-wm_0.18.4.bb
similarity index 68%
rename from meta-efl/recipes-efl/e17/e-wm_0.18.3.bb
rename to meta-efl/recipes-efl/e17/e-wm_0.18.4.bb
index ae21cc1..0122cad 100644
--- a/meta-efl/recipes-efl/e17/e-wm_0.18.3.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_0.18.4.bb
@@ -6,12 +6,13 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
SRC_URI = "\
${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+ file://0001-remove-another-elm-1.8-requirement.patch \
file://enlightenment_start.oe \
file://applications.menu \
"
-SRC_URI[md5sum] = "9f6e6c296b88b038ac05415006c678fd"
-SRC_URI[sha256sum] = "17d207246bf10dec5a5fa854da5763e0e6dd61decde3474ff5fedffbb9dc8629"
+SRC_URI[md5sum] = "d3534c765d562524c63852f2f40932c3"
+SRC_URI[sha256sum] = "273afe860b65e1e39323bab80ab51e44845bcddcd25063b47eadab1c925a77c9"
do_configure_prepend() {
sed '/^ *EFL_PKG_CHECK_VAR/ s/systemduserunitdir/systemdsystemunitdir/g' -i ${S}/configure.ac
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-efl][WIP][PATCH 4/6] e-tasks: Migrate to eldbus
2014-03-06 16:48 [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9* Martin Jansa
` (2 preceding siblings ...)
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 3/6] e-wm: upgrade to 0.18.4 and drop old 0.17.5 Martin Jansa
@ 2014-03-06 16:48 ` Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 5/6] python-efl: upgrade to 1.9.0 Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 6/6] eve: restrict for armv7a, because upstream dropped support in webkit-efl Martin Jansa
5 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2014-03-06 16:48 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../0001-dbus-stuff-Convert-to-eldbus.patch | 204 +++++++++++++++++++++
meta-efl/recipes-efl/e17/e-tasks_git.bb | 4 +-
2 files changed, 207 insertions(+), 1 deletion(-)
create mode 100644 meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch b/meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch
new file mode 100644
index 0000000..f92a772
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-tasks/0001-dbus-stuff-Convert-to-eldbus.patch
@@ -0,0 +1,204 @@
+From 37223289b3d85ea8876e7ba7c9ff97ec428073ba Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 22 Feb 2014 14:36:38 +0100
+Subject: [PATCH] dbus-stuff: Convert to eldbus
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure.ac | 2 +-
+ src/Makefile.am | 2 +-
+ src/dbus-stuff.c | 95 ++++++++++++++++++++++++++++++++------------------------
+ src/dbus-stuff.h | 13 ++------
+ src/main.c | 2 +-
+ 5 files changed, 61 insertions(+), 53 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b3e4d12..4ace32a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@ AC_HEADER_STDC
+
+ AM_PROG_LIBTOOL
+
+-PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 edbus sqlite3])
++PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 eldbus sqlite3])
+
+ AC_OUTPUT([
+ Makefile
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2143dc9..31d5253 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
+ $(TASKS_CFLAGS)
+
+ AM_CFLAGS =\
+- $(EDBUS_CFLAGS) \
++ $(ELDBUS_CFLAGS) \
+ -Wall\
+ -g
+
+diff --git a/src/dbus-stuff.c b/src/dbus-stuff.c
+index 50809bc..9f02ef3 100644
+--- a/src/dbus-stuff.c
++++ b/src/dbus-stuff.c
+@@ -1,8 +1,7 @@
+ /***************************************************************************
+ * dbus-stuff.c
+ *
+- * Copyright 2009 cchandel
+- * <cchandel@yahoo.com>
++ * Copyright 2009 cchandel <cchandel@yahoo.com>
+ ****************************************************************************/
+
+ /*
+@@ -21,51 +20,67 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ */
+ #include "dbus-stuff.h"
+-#include <string.h>
+-#include <E_DBus.h>
+-#include <Elementary.h>
++#include "Eldbus.h"
+
+-void occupy_cpu(void)
++void on_usage_cb(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
++{
++ const char *errname, *errmsg;
++ if (eldbus_message_error_get(msg, &errname, &errmsg))
++ fprintf(stderr, "Error: %s %s\n", errname, errmsg);
++}
++
++int ousaged_resource(const char *resource, int used)
+ {
+- e_dbus_init();
+- conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
+-
+- DBusMessage *msg;
+- msg = dbus_message_new_method_call(
+- "org.freesmartphone.ousaged",
+- "/org/freesmartphone/Usage",
+- "org.freesmartphone.Usage",
+- "RequestResource"
+- );
+-
+- const char *resource = "CPU";
+- dbus_message_append_args (msg, DBUS_TYPE_STRING, &resource, DBUS_TYPE_INVALID);
++ eldbus_init();
++ const char *REQUEST = "RequestResource";
++ const char *RELEASE = "ReleaseResource";
++ const int PREQUEST = 1;
+
+- e_dbus_message_send(conn, msg, dbus_reply_cb, -1, NULL);
+- dbus_message_unref(msg);
+-}
++ Eldbus_Connection *conn;
++ Eldbus_Object *obj;
++ Eldbus_Proxy *usage;
++ Eldbus_Pending *pending;
++ conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
++ if (!conn)
++ {
++ fprintf(stderr, "Error: could not get system bus\n");
++ return EXIT_FAILURE;
++ }
+
+-void release_cpu(void)
+-{
+- DBusMessage *msg;
+- msg = dbus_message_new_method_call(
+- "org.freesmartphone.ousaged",
+- "/org/freesmartphone/Usage",
+- "org.freesmartphone.Usage",
+- "ReleaseResource"
+- );
+-
+- const char *resource = "CPU";
+- dbus_message_append_args (msg, DBUS_TYPE_STRING, &resource, DBUS_TYPE_INVALID);
++ obj = eldbus_object_get(conn, "org.freesmartphone.ousaged", "/org/freesmartphone/Usage");
++ if (!obj)
++ {
++ fprintf(stderr, "Error: could not get object\n");
++ return EXIT_FAILURE;
++ }
+
+- e_dbus_message_send(conn, msg, dbus_reply_cb, -1, NULL);
+- dbus_message_unref(msg);
++ usage = eldbus_proxy_get(obj, "org.freesmartphone.Usage");
++ if (!usage)
++ {
++ fprintf(stderr, "Error: could not get proxy\n");
++ return EXIT_FAILURE;
++ }
++
++ pending = eldbus_proxy_call(usage, used == PREQUEST ? REQUEST : RELEASE, on_usage_cb, NULL, -1, "ss", resource);
++ if (!pending)
++ {
++ fprintf(stderr, "Error: could not call\n");
++ return EXIT_FAILURE;
++ }
++ eldbus_proxy_unref(usage);
++ eldbus_object_unref(obj);
++ eldbus_connection_unref(conn);
++
++ eldbus_shutdown();
++ return EXIT_SUCCESS;
+ }
+
+-void dbus_reply_cb(void *data, DBusMessage *replymsg, DBusError *error)
++int request_cpu(void)
+ {
+- if (dbus_error_is_set(error)) {
+- printf("Error: %s - %s\n", error->name, error->message);
+- }
++ return ousaged_resource("CPU", 1);
+ }
+
++int release_cpu(void)
++{
++ return ousaged_resource("CPU" , 0);
++}
+diff --git a/src/dbus-stuff.h b/src/dbus-stuff.h
+index 83d4778..a3c72cb 100644
+--- a/src/dbus-stuff.h
++++ b/src/dbus-stuff.h
+@@ -2,8 +2,7 @@
+ * dbus.h
+ *
+ * Fri Mar 6 12:32:57 2009
+- * Copyright 2009 nidhin
+- * <nidhin@nids-laptop.home>
++ * Copyright 2009 nidhin <nidhin@nids-laptop.home>
+ ****************************************************************************/
+
+ /*
+@@ -22,11 +21,5 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ */
+
+-#include <E_DBus.h>
+-#include <Elementary.h>
+-
+-void occupy_cpu(void);
+-void release_cpu(void);
+-void dbus_reply_cb(void *data, DBusMessage *replymsg, DBusError *error);
+-
+-E_DBus_Connection *conn;
++int request_cpu(void);
++int release_cpu(void);
+diff --git a/src/main.c b/src/main.c
+index 92d21de..4e4bbe2 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -76,7 +76,7 @@ elm_main(int argc, char **argv)
+ //restore state
+ restore_state();
+
+- occupy_cpu();
++ request_cpu();
+
+ elm_run();
+ //clean up stuff
+--
+1.8.5.3
+
diff --git a/meta-efl/recipes-efl/e17/e-tasks_git.bb b/meta-efl/recipes-efl/e17/e-tasks_git.bb
index d17e4e7..6065157 100644
--- a/meta-efl/recipes-efl/e17/e-tasks_git.bb
+++ b/meta-efl/recipes-efl/e17/e-tasks_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "cchandel"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
SECTION = "e/apps"
-DEPENDS = "elementary eina edbus sqlite3"
+DEPENDS = "elementary eina eldbus sqlite3"
inherit autotools
@@ -12,6 +12,8 @@ SRCREV = "890f5ee37d1a5fd1ceb2495950d15151d4cf756b"
PV = "0.0.2+gitr${SRCPV}"
SRC_URI = "git://github.com/shr-project/e-tasks.git"
+SRC_URI += "file://0001-dbus-stuff-Convert-to-eldbus.patch"
+
S = "${WORKDIR}/git"
do_install_append() {
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-efl][WIP][PATCH 5/6] python-efl: upgrade to 1.9.0
2014-03-06 16:48 [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9* Martin Jansa
` (3 preceding siblings ...)
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 4/6] e-tasks: Migrate to eldbus Martin Jansa
@ 2014-03-06 16:48 ` Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 6/6] eve: restrict for armv7a, because upstream dropped support in webkit-efl Martin Jansa
5 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2014-03-06 16:48 UTC (permalink / raw)
To: openembedded-devel
* announcement:
http://sourceforge.net/p/enlightenment/mailman/message/32066075/
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-devtools/python/python-efl.inc | 2 +-
meta-efl/recipes-devtools/python/python-efl_1.8.1.bb | 4 ----
meta-efl/recipes-devtools/python/python-efl_1.9.0.bb | 4 ++++
3 files changed, 5 insertions(+), 5 deletions(-)
delete mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
create mode 100644 meta-efl/recipes-devtools/python/python-efl_1.9.0.bb
diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc
index cca3562..6ac7ad8 100644
--- a/meta-efl/recipes-devtools/python/python-efl.inc
+++ b/meta-efl/recipes-devtools/python/python-efl.inc
@@ -1,6 +1,6 @@
DESCRIPTION = "${PN} bindings"
-LICENSE = "LGPLv3.0"
+LICENSE = "LGPL-3.0"
LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
# there is also GPLv3.0 in COPYING;md5=d32239bcb673463ab874e80d47fae504 but no file seems to use that
diff --git a/meta-efl/recipes-devtools/python/python-efl_1.8.1.bb b/meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
deleted file mode 100644
index 15009f6..0000000
--- a/meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI[md5sum] = "ca71f501c7e0479f15d2746380b0f81d"
-SRC_URI[sha256sum] = "90ea20d0a90448fd1dcd56210bf34cb9a78905852d83620617bf164f1cef5edc"
diff --git a/meta-efl/recipes-devtools/python/python-efl_1.9.0.bb b/meta-efl/recipes-devtools/python/python-efl_1.9.0.bb
new file mode 100644
index 0000000..f34e428
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-efl_1.9.0.bb
@@ -0,0 +1,4 @@
+require ${BPN}.inc
+
+SRC_URI[md5sum] = "c643d66157cac9b2892af8b6d1a803b1"
+SRC_URI[sha256sum] = "f6d6fecca20df016acc79a12348ae0a0f6db82e6cceaf53c4b46d7ca72bb8f07"
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-efl][WIP][PATCH 6/6] eve: restrict for armv7a, because upstream dropped support in webkit-efl
2014-03-06 16:48 [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9* Martin Jansa
` (4 preceding siblings ...)
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 5/6] python-efl: upgrade to 1.9.0 Martin Jansa
@ 2014-03-06 16:48 ` Martin Jansa
5 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2014-03-06 16:48 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/eve_svn.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb
index 3cc68cb..5845c2d 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_svn.bb
@@ -5,6 +5,12 @@ DEPENDS = "evas ecore edje elementary webkit-efl eldbus"
PV = "0.3.0.0+svnr${SRCPV}"
SRCREV = "84579"
+# webkit-efl isn't available for < armv7a
+COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE_i586 = "(.*)"
+COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE_armv7a = "(.*)"
+
inherit e gettext
SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
S = "${WORKDIR}/${SRCNAME}"
--
1.9.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-03-06 16:48 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-06 16:48 [meta-efl][WIP][PATCH 0/6] EFL upgrade to 1.9* Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 1/6] efl: upgrade to 1.9.0 Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 2/6] webkit-efl: upgrade to new snapshot r164189 Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 3/6] e-wm: upgrade to 0.18.4 and drop old 0.17.5 Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 4/6] e-tasks: Migrate to eldbus Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 5/6] python-efl: upgrade to 1.9.0 Martin Jansa
2014-03-06 16:48 ` [meta-efl][WIP][PATCH 6/6] eve: restrict for armv7a, because upstream dropped support in webkit-efl Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.