summaryrefslogtreecommitdiff
path: root/recipes/efl1
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-06-03 22:28:10 +0200
committerKoen Kooi <koen@Powerbook-3.local>2009-06-05 17:48:10 +0200
commit17bbd23a96b310ef8e2842331a6355228f6c440b (patch)
tree035eb1bea883525d49ee74b1491dec97a0e4e2d1 /recipes/efl1
parent160616d5f2a57ba828ed5ec06e37fc1cd4713af7 (diff)
enlightenment: bump SRCREV in anticipation of new snapshot coming friday * systray is now part of e-wm, so adjust metadata * use lib-glibc override now it exists * fix upgrade paths for eina * fix upgrade paths for evas * fix upgrade paths for edje
Diffstat (limited to 'recipes/efl1')
-rw-r--r--recipes/efl1/edje_svn.bb6
-rw-r--r--recipes/efl1/eina_svn.bb5
-rw-r--r--recipes/efl1/evas.inc54
3 files changed, 50 insertions, 15 deletions
diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb
index 31d47e6fb8..9b8bc6a452 100644
--- a/recipes/efl1/edje_svn.bb
+++ b/recipes/efl1/edje_svn.bb
@@ -14,9 +14,9 @@ PACKAGES =+ "${PN}-utils"
RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests"
RRECOMMENDS_${PN}-utils = "\
- libevas-saver-png \
- libevas-saver-jpeg \
- libevas-saver-eet \
+ evas-saver-png \
+ evas-saver-jpeg \
+ evas-saver-eet \
"
DEBIAN_NOAUTONAME_${PN}-utils = "1"
diff --git a/recipes/efl1/eina_svn.bb b/recipes/efl1/eina_svn.bb
index f38c4c5b36..4baa03b297 100644
--- a/recipes/efl1/eina_svn.bb
+++ b/recipes/efl1/eina_svn.bb
@@ -5,4 +5,9 @@ PR = "r0"
inherit efl
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libeina-ver-pre-svn-00-0 libeina-ver-pre-svn-01-0"
+
FILES_${PN} += "${libdir}/eina"
diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc
index 9561cfedc6..d52a749999 100644
--- a/recipes/efl1/evas.inc
+++ b/recipes/efl1/evas.inc
@@ -20,7 +20,7 @@ python populate_packages_prepend () {
basedir = bb.data.expand( '${libdir}/evas/modules/%s' % plugin_type, d )
do_split_packages(d, basedir, '^(.*)',
- output_pattern = 'libevas-' + plugin_type[:-1] + "-%s",
+ output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
description = 'Evas module %s',
allow_dirs=True, recursive=False, extra_depends="" )
}
@@ -32,22 +32,52 @@ do_install_append() {
FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
-PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
+PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
RRECOMMENDS_${PN} = "\
- 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-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-loader-png \
- libevas-loader-jpeg \
- libevas-loader-eet \
+ evas-loader-png \
+ evas-loader-jpeg \
+ evas-loader-eet \
"
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0"
+
+RREPLACES_${PN}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests"
+
+RREPLACES_evas-loader-pmaps = "liblibevas-ver-pre-svn-00-loader-pmaps libevas-ver-pre-svn-00-loader-pmaps "
+RREPLACES_evas-loader-eet = "liblibevas-ver-pre-svn-00-loader-eet libevas-ver-pre-svn-00-loader-eet "
+RREPLACES_evas-loader-jpeg = "liblibevas-ver-pre-svn-00-loader-jpeg libevas-ver-pre-svn-00-loader-jpeg "
+RREPLACES_evas-loader-tiff = "liblibevas-ver-pre-svn-00-loader-tiff libevas-ver-pre-svn-00-loader-tiff "
+RREPLACES_evas-loader-png = "liblibevas-ver-pre-svn-00-loader-png libevas-ver-pre-svn-00-loader-png "
+RREPLACES_evas-loader-xpm = "liblibevas-ver-pre-svn-00-loader-xpm libevas-ver-pre-svn-00-loader-xpm "
+
+RREPLACES_evas-saver-pmaps = "liblibevas-ver-pre-svn-00-saver-pmaps libevas-ver-pre-svn-00-saver-pmaps "
+RREPLACES_evas-saver-eet = "liblibevas-ver-pre-svn-00-saver-eet libevas-ver-pre-svn-00-saver-eet "
+RREPLACES_evas-saver-jpeg = "liblibevas-ver-pre-svn-00-saver-jpeg libevas-ver-pre-svn-00-saver-jpeg "
+RREPLACES_evas-saver-tiff = "liblibevas-ver-pre-svn-00-saver-tiff libevas-ver-pre-svn-00-saver-tiff "
+RREPLACES_evas-saver-png = "liblibevas-ver-pre-svn-00-saver-png libevas-ver-pre-svn-00-saver-png "
+RREPLACES_evas-saver-xpm = "liblibevas-ver-pre-svn-00-saver-xpm libevas-ver-pre-svn-00-saver-xpm "
+
+RREPLACES_evas-engine-fb = "liblibevas-ver-pre-svn-00-engine-fb libevas-ver-pre-svn-00-engine-fb "
+RREPLACES_evas-engine-software-generic = "liblibevas-ver-pre-svn-00-engine-software-generic libevas-ver-pre-svn-00-engine-software-generic "
+RREPLACES_evas-engine-software-16 = "liblibevas-ver-pre-svn-00-engine-software-16 libevas-ver-pre-svn-00-engine-software-16 "
+RREPLACES_evas-engine-buffer = "liblibevas-ver-pre-svn-00-engine-buffer libevas-ver-pre-svn-00-engine-buffer "
+RREPLACES_evas-engine-xrender-x11 = "liblibevas-ver-pre-svn-00-engine-xrender-x11 libevas-ver-pre-svn-00-engine-xrender-x11 "
+RREPLACES_evas-engine-software-x11 = "liblibevas-ver-pre-svn-00-engine-software-x11 libevas-ver-pre-svn-00-engine-software-x11 "
+
+
+
# disabling this, since (due to OE bugs) it drags in whole Gtk+
#RRECOMMENDS_${PN} += "\
# libevas-loader-svg \