18 files changed, 15 insertions, 4 deletions
diff --git a/packages/e17/e-modules_20050926.bb b/packages/e17/e-modules_20050926.bb
index 9ab3330c97..da6fd1f1a8 100644
--- a/packages/e17/e-modules_20050926.bb
+++ b/packages/e17/e-modules_20050926.bb
@@ -14,3 +14,7 @@ S = "${WORKDIR}/e_modules"
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
+
+do_compile_prepend() {
+        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+\ No newline at end of file
diff --git a/packages/e17/e-utils_20050926.bb b/packages/e17/e-utils_20051009.bb
index 4d0ba6fa73..4d0ba6fa73 100644
--- a/packages/e17/e-utils_20050926.bb
+++ b/packages/e17/e-utils_20051009.bb
diff --git a/packages/e17/e-wm_0.16.999.015.bb b/packages/e17/e-wm_0.16.999.018.bb
index c39b2ab9e1..c39b2ab9e1 100644
--- a/packages/e17/e-wm_0.16.999.015.bb
+++ b/packages/e17/e-wm_0.16.999.018.bb
diff --git a/packages/efl/e_0.16.999.015.bb b/packages/efl/e_0.16.999.018.bb
index 49b1b0b6bd..49b1b0b6bd 100644
--- a/packages/efl/e_0.16.999.015.bb
+++ b/packages/efl/e_0.16.999.018.bb
diff --git a/packages/efl/ecore-fb_0.9.9.015.bb b/packages/efl/ecore-fb_0.9.9.018.bb
index 1f3db9ddfe..a5a843aeb4 100644
--- a/packages/efl/ecore-fb_0.9.9.015.bb
+++ b/packages/efl/ecore-fb_0.9.9.018.bb
@@ -9,6 +9,7 @@ EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-evas \
 		--enable-ecore-evas-fb \
 		--disable-ecore-evas-x \
+		--disable-ecore-evas-xrender \
 		--disable-ecore-evas-gl \
 		--enable-ecore-con \
 		--enable-ecore-config \
diff --git a/packages/efl/ecore-native_0.9.9.015.bb b/packages/efl/ecore-native_0.9.9.018.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.015.bb
+++ b/packages/efl/ecore-native_0.9.9.018.bb
diff --git a/packages/efl/ecore-x11_0.9.9.015.bb b/packages/efl/ecore-x11_0.9.9.018.bb
index b6b452cb71..0927b59e03 100644
--- a/packages/efl/ecore-x11_0.9.9.015.bb
+++ b/packages/efl/ecore-x11_0.9.9.018.bb
@@ -2,6 +2,8 @@ include ecore.inc
 DEPENDS += "evas-x11"
 PR = "r2"
 
+SRC_URI += "file://evas-x11-include.patch;patch=1"
+
 EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-job \
 		--enable-ecore-file \
diff --git a/packages/efl/edje-native_0.5.0.015.bb b/packages/efl/edje-native_0.5.0.018.bb
index 523c38ba46..523c38ba46 100644
--- a/packages/efl/edje-native_0.5.0.015.bb
+++ b/packages/efl/edje-native_0.5.0.018.bb
diff --git a/packages/efl/edje_0.5.0.015.bb b/packages/efl/edje_0.5.0.018.bb
index 3c3a4fdcc7..3c3a4fdcc7 100644
--- a/packages/efl/edje_0.5.0.015.bb
+++ b/packages/efl/edje_0.5.0.018.bb
diff --git a/packages/efl/eet-native_0.9.10.015.bb b/packages/efl/eet-native_0.9.10.018.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.015.bb
+++ b/packages/efl/eet-native_0.9.10.018.bb
diff --git a/packages/efl/eet_0.9.10.015.bb b/packages/efl/eet_0.9.10.018.bb
index c0f89b1064..c0f89b1064 100644
--- a/packages/efl/eet_0.9.10.015.bb
+++ b/packages/efl/eet_0.9.10.018.bb
diff --git a/packages/efl/embryo-native_0.9.1.013.bb b/packages/efl/embryo-native_0.9.1.018.bb
index a33adb7bd2..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.013.bb
+++ b/packages/efl/embryo-native_0.9.1.018.bb
diff --git a/packages/efl/embryo_0.9.1.013.bb b/packages/efl/embryo_0.9.1.018.bb
index 1802da1bca..1802da1bca 100644
--- a/packages/efl/embryo_0.9.1.013.bb
+++ b/packages/efl/embryo_0.9.1.018.bb
diff --git a/packages/efl/evas-fb_0.9.9.015.bb b/packages/efl/evas-fb_0.9.9.019.bb
index 492a0badb1..b0c9d5bdb6 100644
--- a/packages/efl/evas-fb_0.9.9.015.bb
+++ b/packages/efl/evas-fb_0.9.9.019.bb
@@ -8,6 +8,7 @@ EXTRA_OECONF = "--enable-fb         \
 		--disable-software-qtopia   \
 		--disable-software-x11      \
 		--disable-gl-x11            \
+		--disable-xrender-x11       \
 		--enable-image-loader-eet   \
 		--disable-image-loader-edb  \
 		--enable-image-loader-png   \
diff --git a/packages/efl/evas-native_0.9.9.015.bb b/packages/efl/evas-native_0.9.9.019.bb
index 60bf7f6ae5..60bf7f6ae5 100644
--- a/packages/efl/evas-native_0.9.9.015.bb
+++ b/packages/efl/evas-native_0.9.9.019.bb
diff --git a/packages/efl/evas-x11_0.9.9.015.bb b/packages/efl/evas-x11_0.9.9.019.bb
index 68b0c1c860..75a080a26c 100644
--- a/packages/efl/evas-x11_0.9.9.015.bb
+++ b/packages/efl/evas-x11_0.9.9.019.bb
@@ -45,6 +45,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--disable-convert-32-rgb-rot-270"
 
 headers = "Evas_Engine_Software_X11.h \
+           Evas_Engine_XRender_X11.h \
            Evas_Engine_Buffer.h \
            Evas_Engine_FB.h \
            Evas.h"
diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb
index 594e5b3f62..e8a20804a1 100644
--- a/packages/meta/meta-e-x11-core.bb
+++ b/packages/meta/meta-e-x11-core.bb
@@ -6,6 +6,8 @@ PR = "r6"
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
 
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11"
+
 ALLOW_EMPTY = 1
 
 #
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index cb375fe9d7..4a4c2c6b63 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -8,8 +8,8 @@ FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
 
 ALLOW_EMPTY = 1
 
-DEPENDS              = "task-e-x11-core entice eclair examine evidence e-modules e-utils"
-# elitaire
-RDEPENDS_task-e-x11  = "task-e-x11-core entice eclair examine evidence e-modules e-utils"
-# elitaire
+DEPENDS              = "task-e-x11-core entice eclair examine evidence e-modules"
+# e-utils elitaire
+RDEPENDS_task-e-x11  = "task-e-x11-core entice eclair examine evidence e-modules"
+# e-utils elitaire