From adf66c30a6946741462d0274aef624880fb40810 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 Sep 2009 14:51:07 +0200 Subject: [PATCH] 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 | 4 +++- recipes/efl1/ecore.inc | 5 +++++ recipes/efl1/edje-native_svn.bb | 2 +- recipes/efl1/edje_svn.bb | 13 ++++++++++++- 7 files changed, 27 insertions(+), 6 deletions(-) diff --git a/classes/e.bbclass b/classes/e.bbclass index a56cdff2e1..a6fa1d0d78 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -21,7 +21,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 9d24a0f337..22e664ce01 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -23,7 +23,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 00273b25e8..77acd4fdda 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -248,7 +248,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 ?= "41533" +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 7eac09618b..97426fb535 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -107,6 +107,7 @@ FILES_${PN} = "\ ${libdir}/enlightenment/utils/* \ ${libdir}/enlightenment/modules/*/*.* \ ${libdir}/enlightenment/modules/*/*/* \ + ${libdir}/enlightenment/*plugins/*/*/* \ ${libdir}/enlightenment/preload/e_precache.so \ ${datadir}/locale \ ${datadir}/enlightenment/data/icons \ @@ -152,13 +153,14 @@ 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} = "/etc/xdg/menus/applications.menu" +CONFFILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu" ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe" ALTERNATIVE_NAME = "x-window-manager" diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index facd7a231a..0ebddd56dc 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -8,6 +8,11 @@ PR = "r3" inherit efl +do_configure_prepend() { + touch ${S}/po/Makefile.in.in || true + sed -i -e 's: po::g' ${S}/Makefile.am +} + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" PACKAGES =+ "\ diff --git a/recipes/efl1/edje-native_svn.bb b/recipes/efl1/edje-native_svn.bb index e7650cd639..7b4b79a300 100644 --- a/recipes/efl1/edje-native_svn.bb +++ b/recipes/efl1/edje-native_svn.bb @@ -2,7 +2,7 @@ require edje_${PV}.bb inherit native PR = "r3" -DEPENDS = "evas-native ecore-native eet-native embryo-native" +DEPENDS = "lua5.1-native evas-native ecore-native eet-native embryo-native" do_configure_prepend() { sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb index 7f94b08256..bfd00ecb96 100644 --- a/recipes/efl1/edje_svn.bb +++ b/recipes/efl1/edje_svn.bb @@ -1,11 +1,22 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" -DEPENDS = "eet evas ecore embryo edje-native" +DEPENDS = "lua5.1 eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.9.92.060+svnr${SRCREV}" PR = "r4" 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" -- 2.39.2