summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-25 08:55:41 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-25 08:55:41 +0200
commitd25011ebad10a620a7f8fe09ef935c1957d5b68f (patch)
tree820187d87075bee64897cb286cd577ddde26a98d
parent32281c5a3377076b6b157b0afcc7f7935152a917 (diff)
Revert "evas: catch up with new upstream library names; bump version string"
This reverts commit 80c85e0af3865710a189ba536022d326fa996d26.
-rw-r--r--recipes/efl1/evas-native_svn.bb2
-rw-r--r--recipes/efl1/evas.inc29
-rw-r--r--recipes/efl1/evas_svn.bb2
3 files changed, 17 insertions, 16 deletions
diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb
index 4c1acbe02c..4a17942c78 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 libfribidi-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 daef8fdf74..d2a773805d 100644
--- a/recipes/efl1/evas.inc
+++ b/recipes/efl1/evas.inc
@@ -2,8 +2,9 @@ DESCRIPTION = "Evas is the Enlightenment canvas API"
LICENSE = "MIT BSD"
# can also depend on valgrind, libsdl-x11, directfb
DEPENDS = "eina eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig libfribidi"
-PV = "0.9.9.060+svnr${SRCREV}"
-PR = "r0"
+PV = "0.9.9.050+svnr${SRCREV}"
+PR = "r1"
+
# disable thumb mode for arm
ARM_INSTRUCTION_SET = "arm"
@@ -31,23 +32,23 @@ do_install_append() {
FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
-PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
+PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
RRECOMMENDS_${PN} = "\
- evas-engine-buffer \
- evas-engine-fb \
- evas-engine-software-generic \
- evas-engine-software-x11 \
- evas-engine-software-16 \
- evas-engine-software-16-x11 \
- evas-engine-xrender-x11 \
+ libevas-engine-buffer \
+ libevas-engine-fb \
+ libevas-engine-software-generic \
+ libevas-engine-software-x11 \
+ libevas-engine-software-16 \
+ libevas-engine-software-16-x11 \
+ libevas-engine-xrender-x11 \
\
- evas-loader-png \
- evas-loader-jpeg \
- evas-loader-eet \
+ libevas-loader-png \
+ libevas-loader-jpeg \
+ libevas-loader-eet \
"
# disabling this, since (due to OE bugs) it drags in whole Gtk+
#RRECOMMENDS_${PN} += "\
-# evas-loader-svg \
+# libevas-loader-svg \
#"
diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb
index 2094702f64..02d4cf446a 100644
--- a/recipes/efl1/evas_svn.bb
+++ b/recipes/efl1/evas_svn.bb
@@ -1,5 +1,5 @@
require evas.inc
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \