diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | recipes/efl1/ecore.inc | 24 | ||||
| -rw-r--r-- | recipes/efl1/edje_svn.bb | 7 | ||||
| -rw-r--r-- | recipes/efl1/embryo_svn.bb | 11 |
4 files changed, 39 insertions, 5 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b6da1cc1e8..28e41d16b1 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -268,7 +268,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "41038" +EFL_SRCREV ?= "41533" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index 1e639fc342..facd7a231a 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -27,6 +27,27 @@ PACKAGES =+ "\ ${PN}-x \ ${PN}-input \ " +# Some upgrade path tweaking +AUTO_LIBNAME_PKGS = "" + +RREPLACES_${PN} = "libecore-ver-pre-svn-00-0 libecore-ver-pre-svn-01-0" +REPLACES_${PN}-tests = "libecore-ver-pre-svn-01-tests" +RREPLACES_${PN}-con = "libecore-ver-pre-svn-01-con libecore-con-ver-pre-svn-01-0" +RREPLACES_${PN}-config = "libecore-config-ver-pre-svn-01-0" +RREPLACES_${PN}-desktop = "libecore-desktop-ver-pre-svn-01-0" +RREPLACES_${PN}-directfb = "libecore-directfb-ver-pre-svn-01-0" +RREPLACES_${PN}-sdl = "libecore-sdl-ver-pre-svn-01-0" +RREPLACES_${PN}-evas = "libecore-evas-ver-pre-svn-01-0" +RREPLACES_${PN}-fb = "libecore-fb-ver-pre-svn-01-0" +RREPLACES_${PN}-file = "libecore-file-ver-pre-svn-01-0" +RREPLACES_${PN}-imf-evas = "libecore-imf-evas-ver-pre-svn-01-0" +RREPLACES_${PN}-imf = "libecore-imf-ver-pre-svn-01-0" +RREPLACES_${PN}-ipc = "libecore-ipc-ver-pre-svn-01-0" +RREPLACES_${PN}-job = "libecore-job-ver-pre-svn-01-0" +RREPLACES_${PN}-txt = "libecore-txt-ver-pre-svn-01-0" +RREPLACES_${PN}-x = "libecore-x-ver-pre-svn-01-0" +RREPLACES_${PN}-input = "libecore-input-ver-pre-svn-01-0" + FILES_${PN} = "${libdir}/libecore*.so.*" FILES_${PN}-con = "${libdir}/libecore_con*.so.*" FILES_${PN}-config = "${libdir}/libecore_config*.so.*" @@ -43,3 +64,6 @@ FILES_${PN}-job = "${libdir}/libecore_job*.so.*" FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*" FILES_${PN}-x = "${libdir}/libecore_x*.so.*" FILES_${PN}-input = "${libdir}/libecore_input*.so.*" + + + diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb index 2509c859c7..7f94b08256 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.9.92.060+svnr${SRCREV}" -PR = "r3" +PR = "r4" inherit efl @@ -20,6 +20,11 @@ RRECOMMENDS_${PN}-utils = "\ " DEBIAN_NOAUTONAME_${PN}-utils = "1" +# Some upgrade path tweaking +AUTO_LIBNAME_PKGS = "" + +RREPLACES_${PN} = "libedje-ver-pre-svn-00-0 libedje-ver-pre-svn-01-0" + FILES_${PN}-utils = "\ ${bindir}/edje_* \ ${datadir}/edje/include/edje.inc \ diff --git a/recipes/efl1/embryo_svn.bb b/recipes/efl1/embryo_svn.bb index aeceb5abe4..222d85a7cb 100644 --- a/recipes/efl1/embryo_svn.bb +++ b/recipes/efl1/embryo_svn.bb @@ -1,9 +1,14 @@ DESCRIPTION = "The Enlightenment C-like scripting language for Edje" LICENSE = "MIT BSD" PV = "0.9.9.060+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl -# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug -#FULL_OPTIMIZATION_arm =+ "-O0" +# Some upgrade path tweaking +AUTO_LIBNAME_PKGS = "" + +RREPLACES_${PN} = "libembryo-ver-pre-svn-00-0 libembryo-ver-pre-svn-01-0" + +RREPLACES_${PN}-tests = "libembryo-ver-pre-svn-00-tests libembryo-ver-pre-svn-01-tests" + |