From 51f172ce530a7718c1cf628333ba0904120ea1e2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 26 Nov 2009 14:20:22 +0100
Subject: e17: bump SRCREV and start adapting it to new-style staging

---
 classes/efl.bbclass                  | 11 +++++++----
 conf/distro/include/sane-srcrevs.inc |  2 +-
 recipes/efl1/ecore_svn.bb            |  4 ++--
 recipes/efl1/evas-native_svn.bb      |  2 +-
 recipes/efl1/evas_svn.bb             |  1 -
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index d4c3baa9cf..900d9c7f0d 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -11,16 +11,19 @@ PE = "2"
 
 ARM_INSTRUCTION_SET = "arm"
 
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-# do NOT inherit pkgconfig here, see note in autotools_stage_all
 inherit autotools
 
+# evas-native looks at this var, so keep it
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
 do_configure_prepend() {
 	touch config.rpath
 }
 
-do_stage() {
-	autotools_stage_all
+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
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index ce988699db..cff2d4326e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -340,7 +340,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 ?= "43437"
+EFL_SRCREV ?= "43996"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb
index 5be2dc80f1..a6c519526a 100644
--- a/recipes/efl1/ecore_svn.bb
+++ b/recipes/efl1/ecore_svn.bb
@@ -1,5 +1,5 @@
 require ecore.inc
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://iconv.patch;patch=1 \
             file://exit_uclibc.patch;patch=1 \
@@ -27,7 +27,7 @@ EXTRA_OECONF = "\
   --disable-ecore-x-xcb \
   --disable-ecore-directfb \
   --disable-ecore-sdl \
-  --disable-ecore-evas-x11-gl \
+  --enable-ecore-evas-x11-gl \
   --disable-ecore-evas-dfb \
   --disable-ecore-evas-sdl \
   --disable-openssl \
diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb
index d3da6659d6..0cb192ca9f 100644
--- a/recipes/efl1/evas-native_svn.bb
+++ b/recipes/efl1/evas-native_svn.bb
@@ -63,7 +63,7 @@ EXTRA_OECONF = "\
 
 
 # evas needs a different oe_libinstall, so copy/paste autotools_stage_all
-do_stage() {
+do_oldstage() {
         rm -rf ${STAGE_TEMP}
         mkdir -p ${STAGE_TEMP}
         oe_runmake DESTDIR="${STAGE_TEMP}" install
diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb
index 21779818ca..b73d8155ba 100644
--- a/recipes/efl1/evas_svn.bb
+++ b/recipes/efl1/evas_svn.bb
@@ -19,7 +19,6 @@ EXTRA_OECONF = "\
 		--enable-software-x11		\
 		--enable-software-16-x11	\
 		--disable-software-xcb		\
-		--disable-gl-x11			\
 		--enable-xrender-x11		\
 		--disable-xrender-xcb		\
 		--disable-glitz-x11			\
-- 
cgit v1.2.3