diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-04-14 15:58:17 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-14 15:58:17 +0200 |
| commit | 52b2c9f92fb3adbe5a0f01dac114e901e8272d65 (patch) | |
| tree | f1b71a37bdefa4c45ccdfae7ed1d3632dca051b9 /recipes/efl1 | |
| parent | 9f42f9491837260d09a11ce05638a383776e0451 (diff) | |
| parent | ff97dad855526c3b28d8064582a7eea4c31c0602 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/efl1')
| -rw-r--r-- | recipes/efl1/edje-native_svn.bb | 6 | ||||
| -rw-r--r-- | recipes/efl1/edje-sdk_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/efl1/edje_svn.bb | 3 | ||||
| -rw-r--r-- | recipes/efl1/elementary_svn.bb | 4 | ||||
| -rw-r--r-- | recipes/efl1/evas-native_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/efl1/evas.inc | 1 |
6 files changed, 11 insertions, 7 deletions
diff --git a/recipes/efl1/edje-native_svn.bb b/recipes/efl1/edje-native_svn.bb index 238bfd00dc..e7650cd639 100644 --- a/recipes/efl1/edje-native_svn.bb +++ b/recipes/efl1/edje-native_svn.bb @@ -1,11 +1,11 @@ require edje_${PV}.bb inherit native -PR = "r1" +PR = "r3" DEPENDS = "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 - sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's: cpp -I: /usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:\"gcc -I:\"/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } diff --git a/recipes/efl1/edje-sdk_svn.bb b/recipes/efl1/edje-sdk_svn.bb index 2bd75a0672..1733380c0b 100644 --- a/recipes/efl1/edje-sdk_svn.bb +++ b/recipes/efl1/edje-sdk_svn.bb @@ -1,7 +1,7 @@ require edje_svn.bb inherit sdk -PR = "r1" +PR = "r3" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-sdk', '')}" DEPENDS = "evas-native ecore-native eet-native embryo-native" diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb index 7cf257f62a..31d47e6fb8 100644 --- a/recipes/efl1/edje_svn.bb +++ b/recipes/efl1/edje_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.5.0.050+svnr${SRCREV}" -PR = "r1" +PR = "r3" inherit efl @@ -17,7 +17,6 @@ RRECOMMENDS_${PN}-utils = "\ libevas-saver-png \ libevas-saver-jpeg \ libevas-saver-eet \ - libevas-saver-tiff \ " DEBIAN_NOAUTONAME_${PN}-utils = "1" diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index 82a099f00d..13ca29543d 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -31,3 +31,7 @@ FILES_${PN}-tests = "\ ${datadir}/applications/* \ ${datadir}/icons/* \ " + +EXTRA_OECONF = "\ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ +" diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb index dbd03f5257..56723ca9ab 100644 --- a/recipes/efl1/evas-native_svn.bb +++ b/recipes/efl1/evas-native_svn.bb @@ -1,7 +1,7 @@ require evas.inc inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native eina-native" -PR = "r0" +PR = "r1" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc index ff7a184fb2..0fb01f31a7 100644 --- a/recipes/efl1/evas.inc +++ b/recipes/efl1/evas.inc @@ -3,6 +3,7 @@ LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb DEPENDS = "eina eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig" PV = "0.9.9.050+svnr${SRCREV}" +PR = "r1" # disable thumb mode for arm |