MASSIVE EFL (Enlightenment Foundation Libraries) Update:

- edb
- eet
- embryo
- ecore
- evas
- edje
- ewl
- imlib
- adjust preferred-e-packages as well
Next step: Add Entrance and E17

28 files changed, 110 insertions, 76 deletions

diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index 7f51344ec7..d861944d53 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -2,13 +2,12 @@
 # Specify which versions of E-related libraries and applications to build
 #
 
-PREFERRED_VERSION_ecore = "0.9.9.007"
-PREFERRED_VERSION_edb = "1.0.5.003"
-PREFERRED_VERSION_edje = "0.5.0.007"
-PREFERRED_VERSION_eet = "0.9.10.007"
-PREFERRED_VERSION_embryo = "0.9.1.007"
-PREFERRED_VERSION_etox = "0.9.0.003"
-PREFERRED_VERSION_evas = "0.9.9.007"
-PREFERRED_VERSION_ewl = "0.0.4.003"
-PREFERRED_VERSION_imlib2 = "1.2.0.007"
-
+PREFERRED_VERSION_ecore = "0.9.9.013"
+PREFERRED_VERSION_edb = "1.0.5.004"
+PREFERRED_VERSION_edje = "0.5.0.013"
+PREFERRED_VERSION_eet = "0.9.10.013"
+PREFERRED_VERSION_embryo = "0.9.1.013"
+PREFERRED_VERSION_etox = "0.9.0.004"
+PREFERRED_VERSION_evas = "0.9.9.013"
+PREFERRED_VERSION_ewl = "0.0.4.004"
+PREFERRED_VERSION_imlib2 = "1.2.1.004"
diff --git a/packages/ecore/ecore-fb_0.9.9.007.bb b/packages/ecore/ecore-fb_0.9.9.013.bb
index ea2fa6c9ae..f52c0a2f2b 100644
--- a/packages/ecore/ecore-fb_0.9.9.007.bb
+++ b/packages/ecore/ecore-fb_0.9.9.013.bb
@@ -1,15 +1,17 @@
 include ecore_${PV}.inc
-
-PR = "r2"
+PR = "r0"
 
 EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-job \
 		--enable-ecore-file \
+		--enable-poll \
 		--enable-ecore-dbus \
+		--enable-ecore-evas \
 		--enable-ecore-evas-fb \
 		--disable-ecore-evas-x \
 		--disable-ecore-evas-gl \
 		--enable-ecore-con \
+		--enable-ecore-config \
 		--enable-ecore-ipc \
 		--enable-ecore-txt \
 		--disable-ecore-x \
