merge of '4273804b598541555abb070bcb83ec503beaceff'

     and '99925725722e255ce214c4cfb61018cbf2729439'

6 files changed, 19 insertions, 13 deletions

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index ccd458da89..4d9509fc15 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20070819"
+EFL_SRCDATE = "20071206"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -89,6 +89,7 @@ SRCDATE_python-evas ?= "${EFL_SRCDATE}"
 SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
 SRCDATE_python-edje ?= "${EFL_SRCDATE}"
 SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
+SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
 SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
 SRCDATE_python-etk ?= "${EFL_SRCDATE}"
 
@@ -102,8 +103,11 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}"
 SRCDATE_expedite ?= "${EFL_SRCDATE}"
 SRCDATE_elitaire ?= "${EFL_SRCDATE}"
 SRCDATE_entice ?= "${EFL_SRCDATE}"
+SRCDATE_entrance ?= "${EFL_SRCDATE}"
 SRCDATE_e-utils ?= "${EFL_SRCDATE}"
+SRCDATE_e-wm ?= "${EFL_SRCDATE}"
 SRCDATE_enna ?= "${EFL_SRCDATE}"
+SRCDATE_exquisite ?= "${EFL_SRCDATE}"
 
 # Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 86c87214cf..b71a4b7582 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -9,9 +9,11 @@ PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
 
-SRC_URI += "file://configure.patch;patch=1 \
-           file://fix-tslib-configure.patch;patch=1 \
-           file://fix-directfb-include.patch;patch=1"
+# SRC_URI += "file://configure.patch;patch=1 \
+#           file://fix-tslib-configure.patch;patch=1 \
+#           file://fix-directfb-include.patch;patch=1"
+
+SRC_URI += "file://fix-directfb-include.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index dd6c467c54..53ee8642d8 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -6,8 +6,8 @@ EXTRA_OECONF = "\
 		--disable-ecore-x-xcb \
 		--enable-ecore-x \
 		--enable-ecore-job \
-		--enable-ecore-directfb \
-		--enable-ecore-sdl \
+		--disable-ecore-directfb \
+		--disable-ecore-sdl \
 		--enable-ecore-fb \
 		--enable-ecore-evas \
 		--disable-ecore-evas-gl \
diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_cvs.bb
index 8b8694899e..204abbb821 100644
--- a/packages/efl1/evas-native_cvs.bb
+++ b/packages/efl1/evas-native_cvs.bb
@@ -6,7 +6,7 @@ PR = "r0"
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
-		--disable-fb				\
+		--enable-fb				\
 		--disable-directfb			\
 		--disable-sdl				\
 		--enable-buffer				\
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 840f2929c5..de3359114c 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -3,13 +3,13 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
 down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
-# can also depend on valgrind (?)
-DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext"
+# can also depend on valgrind, libsdl-x11, directfb
+DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender"
 PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
 
-SRC_URI += "file://fix-configure.patch;patch=1"
+# SRC_URI += "file://fix-configure.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index b80ff8bcba..67490e756d 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,12 +1,12 @@
 require evas.inc
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
 		--enable-fb					\
-		--enable-directfb			\
-		--enable-sdl				\
+		--disable-directfb			\
+		--disable-sdl				\
 		--enable-buffer				\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\