import meta-oe rev 6f3ca440cb00622ae42433a4088c59eb11fb0bb3

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

COPYING.MIT

@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.

combo-layer.conf

@@ -2,23 +2,29 @@
 src_uri = git://github.com/openembedded/bitbake.git
 local_repo_dir = /Users/koen/Projects/Angstrom/setup-scripts/sources/bitbake
 dest_dir = bitbake
-last_revision = c3c2ad6f22e35b893a353d4c21d0e923e46ad07b
+last_revision = bb688635c2050da3cbbaa5aa5b00e882887695de
 
 [oe-core]
 src_uri = git://github.com/openembedded/oe-core.git
 local_repo_dir = /Users/koen/Projects/Angstrom/setup-scripts/sources/openembedded-core
 dest_dir = .
-last_revision = a9d41062e24a6b99661b3a5256f369b557433607
+last_revision = 59c26a280f909470e19a2be04b8ea9dd3aa5c24b
+
+[meta-oe]
+src_uri = git://github.com/openembedded/meta-oe.git
+local_repo_dir = /Users/koen/Projects/Angstrom/setup-scripts/sources/meta-openembedded
+dest_dir = .
+last_revision = 6f3ca440cb00622ae42433a4088c59eb11fb0bb3
 
 [meta-angstrom]
 src_uri = git://git.angstrom-distribution.org/meta-angstrom
 local_repo_dir = /Users/koen/Projects/Angstrom/setup-scripts/sources/meta-angstrom
 dest_dir = meta-angstrom
-last_revision =
+last_revision = faa96f6e2b760de21853cbe67cf17f5e2e0a674d
 
 [meta-ti]
 src_uri = git://git.angstrom-distribution.org/meta-texasinstruments
 local_repo_dir = /Users/koen/Projects/Angstrom/setup-scripts/sources/meta-texasinstruments
 dest_dir = meta-ti
-last_revision =
+last_revision = 37218fc460584d419276100e96c813ce3c935982
 

meta-efl/COPYING.MIT

@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.

meta-efl/README

@@ -0,0 +1,16 @@
+This layer depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+branch: master
+revision: HEAD
+
+URI: git://git.openembedded.net/meta-openembedded
+branch: master
+revision: HEAD
+
+Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-efl]' in the subject'
+
+When sending single patches, please using something like 'git send-email -1 --to openembedded-devel@lists.openembedded.org --subject-prefix meta-efl'
+
+Interim layer maintainer: Koen Kooi <koen@dominion.thruhere.net>
+

meta-efl/classes/e-base.bbclass

@@ -0,0 +1,9 @@
+HOMEPAGE = "http://www.enlightenment.org"
+SRCNAME ?= "${BPN}"
+
+# usually tracks svn trunk HEAD
+EFL_SRCREV ?= "59463"
+# revision when 1.0.0 was released, for recipes which don't need rebuild so often
+EFL_SRCREV_1.0.0 ?= "56356"
+
+ARM_INSTRUCTION_SET = "arm"

meta-efl/classes/e.bbclass

@@ -0,0 +1,26 @@
+SECTION = "e/apps"
+
+inherit e-base autotools pkgconfig binconfig
+
+do_prepsources () {
+	make clean distclean || true
+}
+addtask prepsources after do_patch before do_configure
+
+do_configure_prepend() {
+	autopoint || touch config.rpath
+}
+
+do_configure_append() {
+	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
+export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
+
+# This construction is stupid, someone with more E knowledge should change it to =+ or something
+# And it's in efl.bbclass as well....
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib ${PN}-static"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
+FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"

meta-efl/classes/efl.bbclass

@@ -0,0 +1,63 @@
+SECTION = "e/libs"
+LICENSE = "MIT BSD"
+DEPENDS += "pkgconfig-native"
+
+# revision 0d93ec84b30bc1bee2caaee72d667f87bc468a70 made SRCDATE and hence PV go backwards, so we need to up PE to unbreak builds and feeds :(
+PE = "2"
+
+inherit e-base autotools
+
+# evas-native looks at this var, so keep it
+
+do_configure_prepend() {
+	autopoint || touch config.rpath
+}
+
+do_install_prepend () {
+	for i in `find ${S}/ -name "*.pc" -type f` ; do \
+		sed -i -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' $i
+	done
+}
+
+# This construction is stupid, someone with more E knowledge should change it to =+ or something
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static"
+
+FILES_${PN} = "${libdir}/*.so.* \
+               ${libdir}/edje/modules/${PN}/*/module.so \
+               ${libdir}/${PN}/plugins/*.so \
+               ${datadir}/dbus-1/services/* \
+"
+
+
+FILES_${PN}-themes = "${datadir}/${PN}/themes \
+                      ${datadir}/${PN}/data \
+                      ${libdir}/${PN}/plugins/data/*.edj \
+                      ${datadir}/${PN}/fonts \
+                      ${datadir}/${PN}/pointers \
+                      ${datadir}/${PN}/images \
+                      ${datadir}/${PN}/users \
+                      ${datadir}/${PN}/images \
+                      ${datadir}/${PN}/styles"
+
+FILES_${PN}-dev   += "${bindir}/${PN}-config \
+                      ${libdir}/pkgconfig/* \
+                      ${libdir}/lib*.la \
+                      ${libdir}/*.so \
+                      ${libdir}/${PN}/*.la \
+                      ${libdir}/${PN}/*/*.la \
+                      ${datadir}/${PN}/edje_externals \
+                      ${libdir}/edje/modules/${PN}/*/module.la \
+"
+
+FILES_${PN}-static += "${libdir}/${PN}/*.a \
+                       ${libdir}/${PN}/*/*.a \
+"
+
+FILES_${PN}-dbg +=   "${libdir}/${PN}/.debug \
+                      ${libdir}/${PN}/*/.debug \
+                      ${libdir}/edje/modules/${PN}/*/.debug/module.so \
+"
+
+FILES_${PN}-tests  = "${bindir}/${PN} \
+                      ${bindir}/*_* \
+                      ${datadir}"

meta-efl/conf/distro/include/efl-from-svn.inc

@@ -0,0 +1,17 @@
+EFL_PREFERRED_VERSION ?= "1.0.999%"
+PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_edbus ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_edbus-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_edje ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_edje-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_eeze ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_eeze-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_efreet ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_efreet-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_eina ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_eina-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_embryo ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_embryo-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_evas-native ?= "${EFL_PREFERRED_VERSION}"

meta-efl/conf/layer.conf

@@ -0,0 +1,9 @@
+# We have a conf and classes directory, append to BBPATH 
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "efl-layer"
+BBFILE_PATTERN_efl-layer := "^${LAYERDIR}/"
+BBFILE_PRIORITY_efl-layer = "7"

meta-efl/recipes-devtools/python/python-ecore_svn.bb

@@ -0,0 +1,6 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+SRCREV = "${EFL_SRCREV}"
+DEPENDS += "python-evas ecore"
+RDEPENDS_${PN} += "python-evas"

meta-efl/recipes-devtools/python/python-edbus_svn.bb

@@ -0,0 +1,7 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+SRCREV = "${EFL_SRCREV}"
+DEPENDS += "edbus python-dbus"
+RDEPENDS_${PN} += "python-dbus"
+SRCNAME = "python-e_dbus"

meta-efl/recipes-devtools/python/python-edje/0001-fix-unicode-conversion.patch

@@ -0,0 +1,38 @@
+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)

