* [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade
@ 2014-01-15 17:17 Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 1/7] meta-efl: Add efl 1.8.4, elementary 1.8.3, terminology 0.4.0 and python-efl 1.8.0 recipes Martin Jansa
` (7 more replies)
0 siblings, 8 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
WIP because it's only build tested and webkit-efl is failing for armv[45].
for other architectures you need to fix cmake in oe-core:
http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088218.html
Sharing as WIP, because 1.7 is pretty much dead and we need to start updating
apps to work with this 1.8 (and eventually also upgrade e-wm to 18).
Good thing is that unlike earlier elementary upgrades this really has
quite stable API, so I had to change only few SHR apps which are built with -Werror
and were using some deprecated API.
Hopefully we'll get this in shape before closing 1.6.
Testers, contributions welcome.
Does someone care about upgrade path here? See first patch it doesn't even build
correctly in incremental build (because of oe bug), so I'm tempted to ignore it this time.
The following changes since commit a1b6699ad26e1035f5c29918e059b8b57fde57ff:
add libcrypt-openssl-rsa-perl (2014-01-13 09:59:45 +0000)
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 (7):
meta-efl: Add efl 1.8.4, elementary 1.8.3, terminology 0.4.0 and
python-efl 1.8.0 recipes
webkit-efl: Add recipe with snapshot from r159807
enjoy: Upgrade to version from git
libeflvala: Fix build of tests
eve: bump SRCREV to catch up with edbus2 -> eldbus rename
e-wm: Drop evas-.*-loader.* from RDEPENDS
webkit-efl: Try to disable llint/jit to fix armv[45] build
meta-efl/conf/layer.conf | 1 +
meta-efl/recipes-devtools/python/python-ecore.inc | 5 -
.../recipes-devtools/python/python-ecore_1.7.0.bb | 5 -
.../recipes-devtools/python/python-ecore_svn.bb | 8 -
meta-efl/recipes-devtools/python/python-edbus.inc | 50 +++++-
.../recipes-devtools/python/python-edbus_1.7.0.bb | 3 +-
.../recipes-devtools/python/python-edbus_svn.bb | 8 -
meta-efl/recipes-devtools/python/python-edje.inc | 6 -
.../python-edje/0001-fix-unicode-conversion.patch | 38 -----
.../recipes-devtools/python/python-edje_1.7.0.bb | 6 -
.../recipes-devtools/python/python-edje_svn.bb | 10 --
meta-efl/recipes-devtools/python/python-efl.inc | 36 ++---
.../recipes-devtools/python/python-efl_1.8.0.bb | 4 +
.../recipes-devtools/python/python-elementary.inc | 5 -
.../python/python-elementary_1.7.0.bb | 5 -
.../python/python-elementary_svn.bb | 8 -
.../recipes-devtools/python/python-emotion.inc | 5 -
.../python/python-emotion_1.7.0.bb | 5 -
.../recipes-devtools/python/python-emotion_svn.bb | 8 -
meta-efl/recipes-devtools/python/python-evas.inc | 4 -
.../recipes-devtools/python/python-evas_1.7.0.bb | 5 -
.../recipes-devtools/python/python-evas_svn.bb | 8 -
meta-efl/recipes-efl/e17/e-wm.inc | 4 -
...position-as-percent-and-define-a-1-second.patch | 14 +-
.../recipes-efl/e17/{enjoy_svn.bb => enjoy_git.bb} | 12 +-
meta-efl/recipes-efl/e17/eve_svn.bb | 4 +-
meta-efl/recipes-efl/e17/terminology_0.3.0.bb | 10 --
meta-efl/recipes-efl/e17/terminology_0.4.0.bb | 10 ++
meta-efl/recipes-efl/efl/ecore_1.7.9.bb | 124 --------------
meta-efl/recipes-efl/efl/edbus2.inc | 11 --
meta-efl/recipes-efl/efl/edbus2_svn.bb | 14 --
meta-efl/recipes-efl/efl/edbus_svn.bb | 13 --
meta-efl/recipes-efl/efl/edje_1.7.9.bb | 72 ---------
meta-efl/recipes-efl/efl/eet_1.7.9.bb | 30 ----
meta-efl/recipes-efl/efl/eeze_1.7.9.bb | 23 ---
meta-efl/recipes-efl/efl/efl.inc | 145 +++++++++++++++++
...igure.ac-Don-t-check-for-Xprint-extension.patch | 27 ++++
meta-efl/recipes-efl/efl/efl_1.8.4.bb | 17 ++
meta-efl/recipes-efl/efl/efreet_1.7.9.bb | 22 ---
meta-efl/recipes-efl/efl/eina_1.7.9.bb | 19 ---
meta-efl/recipes-efl/efl/eio_1.7.9.bb | 15 --
meta-efl/recipes-efl/efl/elementary.inc | 29 ++--
...e-elm_prefs_cc-and-elementary_codegen-def.patch | 61 +++++++
meta-efl/recipes-efl/efl/elementary_1.7.9.bb | 8 -
meta-efl/recipes-efl/efl/elementary_1.8.3.bb | 12 ++
meta-efl/recipes-efl/efl/embryo_1.7.9.bb | 20 ---
.../recipes-efl/efl/emotion-generic-players.inc | 10 ++
.../efl/emotion-generic-players_1.8.0.bb | 8 +
meta-efl/recipes-efl/efl/emotion_1.7.9.bb | 22 ---
meta-efl/recipes-efl/efl/ethumb_1.7.9.bb | 27 ----
meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +-
.../recipes-efl/efl/evas-generic-loaders_1.7.9.bb | 8 -
.../recipes-efl/efl/evas-generic-loaders_1.8.1.bb | 8 +
...s_font_load-Fix-build-with-newer-freetype.patch | 26 ---
meta-efl/recipes-efl/efl/evas_1.7.9.bb | 178 ---------------------
meta-efl/recipes-efl/efl/expedite_1.7.9.bb | 8 -
.../efl/libeflvala/disable.eina.test.patch | 44 +++++
meta-efl/recipes-efl/efl/libeflvala_svn.bb | 1 +
...lines.h-remove-indexingHeader-preCapacity.patch | 27 ++++
...KitHelpers.cmake-Add-Wno-error-cast-align.patch | 29 ++++
.../webkit/webkit-efl/gcc-4.8.2.fix.patch | 15 ++
.../webkit/webkit-efl_2.3.2+svnr159807.bb | 51 ++++++
62 files changed, 563 insertions(+), 850 deletions(-)
delete mode 100644 meta-efl/recipes-devtools/python/python-ecore.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-ecore_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-edbus_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-edje.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-edje/0001-fix-unicode-conversion.patch
delete mode 100644 meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-edje_svn.bb
create mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-elementary.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-elementary_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-emotion.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-emotion_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-evas.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-evas_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-evas_svn.bb
rename meta-efl/recipes-efl/e17/{enjoy_svn.bb => enjoy_git.bb} (88%)
delete mode 100644 meta-efl/recipes-efl/e17/terminology_0.3.0.bb
create mode 100644 meta-efl/recipes-efl/e17/terminology_0.4.0.bb
delete mode 100644 meta-efl/recipes-efl/efl/ecore_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/edbus2.inc
delete mode 100644 meta-efl/recipes-efl/efl/edbus2_svn.bb
delete mode 100644 meta-efl/recipes-efl/efl/edbus_svn.bb
delete mode 100644 meta-efl/recipes-efl/efl/edje_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eet_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eeze_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/efl.inc
create mode 100644 meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
create mode 100644 meta-efl/recipes-efl/efl/efl_1.8.4.bb
delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eina_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eio_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch
delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/elementary_1.8.3.bb
delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players.inc
create mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players_1.8.0.bb
delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
delete mode 100644 meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch
delete mode 100644 meta-efl/recipes-efl/efl/evas_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
create 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.2+svnr159807.bb
--
1.8.5.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [meta-efl][WIP][PATCHv2 1/7] meta-efl: Add efl 1.8.4, elementary 1.8.3, terminology 0.4.0 and python-efl 1.8.0 recipes
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
@ 2014-01-15 17:17 ` Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 2/7] webkit-efl: Add recipe with snapshot from r159807 Martin Jansa
` (6 subsequent siblings)
7 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
* announcements:
efl & friends
http://sourceforge.net/mailarchive/message.php?msg_id=31733071
EFL 1.8.4 and Elementary 1.8.3 releases
http://sourceforge.net/mailarchive/message.php?msg_id=31826305
python-efl
http://sourceforge.net/mailarchive/message.php?msg_id=31728838
terminology
http://sourceforge.net/mailarchive/message.php?msg_id=31728362
* be aware that upgrade-path wont probably work correctly
and that you have to manually cleanup your sysroots before
migrating to new shared efl recipe, for details see
https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/conf/layer.conf | 1 +
meta-efl/recipes-devtools/python/python-ecore.inc | 5 -
.../recipes-devtools/python/python-ecore_1.7.0.bb | 5 -
.../recipes-devtools/python/python-ecore_svn.bb | 8 -
meta-efl/recipes-devtools/python/python-edbus.inc | 50 +++++-
.../recipes-devtools/python/python-edbus_1.7.0.bb | 3 +-
.../recipes-devtools/python/python-edbus_svn.bb | 8 -
meta-efl/recipes-devtools/python/python-edje.inc | 6 -
.../python-edje/0001-fix-unicode-conversion.patch | 38 -----
.../recipes-devtools/python/python-edje_1.7.0.bb | 6 -
.../recipes-devtools/python/python-edje_svn.bb | 10 --
meta-efl/recipes-devtools/python/python-efl.inc | 36 ++---
.../recipes-devtools/python/python-efl_1.8.0.bb | 4 +
.../recipes-devtools/python/python-elementary.inc | 5 -
.../python/python-elementary_1.7.0.bb | 5 -
.../python/python-elementary_svn.bb | 8 -
.../recipes-devtools/python/python-emotion.inc | 5 -
.../python/python-emotion_1.7.0.bb | 5 -
.../recipes-devtools/python/python-emotion_svn.bb | 8 -
meta-efl/recipes-devtools/python/python-evas.inc | 4 -
.../recipes-devtools/python/python-evas_1.7.0.bb | 5 -
.../recipes-devtools/python/python-evas_svn.bb | 8 -
meta-efl/recipes-efl/e17/enjoy_svn.bb | 2 +-
meta-efl/recipes-efl/e17/eve_svn.bb | 2 +-
meta-efl/recipes-efl/e17/terminology_0.3.0.bb | 10 --
meta-efl/recipes-efl/e17/terminology_0.4.0.bb | 10 ++
meta-efl/recipes-efl/efl/ecore_1.7.9.bb | 124 --------------
meta-efl/recipes-efl/efl/edbus2.inc | 11 --
meta-efl/recipes-efl/efl/edbus2_svn.bb | 14 --
meta-efl/recipes-efl/efl/edbus_svn.bb | 13 --
meta-efl/recipes-efl/efl/edje_1.7.9.bb | 72 ---------
meta-efl/recipes-efl/efl/eet_1.7.9.bb | 30 ----
meta-efl/recipes-efl/efl/eeze_1.7.9.bb | 23 ---
meta-efl/recipes-efl/efl/efl.inc | 145 +++++++++++++++++
...igure.ac-Don-t-check-for-Xprint-extension.patch | 27 ++++
meta-efl/recipes-efl/efl/efl_1.8.4.bb | 17 ++
meta-efl/recipes-efl/efl/efreet_1.7.9.bb | 22 ---
meta-efl/recipes-efl/efl/eina_1.7.9.bb | 19 ---
meta-efl/recipes-efl/efl/eio_1.7.9.bb | 15 --
meta-efl/recipes-efl/efl/elementary.inc | 29 ++--
...e-elm_prefs_cc-and-elementary_codegen-def.patch | 61 +++++++
meta-efl/recipes-efl/efl/elementary_1.7.9.bb | 8 -
meta-efl/recipes-efl/efl/elementary_1.8.3.bb | 12 ++
meta-efl/recipes-efl/efl/embryo_1.7.9.bb | 20 ---
.../recipes-efl/efl/emotion-generic-players.inc | 10 ++
.../efl/emotion-generic-players_1.8.0.bb | 8 +
meta-efl/recipes-efl/efl/emotion_1.7.9.bb | 22 ---
meta-efl/recipes-efl/efl/ethumb_1.7.9.bb | 27 ----
meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +-
.../recipes-efl/efl/evas-generic-loaders_1.7.9.bb | 8 -
.../recipes-efl/efl/evas-generic-loaders_1.8.1.bb | 8 +
...s_font_load-Fix-build-with-newer-freetype.patch | 26 ---
meta-efl/recipes-efl/efl/evas_1.7.9.bb | 178 ---------------------
meta-efl/recipes-efl/efl/expedite_1.7.9.bb | 8 -
54 files changed, 384 insertions(+), 832 deletions(-)
delete mode 100644 meta-efl/recipes-devtools/python/python-ecore.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-ecore_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-edbus_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-edje.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-edje/0001-fix-unicode-conversion.patch
delete mode 100644 meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-edje_svn.bb
create mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-elementary.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-elementary_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-emotion.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-emotion_svn.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-evas.inc
delete mode 100644 meta-efl/recipes-devtools/python/python-evas_1.7.0.bb
delete mode 100644 meta-efl/recipes-devtools/python/python-evas_svn.bb
delete mode 100644 meta-efl/recipes-efl/e17/terminology_0.3.0.bb
create mode 100644 meta-efl/recipes-efl/e17/terminology_0.4.0.bb
delete mode 100644 meta-efl/recipes-efl/efl/ecore_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/edbus2.inc
delete mode 100644 meta-efl/recipes-efl/efl/edbus2_svn.bb
delete mode 100644 meta-efl/recipes-efl/efl/edbus_svn.bb
delete mode 100644 meta-efl/recipes-efl/efl/edje_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eet_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eeze_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/efl.inc
create mode 100644 meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
create mode 100644 meta-efl/recipes-efl/efl/efl_1.8.4.bb
delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eina_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/eio_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch
delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/elementary_1.8.3.bb
delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players.inc
create mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players_1.8.0.bb
delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb
create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
delete mode 100644 meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch
delete mode 100644 meta-efl/recipes-efl/efl/evas_1.7.9.bb
delete mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.9.bb
diff --git a/meta-efl/conf/layer.conf b/meta-efl/conf/layer.conf
index fb9a7ce..5ed7bd6 100644
--- a/meta-efl/conf/layer.conf
+++ b/meta-efl/conf/layer.conf
@@ -9,4 +9,5 @@ BBFILE_PATTERN_efl-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_efl-layer = "7"
E_MIRROR = "http://download.enlightenment.org/releases"
+E_RELEASES = "http://download.enlightenment.org/rel"
E_SVN = "svn://svn.enlightenment.org/svn/e"
diff --git a/meta-efl/recipes-devtools/python/python-ecore.inc b/meta-efl/recipes-devtools/python/python-ecore.inc
deleted file mode 100644
index 79aaeec..0000000
--- a/meta-efl/recipes-devtools/python/python-ecore.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS += "python-evas ecore"
-RDEPENDS_${PN} += "python-evas"
diff --git a/meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb b/meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
deleted file mode 100644
index 17b7137..0000000
--- a/meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "15dd908b71d09ef30f7e758739f3b6fd"
-SRC_URI[sha256sum] = "45d374ffab243b561718897e4eac9aadc1e7ce6e34321a3e728a5f6d07d1e9b6"
diff --git a/meta-efl/recipes-devtools/python/python-ecore_svn.bb b/meta-efl/recipes-devtools/python/python-ecore_svn.bb
deleted file mode 100644
index d551073..0000000
--- a/meta-efl/recipes-devtools/python/python-ecore_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.0+svnr${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-devtools/python/python-edbus.inc b/meta-efl/recipes-devtools/python/python-edbus.inc
index 86ae773..1d8098f 100644
--- a/meta-efl/recipes-devtools/python/python-edbus.inc
+++ b/meta-efl/recipes-devtools/python/python-edbus.inc
@@ -1,6 +1,50 @@
-require python-efl.inc
+DESCRIPTION = "${PN} bindings"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS += "edbus python-dbus"
-RDEPENDS_${PN} += "python-dbus"
+AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
+# NOTE: Due to a bug in distutils, even if we don't use pyrex but cython,
+# we need to build pyrex otherwise cython doesn't get called to build
+# the extension modules.
+DEPENDS = "python-cython-native python-pyrex-native python-numeric eina edbus python-dbus"
+RDEPENDS_${PN} += "python-lang python-dbus"
+
+# necessary to let the call for python-config succeed
+export BUILD_SYS
+export HOST_SYS
+
+inherit e-base autotools pkgconfig distutils-base
+
SRCNAME = "python-e_dbus"
+SRCVER = "${PV}"
+
+SRC_URI = "\
+ ${E_MIRROR}/BINDINGS/python/${SRCNAME}-${SRCVER}.tar.bz2 \
+"
+S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
+
+
+do_configure_prepend() {
+ # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
+ sed -i "s#=\`\$PKG_CONFIG --variable=includedir \"python-evas#=${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
+}
+
+do_install_append() {
+ if [ -e examples ]; then
+ for i in `find examples -name "*.edc"`; do
+ cd ${S}/`dirname $i`
+ echo "Generating .edj file for $i..."
+ edje_cc `basename $i`
+ echo "Removing sources in this directory..."
+ rm -f *.edc *.png *.ttf *.jpeg
+ done
+ cd ${S}
+ install -d ${D}${datadir}/${PN}/
+ cp -a examples ${D}${datadir}/${PN}/
+ find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf
+ fi
+}
+
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
+
+PACKAGES += "${PN}-examples"
+FILES_${PN}-examples = "${datadir}/${PN}/examples"
diff --git a/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb b/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb
index 5628469..9e5ff0a 100644
--- a/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb
+++ b/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb
@@ -1,5 +1,6 @@
require ${BPN}.inc
-PR = "${INC_PR}.0"
+
+PR = "r1"
SRC_URI[md5sum] = "40b479444bb06147429a276127981890"
SRC_URI[sha256sum] = "78e5ca334ee25185748660b4e612f984f4d3bced018f062278701429868f117b"
diff --git a/meta-efl/recipes-devtools/python/python-edbus_svn.bb b/meta-efl/recipes-devtools/python/python-edbus_svn.bb
deleted file mode 100644
index d551073..0000000
--- a/meta-efl/recipes-devtools/python/python-edbus_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.0+svnr${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-devtools/python/python-edje.inc b/meta-efl/recipes-devtools/python/python-edje.inc
deleted file mode 100644
index 2e2e1f2..0000000
--- a/meta-efl/recipes-devtools/python/python-edje.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS += "edje python-evas evas"
-RDEPENDS_${PN} += "python-evas"
-EXTRA_OECONF += "--disable-examples"
diff --git a/meta-efl/recipes-devtools/python/python-edje/0001-fix-unicode-conversion.patch b/meta-efl/recipes-devtools/python/python-edje/0001-fix-unicode-conversion.patch
deleted file mode 100644
index 3b0cdc6..0000000
--- a/meta-efl/recipes-devtools/python/python-edje/0001-fix-unicode-conversion.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From fa12a33b5a3c0e86231ca84967d9eff456e5f314 Mon Sep 17 00:00:00 2001
-From: Jan Luebbe <jluebbe@debian.org>
-Date: Sat, 9 Aug 2008 18:30:04 +0200
-Subject: [PATCH] fix unicode conversion
-
----
- edje/edje.c_edje_object.pxi | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/edje/edje.c_edje_object.pxi b/edje/edje.c_edje_object.pxi
-index 0f4da68..21c237e 100644
---- a/edje/edje.c_edje_object.pxi
-+++ b/edje/edje.c_edje_object.pxi
-@@ -415,17 +415,20 @@
- else:
- raise TypeError("func must be callable or None")
-
-- def part_text_set(self, char *part, char *text):
-- edje_object_part_text_set(self.obj, part, text)
-+ def part_text_set(self, char *part, text):
-+ cdef char *s
-+ u = text.encode("utf8")
-+ s = u
-+ edje_object_part_text_set(self.obj, part, s)
-
- def part_text_get(self, char *part):
-- "@rtype: str"
-+ "@rtype: unicode"
- cdef const_char_ptr s
- s = edje_object_part_text_get(self.obj, part)
- if s == NULL:
- return None
- else:
-- return s
-+ return s.decode("utf8")
-
- def part_text_select_all(self, char *part):
- edje_object_part_text_select_all(self.obj, part)
diff --git a/meta-efl/recipes-devtools/python/python-edje_1.7.0.bb b/meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
deleted file mode 100644
index 9a30ad4..0000000
--- a/meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI += "file://0001-fix-unicode-conversion.patch"
-
-SRC_URI[md5sum] = "1e0d7a4a4504298caaad0cee476e4edb"
-SRC_URI[sha256sum] = "b1eb7be4dea099752c587baa4747d8100de6cead256ffea22a6cc0e88c4e8786"
diff --git a/meta-efl/recipes-devtools/python/python-edje_svn.bb b/meta-efl/recipes-devtools/python/python-edje_svn.bb
deleted file mode 100644
index eca8b75..0000000
--- a/meta-efl/recipes-devtools/python/python-edje_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.0+svnr${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-S = "${WORKDIR}/${SRCNAME}"
-
-SRC_URI += "file://0001-fix-unicode-conversion.patch"
diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc
index b622c40..c608bac 100644
--- a/meta-efl/recipes-devtools/python/python-efl.inc
+++ b/meta-efl/recipes-devtools/python/python-efl.inc
@@ -1,48 +1,32 @@
DESCRIPTION = "${PN} bindings"
-LICENSE = "BSD"
+
+LICENSE = "LGPLv3.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
+
AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
# NOTE: Due to a bug in distutils, even if we don't use pyrex but cython,
# we need to build pyrex otherwise cython doesn't get called to build
# the extension modules.
DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
RDEPENDS_${PN} += "python-lang"
-INC_PR = "r1"
+
+PROVIDES = "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas"
+RPROVIDES_${PN} += "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas"
# necessary to let the call for python-config succeed
export BUILD_SYS
export HOST_SYS
-inherit e-base autotools pkgconfig distutils-base
+inherit e-base distutils pkgconfig
SRCVER = "${PV}"
SRC_URI = "\
- ${E_MIRROR}/BINDINGS/python/${SRCNAME}-${SRCVER}.tar.bz2 \
+ ${E_RELEASES}/bindings/python/${SRCNAME}-${SRCVER}.tar.gz \
"
S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
-
-do_configure_prepend() {
- # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
- sed -i "s#=\`\$PKG_CONFIG --variable=includedir \"python-evas#=${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
-}
-
-do_install_append() {
- if [ -e examples ]; then
- for i in `find examples -name "*.edc"`; do
- cd ${S}/`dirname $i`
- echo "Generating .edj file for $i..."
- edje_cc `basename $i`
- echo "Removing sources in this directory..."
- rm -f *.edc *.png *.ttf *.jpeg
- done
- cd ${S}
- install -d ${D}${datadir}/${PN}/
- cp -a examples ${D}${datadir}/${PN}/
- find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf
- fi
-}
-
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
PACKAGES += "${PN}-examples"
diff --git a/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb b/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
new file mode 100644
index 0000000..a6ae64e
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
@@ -0,0 +1,4 @@
+require ${BPN}.inc
+
+SRC_URI[md5sum] = "58a55193caee3c2c74fd962cc17bc9c1"
+SRC_URI[sha256sum] = "8f883c325e30ee3eb2fa38822fa353a22207441b385f4e167cf9c1cf855638f7"
diff --git a/meta-efl/recipes-devtools/python/python-elementary.inc b/meta-efl/recipes-devtools/python/python-elementary.inc
deleted file mode 100644
index 3f1d123..0000000
--- a/meta-efl/recipes-devtools/python/python-elementary.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require python-efl.inc
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS += "elementary python-evas"
-RDEPENDS_${PN} += "python-evas python-ecore python-edje"
diff --git a/meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb b/meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
deleted file mode 100644
index 625c09d..0000000
--- a/meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "38c8b2ac508ab4e1d12f1557a12169c9"
-SRC_URI[sha256sum] = "63052f8428d725599a0a2765fe48a21e695c66599ec1dcce0a909db440d2216b"
diff --git a/meta-efl/recipes-devtools/python/python-elementary_svn.bb b/meta-efl/recipes-devtools/python/python-elementary_svn.bb
deleted file mode 100644
index d551073..0000000
--- a/meta-efl/recipes-devtools/python/python-elementary_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.0+svnr${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-devtools/python/python-emotion.inc b/meta-efl/recipes-devtools/python/python-emotion.inc
deleted file mode 100644
index ac64676..0000000
--- a/meta-efl/recipes-devtools/python/python-emotion.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS += "emotion python-evas"
-RDEPENDS_${PN} += "python-ecore"
diff --git a/meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb b/meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
deleted file mode 100644
index 01e6751..0000000
--- a/meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "ac7197ce2617a87fad3dd134a98ad01f"
-SRC_URI[sha256sum] = "ac2910c0e3e861dfc07253b825dc038baa1a3e6ce7d5b362122ad51127e20e91"
diff --git a/meta-efl/recipes-devtools/python/python-emotion_svn.bb b/meta-efl/recipes-devtools/python/python-emotion_svn.bb
deleted file mode 100644
index d551073..0000000
--- a/meta-efl/recipes-devtools/python/python-emotion_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.0+svnr${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-devtools/python/python-evas.inc b/meta-efl/recipes-devtools/python/python-evas.inc
deleted file mode 100644
index 3211b14..0000000
--- a/meta-efl/recipes-devtools/python/python-evas.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS += "evas"
diff --git a/meta-efl/recipes-devtools/python/python-evas_1.7.0.bb b/meta-efl/recipes-devtools/python/python-evas_1.7.0.bb
deleted file mode 100644
index 62219d8..0000000
--- a/meta-efl/recipes-devtools/python/python-evas_1.7.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "c3fda2025171f5e3d2bc224e8bae88e5"
-SRC_URI[sha256sum] = "bc00ea23d4d3e9d6448c8a24f918f577cf3c2b25636f36b76b2ed2e3a74d42f5"
diff --git a/meta-efl/recipes-devtools/python/python-evas_svn.bb b/meta-efl/recipes-devtools/python/python-evas_svn.bb
deleted file mode 100644
index d551073..0000000
--- a/meta-efl/recipes-devtools/python/python-evas_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.0+svnr${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb
index 2e1a8a2..aa99898 100644
--- a/meta-efl/recipes-efl/e17/enjoy_svn.bb
+++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Enjoy music player"
LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "evas ecore edje elementary emotion lightmediascanner edbus2 gst-plugins-good"
+DEPENDS = "evas ecore edje elementary emotion lightmediascanner eldbus gst-plugins-good"
SRCREV = "${EFL_SRCREV}"
PV = "0.0+svnr${SRCPV}"
diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb
index 128bd1a..c7f7b1a 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = " Enlightenment Web Browser"
LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "evas ecore edje elementary webkit-efl edbus2"
+DEPENDS = "evas ecore edje elementary webkit-efl eldbus"
PV = "0.3.0.0+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}"
diff --git a/meta-efl/recipes-efl/e17/terminology_0.3.0.bb b/meta-efl/recipes-efl/e17/terminology_0.3.0.bb
deleted file mode 100644
index d3cd59c..0000000
--- a/meta-efl/recipes-efl/e17/terminology_0.3.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "7cecd058cb4509873412252477f2ce5b"
-SRC_URI[sha256sum] = "77850b1100fab93fc5c3c571d78f80fe10f5b153863dbb8efad83eccb55cc5b6"
diff --git a/meta-efl/recipes-efl/e17/terminology_0.4.0.bb b/meta-efl/recipes-efl/e17/terminology_0.4.0.bb
new file mode 100644
index 0000000..611d80e
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/terminology_0.4.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+ ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "5a2eee4849d4fa44db4caf743b3beb37"
+SRC_URI[sha256sum] = "63f2d1fa584ecda6c4ef61b05b8956415feb955c4bb13c0872c11d98024dcfc6"
diff --git a/meta-efl/recipes-efl/efl/ecore_1.7.9.bb b/meta-efl/recipes-efl/efl/ecore_1.7.9.bb
deleted file mode 100644
index c34eb27..0000000
--- a/meta-efl/recipes-efl/efl/ecore_1.7.9.bb
+++ /dev/null
@@ -1,124 +0,0 @@
-DESCRIPTION = "Ecore is the Enlightenment application framework library"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d6ff2c3c85de2faf5fd7dcd9ccfc8886"
-DEPENDS = "virtual/libiconv tslib curl eet evas glib-2.0 gnutls \
- libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxfixes"
-DEPENDS_virtclass-native = "eet-native evas-native gettext-native"
-# optional
-# DEPENDS += "directfb virtual/libsdl openssl virtual/libiconv"
-
-inherit efl gettext
-
-BBCLASSEXTEND = "native"
-
-do_configure_prepend() {
- touch ${S}/po/Makefile.in.in || true
- sed -i -e 's: po::g' ${S}/Makefile.am
-}
-
-FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
-
-PACKAGES =+ "\
- ${PN}-con \
- ${PN}-config \
- ${PN}-desktop \
- ${PN}-directfb \
- ${PN}-sdl \
- ${PN}-evas \
- ${PN}-fb \
- ${PN}-file \
- ${PN}-imf-evas \
- ${PN}-imf \
- ${PN}-ipc \
- ${PN}-job \
- ${PN}-txt \
- ${PN}-x \
- ${PN}-input \
-"
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} = "${libdir}/libecore*.so.* \
- ${bindir} \
-"
-FILES_${PN}-con = "${libdir}/libecore_con*.so.*"
-FILES_${PN}-config = "${libdir}/libecore_config*.so.*"
-FILES_${PN}-desktop = "${libdir}/libecore_desktop*.so.*"
-FILES_${PN}-directfb = "${libdir}/libecore_directfb*.so.*"
-FILES_${PN}-sdl = "${libdir}/libecore_sdl*.so.*"
-FILES_${PN}-evas = "${libdir}/libecore_evas*.so.*"
-FILES_${PN}-fb = "${libdir}/libecore_fb*.so.*"
-FILES_${PN}-file = "${libdir}/libecore_file*.so.*"
-FILES_${PN}-imf = "${libdir}/libecore_imf*.so.* \
- ${libdir}/ecore/immodules/*.so \
-"
-FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas*.so.*"
-FILES_${PN}-ipc = "${libdir}/libecore_ipc*.so.*"
-FILES_${PN}-job = "${libdir}/libecore_job*.so.*"
-FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
-FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
-FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
-
-ECORE_OECONF = "\
- --x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-simple-x11 \
- --enable-ecore-config \
- --enable-ecore-x \
- --enable-ecore-job \
- --enable-ecore-fb \
- --enable-ecore-evas \
- --enable-ecore-evas-software-16-x11 \
- --enable-ecore-evas-xrender \
- --enable-abstract-sockets \
- --enable-ecore-con \
- --enable-ecore-ipc \
- --enable-ecore-file \
- --enable-inotify \
- --disable-ecore-desktop \
- --disable-ecore-x-xcb \
- --disable-ecore-x-xprint \
- --disable-ecore-directfb \
- --disable-ecore-sdl \
- --enable-ecore-evas-opengl-x11 \
- --disable-ecore-evas-dfb \
- --disable-ecore-evas-sdl \
- --disable-openssl \
- --disable-poll \
- --enable-xim \
-"
-
-EXTRA_OECONF = "${ECORE_OECONF} \
- --enable-curl \
-"
-
-EXTRA_OECONF_virtclass-native = "\
- ${ECORE_OECONF} \
- --disable-curl \
- --disable-ecore-x-composite \
- --disable-ecore-x-damage \
- --disable-ecore-x-dpms \
- --disable-ecore-x-randr \
- --disable-ecore-x-render \
- --disable-ecore-x-screensaver \
- --disable-ecore-x-shape \
- --disable-ecore-x-sync \
- --disable-ecore-x-xfixes \
- --disable-ecore-x-xinerama \
- --disable-ecore-x-xprint \
- --disable-ecore-x-xtest \
- --disable-ecore-x-cursor \
- --disable-ecore-x-input \
- --disable-ecore-x-dri \
-"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
- file://fix-ecore-fb-initialization.patch \
-"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[wayland] = "--enable-ecore-wayland,--disable-ecore-wayland,wayland xkbcommon"
-
-SRC_URI[md5sum] = "2d5a4fb8f702628f5c7b785309be01ab"
-SRC_URI[sha256sum] = "c145cc00280d3a310c76e5e6a9fb509c81b8b173f04458c97ea4ae6bf563eaf3"
diff --git a/meta-efl/recipes-efl/efl/edbus2.inc b/meta-efl/recipes-efl/efl/edbus2.inc
deleted file mode 100644
index 9b41d8b..0000000
--- a/meta-efl/recipes-efl/efl/edbus2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "DBus convenience wrappers for EFL"
-DEPENDS = "dbus ecore eina"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4ed65f801204783f71fedafc082038d9"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-INC_PR = "r0"
-
-SRCNAME = "edbus"
diff --git a/meta-efl/recipes-efl/efl/edbus2_svn.bb b/meta-efl/recipes-efl/efl/edbus2_svn.bb
deleted file mode 100644
index e87f147..0000000
--- a/meta-efl/recipes-efl/efl/edbus2_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.99+svnr${SRCPV}"
-PR = "${INC_PR}.2"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "\
- ${E_SVN}/trunk/IN-EFL;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${bindir}/edbus-codegen"
diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb
deleted file mode 100644
index 5b13b9e..0000000
--- a/meta-efl/recipes-efl/efl/edbus_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
- ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/edje_1.7.9.bb b/meta-efl/recipes-efl/efl/edje_1.7.9.bb
deleted file mode 100644
index 2e8c566..0000000
--- a/meta-efl/recipes-efl/efl/edje_1.7.9.bb
+++ /dev/null
@@ -1,72 +0,0 @@
-DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
-DEPENDS = "lua5.1 eet evas ecore embryo edje-native eina libsndfile1 eio"
-DEPENDS_virtclass-native = "lua5.1-native evas-native ecore-native eet-native embryo-native eina-native"
-DEPENDS_virtclass-nativesdk = "evas-native ecore-native eet-native embryo-native eina-native"
-# GPLv2 because of epp in PN-utils
-LICENSE = "MIT BSD GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c18cc221a14a84b033db27794dc36df8"
-
-inherit efl
-
-BBCLASSEXTEND = "native nativesdk"
-
-do_configure_prepend_virtclass-native() {
- sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
- sed -i 's: cpp -I: /usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
- sed -i 's:\"gcc -I:\"/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
-}
-# The new lua stuff is a bit broken...
-do_configure_append() {
- for i in $(find "${S}" -name "Makefile") ; do
- sed -i -e 's:-L/usr/local/lib::g' $i
- done
-}
-
-do_compile_append() {
- sed -i -e s:local/::g -e 's:-L${STAGING_LIBDIR}::g' ${S}/edje.pc
-}
-
-# gain some extra performance at the expense of RAM - generally i'd say bad
-# and a possible source of bugs
-#EXTRA_OECONF = "--enable-edje-program-cache"
-
-# Since r44323 edje has a fixed-point mode
-require edje-fpu.inc
-EXTRA_OECONF += "${@get_edje_fpu_setting(bb, d)}"
-
-SNDFILE = "--enable-sndfile"
-SNDFILE_virtclass-native = "--disable-sndfile"
-SNDFILE_virtclass-nativesdk = "--disable-sndfile"
-EXTRA_OECONF += "${SNDFILE}"
-
-PACKAGES =+ "${PN}-utils"
-RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests"
-
-RRECOMMENDS_${PN}-utils = "\
- evas-saver-png \
- evas-saver-jpeg \
- evas-saver-eet \
-"
-
-DEBIAN_NOAUTONAME_${PN}-utils = "1"
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN}-utils = "\
- ${bindir}/edje_* \
- ${bindir}/inkscape2edc \
- ${libdir}/edje/utils/epp \
- ${datadir}/edje/include/edje.inc \
-"
-
-FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so \
- ${datadir}/mime/packages/edje.xml"
-FILES_${PN}-dev += "${libdir}/${PN}/modules/*/*/module.la"
-FILES_${PN}-dbg += "${libdir}/${PN}/modules/*/*/.debug"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "49152d8636aefcd028af0f97483391ef"
-SRC_URI[sha256sum] = "dac12e5fd81ab303151bec6742971b63f2de577ef940ed0b6af20419130300ab"
diff --git a/meta-efl/recipes-efl/efl/eet_1.7.9.bb b/meta-efl/recipes-efl/efl/eet_1.7.9.bb
deleted file mode 100644
index 9521e68..0000000
--- a/meta-efl/recipes-efl/efl/eet_1.7.9.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "EET is the Enlightenment data storage library"
-DEPENDS = "pkgconfig zlib jpeg openssl eina gnutls"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-
-EXTRA_OECONF = "\
- --enable-openssl \
- --enable-cypher \
- --enable-signature \
- --disable-coverage \
- --enable-old-eet-file-format \
- --disable-assert \
-"
-
-PACKAGES =+ "${PN}-utils"
-
-FILES_${PN}-utils = "\
- ${bindir}/${PN} \
-"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "225eadf514465be321a44a003d687a55"
-SRC_URI[sha256sum] = "3345e0889bbc29536dbe0f6236ed1ae6a9d685b8e39877d5404fa6217bd12ec6"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.9.bb b/meta-efl/recipes-efl/efl/eeze_1.7.9.bb
deleted file mode 100644
index 7ae7fbb..0000000
--- a/meta-efl/recipes-efl/efl/eeze_1.7.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Eeze is a library to simplify the use of devices"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=315521fe061b6fd4290ef01db714a3c8"
-DEPENDS = "ecore eet udev"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} += "${libdir}/enlightenment/utils/eeze_scanner"
-FILES_${PN}-dbg += "${libdir}/enlightenment/utils/.debug"
-
-RRECOMMENDS_${PN} += "eject"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "1e6119b4c12f2539ae5d191659652a89"
-SRC_URI[sha256sum] = "1b4b38943bfc564ddd18d4314a6a12af5ce656b551e69154e818ad14231050b8"
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc
new file mode 100644
index 0000000..2a8f2a2
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efl.inc
@@ -0,0 +1,145 @@
+DESCRIPTION = "EFL"
+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"
+
+inherit efl gettext pkgconfig
+
+BBCLASSEXTEND = "native"
+
+PROVIDES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus"
+
+# we don't have bullet for physics
+EXTRA_OECONF = " \
+ --disable-physics \
+"
+EXTRA_OECONF_append_class-target = " \
+ --with-bin-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
+EXTRA_OECONF_append_class-native = " \
+ --disable-fontconfig \
+ --disable-audio \
+ --with-x11=none \
+ --disable-image-loader-bmp \
+ --disable-image-loader-eet \
+ --disable-image-loader-generic \
+ --disable-image-loader-gif \
+ --disable-image-loader-ico \
+ --disable-image-loader-jp2k \
+ --disable-image-loader-pmaps \
+ --disable-image-loader-psd \
+ --disable-image-loader-tga \
+ --disable-image-loader-wbmp \
+ --disable-image-loader-webp \
+ --disable-image-loader-xpm \
+"
+
+PACKAGECONFIG ??= "opengl-es"
+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[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
+
+# 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() {
+ sed -i 's/EFL_LIB_START_OPTIONAL(\[Eeze\], \[test "${have_linux}" = "yes"\])/EFL_LIB_START_OPTIONAL([Eeze], [test "${no-we-really-dont-want-native-eeze}" = "yes"])/g' ${S}/configure.ac
+}
+
+PACKAGES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus"
+RPROVIDES_edje += "edje-utils"
+
+python populate_packages_prepend () {
+ for plugin_type in "engines loaders savers".split():
+ bb.note( "splitting packages for evas %s..." % plugin_type )
+ basedir = d.expand( '${libdir}/evas/modules/%s' % plugin_type)
+
+ do_split_packages(d, basedir, '^(.*)',
+ output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
+ description = 'Evas module %s',
+ allow_dirs=True, recursive=False, extra_depends="" )
+
+ plugin_type = "cserve2"
+ bb.note( "splitting packages for evas %s..." % plugin_type )
+ basedir = d.expand( '${libdir}/evas/%s/loaders' % plugin_type)
+
+ do_split_packages(d, basedir, '^(.*)',
+ output_pattern = 'evas-' + plugin_type + "-%s",
+ description = 'Evas csever2 loader module %s',
+ allow_dirs=True, recursive=False, extra_depends="" )
+}
+
+PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*"
+
+FILES_efreet = " \
+ ${libdir}/efreet/*/efreet*create \
+ ${bindir}/efreetd \
+ ${datadir}/efreet \
+"
+FILES_eet = " \
+ ${bindir}/eet \
+"
+FILES_emotion = " \
+ ${datadir}/emotion \
+"
+FILES_embryo = " \
+ ${datadir}/embryo \
+"
+FILES_ethumb = " \
+ ${bindir}/ethumbd \
+ ${bindir}/ethumb \
+ ${libdir}/ethumb/*/*/*/module.so \
+ ${libdir}/ethumb/*/*/*/*.edj \
+ ${libdir}/ethumb_client/utils/*/ethumbd_slave \
+ ${datadir}/ethumb* \
+"
+FILES_ecore = " \
+ ${libdir}/ecore*/*/*/*/module.so \
+ ${datadir}/ecore* \
+"
+FILES_evas = " \
+ ${libdir}/evas*/*/*/*/*/module.so \
+ ${libdir}/evas*/*/*/*/*/*.edj \
+ ${libdir}/evas/cserve2/bin/*/evas_cserve2* \
+ ${datadir}/evas* \
+"
+
+FILES_eeze = " \
+ ${libdir}/eeze*/*/*/*/*/module.so \
+ ${datadir}/eeze \
+"
+FILES_edje = " \
+ ${libdir}/edje*/*/*/*/module.so \
+ ${libdir}/edje/utils/*/epp \
+ ${datadir}/edje \
+ ${datadir}/mime \
+"
+FILES_${PN}-dbg += " \
+ ${libdir}/efreet/*/.debug \
+ ${libdir}/ecore*/*/*/*/.debug \
+ ${libdir}/evas*/*/*/*/*/.debug \
+ ${libdir}/evas/cserve2/bin/*/.debug \
+ ${libdir}/eeze*/*/*/*/*/.debug \
+ ${libdir}/edje*/*/*/*/.debug \
+ ${libdir}/edje/utils/*/.debug \
+ ${libdir}/ethumb/*/*/*/.debug \
+ ${libdir}/ethumb_client/utils/*/.debug \
+"
+FILES_${PN}-dev += " \
+ ${libdir}/cmake \
+ ${libdir}/ecore*/*/*/*/module.la \
+ ${libdir}/evas*/*/*/*/*/module.la \
+ ${libdir}/ethumb*/*/*/*/module.la \
+ ${libdir}/eeze*/*/*/*/*/module.la \
+ ${libdir}/edje*/*/*/*/module.la \
+ ${datadir}/gdb/auto-load \
+ ${datadir}/eo/gdb \
+ ${bindir}/eldbus-codegen \
+ ${bindir}/eina-bench-cmp \
+"
diff --git a/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch b/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
new file mode 100644
index 0000000..012810b
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
@@ -0,0 +1,27 @@
+From 7097b46383a6ec96662bf1bf0a04190a38d25a20 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Fri, 10 Jan 2014 17:07:13 +0100
+Subject: [PATCH] configure.ac: Don't check for Xprint extension
+
+* it's long gone
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d8c4cc..0a08330 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2769,7 +2769,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then
+ ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
+ ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion])
+ ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens])
+- ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens])
+ ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent])
+ ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
+ ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
+--
+1.8.5.2
+
diff --git a/meta-efl/recipes-efl/efl/efl_1.8.4.bb b/meta-efl/recipes-efl/efl/efl_1.8.4.bb
new file mode 100644
index 0000000..d97bcf8
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efl_1.8.4.bb
@@ -0,0 +1,17 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "a23c2b6c4a0a0370c09d4763c6642810"
+SRC_URI[sha256sum] = "c24dc307f16d7e7f5c140db14c1efe89545188e0282724e36171fc2858fa3796"
+
+# 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 = ""
+
+SRC_URI += "file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.9.bb b/meta-efl/recipes-efl/efl/efreet_1.7.9.bb
deleted file mode 100644
index 0d87eb7..0000000
--- a/meta-efl/recipes-efl/efl/efreet_1.7.9.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "The Enlightenment freedesktop.org library"
-DEPENDS = "ecore"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9594ec75c5a57e71fccedcbe10dd3ef4"
-
-inherit efl gettext
-
-PACKAGES =+ "${PN}-mime ${PN}-trash"
-FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
-FILES_${PN}-trash = "${libdir}/libefreet_trash.so.*"
-
-# efreet_desktop_cache_create is needed for e-wm start, don't include it in -tests
-FILES_${PN} += "${libdir}/efreet/efreet_desktop_cache_create \
- ${libdir}/efreet/efreet_icon_cache_create \
-"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "5972833cf78ca93440403b94ed4ed74d"
-SRC_URI[sha256sum] = "d5037c04ac8130879bf87d924e6b83cf479e7dee8235321ed1a49f97083b611b"
diff --git a/meta-efl/recipes-efl/efl/eina_1.7.9.bb b/meta-efl/recipes-efl/efl/eina_1.7.9.bb
deleted file mode 100644
index 3638123..0000000
--- a/meta-efl/recipes-efl/efl/eina_1.7.9.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Eina is the Enlightenment data library"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9cc092d35d7bbfcd986232cde130a551"
-
-BBCLASSEXTEND = "native"
-
-inherit efl
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} += "${libdir}/eina"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "cddf2755e20bfb3f90764fd2b689b888"
-SRC_URI[sha256sum] = "b7fe26d98b80479d0f72be47b2584dfa243e4d18774cb824acc398354a45d520"
diff --git a/meta-efl/recipes-efl/efl/eio_1.7.9.bb b/meta-efl/recipes-efl/efl/eio_1.7.9.bb
deleted file mode 100644
index 5bf34b2..0000000
--- a/meta-efl/recipes-efl/efl/eio_1.7.9.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Enlightenment Input Output Library"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=180fca752525726bd6ba021689509a08"
-DEPENDS = "ecore eina"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "f4d6cbd216a9ae5983fa8ee8dadf04cb"
-SRC_URI[sha256sum] = "35ce08ecf6afd5faa4fe857764537e15aede2b0d2c37922e55e97e2dff3352de"
diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc
index 542e200..c0ef493 100644
--- a/meta-efl/recipes-efl/efl/elementary.inc
+++ b/meta-efl/recipes-efl/efl/elementary.inc
@@ -1,20 +1,26 @@
DESCRIPTION = "EFL based widget set for mobile devices"
LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10a051c72424b80bc784a3903651b43b"
-DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb poppler eio"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae1a906a61040d01df137a6b2c6acb68"
+DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb poppler eio"
+DEPENDS_class-native = ""
inherit efl gettext
EXTRA_OECONF = "\
+ --disable-web \
+"
+EXTRA_OECONF_append_class-target = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
- --disable-web \
+ --with-elementary-codegen=${STAGING_BINDIR_NATIVE}/elementary_codegen \
+ --with-elm-prefs-cc=${STAGING_BINDIR_NATIVE}/elm_prefs_cc \
"
-PACKAGECONFIG ??= ""
+BBCLASSEXTEND = "native"
+
PACKAGECONFIG[eweather] = "--enable-eweather,--disable-eweather,libeweather"
-do_compile_append() {
+do_compile_append_class-target() {
sed -i -e s:${STAGING_DIR_TARGET}::g \
-e s:/${TARGET_SYS}::g \
elementary.pc
@@ -22,6 +28,8 @@ do_compile_append() {
PACKAGES += "${PN}-configs ${PN}-accessibility"
+RDEPENDS_${PN}_class-native = ""
+
RDEPENDS_${PN} = "\
${PN}-themes \
${PN}-configs \
@@ -31,10 +39,14 @@ RSUGGESTS_${PN} = "${PN}-tests ${PN}-accessibility"
FILES_${PN} += "\
${libdir}/edje/modules/elm \
${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.so \
+ ${libdir}/elementary/modules/prefs/*/module.so \
+ ${libdir}/elementary/modules/prefs/*/*.edj \
"
FILES_${PN}-dev += "\
- ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.la \
+ ${bindir}/elm_prefs_cc \
+ ${libdir}/elementary/modules/*/*/module.la \
+ ${libdir}/cmake \
"
FILES_${PN}-themes = "\
@@ -46,10 +58,7 @@ FILES_${PN}-configs = "\
"
FILES_${PN}-dbg += "\
- ${libdir}/elementary/modules/test_entry/*/.debug \
- ${libdir}/elementary/modules/test_map/*/.debug \
- ${libdir}/elementary/modules/access_output/*/.debug \
- ${libdir}/elementary/modules/datetime_input_ctxpopup/*/.debug \
+ ${libdir}/elementary/modules/*/*/.debug \
${libdir}/edje/modules/elm/*/.debug \
"
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
new file mode 100644
index 0000000..e3fba9b
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch
@@ -0,0 +1,61 @@
+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.7.9.bb b/meta-efl/recipes-efl/efl/elementary_1.7.9.bb
deleted file mode 100644
index 712d668..0000000
--- a/meta-efl/recipes-efl/efl/elementary_1.7.9.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "6a3acb394b640697b1fd2dd61d990d0b"
-SRC_URI[sha256sum] = "3667c6da3d89be5a46363509645be59e3deb1f052bfa14239986ac9499da52fb"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.8.3.bb b/meta-efl/recipes-efl/efl/elementary_1.8.3.bb
new file mode 100644
index 0000000..2c2cac3
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary_1.8.3.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+# 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[md5sum] = "c63f126ca81badcf9b6d0f4f08436842"
+SRC_URI[sha256sum] = "c479fb82c6e0de7b6598e8946c979424765215ab38caae573549beb293240270"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.9.bb b/meta-efl/recipes-efl/efl/embryo_1.7.9.bb
deleted file mode 100644
index 08d7e49..0000000
--- a/meta-efl/recipes-efl/efl/embryo_1.7.9.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
-
-inherit efl
-
-LICENSE = "MIT BSD CompuPhase"
-LIC_FILES_CHKSUM = "file://COPYING;md5=220a7f1107df42c62428d8ebe559ed14"
-
-BBCLASSEXTEND = "native"
-
-DEPENDS += "eina"
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "98614ec48376ff6d3a39187504b70ed4"
-SRC_URI[sha256sum] = "6b2739a53c3ab2fcf44edfb9c3a4c56d11aba91e27e556a9e70116a161201e34"
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players.inc b/meta-efl/recipes-efl/efl/emotion-generic-players.inc
new file mode 100644
index 0000000..8e536ee
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion-generic-players.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Emotion generic players"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=06568fc31423f3c8ad84f375e061c342"
+#DEPENDS = "eina poppler librsvg cairo"
+
+inherit efl
+
+SRCNAME = "emotion_generic_players"
+
+#PACKAGES_DYNAMIC += "^emotion-generic-players-.*"
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.0.bb
new file mode 100644
index 0000000..daed384
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.0.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "466cba6bb3a29b83149102ef47f62a65"
+SRC_URI[sha256sum] = "34e35f3125160b7469aa6c6270c8f8e888c23ba09bb9b80c6e4da3deb3efb106"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.9.bb b/meta-efl/recipes-efl/efl/emotion_1.7.9.bb
deleted file mode 100644
index b7e1b16..0000000
--- a/meta-efl/recipes-efl/efl/emotion_1.7.9.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "The Enlightenment multimedia library"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd"
-# we no longer build the libxine backend, since the gstreamer backend seems more promising
-DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base eio"
-
-inherit efl
-
-EXTRA_OECONF = "--disable-xine --disable-generic-vlc --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-PACKAGES =+ "emotion-backend-gstreamer"
-FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
-RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
-# upgrade path from libemotion0 to libemotion1
-RREPLACES_${PN} = "libemotion0"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "171bbc41a5e5d202d0dc57c34e318c14"
-SRC_URI[sha256sum] = "ff72204490e740adaa7980bad1a060dae8113c308c6083e5bcee380a11dad1f4"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.9.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.9.bb
deleted file mode 100644
index d0a5389..0000000
--- a/meta-efl/recipes-efl/efl/ethumb_1.7.9.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "EFL based thumbnail generation library"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e6a6db9e80255adbafa16e817d9a4d8c"
-DEPENDS = "libexif eet-native evas ecore edje eet edbus emotion epdf"
-
-inherit efl
-
-EXTRA_OECONF = "\
- --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
- --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
- --disable-docs \
-"
-
-# Some upgrade path tweaking, as in evas
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} += "\
- ${bindir}/ethumbd \
- ${libexecdir}/ethumbd_slave \
-"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "d71a6fbcce2c6a8f46ea9b9b9d53cbab"
-SRC_URI[sha256sum] = "a97c39a9184ec7e1b352a7f251d97992b8082e3a0d6735ea1f34e4e40129a12f"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
index 5b07557..ec49770 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=06568fc31423f3c8ad84f375e061c342"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f86abf15f4d911ae87092e90222d0ef3"
DEPENDS = "eina poppler librsvg cairo"
inherit efl
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb
deleted file mode 100644
index 45eea84..0000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.9.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "01bb7cf2c97014f087bbba4de237b3e8"
-SRC_URI[sha256sum] = "e163a97db7311cbc8489572f201c404929a52099b3156e54a9af2181f8389824"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
new file mode 100644
index 0000000..21e57f9
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "2f39de031a236e53d251beefb4f6fcfd"
+SRC_URI[sha256sum] = "fa5d40324367b2e126853ba70f6522552fff9e80f6dd91566b2dacc4b0ffebc0"
diff --git a/meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch b/meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch
deleted file mode 100644
index 0197f1c..0000000
--- a/meta-efl/recipes-efl/efl/evas/0001-evas_font_load-Fix-build-with-newer-freetype.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ff5e8aa48d223401497dbaad1ffdc81977b2c09d Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 1 Jan 2014 13:03:48 +0100
-Subject: [PATCH] evas_font_load: Fix build with newer freetype
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/lib/engines/common/evas_font_load.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/engines/common/evas_font_load.c b/src/lib/engines/common/evas_font_load.c
-index 805eaf8..6650816 100644
---- a/src/lib/engines/common/evas_font_load.c
-+++ b/src/lib/engines/common/evas_font_load.c
-@@ -5,7 +5,7 @@
-
- #include "evas_font_private.h" /* for Frame-Queuing support */
- #include "evas_font_ot.h"
--#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
-+#include <freetype2/tttables.h> /* Freetype2 OS/2 font table. */
-
- #ifdef EVAS_CSERVE2
- # include "../../cserve2/evas_cs2_private.h"
---
-1.8.4.3
-
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.9.bb b/meta-efl/recipes-efl/efl/evas_1.7.9.bb
deleted file mode 100644
index 1b6c7b3..0000000
--- a/meta-efl/recipes-efl/efl/evas_1.7.9.bb
+++ /dev/null
@@ -1,178 +0,0 @@
-DESCRIPTION = "Evas is the Enlightenment canvas API"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b9b25b03d63aa496552658c7e78b11a1"
-# can also depend on valgrind, libsdl-x11, directfb
-DEPENDS = "librsvg eina eet freetype jpeg libpng tiff virtual/libx11 libxext libxrender fontconfig libfribidi giflib"
-DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native eet-native eina-native libfribidi-native"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
-
-python populate_packages_prepend () {
- for plugin_type in "engines loaders savers".split():
- bb.note( "splitting packages for evas %s..." % plugin_type )
- basedir = d.expand( '${libdir}/evas/modules/%s' % plugin_type)
-
- do_split_packages(d, basedir, '^(.*)',
- output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
- description = 'Evas module %s',
- allow_dirs=True, recursive=False, extra_depends="" )
-
- plugin_type = "cserve2"
- bb.note( "splitting packages for evas %s..." % plugin_type )
- basedir = d.expand( '${libdir}/evas/%s/loaders' % plugin_type)
-
- do_split_packages(d, basedir, '^(.*)',
- output_pattern = 'evas-' + plugin_type + "-%s",
- description = 'Evas csever2 loader module %s',
- allow_dirs=True, recursive=False, extra_depends="" )
-}
-
-do_install_append() {
- find "${D}" -name .debug -type d -exec rm -rf {} \;
-}
-
-FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/ ${libdir}/evas/cserve2/loaders/*/*/.debug/"
-FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave"
-
-PACKAGES += "${PN}-cserve2"
-PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*"
-
-# evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon
-# http://www.intesis.hr/news/16-esvg-source
-# http://blog.gmane.org/gmane.comp.window-managers.enlightenment.user/page=3
-RRECOMMENDS_${PN} += "evas-loader-generic evas-generic-loader-svn"
-
-RRECOMMENDS_${PN} += " \
- evas-engine-fb \
- evas-engine-software-generic \
- evas-engine-software-x11 \
- evas-engine-software-16 \
- evas-engine-software-16-x11 \
- evas-engine-xrender-x11 \
- \
- evas-loader-png \
- evas-loader-jpeg \
- evas-loader-gif \
- evas-loader-svg \
-"
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-EVAS_CPU_TWEAKS = ""
-# Disabled for now, see http://thread.gmane.org/gmane.comp.window-managers.enlightenment.devel/25194
-EVAS_CPU_TWEAKS_armv7a = "--disable-cpu-neon"
-
-# common options
-EVAS_OECONF = " \
- --x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-evas-magic-debug \
- --enable-fb \
- --disable-directfb \
- --disable-sdl \
- --enable-buffer=static \
- --enable-static-software-generic \
- --disable-software-ddraw \
- --disable-software-qtopia \
- --disable-software-xcb \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --enable-image-loader-eet=static \
- --disable-image-loader-edb \
- --enable-image-loader-png \
- --enable-image-loader-jpeg \
- --enable-image-loader-tiff \
- --enable-image-loader-xpm \
- --enable-cpu-c \
- --enable-fontconfig \
- --enable-font-loader-eet \
- --enable-scale-sample \
- --enable-scale-smooth \
- --enable-convert-yuv \
- --enable-small-dither-mask \
- --disable-no-dither-mask \
- --disable-convert-8-rgb-332 \
- --disable-convert-8-rgb-666 \
- --disable-convert-8-rgb-232 \
- --disable-convert-8-rgb-222 \
- --disable-convert-8-rgb-221 \
- --disable-convert-8-rgb-121 \
- --disable-convert-8-rgb-111 \
- --enable-convert-16-rgb-565 \
- --disable-convert-16-rgb-555 \
- --disable-convert-16-rgb-444 \
- --disable-convert-16-rgb-ipq \
- --enable-convert-16-rgb-rot-0 \
- --enable-convert-16-rgb-rot-90 \
- --disable-convert-16-rgb-rot-180 \
- --enable-convert-16-rgb-rot-270 \
-"
-
-# either sgx or 6410 atm
-GLES ?= "sgx"
-
-# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging.
-# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing
-
-# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK
-
-EXTRA_OECONF = "${EVAS_OECONF} \
- ${EVAS_CPU_TWEAKS} \
- --enable-pthreads \
- --enable-async-events \
- --enable-async-preload \
- --enable-simple-x11 \
- --enable-software-x11 \
- --enable-xrender-x11 \
- --enable-software-16-x11 \
- --enable-image-loader-gif \
- --enable-image-loader-svg \
- --enable-convert-24-rgb-888 \
- --enable-convert-24-bgr-888 \
- --enable-convert-32-rgb-8888 \
- --enable-convert-32-rgbx-8888 \
- --enable-convert-32-bgr-8888 \
- --enable-convert-32-bgrx-8888 \
- --enable-convert-32-rgb-rot-0 \
- --enable-convert-32-rgb-rot-90 \
- --disable-convert-32-rgb-rot-180 \
- --enable-convert-32-rgb-rot-270 \
- --enable-gl-x11 \
- --enable-gl-xlib \
- --enable-gl-flavor-gles \
- --enable-gles-variety-${GLES} \
-"
-EXTRA_OECONF_virtclass-native = "${EVAS_OECONF} \
- --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-gl-x11 \
- --disable-gl-xlib \
- --disable-xrender-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-svg \
- --disable-convert-24-rgb-888 \
- --disable-convert-24-bgr-888 \
- --disable-convert-32-rgb-8888 \
- --disable-convert-32-rgbx-8888 \
- --disable-convert-32-bgr-8888 \
- --disable-convert-32-bgrx-8888 \
- --disable-convert-32-rgb-rot-0 \
- --disable-convert-32-rgb-rot-90 \
- --disable-convert-32-rgb-rot-270 \
-"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz"
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
- file://0001-evas_font_load-Fix-build-with-newer-freetype.patch \
-"
-
-SRC_URI[md5sum] = "c96a23ede14cd0adb7e8e549e8acdee1"
-SRC_URI[sha256sum] = "1fd687e43ebe3031be4ac7628043eae1aafca83ce6d1d1f06ff3b59fb4c027f0"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.9.bb b/meta-efl/recipes-efl/efl/expedite_1.7.9.bb
deleted file mode 100644
index cee2d60..0000000
--- a/meta-efl/recipes-efl/efl/expedite_1.7.9.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI = "\
- ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "954fe8e40fec6a561190ff0fb75b6bdd"
-SRC_URI[sha256sum] = "a05be096c911e0d66d4bdc497ebb935a04ad23696de9084aed9959b5172a593e"
--
1.8.5.2
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][WIP][PATCHv2 2/7] webkit-efl: Add recipe with snapshot from r159807
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 1/7] meta-efl: Add efl 1.8.4, elementary 1.8.3, terminology 0.4.0 and python-efl 1.8.0 recipes Martin Jansa
@ 2014-01-15 17:17 ` Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 3/7] enjoy: Upgrade to version from git Martin Jansa
` (5 subsequent siblings)
7 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
* announcement:
http://sourceforge.net/mailarchive/message.php?msg_id=31742684
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
| 27 ++++++++++++
...KitHelpers.cmake-Add-Wno-error-cast-align.patch | 29 +++++++++++++
.../webkit/webkit-efl/gcc-4.8.2.fix.patch | 15 +++++++
.../webkit/webkit-efl_2.3.2+svnr159807.bb | 48 ++++++++++++++++++++++
4 files changed, 119 insertions(+)
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
create 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.2+svnr159807.bb
--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
new file mode 100644
index 0000000..003a1d1
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000..5df0f8a
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
@@ -0,0 +1,29 @@
+From bfabbcab5dc4fe29bc91bbfbd9c9a404a3e2538b 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
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Source/cmake/WebKitHelpers.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
+index 1e51ebc..d813117 100644
+--- a/Source/cmake/WebKitHelpers.cmake
++++ b/Source/cmake/WebKitHelpers.cmake
+@@ -42,7 +42,10 @@ 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}")
+ endif ()
+
+ # Disable C++0x compat warnings for GCC >= 4.6.0 until we build
+--
+1.8.5.2
+
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
new file mode 100644
index 0000000..635c1cb
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch
@@ -0,0 +1,15 @@
+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.2+svnr159807.bb b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
new file mode 100644
index 0000000..879ff1f
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "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 \
+"
+
+# you need harfbuzz with icu enabled, you can add this to your config:
+# PACKAGECONFIG_append_pn-harfbuzz = " icu"
+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 eldbus harfbuzz enchant \
+ ruby-native"
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/webkit-efl/webkit-efl-159807.tar.xz \
+ file://gcc-4.8.2.fix.patch \
+ file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
+ file://0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch \
+"
+SRC_URI[md5sum] = "3e1377d976460dd14db0dd3cd39b8e48"
+SRC_URI[sha256sum] = "a99531299e41ba4671b32bbf46c3efc4d65960c9c87949a87f76e622c284f178"
+
+S = "${WORKDIR}/${BPN}"
+
+inherit cmake lib_package pkgconfig perlnative pythonnative
+
+ARM_INSTRUCTION_SET = "arm"
+
+EXTRA_OECMAKE = " \
+ -DPORT=Efl \
+ -DSHARED_CORE=On \
+ -DENABLE_DRAG_SUPPORT=On \
+ -DENABLE_WEB_AUDIO=Off \
+ -DENABLE_VIDEO=Off \
+ -DENABLE_VIDEO_TRACK=Off \
+ -DENABLE_ACCESSIBILITY=Off \
+ -DENABLE_BATTERY_STATUS=Off \
+"
+
+LEAD_SONAME = "libewebkit.so"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector"
+
+FILES_${PN} += "${datadir}/webkit-1.0/theme/default.edj ${datadir}/ewebkit-0/themes/default.edj"
+FILES_${PN}-dev += "${libdir}/cmake"
+FILES_${PN}launcher = "${bindir}/EWebLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher"
+FILES_${PN}-inspector += "${datadir}/ewebkit-0/inspector"
--
1.8.5.2
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][WIP][PATCHv2 3/7] enjoy: Upgrade to version from git
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 1/7] meta-efl: Add efl 1.8.4, elementary 1.8.3, terminology 0.4.0 and python-efl 1.8.0 recipes Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 2/7] webkit-efl: Add recipe with snapshot from r159807 Martin Jansa
@ 2014-01-15 17:17 ` Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 4/7] libeflvala: Fix build of tests Martin Jansa
` (4 subsequent siblings)
7 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...ays-use-position-as-percent-and-define-a-1-second.patch | 14 +++++++-------
meta-efl/recipes-efl/e17/{enjoy_svn.bb => enjoy_git.bb} | 10 ++++------
2 files changed, 11 insertions(+), 13 deletions(-)
rename meta-efl/recipes-efl/e17/{enjoy_svn.bb => enjoy_git.bb} (90%)
diff --git a/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch b/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch
index 45f02b7..0962450 100644
--- a/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch
+++ b/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch
@@ -1,4 +1,4 @@
-From ac4c8a57e8a042acd4b8ff803d3d3574b0e7a7fb Mon Sep 17 00:00:00 2001
+From 751505501e0db31cf766ec0ae95a6968b4d1eb93 Mon Sep 17 00:00:00 2001
From: Alban Browaeys <prahal@yahoo.com>
Date: Wed, 5 Sep 2012 02:58:26 +0000
Subject: [PATCH] always use position as percent and define a 1 seconds
@@ -7,12 +7,12 @@ Subject: [PATCH] always use position as percent and define a 1 seconds
Fix "reverb" effect: ie loop between setting the slider to match
the position and handling slider to position (seek).
---
- data/themes/default.edc | 8 +++-----
- src/bin/win.c | 28 ++++++++++++++++++++++------
+ data/themes/default.edc | 8 +++-----
+ src/bin/win.c | 28 ++++++++++++++++++++++------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
-index 65efddf..27bb9e4 100644
+index ebf8ba4..7a906b1 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -186,7 +186,6 @@ collections {
@@ -42,7 +42,7 @@ index 65efddf..27bb9e4 100644
} else if (type == MSG_INT && id == MSG_SHUFFLE) {
external_param_set_bool(PART:"buttons.shuffle", "state", getarg(2));
} else if (type == MSG_INT && id == MSG_LOOP) {
-@@ -687,7 +685,7 @@ collections {
+@@ -689,7 +687,7 @@ collections {
source: "progress.slider";
signal: "changed";
script {
@@ -52,7 +52,7 @@ index 65efddf..27bb9e4 100644
}
program {
diff --git a/src/bin/win.c b/src/bin/win.c
-index 63951db..ad93ab5 100644
+index 2f65953..428e268 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -194,8 +194,8 @@ _win_play_eval(Win *w)
@@ -129,5 +129,5 @@ index 63951db..ad93ab5 100644
}
--
-1.7.7
+1.8.5.2
diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_git.bb
similarity index 90%
rename from meta-efl/recipes-efl/e17/enjoy_svn.bb
rename to meta-efl/recipes-efl/e17/enjoy_git.bb
index aa99898..c9ff070 100644
--- a/meta-efl/recipes-efl/e17/enjoy_svn.bb
+++ b/meta-efl/recipes-efl/e17/enjoy_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Enjoy music player"
LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
DEPENDS = "evas ecore edje elementary emotion lightmediascanner eldbus gst-plugins-good"
-SRCREV = "${EFL_SRCREV}"
-PV = "0.0+svnr${SRCPV}"
+SRCREV = "aa8fec69e885eec048a849c2b34059ec58404e02"
+PV = "0.1.0+gitr${SRCPV}"
#1st needed for all formats
#2nd needed for mp3 playback
@@ -20,12 +20,10 @@ RDEPENDS_${PN} += "\
inherit e gettext
SRC_URI = " \
- ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+ git://git.enlightenment.org/apps/enjoy.git \
file://0001-always-use-position-as-percent-and-define-a-1-second.patch \
"
-S = "${WORKDIR}/${SRCNAME}"
-
-PR = "r1"
+S = "${WORKDIR}/git"
FILES_${PN} += "${datadir}/icons/"
--
1.8.5.2
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][WIP][PATCHv2 4/7] libeflvala: Fix build of tests
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
` (2 preceding siblings ...)
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 3/7] enjoy: Upgrade to version from git Martin Jansa
@ 2014-01-15 17:17 ` Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 5/7] eve: bump SRCREV to catch up with edbus2 -> eldbus rename Martin Jansa
` (3 subsequent siblings)
7 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../efl/libeflvala/disable.eina.test.patch | 44 ++++++++++++++++++++++
meta-efl/recipes-efl/efl/libeflvala_svn.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644 meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch
diff --git a/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch b/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch
new file mode 100644
index 0000000..84be133
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch
@@ -0,0 +1,44 @@
+It causes testeina.c build to fail linking to internal eina_.*_{init,shutdown} symbols
+as reported in:
+http://lists.alioth.debian.org/pipermail/pkg-fso-maint/2010-May/003056.html
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+diff -uNr vala/tests/testeina.vala ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala
+--- vala/tests/testeina.vala 2014-01-13 16:16:53.984999035 +0100
++++ ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala 2010-02-26 09:02:06.000000000 +0100
+@@ -153,22 +153,22 @@
+
+ void test_eina_benchmark()
+ {
+- assert( Eina.Module.init() );
+- assert( Eina.List.init() );
+- assert( Eina.Array.init() );
+- assert( Eina.Benchmark.init() );
+- assert( Eina.Mempool.init() );
++// assert( Eina.Module.init() );
++// assert( Eina.List.init() );
++// assert( Eina.Array.init() );
++// assert( Eina.Benchmark.init() );
++// assert( Eina.Mempool.init() );
+ var b = new Eina.Benchmark( "test", "test");
+ assert( b.register( "bogus", spec_one, 0, 100, 5 ) );
+ unowned Eina.Array<string> result = b.run();
+ assert( result.count_get() == 2 );
+ result = null;
+ b = null;
+- assert( Eina.Mempool.shutdown() );
+- assert( Eina.Benchmark.shutdown() );
+- assert( Eina.Array.shutdown() );
+- assert( Eina.List.shutdown() );
+- assert( Eina.Module.shutdown() );
++// assert( Eina.Mempool.shutdown() );
++// assert( Eina.Benchmark.shutdown() );
++// assert( Eina.Array.shutdown() );
++// assert( Eina.List.shutdown() );
++// assert( Eina.Module.shutdown() );
+ }
+
+ //===========================================================================
diff --git a/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
index 1eb9c13..ab37a68 100644
--- a/meta-efl/recipes-efl/efl/libeflvala_svn.bb
+++ b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
@@ -13,6 +13,7 @@ SRCNAME = "vala"
inherit e-base autotools pkgconfig vala
SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};protocol=http \
+ file://disable.eina.test.patch \
"
S = "${WORKDIR}/${SRCNAME}"
--
1.8.5.2
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][WIP][PATCHv2 5/7] eve: bump SRCREV to catch up with edbus2 -> eldbus rename
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
` (3 preceding siblings ...)
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 4/7] libeflvala: Fix build of tests Martin Jansa
@ 2014-01-15 17:17 ` Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 6/7] e-wm: Drop evas-.*-loader.* from RDEPENDS Martin Jansa
` (2 subsequent siblings)
7 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/eve_svn.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb
index c7f7b1a..67d1188 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
DEPENDS = "evas ecore edje elementary webkit-efl eldbus"
PV = "0.3.0.0+svnr${SRCPV}"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "84579"
inherit e gettext
SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
--
1.8.5.2
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][WIP][PATCHv2 6/7] e-wm: Drop evas-.*-loader.* from RDEPENDS
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
` (4 preceding siblings ...)
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 5/7] eve: bump SRCREV to catch up with edbus2 -> eldbus rename Martin Jansa
@ 2014-01-15 17:17 ` Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 7/7] webkit-efl: Try to disable llint/jit to fix armv[45] build Martin Jansa
2014-01-20 17:42 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Martin Jansa
7 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
* with new evas those are by default built-in not as separate libs
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/e-wm.inc | 4 ----
1 file changed, 4 deletions(-)
diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc
index 659ad6a..3f24b62 100644
--- a/meta-efl/recipes-efl/e17/e-wm.inc
+++ b/meta-efl/recipes-efl/e17/e-wm.inc
@@ -60,10 +60,6 @@ RDEPENDS_${PN} += "\
edje-utils \
${PN}-utils \
dbus-x11 \
- evas-loader-png \
- evas-loader-jpeg \
- evas-loader-gif \
- evas-generic-loader-svg \
"
# Uclibc build don't have 'glibc-utils'
--
1.8.5.2
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][WIP][PATCHv2 7/7] webkit-efl: Try to disable llint/jit to fix armv[45] build
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
` (5 preceding siblings ...)
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 6/7] e-wm: Drop evas-.*-loader.* from RDEPENDS Martin Jansa
@ 2014-01-15 17:17 ` Martin Jansa
2014-01-20 17:42 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Martin Jansa
7 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-15 17:17 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
index 879ff1f..59a05a0 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
@@ -37,6 +37,9 @@ EXTRA_OECMAKE = " \
-DENABLE_ACCESSIBILITY=Off \
-DENABLE_BATTERY_STATUS=Off \
"
+# generated ASM code isn't compatible with armv[45]
+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"
LEAD_SONAME = "libewebkit.so"
PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector"
--
1.8.5.2
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
` (6 preceding siblings ...)
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 7/7] webkit-efl: Try to disable llint/jit to fix armv[45] build Martin Jansa
@ 2014-01-20 17:42 ` Martin Jansa
2014-01-20 17:42 ` [PATCH 2/4] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
` (3 more replies)
7 siblings, 4 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-20 17:42 UTC (permalink / raw)
To: openembedded-devel
* with floating dependency some packages can fail to detect elementary:
Package 'ewebkit', required by 'elementary', not found
* webkit-efl isn't in very good shape, so I don't want to force using
it on everybody -> disable ewebkit by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/efl/elementary.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc
index c0ef493..f5f1692 100644
--- a/meta-efl/recipes-efl/efl/elementary.inc
+++ b/meta-efl/recipes-efl/efl/elementary.inc
@@ -19,6 +19,7 @@ EXTRA_OECONF_append_class-target = "\
BBCLASSEXTEND = "native"
PACKAGECONFIG[eweather] = "--enable-eweather,--disable-eweather,libeweather"
+PACKAGECONFIG[ewebkit] = "--with-elementary-web-backend=ewebkit,--with-elementary-web-backend=none,webkit-efl"
do_compile_append_class-target() {
sed -i -e s:${STAGING_DIR_TARGET}::g \
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/4] efl: Adjust packaging to match more with old 1.7 separate recipes
2014-01-20 17:42 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Martin Jansa
@ 2014-01-20 17:42 ` Martin Jansa
2014-01-22 14:26 ` Otavio Salvador
2014-01-20 17:42 ` [PATCH 3/4] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
` (2 subsequent siblings)
3 siblings, 1 reply; 20+ messages in thread
From: Martin Jansa @ 2014-01-20 17:42 UTC (permalink / raw)
To: openembedded-devel
* it improves upgrade-path, it's not perfect and I was testing it only on
my SHR images which include lot of efl stuff, but not all, so some packages
can still be a bit different
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/efl/efl.inc | 104 +++++++++++++++++++++++++++++++++++++--
1 file changed, 100 insertions(+), 4 deletions(-)
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc
index 2a8f2a2..a5ed55b 100644
--- a/meta-efl/recipes-efl/efl/efl.inc
+++ b/meta-efl/recipes-efl/efl/efl.inc
@@ -52,8 +52,19 @@ do_configure_prepend_class-native() {
sed -i 's/EFL_LIB_START_OPTIONAL(\[Eeze\], \[test "${have_linux}" = "yes"\])/EFL_LIB_START_OPTIONAL([Eeze], [test "${no-we-really-dont-want-native-eeze}" = "yes"])/g' ${S}/configure.ac
}
-PACKAGES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus"
-RPROVIDES_edje += "edje-utils"
+PACKAGES =+ "edje-utils embryo-utils embryo-tests efreet-trash efreet-mime libeet libefreet ecore-audio ecore-input-evas ecore-input ecore-imf-evas ecore-imf ecore-file ecore-con ecore-ipc ecore-x ecore-evas libemotion eo ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus"
+
+# upgrade path from 1.7
+DEBIAN_NOAUTONAME_ecore-audio = "1"
+DEBIAN_NOAUTONAME_ecore-input-evas = "1"
+DEBIAN_NOAUTONAME_ecore-input = "1"
+DEBIAN_NOAUTONAME_ecore-imf-evas = "1"
+DEBIAN_NOAUTONAME_ecore-imf = "1"
+DEBIAN_NOAUTONAME_ecore-file = "1"
+DEBIAN_NOAUTONAME_ecore-con = "1"
+DEBIAN_NOAUTONAME_ecore-ipc = "1"
+DEBIAN_NOAUTONAME_ecore-x = "1"
+DEBIAN_NOAUTONAME_ecore-evas = "1"
python populate_packages_prepend () {
for plugin_type in "engines loaders savers".split():
@@ -77,22 +88,102 @@ python populate_packages_prepend () {
PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*"
+# PACKAGES_DYNAMIC + do_split_packages isn't used for all libe libs,
+# because PACKAGES_DYNAMIC would be catching too many patterns
+# (or need to list all possible prefixes) and not all original packages
+# were splitted like that, so it would need RCONFLICTS/RPROVIDES/RREPLACES
+# combos at least in few places for upgrade path.
+
+FILES_efreet-trash = " \
+ ${libdir}/libefreet_trash${SOLIBS} \
+"
+FILES_efreet-mime = " \
+ ${libdir}/libefreet_mime${SOLIBS} \
+"
+FILES_libeet = " \
+ ${libdir}/libeet${SOLIBS} \
+"
+FILES_libefreet = " \
+ ${libdir}/libefreet${SOLIBS} \
+"
+FILES_ecore-audio = "\
+ ${libdir}/libecore_audio${SOLIBS} \
+"
+FILES_ecore-input-evas = "\
+ ${libdir}/libecore_input_evas${SOLIBS} \
+"
+FILES_ecore-input = "\
+ ${libdir}/libecore_input${SOLIBS} \
+"
+FILES_ecore-imf-evas = "\
+ ${libdir}/libecore_imf_evas${SOLIBS} \
+"
+FILES_ecore-imf = "\
+ ${libdir}/libecore_imf${SOLIBS} \
+"
+FILES_ecore-file = "\
+ ${libdir}/libecore_file${SOLIBS} \
+"
+FILES_ecore-con = "\
+ ${libdir}/libecore_con${SOLIBS} \
+"
+FILES_ecore-ipc = "\
+ ${libdir}/libecore_ipc${SOLIBS} \
+"
+FILES_ecore-x = "\
+ ${libdir}/libecore_x${SOLIBS} \
+"
+FILES_ecore-evas = "\
+ ${libdir}/libecore_evas${SOLIBS} \
+"
+FILES_eio = "\
+ ${libdir}/libeio${SOLIBS} \
+"
+FILES_eina = "\
+ ${libdir}/libeina${SOLIBS} \
+ ${bindir}/eina-bench-cmp \
+"
+FILES_edje-utils = "\
+ ${bindir}/edje_* \
+ ${datadir}/edje/include/edje.inc \
+"
+FILES_eldbus = "\
+ ${libdir}/libeldbus${SOLIBS} \
+"
+FILES_eo = "\
+ ${libdir}/libeo${SOLIBS} \
+"
+FILES_libemotion = "\
+ ${libdir}/libemotion${SOLIBS} \
+"
FILES_efreet = " \
+ ${datadir}/dbus-1/services/*Efreet* \
${libdir}/efreet/*/efreet*create \
${bindir}/efreetd \
${datadir}/efreet \
"
FILES_eet = " \
${bindir}/eet \
+ ${libdir}/libeet${SOLIBS} \
"
FILES_emotion = " \
${datadir}/emotion \
"
+FILES_embryo-tests = " \
+ ${datadir}/embryo/ \
+"
+FILES_embryo-utils = " \
+ ${binddir}/embryo_* \
+"
FILES_embryo = " \
- ${datadir}/embryo \
+ ${libdir}/libembryo${SOLIBS} \
"
FILES_ethumb = " \
+ ${datadir}/dbus-1/services/*Ethumb* \
+ ${libdir}/libethumb${SOLIBS} \
+ ${libdir}/libethumb_client${SOLIBS} \
${bindir}/ethumbd \
+ ${bindir}/ethumbd_client \
${bindir}/ethumb \
${libdir}/ethumb/*/*/*/module.so \
${libdir}/ethumb/*/*/*/*.edj \
@@ -100,21 +191,27 @@ FILES_ethumb = " \
${datadir}/ethumb* \
"
FILES_ecore = " \
+ ${libdir}/libecore${SOLIBS} \
${libdir}/ecore*/*/*/*/module.so \
${datadir}/ecore* \
"
FILES_evas = " \
+ ${libdir}/libevas${SOLIBS} \
${libdir}/evas*/*/*/*/*/module.so \
${libdir}/evas*/*/*/*/*/*.edj \
${libdir}/evas/cserve2/bin/*/evas_cserve2* \
${datadir}/evas* \
+ ${bindir}/evas_cserve2_* \
"
FILES_eeze = " \
+ ${libdir}/libeeze${SOLIBS} \
${libdir}/eeze*/*/*/*/*/module.so \
${datadir}/eeze \
+ ${bindir}/eeze_* \
"
FILES_edje = " \
+ ${libdir}/libedje${SOLIBS} \
${libdir}/edje*/*/*/*/module.so \
${libdir}/edje/utils/*/epp \
${datadir}/edje \
@@ -141,5 +238,4 @@ FILES_${PN}-dev += " \
${datadir}/gdb/auto-load \
${datadir}/eo/gdb \
${bindir}/eldbus-codegen \
- ${bindir}/eina-bench-cmp \
"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/4] python-efl: Upgrade to 1.8.1 and update packaging to match old packages
2014-01-20 17:42 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Martin Jansa
2014-01-20 17:42 ` [PATCH 2/4] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
@ 2014-01-20 17:42 ` Martin Jansa
2014-01-22 14:28 ` Otavio Salvador
2014-01-20 17:42 ` [PATCH 4/4] e-wm: Add recipe for 0.18.2 Martin Jansa
2014-01-22 14:25 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Otavio Salvador
3 siblings, 1 reply; 20+ messages in thread
From: Martin Jansa @ 2014-01-20 17:42 UTC (permalink / raw)
To: openembedded-devel
* announcement:
http://sourceforge.net/mailarchive/message.php?msg_id=31862842
* like in efl recipe create packages matching with old separate recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-devtools/python/python-efl.inc | 41 ++++++++++++++++++++--
.../recipes-devtools/python/python-efl_1.8.0.bb | 4 ---
.../recipes-devtools/python/python-efl_1.8.1.bb | 4 +++
3 files changed, 43 insertions(+), 6 deletions(-)
delete mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
create mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc
index c608bac..cca3562 100644
--- a/meta-efl/recipes-devtools/python/python-efl.inc
+++ b/meta-efl/recipes-devtools/python/python-efl.inc
@@ -12,7 +12,6 @@ DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
RDEPENDS_${PN} += "python-lang"
PROVIDES = "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas"
-RPROVIDES_${PN} += "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas"
# necessary to let the call for python-config succeed
export BUILD_SYS
@@ -27,7 +26,45 @@ SRC_URI = "\
"
S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
+do_install_append() {
+ # drop all .pyo, pyc files
+ find ${D}${libdir}/${PYTHON_DIR}/site-packages -name \*.pyo -o -name \*.pyc | xargs rm -f
+}
+
+PACKAGES += "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas ${PN}-examples"
+
+FILES_${PN} = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/python_efl*egg-info \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/eo.so \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/utils \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/__init__.py \
+"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/*/*.la"
-PACKAGES += "${PN}-examples"
FILES_${PN}-examples = "${datadir}/${PN}/examples"
+
+FILES_python-ecore = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/ecore/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/ecore.so \
+"
+FILES_python-eldbus = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/e_dbus/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/dbus_mainloop.so \
+"
+FILES_python-edje = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/edje/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/edje*so \
+"
+FILES_python-elementary = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/elementary/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/elementary/ \
+"
+FILES_python-emotion = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/emotion/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/emotion.so \
+"
+FILES_python-evas = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/evas/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/evas.so \
+"
diff --git a/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb b/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
deleted file mode 100644
index a6ae64e..0000000
--- a/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI[md5sum] = "58a55193caee3c2c74fd962cc17bc9c1"
-SRC_URI[sha256sum] = "8f883c325e30ee3eb2fa38822fa353a22207441b385f4e167cf9c1cf855638f7"
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
new file mode 100644
index 0000000..15009f6
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
@@ -0,0 +1,4 @@
+require ${BPN}.inc
+
+SRC_URI[md5sum] = "ca71f501c7e0479f15d2746380b0f81d"
+SRC_URI[sha256sum] = "90ea20d0a90448fd1dcd56210bf34cb9a78905852d83620617bf164f1cef5edc"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/4] e-wm: Add recipe for 0.18.2
2014-01-20 17:42 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Martin Jansa
2014-01-20 17:42 ` [PATCH 2/4] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
2014-01-20 17:42 ` [PATCH 3/4] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
@ 2014-01-20 17:42 ` Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 1/5] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
2014-01-22 14:25 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Otavio Salvador
3 siblings, 1 reply; 20+ messages in thread
From: Martin Jansa @ 2014-01-20 17:42 UTC (permalink / raw)
To: openembedded-devel
* keep old 0.17.* around because new enlightenment is more picky on where it
will run (compositor is now mandatory)
* announcement
http://sourceforge.net/mailarchive/message.php?msg_id=31789335
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/e-wm.inc | 14 +++-----------
meta-efl/recipes-efl/e17/e-wm_0.17.5.bb | 12 ++++++++++++
meta-efl/recipes-efl/e17/e-wm_0.18.2.bb | 20 ++++++++++++++++++++
3 files changed, 35 insertions(+), 11 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/e-wm_0.18.2.bb
diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc
index 3f24b62..08fe25f 100644
--- a/meta-efl/recipes-efl/e17/e-wm.inc
+++ b/meta-efl/recipes-efl/e17/e-wm.inc
@@ -7,7 +7,8 @@ SRCNAME = "e"
inherit e update-alternatives gettext
S = "${WORKDIR}/${SRCNAME}"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
EXTRA_OECONF = "\
@@ -30,16 +31,6 @@ do_install_append() {
# xinit[418]: ERROR: CONFIGURATION FILE HAS BAD PERMISSIONS
chmod 600 ${D}/${sysconfdir}/enlightenment/sysactions.conf
- 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
-
install -d ${D}/${sysconfdir}/xdg/menus
install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done
@@ -124,6 +115,7 @@ FILES_${PN} = "\
${datadir}/enlightenment/COPYING \
${datadir}/xsessions/enlightenment.desktop \
${sysconfdir}/xdg \
+ ${systemd_unitdir} \
"
FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
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
index 57eefdb..d374680 100644
--- a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
@@ -12,3 +12,15 @@ SRC_URI = "\
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.2.bb b/meta-efl/recipes-efl/e17/e-wm_0.18.2.bb
new file mode 100644
index 0000000..ab96e9a
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-wm_0.18.2.bb
@@ -0,0 +1,20 @@
+require ${BPN}.inc
+
+SRCNAME = "enlightenment"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+SRC_URI = "\
+ ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+ file://enlightenment_start.oe \
+ file://applications.menu \
+"
+
+SRC_URI[md5sum] = "eea52b438b143ac318d5ed8e09e06f2b"
+SRC_URI[sha256sum] = "106a6949b14ce3eae0c1eb82bf09492fa8417df0b26faf595f5050f0e89b5483"
+
+do_configure_prepend() {
+ sed '/^ *EFL_PKG_CHECK_VAR/ s/systemduserunitdir/systemdsystemunitdir/g' -i ${S}/configure.ac
+}
+
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][PATCHv2 1/5] efl: Adjust packaging to match more with old 1.7 separate recipes
2014-01-20 17:42 ` [PATCH 4/4] e-wm: Add recipe for 0.18.2 Martin Jansa
@ 2014-01-22 11:51 ` Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 2/5] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
` (3 more replies)
0 siblings, 4 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-22 11:51 UTC (permalink / raw)
To: openembedded-devel
* it improves upgrade-path, it's not perfect and I was testing it only on
my SHR images which include lot of efl stuff, but not all, so some packages
can still be a bit different
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/efl/efl.inc | 111 +++++++++++++++++++++++++++++++++++++--
1 file changed, 107 insertions(+), 4 deletions(-)
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc
index 2a8f2a2..8f2361e 100644
--- a/meta-efl/recipes-efl/efl/efl.inc
+++ b/meta-efl/recipes-efl/efl/efl.inc
@@ -52,8 +52,23 @@ do_configure_prepend_class-native() {
sed -i 's/EFL_LIB_START_OPTIONAL(\[Eeze\], \[test "${have_linux}" = "yes"\])/EFL_LIB_START_OPTIONAL([Eeze], [test "${no-we-really-dont-want-native-eeze}" = "yes"])/g' ${S}/configure.ac
}
-PACKAGES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus"
-RPROVIDES_edje += "edje-utils"
+PACKAGES =+ "edje-utils embryo-utils embryo-tests efreet-trash efreet-mime libeet libefreet ecore-audio ecore-input-evas ecore-input ecore-imf-evas ecore-imf ecore-file ecore-con ecore-ipc ecore-x ecore-evas libemotion eo ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus"
+
+# upgrade path from 1.7
+DEBIAN_NOAUTONAME_ecore-audio = "1"
+DEBIAN_NOAUTONAME_ecore-input-evas = "1"
+DEBIAN_NOAUTONAME_ecore-input = "1"
+DEBIAN_NOAUTONAME_ecore-imf-evas = "1"
+DEBIAN_NOAUTONAME_ecore-imf = "1"
+DEBIAN_NOAUTONAME_ecore-file = "1"
+DEBIAN_NOAUTONAME_ecore-con = "1"
+DEBIAN_NOAUTONAME_ecore-ipc = "1"
+DEBIAN_NOAUTONAME_ecore-x = "1"
+DEBIAN_NOAUTONAME_ecore-evas = "1"
+DEBIAN_NOAUTONAME_embryo = "1"
+
+ALLOW_EMPTY_ecore = "1"
+RDEPENDS_ecore = "ecore-audio ecore-input-evas ecore-input ecore-imf-evas ecore-imf ecore-file ecore-con ecore-ipc ecore-x ecore-evas"
python populate_packages_prepend () {
for plugin_type in "engines loaders savers".split():
@@ -77,22 +92,105 @@ python populate_packages_prepend () {
PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*"
+# PACKAGES_DYNAMIC + do_split_packages isn't used for all libe libs,
+# because PACKAGES_DYNAMIC would be catching too many patterns
+# (or need to list all possible prefixes) and not all original packages
+# were splitted like that, so it would need RCONFLICTS/RPROVIDES/RREPLACES
+# combos at least in few places for upgrade path.
+
+FILES_efreet-trash = " \
+ ${libdir}/libefreet_trash${SOLIBS} \
+"
+FILES_efreet-mime = " \
+ ${libdir}/libefreet_mime${SOLIBS} \
+"
+FILES_libeet = " \
+ ${libdir}/libeet${SOLIBS} \
+"
+FILES_libefreet = " \
+ ${libdir}/libefreet${SOLIBS} \
+"
+FILES_ecore-audio = "\
+ ${libdir}/libecore_audio${SOLIBS} \
+"
+FILES_ecore-input-evas = "\
+ ${libdir}/libecore_input_evas${SOLIBS} \
+"
+FILES_ecore-input = "\
+ ${libdir}/libecore_input${SOLIBS} \
+"
+FILES_ecore-imf-evas = "\
+ ${libdir}/libecore_imf_evas${SOLIBS} \
+ ${libdir}/ecore-imf/modules/*/*/module.so \
+"
+FILES_ecore-imf = "\
+ ${libdir}/libecore_imf${SOLIBS} \
+"
+
+FILES_ecore-file = "\
+ ${libdir}/libecore_file${SOLIBS} \
+"
+FILES_ecore-con = "\
+ ${libdir}/libecore_con${SOLIBS} \
+"
+FILES_ecore-ipc = "\
+ ${libdir}/libecore_ipc${SOLIBS} \
+"
+FILES_ecore-x = "\
+ ${libdir}/libecore_x${SOLIBS} \
+"
+FILES_ecore-evas = "\
+ ${libdir}/libecore_evas${SOLIBS} \
+ ${libdir}/ecore-evas/engines/*/*/module.so \
+"
+FILES_eio = "\
+ ${libdir}/libeio${SOLIBS} \
+"
+FILES_eina = "\
+ ${libdir}/libeina${SOLIBS} \
+ ${bindir}/eina-bench-cmp \
+"
+FILES_edje-utils = "\
+ ${bindir}/edje_* \
+ ${datadir}/edje/include/edje.inc \
+"
+FILES_eldbus = "\
+ ${libdir}/libeldbus${SOLIBS} \
+"
+FILES_eo = "\
+ ${libdir}/libeo${SOLIBS} \
+"
+FILES_libemotion = "\
+ ${libdir}/libemotion${SOLIBS} \
+"
FILES_efreet = " \
+ ${datadir}/dbus-1/services/*Efreet* \
${libdir}/efreet/*/efreet*create \
${bindir}/efreetd \
${datadir}/efreet \
"
FILES_eet = " \
${bindir}/eet \
+ ${libdir}/libeet${SOLIBS} \
"
FILES_emotion = " \
${datadir}/emotion \
"
+FILES_embryo-tests = " \
+ ${datadir}/embryo/ \
+"
+FILES_embryo-utils = " \
+ ${binddir}/embryo_* \
+"
FILES_embryo = " \
- ${datadir}/embryo \
+ ${libdir}/libembryo${SOLIBS} \
"
FILES_ethumb = " \
+ ${datadir}/dbus-1/services/*Ethumb* \
+ ${libdir}/libethumb${SOLIBS} \
+ ${libdir}/libethumb_client${SOLIBS} \
${bindir}/ethumbd \
+ ${bindir}/ethumbd_client \
${bindir}/ethumb \
${libdir}/ethumb/*/*/*/module.so \
${libdir}/ethumb/*/*/*/*.edj \
@@ -100,21 +198,27 @@ FILES_ethumb = " \
${datadir}/ethumb* \
"
FILES_ecore = " \
+ ${libdir}/libecore${SOLIBS} \
${libdir}/ecore*/*/*/*/module.so \
${datadir}/ecore* \
"
FILES_evas = " \
+ ${libdir}/libevas${SOLIBS} \
${libdir}/evas*/*/*/*/*/module.so \
${libdir}/evas*/*/*/*/*/*.edj \
${libdir}/evas/cserve2/bin/*/evas_cserve2* \
${datadir}/evas* \
+ ${bindir}/evas_cserve2_* \
"
FILES_eeze = " \
+ ${libdir}/libeeze${SOLIBS} \
${libdir}/eeze*/*/*/*/*/module.so \
${datadir}/eeze \
+ ${bindir}/eeze_* \
"
FILES_edje = " \
+ ${libdir}/libedje${SOLIBS} \
${libdir}/edje*/*/*/*/module.so \
${libdir}/edje/utils/*/epp \
${datadir}/edje \
@@ -141,5 +245,4 @@ FILES_${PN}-dev += " \
${datadir}/gdb/auto-load \
${datadir}/eo/gdb \
${bindir}/eldbus-codegen \
- ${bindir}/eina-bench-cmp \
"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][PATCHv2 2/5] python-efl: Upgrade to 1.8.1 and update packaging to match old packages
2014-01-22 11:51 ` [meta-efl][PATCHv2 1/5] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
@ 2014-01-22 11:51 ` Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 3/5] e-wm: Add recipe for 0.18.2 Martin Jansa
` (2 subsequent siblings)
3 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-22 11:51 UTC (permalink / raw)
To: openembedded-devel
* announcement:
http://sourceforge.net/mailarchive/message.php?msg_id=31862842
* like in efl recipe create packages matching with old separate recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-devtools/python/python-efl.inc | 41 ++++++++++++++++++++--
.../recipes-devtools/python/python-efl_1.8.0.bb | 4 ---
.../recipes-devtools/python/python-efl_1.8.1.bb | 4 +++
3 files changed, 43 insertions(+), 6 deletions(-)
delete mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
create mode 100644 meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc
index c608bac..cca3562 100644
--- a/meta-efl/recipes-devtools/python/python-efl.inc
+++ b/meta-efl/recipes-devtools/python/python-efl.inc
@@ -12,7 +12,6 @@ DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
RDEPENDS_${PN} += "python-lang"
PROVIDES = "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas"
-RPROVIDES_${PN} += "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas"
# necessary to let the call for python-config succeed
export BUILD_SYS
@@ -27,7 +26,45 @@ SRC_URI = "\
"
S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
+do_install_append() {
+ # drop all .pyo, pyc files
+ find ${D}${libdir}/${PYTHON_DIR}/site-packages -name \*.pyo -o -name \*.pyc | xargs rm -f
+}
+
+PACKAGES += "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas ${PN}-examples"
+
+FILES_${PN} = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/python_efl*egg-info \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/eo.so \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/utils \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/__init__.py \
+"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/*/*.la"
-PACKAGES += "${PN}-examples"
FILES_${PN}-examples = "${datadir}/${PN}/examples"
+
+FILES_python-ecore = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/ecore/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/ecore.so \
+"
+FILES_python-eldbus = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/e_dbus/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/dbus_mainloop.so \
+"
+FILES_python-edje = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/edje/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/edje*so \
+"
+FILES_python-elementary = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/elementary/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/elementary/ \
+"
+FILES_python-emotion = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/emotion/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/emotion.so \
+"
+FILES_python-evas = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/evas/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/efl/evas.so \
+"
diff --git a/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb b/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
deleted file mode 100644
index a6ae64e..0000000
--- a/meta-efl/recipes-devtools/python/python-efl_1.8.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI[md5sum] = "58a55193caee3c2c74fd962cc17bc9c1"
-SRC_URI[sha256sum] = "8f883c325e30ee3eb2fa38822fa353a22207441b385f4e167cf9c1cf855638f7"
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
new file mode 100644
index 0000000..15009f6
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-efl_1.8.1.bb
@@ -0,0 +1,4 @@
+require ${BPN}.inc
+
+SRC_URI[md5sum] = "ca71f501c7e0479f15d2746380b0f81d"
+SRC_URI[sha256sum] = "90ea20d0a90448fd1dcd56210bf34cb9a78905852d83620617bf164f1cef5edc"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][PATCHv2 3/5] e-wm: Add recipe for 0.18.2
2014-01-22 11:51 ` [meta-efl][PATCHv2 1/5] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 2/5] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
@ 2014-01-22 11:51 ` Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 4/5] elfe: Replace svn with git version Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 5/5] evas-generic-loaders: package generic pdf loaders as well Martin Jansa
3 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-22 11:51 UTC (permalink / raw)
To: openembedded-devel
* keep old 0.17.* around because new enlightenment is more picky on where it
will run (compositor is now mandatory)
* announcement
http://sourceforge.net/mailarchive/message.php?msg_id=31789335
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/e-wm.inc | 14 +++-----------
meta-efl/recipes-efl/e17/e-wm_0.17.5.bb | 12 ++++++++++++
meta-efl/recipes-efl/e17/e-wm_0.18.2.bb | 20 ++++++++++++++++++++
3 files changed, 35 insertions(+), 11 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/e-wm_0.18.2.bb
diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc
index 3f24b62..08fe25f 100644
--- a/meta-efl/recipes-efl/e17/e-wm.inc
+++ b/meta-efl/recipes-efl/e17/e-wm.inc
@@ -7,7 +7,8 @@ SRCNAME = "e"
inherit e update-alternatives gettext
S = "${WORKDIR}/${SRCNAME}"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
EXTRA_OECONF = "\
@@ -30,16 +31,6 @@ do_install_append() {
# xinit[418]: ERROR: CONFIGURATION FILE HAS BAD PERMISSIONS
chmod 600 ${D}/${sysconfdir}/enlightenment/sysactions.conf
- 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
-
install -d ${D}/${sysconfdir}/xdg/menus
install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done
@@ -124,6 +115,7 @@ FILES_${PN} = "\
${datadir}/enlightenment/COPYING \
${datadir}/xsessions/enlightenment.desktop \
${sysconfdir}/xdg \
+ ${systemd_unitdir} \
"
FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
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
index 57eefdb..d374680 100644
--- a/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_0.17.5.bb
@@ -12,3 +12,15 @@ SRC_URI = "\
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.2.bb b/meta-efl/recipes-efl/e17/e-wm_0.18.2.bb
new file mode 100644
index 0000000..ab96e9a
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-wm_0.18.2.bb
@@ -0,0 +1,20 @@
+require ${BPN}.inc
+
+SRCNAME = "enlightenment"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+SRC_URI = "\
+ ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+ file://enlightenment_start.oe \
+ file://applications.menu \
+"
+
+SRC_URI[md5sum] = "eea52b438b143ac318d5ed8e09e06f2b"
+SRC_URI[sha256sum] = "106a6949b14ce3eae0c1eb82bf09492fa8417df0b26faf595f5050f0e89b5483"
+
+do_configure_prepend() {
+ sed '/^ *EFL_PKG_CHECK_VAR/ s/systemduserunitdir/systemdsystemunitdir/g' -i ${S}/configure.ac
+}
+
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][PATCHv2 4/5] elfe: Replace svn with git version
2014-01-22 11:51 ` [meta-efl][PATCHv2 1/5] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 2/5] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 3/5] e-wm: Add recipe for 0.18.2 Martin Jansa
@ 2014-01-22 11:51 ` Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 5/5] evas-generic-loaders: package generic pdf loaders as well Martin Jansa
3 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-22 11:51 UTC (permalink / raw)
To: openembedded-devel
* bump PE to cope with +svn -> +git
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/elfe_git.bb | 15 +++++++++++++++
meta-efl/recipes-efl/e17/elfe_svn.bb | 10 ----------
2 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/elfe_git.bb
delete mode 100644 meta-efl/recipes-efl/e17/elfe_svn.bb
diff --git a/meta-efl/recipes-efl/e17/elfe_git.bb b/meta-efl/recipes-efl/e17/elfe_git.bb
new file mode 100644
index 0000000..fcb97a9
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/elfe_git.bb
@@ -0,0 +1,15 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
+PV = "0.0.1+gitr${SRCPV}"
+PE = "1"
+
+require e-module.inc
+
+SRC_URI = " \
+ git://git.enlightenment.org/enlightenment/modules/${BPN}.git \
+"
+S = "${WORKDIR}/git"
+
+SRCREV = "1ec0e7713c3ca901014811ff78277d9e2aaac981"
+
+DEPENDS += "elementary"
diff --git a/meta-efl/recipes-efl/e17/elfe_svn.bb b/meta-efl/recipes-efl/e17/elfe_svn.bb
deleted file mode 100644
index f6d6fdb..0000000
--- a/meta-efl/recipes-efl/e17/elfe_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
-PV = "0.0.1+svnr${SRCPV}"
-PR = "${INC_PR}.1"
-
-require e-module.inc
-
-SRCREV = "${EFL_SRCREV}"
-
-DEPENDS += "elementary"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [meta-efl][PATCHv2 5/5] evas-generic-loaders: package generic pdf loaders as well
2014-01-22 11:51 ` [meta-efl][PATCHv2 1/5] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
` (2 preceding siblings ...)
2014-01-22 11:51 ` [meta-efl][PATCHv2 4/5] elfe: Replace svn with git version Martin Jansa
@ 2014-01-22 11:51 ` Martin Jansa
3 siblings, 0 replies; 20+ messages in thread
From: Martin Jansa @ 2014-01-22 11:51 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
index ec49770..0d0ec33 100644
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
@@ -23,9 +23,14 @@ python populate_packages_prepend () {
output_pattern = "evas-generic-loader-%s",
description = 'Evas generic loaders - module %s',
allow_dirs=True, recursive=False, extra_depends="" )
+
+ do_split_packages(d, basedir, '^evas_generic_pdf_loader\.(.*)$',
+ output_pattern = "evas-generic-pdf-loader-%s",
+ description = 'Evas generic pdf loaders - module %s',
+ allow_dirs=True, recursive=False, extra_depends="" )
}
FILES_evas-generic-loader-xcf += "${libdir}/evas/utils/*.xcf.gz"
FILES_${PN}-dbg += "${libdir}/evas/utils/.debug"
-PACKAGES_DYNAMIC += "^evas-generic-loader-.*"
+PACKAGES_DYNAMIC += "^evas-generic-loader-.* ^evas-generic-pdf-loader-.*"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default
2014-01-20 17:42 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Martin Jansa
` (2 preceding siblings ...)
2014-01-20 17:42 ` [PATCH 4/4] e-wm: Add recipe for 0.18.2 Martin Jansa
@ 2014-01-22 14:25 ` Otavio Salvador
3 siblings, 0 replies; 20+ messages in thread
From: Otavio Salvador @ 2014-01-22 14:25 UTC (permalink / raw)
To: OpenEmbedded Devel List
On Mon, Jan 20, 2014 at 3:42 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * with floating dependency some packages can fail to detect elementary:
> Package 'ewebkit', required by 'elementary', not found
> * webkit-efl isn't in very good shape, so I don't want to force using
> it on everybody -> disable ewebkit by default
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/4] efl: Adjust packaging to match more with old 1.7 separate recipes
2014-01-20 17:42 ` [PATCH 2/4] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
@ 2014-01-22 14:26 ` Otavio Salvador
0 siblings, 0 replies; 20+ messages in thread
From: Otavio Salvador @ 2014-01-22 14:26 UTC (permalink / raw)
To: OpenEmbedded Devel List
On Mon, Jan 20, 2014 at 3:42 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * it improves upgrade-path, it's not perfect and I was testing it only on
> my SHR images which include lot of efl stuff, but not all, so some packages
> can still be a bit different
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Gosh, this is ugly ...
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 3/4] python-efl: Upgrade to 1.8.1 and update packaging to match old packages
2014-01-20 17:42 ` [PATCH 3/4] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
@ 2014-01-22 14:28 ` Otavio Salvador
0 siblings, 0 replies; 20+ messages in thread
From: Otavio Salvador @ 2014-01-22 14:28 UTC (permalink / raw)
To: OpenEmbedded Devel List
On Mon, Jan 20, 2014 at 3:42 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * announcement:
> http://sourceforge.net/mailarchive/message.php?msg_id=31862842
> * like in efl recipe create packages matching with old separate recipes
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
I'd prefer this in two patches (one reworking the packaging and
another for the update) but I think it is fine.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2014-01-22 14:28 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-15 17:17 [meta-efl][WIP][PATCHv2 0/7] Major efl upgrade Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 1/7] meta-efl: Add efl 1.8.4, elementary 1.8.3, terminology 0.4.0 and python-efl 1.8.0 recipes Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 2/7] webkit-efl: Add recipe with snapshot from r159807 Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 3/7] enjoy: Upgrade to version from git Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 4/7] libeflvala: Fix build of tests Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 5/7] eve: bump SRCREV to catch up with edbus2 -> eldbus rename Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 6/7] e-wm: Drop evas-.*-loader.* from RDEPENDS Martin Jansa
2014-01-15 17:17 ` [meta-efl][WIP][PATCHv2 7/7] webkit-efl: Try to disable llint/jit to fix armv[45] build Martin Jansa
2014-01-20 17:42 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Martin Jansa
2014-01-20 17:42 ` [PATCH 2/4] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
2014-01-22 14:26 ` Otavio Salvador
2014-01-20 17:42 ` [PATCH 3/4] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
2014-01-22 14:28 ` Otavio Salvador
2014-01-20 17:42 ` [PATCH 4/4] e-wm: Add recipe for 0.18.2 Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 1/5] efl: Adjust packaging to match more with old 1.7 separate recipes Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 2/5] python-efl: Upgrade to 1.8.1 and update packaging to match old packages Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 3/5] e-wm: Add recipe for 0.18.2 Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 4/5] elfe: Replace svn with git version Martin Jansa
2014-01-22 11:51 ` [meta-efl][PATCHv2 5/5] evas-generic-loaders: package generic pdf loaders as well Martin Jansa
2014-01-22 14:25 ` [PATCH 1/4] elementary: Add PACKAGECONFIG for ewebkit and disable it by default Otavio Salvador
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.