diff --git a/packages/ecore/ecore-native_0.9.9.007.bb b/packages/ecore/ecore-native_0.9.9.007.bb
deleted file mode 100644
index 6e5e1d1413..0000000000
--- a/packages/ecore/ecore-native_0.9.9.007.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-include ecore_${PV}.bb
-LICENSE = "MIT"
-inherit native
-DEPENDS = "edb-native eet-native evas-native freetype-native"
-
-do_stage () {
-	for p in ${parts}; do
-		dir=`echo $p|tr A-Z a-z`
-		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
-		oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
-	done
-	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/ecore/ecore-native_0.9.9.013.bb b/packages/ecore/ecore-native_0.9.9.013.bb
new file mode 100644
index 0000000000..cd60c15ed4
--- /dev/null
+++ b/packages/ecore/ecore-native_0.9.9.013.bb
@@ -0,0 +1,18 @@
+include ecore-fb_${PV}.bb
+inherit native
+DEPENDS = "curl-native edb-native eet-native evas-native freetype-native"
+
+export CURL_CONFIG = "${STAGING_BINDIR}/curl-config-native"
+export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native"
+export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native"
+export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native"
+
+do_stage () {
+	for p in ${parts}; do
+		dir=`echo $p|tr A-Z a-z`
+		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
+		oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
+	done
+	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/ecore/ecore-x11_0.9.9.007.bb b/packages/ecore/ecore-x11_0.9.9.013.bb
index 785cc2be97..785cc2be97 100644
--- a/packages/ecore/ecore-x11_0.9.9.007.bb
+++ b/packages/ecore/ecore-x11_0.9.9.013.bb
diff --git a/packages/ecore/ecore_0.9.9.007.inc b/packages/ecore/ecore_0.9.9.013.inc
index b4a74739de..3fd4e17a3a 100644
--- a/packages/ecore/ecore_0.9.9.007.inc
+++ b/packages/ecore/ecore_0.9.9.013.inc
@@ -8,6 +8,7 @@ LEAD_SONAME = "libecore.so"
 PROVIDES = "virtual/ecore"
 LICENSE = "MIT"
 DEPENDS = "edb eet virtual/evas freetype edb-native"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
            file://fix-configure.patch;patch=1"
@@ -29,8 +30,9 @@ do_stage () {
 	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
 }
 
-PACKAGES += "ecore-examples"
+PACKAGES =+ "ecore-examples ecore-config"
 
 FILES_${PN} = "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
 FILES_${PN}-dev += "${bindir}/ecore-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/ecore_test ${bindir}/ecore_evas_test ${datadir}"
+FILES_ecore-config = "${bindir}/ecore_config"
+FILES_ecore-examples = "${bindir}/ecore_test ${bindir}/ecore_evas_test ${datadir}"
diff --git a/packages/edb/edb-native_1.0.5.003.bb b/packages/edb/edb-native_1.0.5.004.bb
index b570683020..b570683020 100644
--- a/packages/edb/edb-native_1.0.5.003.bb
+++ b/packages/edb/edb-native_1.0.5.004.bb
diff --git a/packages/edb/edb_1.0.5.003.bb b/packages/edb/edb_1.0.5.004.bb
index d6204b289f..d6204b289f 100644
--- a/packages/edb/edb_1.0.5.003.bb
+++ b/packages/edb/edb_1.0.5.004.bb
diff --git a/packages/edje/edje-native_0.5.0.007.bb b/packages/edje/edje-native_0.5.0.007.bb
deleted file mode 100644
index 848c8dbe21..0000000000
--- a/packages/edje/edje-native_0.5.0.007.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-include edje_${PV}.bb
-inherit native
-DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
-
-EXTRA_OECONF = "--enable-fb-only"
-
-do_stage() {
-	for i in edje edje_ls edje_cc
-	do
-		install -m 0755 src/bin/$i ${STAGING_BINDIR}
-	done
-}
diff --git a/packages/edje/edje-native_0.5.0.013.bb b/packages/edje/edje-native_0.5.0.013.bb
new file mode 100644
index 0000000000..b3c24a6af1
--- /dev/null
+++ b/packages/edje/edje-native_0.5.0.013.bb
@@ -0,0 +1,18 @@
+include edje_${PV}.bb
+inherit native
+DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
+
+EXTRA_OECONF = "--with-fb-only \
+  --with-evas-config=${STAGING_BINDIR}/evas-config-native	\
+  --with-ecore-config=${STAGING_BINDIR}/ecore-config-native	\
+  --with-eet-config=${STAGING_BINDIR}/eet-config-native		\
+  --with-embryo-config=${STAGING_BINDIR}/embryo-config-native	\
+  --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native	"
+
+do_stage() {
+	for i in ${BINARIES}
+	do
+		install -m 0755 src/bin/$i ${STAGING_BINDIR}
+	done
+}
diff --git a/packages/edje/edje_0.5.0.007.bb b/packages/edje/edje_0.5.0.013.bb
index d3ae255db8..fd67d9d3f7 100644
--- a/packages/edje/edje_0.5.0.007.bb
+++ b/packages/edje/edje_0.5.0.013.bb
@@ -1,7 +1,9 @@
-DESCRIPTION = "edje is a complex graphical design & layout library."
-DEPENDS = "freetype evas ecore embryo eet edb edje-native"
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native"
 LICENSE = "MIT"
+HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/libs"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/edje-${PV}.tar.gz"
@@ -20,9 +22,10 @@ do_stage () {
 	install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/
 }
 
+BINARIES = "ejde edje_ls edje_test edje_cc edje_decc edje_thumb"
+
 PACKAGES += "edje-examples"
 
 FILES_${PN} = "${libdir}/libedje*.so*"
-FILES_${PN}-dev += "${bindir}/edje-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/edje ${bindir}/edje_ls ${datadir}"
-
+FILES_${PN}-dev += "${bindir}/edje-config ${bindir}/edje_ls ${bindir}/edje_cc ${bindir}/edje_decc ${bindir}/edje_thumb ${libdir}/pkgconfig"
+FILES_${PN}-examples = "${bindir}/edje ${bindir}/edje_test ${datadir}"
diff --git a/packages/eet/eet-native_0.9.10.007.bb b/packages/eet/eet-native_0.9.10.013.bb
index b08b724312..b08b724312 100644
--- a/packages/eet/eet-native_0.9.10.007.bb
+++ b/packages/eet/eet-native_0.9.10.013.bb
diff --git a/packages/eet/eet_0.9.10.007.bb b/packages/eet/eet_0.9.10.013.bb
index 2d62a6e9da..2d62a6e9da 100644
--- a/packages/eet/eet_0.9.10.007.bb
+++ b/packages/eet/eet_0.9.10.013.bb
diff --git a/packages/embryo/embryo-native_0.9.1.007.bb b/packages/embryo/embryo-native_0.9.1.013.bb
index 89980d343e..89980d343e 100644
--- a/packages/embryo/embryo-native_0.9.1.007.bb
+++ b/packages/embryo/embryo-native_0.9.1.013.bb
diff --git a/packages/embryo/embryo_0.9.1.007.bb b/packages/embryo/embryo_0.9.1.013.bb
index 49a1e9df4e..49a1e9df4e 100644
--- a/packages/embryo/embryo_0.9.1.007.bb
+++ b/packages/embryo/embryo_0.9.1.013.bb
diff --git a/packages/etox/etox_0.9.0.003.bb b/packages/etox/etox_0.9.0.004.bb
index e986212a8d..26c24cc6b7 100644
--- a/packages/etox/etox_0.9.0.003.bb
+++ b/packages/etox/etox_0.9.0.004.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
 Etox helps you when it comes to displaying, moving, resizing, layering, \
 clipping, aligning and coloring fonts in different styles, and more."
 SECTION = "e/libs"
-DEPENDS = "edb evas ecore"
+DEPENDS = "edb virtual/evas virtual/ecore"
 LICENSE = "MIT"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/etox-${PV}.tar.gz"
diff --git a/packages/evas/evas-fb_0.0.9.007.bb b/packages/evas/evas-fb_0.9.9.013.bb
index 26241f7e39..ba0d4c7675 100644
--- a/packages/evas/evas-fb_0.0.9.007.bb
+++ b/packages/evas/evas-fb_0.9.9.013.bb
@@ -1,5 +1,5 @@
 include evas_${PV}.inc
-PR = "r1"
+PR = "r0"
 
 EXTRA_OECONF = "--enable-fb			\
 		--disable-directfb		\
diff --git a/packages/evas/evas-native_0.9.9.007.bb b/packages/evas/evas-native_0.9.9.013.bb
index 8ccc3bf2ab..3f1390800a 100644
--- a/packages/evas/evas-native_0.9.9.007.bb
+++ b/packages/evas/evas-native_0.9.9.013.bb
@@ -1,11 +1,10 @@
-DESCRIPTION = "The Enlightenment Canvas Library"
-include evas_${PV}.bb
+include evas-fb_${PV}.bb
 inherit native
 DEPENDS = "freetype-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 do_stage () {
-        for i in ${headers}; do
+        for i in ${headers}
+        do
                 install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
         done
         oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
diff --git a/packages/evas/evas-x11_0.0.9.007.bb b/packages/evas/evas-x11_0.9.9.013.bb
index a733822b16..a733822b16 100644
--- a/packages/evas/evas-x11_0.0.9.007.bb
+++ b/packages/evas/evas-x11_0.9.9.013.bb
diff --git a/packages/evas/evas_0.9.9.007.inc b/packages/evas/evas_0.9.9.013.inc
index 9e3c5f4c2f..a0135e1aaa 100644
--- a/packages/evas/evas_0.9.9.007.inc
+++ b/packages/evas/evas_0.9.9.013.inc
@@ -8,6 +8,7 @@ SECTION = "e/libs"
 PRIORITY = "optional"
 PROVIDES = "virtual/evas"
 DEPENDS = "libpng jpeg edb eet freetype"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
            file://pkg.m4"
@@ -31,8 +32,8 @@ do_stage () {
 	oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
 }
 
-PACKAGES += "evas-examples"
+PACKAGES =+ "evas-examples"
 
 FILES_${PN} = "${libdir}/libevas*.so*"
 FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/evas_fb_test ${datadir}"
+FILES_evas-examples = "${bindir}/evas_fb_test ${datadir}"
diff --git a/packages/evas/evas/.mtn2git_empty b/packages/evas/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/evas/evas/.mtn2git_empty
+++ b/packages/evas/files/.mtn2git_empty
diff --git a/packages/evas/evas/pkg.m4 b/packages/evas/files/pkg.m4
index c80e0acfc4..c80e0acfc4 100644
--- a/packages/evas/evas/pkg.m4
+++ b/packages/evas/files/pkg.m4
diff --git a/packages/ewl/ewl_0.0.4.003.bb b/packages/ewl/ewl_0.0.4.004.bb
index 445a9d376f..f309169dfa 100644
--- a/packages/ewl/ewl_0.0.4.003.bb
+++ b/packages/ewl/ewl_0.0.4.004.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
 SECTION = "e/libs"
-DEPENDS = "edb eet evas ecore etox edje"
+DEPENDS = "edb eet virtual/evas virtual/ecore etox edje"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "MIT"
 PR = "r0"
 
@@ -11,6 +13,8 @@ S = "${WORKDIR}/ewl-${PV}"
 
 inherit autotools binconfig
 
+PARALLEL_MAKE = ""
+
 do_stage () {
 	oe_libinstall -C src libewl ${STAGING_LIBDIR}/
 	install -m 0644 ${S}/src/lib/Ewl.h ${STAGING_INCDIR}/
diff --git a/packages/imlib2/imlib2-fb_1.2.0.007.bb b/packages/imlib2/imlib2-fb_1.2.0.007.bb
deleted file mode 100644
index a49e96c0d4..0000000000
--- a/packages/imlib2/imlib2-fb_1.2.0.007.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-SECTION = "libs"
-LICENSE = "BSD"
-include imlib2.inc
-inherit native
-DEPENDS = "freetype"
-
-EXTRA_OECONF = "--without-x \
-		--disable-mmx"
diff --git a/packages/imlib2/imlib2-fb_1.2.1.004.bb b/packages/imlib2/imlib2-fb_1.2.1.004.bb
new file mode 100644
index 0000000000..bddb085fdd
--- /dev/null
+++ b/packages/imlib2/imlib2-fb_1.2.1.004.bb
@@ -0,0 +1,4 @@
+include imlib2.inc
+
+EXTRA_OECONF = "--without-x \
+		--disable-mmx"
diff --git a/packages/imlib2/imlib2-native_1.2.0.007.bb b/packages/imlib2/imlib2-native_1.2.1.004.bb
index 17c54ae5a2..e3a46c4aba 100644
--- a/packages/imlib2/imlib2-native_1.2.0.007.bb
+++ b/packages/imlib2/imlib2-native_1.2.1.004.bb
@@ -4,8 +4,3 @@ DEPENDS = "freetype-native libpng-native jpeg-native"
 
 EXTRA_OECONF = "--disable-mmx \
                 --without-x"
-
-do_stage () {
-  oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
-}
diff --git a/packages/imlib2/imlib2-x11_1.2.0.007.bb b/packages/imlib2/imlib2-x11_1.2.1.004.bb
index 53d38bff34..4cec9a979f 100644
--- a/packages/imlib2/imlib2-x11_1.2.0.007.bb
+++ b/packages/imlib2/imlib2-x11_1.2.1.004.bb
@@ -5,5 +5,4 @@ EXTRA_OECONF = "--disable-mmx \
                 --with-x \
                 --x-includes=${STAGING_INCDIR} \
                 --x-libraries=${STAGING_LIBDIR}"
-DEPENDS += ""
 
diff --git a/packages/imlib2/imlib2.inc b/packages/imlib2/imlib2.inc
index fce10c2eb3..cf73ba446f 100644
--- a/packages/imlib2/imlib2.inc
+++ b/packages/imlib2/imlib2.inc
@@ -5,11 +5,7 @@ SECTION = "e/libs"
 PRIORITY = "optional"
 PROVIDES = "virtual/imlib2"
 DEPENDS = "freetype libpng jpeg"
-
-do_prepsources () {
-	make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/imlib2-${PV}.tar.gz"
 S = "${WORKDIR}/imlib2-${PV}"
@@ -19,9 +15,37 @@ inherit autotools pkgconfig binconfig
 do_stage () {
 	oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
 	install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
+
+	install -d ${STAGING_LIBDIR}/imlib2/loaders
+	for i in src/modules/loaders/.libs/*.so
+	do
+		install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders
+	done
+
+	install -d ${STAGING_LIBDIR}/imlib2/filters
+	for i in src/modules/filters/.libs/*.so
+	do
+		install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters
+	done
+}
+
+do_install_append() {
+        install -d ${D}${libdir}/imlib2/loaders
+        for i in src/modules/loaders/.libs/*.so
+        do
+                install -m 0755 $i ${D}${libdir}/imlib2/loaders
+        done
+
+        install -d ${D}${libdir}/imlib2/filters
+        for i in src/modules/filters/.libs/*.so
+        do
+                install -m 0755 $i ${D}${libdir}/imlib2/filters
+        done
 }
 
-PACKAGES += "${PN}-bin"
+PACKAGES =+ "imlib2-bin imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
 FILES_${PN}-dev += "${bindir}/imlib2-config"
-FILES_${PN}-bin = "${bindir}"
+FILES_imlib2-bin = "${bindir}"
+FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
+FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"