meta-efl/recipes-devtools/python/python-edje_svn.bb

@@ -0,0 +1,8 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+SRCREV = "${EFL_SRCREV}"
+DEPENDS += "edje python-evas"
+RDEPENDS_${PN} += "python-evas"
+
+SRC_URI += "file://0001-fix-unicode-conversion.patch"

meta-efl/recipes-devtools/python/python-efl.inc

@@ -0,0 +1,46 @@
+DESCRIPTION = "${PN} bindings"
+LICENSE = "BSD"
+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"
+PV = "0.7.3+svnr${SRCPV}"
+PR = "ml1"
+
+# necessary to let the call for python-config succeed
+export BUILD_SYS
+export HOST_SYS
+
+inherit e-base autotools pkgconfig distutils-base
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
+
+
+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"

meta-efl/recipes-devtools/python/python-elementary_svn.bb

@@ -0,0 +1,6 @@
+require python-efl.inc
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
+SRCREV = "${EFL_SRCREV}"
+DEPENDS += "elementary python-evas"
+RDEPENDS_${PN} += "python-evas python-ecore python-edje" 

meta-efl/recipes-devtools/python/python-emotion_svn.bb

@@ -0,0 +1,6 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+SRCREV = "${EFL_SRCREV}"
+DEPENDS += "emotion python-evas"
+RDEPENDS_${PN} += "python-ecore"

meta-efl/recipes-devtools/python/python-evas_svn.bb

@@ -0,0 +1,5 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+SRCREV = "${EFL_SRCREV}"
+DEPENDS += "evas"

meta-efl/recipes-efl/e17/cpu_svn.bb

@@ -0,0 +1,5 @@
+LICENSE = "MIT"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "${INC_PR}.0"
+
+require e-module.inc

meta-efl/recipes-efl/e17/diskio_svn.bb

@@ -0,0 +1,9 @@
+LICENSE = "MIT"
+PV = "0.0.1+svnr${SRCPV}"
+PR = "${INC_PR}.0"
+
+require e-module.inc
+
+
+
+

meta-efl/recipes-efl/e17/e-module.inc

@@ -0,0 +1,18 @@
+DESCRIPTION = "E17 ${PN} module"
+SECTION = "x11/multimedia"
+DEPENDS = "e-wm"
+
+SRCREV = "${EFL_SRCREV}"
+INC_PR = "r5"
+
+SRCNAME = "E-MODULES-EXTRA/${PN}"
+
+inherit e
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+FILES_${PN} += "${libdir}/enlightenment/modules/${PN}"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/${PN}/*/.debug"
+

meta-efl/recipes-efl/e17/e-tasks/depends.eina.patch

@@ -0,0 +1,12 @@
+diff -uNr trunk.orig//configure.ac trunk/configure.ac
+--- trunk.orig//configure.ac	2009-12-18 12:59:52.000000000 +0100
++++ trunk/configure.ac	2010-08-22 23:22:52.000000000 +0200
+@@ -15,7 +15,7 @@
+
+ AM_PROG_LIBTOOL
+
+-PKG_CHECK_MODULES(TASKS, [elementary eina-0 dbus-1 sqlite3])
++PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 sqlite3])
+
+ AC_OUTPUT([
+ Makefile