[oe-commits] Koen Kooi : enlightenment: bump SRCREV

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: fb743b5c3bea3fb09d18d9bc7360871bde7c0a36
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fb743b5c3bea3fb09d18d9bc7360871bde7c0a36

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Sep 24 14:51:07 2009 +0200

enlightenment: bump SRCREV

* runtime tested on angstrom/beagleboard
* upgrade paths intact and working

---

 classes/e.bbclass                    |    4 +++-
 classes/efl.bbclass                  |    3 ++-
 conf/distro/include/sane-srcrevs.inc |    2 +-
 recipes/e17/e-wm_svn.bb              |    8 ++++++++
 recipes/efl1/edje_svn.bb             |   11 +++++++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 360caf4..33fec8d 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -27,7 +27,9 @@ do_configure_append() {
 export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
 export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib"
+# This construction is stupid, someone with more E knowledge should change it to =+ or something
+# And it's in efl.bbclass as well....
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
 FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index ed9faa9..c9a85b2 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -26,7 +26,8 @@ do_stage() {
 	autotools_stage_all
 }
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests"
+# This construction is stupid, someone with more E knowledge should change it to =+ or something
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests"
 
 FILES_${PN} = "${libdir}/*.so.*"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b5763a3..79c2fcd 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -243,7 +243,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 ?= "40567"
+EFL_SRCREV ?= "42645"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index d06acbf..cac1966 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -115,6 +115,8 @@ FILES_${PN} = "\
   ${bindir}/* \
   ${libdir}/enlightenment/modules/*/*.* \
   ${libdir}/enlightenment/modules/*/*/* \
+  ${libdir}/enlightenment/*plugins/*/*/* \
+  ${libdir}/enlightenment/preload/e_precache.so \
   ${datadir}/locale \
   ${datadir}/enlightenment/data/icons \
   ${datadir}/enlightenment/data/input_methods \
@@ -154,6 +156,12 @@ RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default"
 FILES_${PN}-dbg += "\
   ${libdir}/enlightenment/modules/*/*/.debug/ \
   ${libdir}/enlightenment/preload/.debug/ \
+  ${libdir}/enlightenment/utils/.debug/ \
+  ${libdir}/enlightenment/*plugins/*/*/.debug \
+"
+
+FILES_${PN}-doc += "\
+  ${datadir}/enlightenment/doc \
 "
 CONFFILES_${PN}-menu = "/etc/xdg/menus/applications.menu"
 CONFFILES_${PN}-sysactions = "/etc/enlightenment/sysactions.conf"
diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb
index d38100a..3751995 100644
--- a/recipes/efl1/edje_svn.bb
+++ b/recipes/efl1/edje_svn.bb
@@ -6,6 +6,17 @@ PR = "r2"
 
 inherit efl
 
+# The new lua stuff is a bit broken...
+do_configure_append() {
+	for i in $(find "${S}" -name "Makefile") ; do
+		sed -i -e 's:-L/usr/local/lib::g'  $i
+	done
+}
+
+do_compile_append() {
+	sed -i -e s:local/::g -e 's:-L${STAGING_LIBDIR}::g' ${S}/edje.pc
+}
+
 # gain some extra performance at the expense of RAM - generally i'd say bad
 # and a possible source of bugs
 #EXTRA_OECONF = "--enable-edje-program-cache"