efl: bump SRCREV

* eet: convert to BBCLASSEXTEND
* elementary: add dep on eet-native

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f0119c1..8d73043 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -335,7 +335,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "45060"
+EFL_SRCREV ?= "45489"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"

diff --git a/recipes/efl1/eet-native_svn.bb b/recipes/efl1/eet-native_svn.bb
deleted file mode 100644 (file)
index 454bc53..0000000
--- a/recipes/efl1/eet-native_svn.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require eet_svn.bb
-inherit native
-DEPENDS = "zlib-native jpeg-native eina-native"
-# we no longer inherit pkgconfig, so we need to state this explicitly
-# (see explanation in efl.bbclass and autotools.bbclass)
-DEPENDS += "pkgconfig-native"

diff --git a/recipes/efl1/eet_svn.bb b/recipes/efl1/eet_svn.bb
index 338cf89..579fb28 100644 (file)
--- a/recipes/efl1/eet_svn.bb
+++ b/recipes/efl1/eet_svn.bb
@@ -1,11 +1,13 @@
 DESCRIPTION = "EET is the Enlightenment data storage library"
-DEPENDS = "zlib jpeg openssl eina"
+DEPENDS = "pkgconfig zlib jpeg openssl eina"
 LICENSE = "MIT BSD"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "r1"
 
 inherit efl
 
+BBCLASSEXTEND="native"
+
 EXTRA_OECONF = "\
   --enable-openssl \
   --enable-cypher \

diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb
index b37e989..db75d52 100644 (file)
--- a/recipes/efl1/elementary_svn.bb
+++ b/recipes/efl1/elementary_svn.bb
@@ -1,12 +1,15 @@
 DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPL"
-DEPENDS = "efreet evas ecore edje eet edbus"
+DEPENDS = "eet-native efreet evas ecore edje eet edbus"
 PV = "0.0.0+svnr${SRCPV}"
-PR = "r6"
+PR = "r7"
 
 inherit efl
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+EXTRA_OECONF = " \
+       --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+       --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary;proto=http"
 S = "${WORKDIR}/elementary"
@@ -32,6 +35,3 @@ FILES_${PN}-tests = "\
   ${datadir}/icons/* \
 "
 
-EXTRA_OECONF = "\
-  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-"