diff options
67 files changed, 363 insertions, 277 deletions
diff --git a/meta-efl/conf/distro/include/efl-from-svn.inc b/meta-efl/conf/distro/include/efl-from-svn.inc index 03f203c..b2d27fa 100644 --- a/meta-efl/conf/distro/include/efl-from-svn.inc +++ b/meta-efl/conf/distro/include/efl-from-svn.inc @@ -1,10 +1,14 @@ -EFL_PREFERRED_VERSION ?= "1.1.%" +EFL_PREFERRED_VERSION ?= "1.2.0+svn%" +EFL_PREFERRED_VERSION_1.0 ?= "1.0.0+svn%" +EFL_PREFERRED_VERSION_EET ?= "1.6.0+svn%" + PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_edbus ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_edbus-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_edje ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_edje-native ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_edje-nativesdk ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_eeze ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_eeze-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_efreet ?= "${EFL_PREFERRED_VERSION}" @@ -17,5 +21,12 @@ PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_evas-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_expedite ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_expedite-native ?= "${EFL_PREFERRED_VERSION}" -PREFERRED_VERSION_eet ?= "1.5.%" -PREFERRED_VERSION_eet-native ?= "1.5%" + +PREFERRED_VERSION_eet ?= "${EFL_PREFERRED_VERSION_EET}" +PREFERRED_VERSION_eet-native ?= "${EFL_PREFERRED_VERSION_EET}" + +PREFERRED_VERSION_eio ?= "${EFL_PREFERRED_VERSION_1.0}" +PREFERRED_VERSION_eio-native ?= "${EFL_PREFERRED_VERSION_1.0}" +PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION_1.0}" +PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION_1.0}" +PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION_1.0}" diff --git a/meta-efl/recipes-efl/e17/e-module.inc b/meta-efl/recipes-efl/e17/e-module.inc index 97081aa..2c1706e 100644 --- a/meta-efl/recipes-efl/e17/e-module.inc +++ b/meta-efl/recipes-efl/e17/e-module.inc @@ -3,7 +3,7 @@ SECTION = "x11/multimedia" DEPENDS = "e-wm" SRCREV = "${EFL_SRCREV}" -INC_PR = "r5" +INC_PR = "r0" SRCNAME = "E-MODULES-EXTRA/${PN}" diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb index d5d87e5..038a19f 100644 --- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb @@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454 SRCREV = "${EFL_SRCREV}" PV = "0.0+svnr${SRCPV}" -PR = "r1" inherit e-base allarch diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index ec921af..dd62eeb 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -4,7 +4,6 @@ LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r24" SRCREV = "${EFL_SRCREV}" inherit e update-alternatives gettext diff --git a/meta-efl/recipes-efl/e17/edje-viewer_svn.bb b/meta-efl/recipes-efl/e17/edje-viewer_svn.bb index 3056540..f59cbb1 100644 --- a/meta-efl/recipes-efl/e17/edje-viewer_svn.bb +++ b/meta-efl/recipes-efl/e17/edje-viewer_svn.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Edje_Viewer is just that." LICENSE = "MIT BSD" DEPENDS = "elementary" PV = "0.0.0+svnr${SRCPV}" -PR = "r3" SRCREV = "${EFL_SRCREV}" inherit e diff --git a/meta-efl/recipes-efl/e17/elementary-alarm_svn.bb b/meta-efl/recipes-efl/e17/elementary-alarm_svn.bb index c930a0c..e25ced6 100644 --- a/meta-efl/recipes-efl/e17/elementary-alarm_svn.bb +++ b/meta-efl/recipes-efl/e17/elementary-alarm_svn.bb @@ -3,7 +3,6 @@ LICENSE = "GPL" DEPENDS = "elementary" SECTION = "x11" PV = "0.0.0+svnr${SRCPV}" -PR = "r2" SRCREV = "${EFL_SRCREV}" inherit e diff --git a/meta-efl/recipes-efl/e17/elfe_svn.bb b/meta-efl/recipes-efl/e17/elfe_svn.bb index 5206e24..33b8d05 100644 --- a/meta-efl/recipes-efl/e17/elfe_svn.bb +++ b/meta-efl/recipes-efl/e17/elfe_svn.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" PV = "0.0.1+svnr${SRCPV}" -PR = "${INC_PR}.3" +PR = "${INC_PR}.0" require e-module.inc diff --git a/meta-efl/recipes-efl/e17/elmdentica_svn.bb b/meta-efl/recipes-efl/e17/elmdentica_svn.bb index 013a7de..5235dee 100644 --- a/meta-efl/recipes-efl/e17/elmdentica_svn.bb +++ b/meta-efl/recipes-efl/e17/elmdentica_svn.bb @@ -12,7 +12,6 @@ S = "${WORKDIR}/${SRCNAME}" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" PV = "0.9.9+svnr${SRCPV}" -PR = "r3" SRCREV = "${EFL_SRCREV}" RDEPENDS_${PN} = "${PN}-themes" diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb index 8f701a3..e1facd7 100644 --- a/meta-efl/recipes-efl/e17/enjoy_svn.bb +++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0f507c68d42d1cc0fcb507d007112bf2" DEPENDS = "evas ecore edje elementary emotion lightmediascanner" SRCREV = "${EFL_SRCREV}" PV = "0.0+svnr${SRCPV}" -PR = "r4" DEPENDS += "gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb index 1111553..9806d4f 100644 --- a/meta-efl/recipes-efl/e17/eve_svn.bb +++ b/meta-efl/recipes-efl/e17/eve_svn.bb @@ -3,7 +3,6 @@ LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" DEPENDS = "evas ecore edje elementary webkit-efl" PV = "0.3.0.0+svnr${SRCPV}" -PR = "r3" SRCREV = "${EFL_SRCREV}" inherit e gettext diff --git a/meta-efl/recipes-efl/e17/exalt_svn.bb b/meta-efl/recipes-efl/e17/exalt_svn.bb index 712204f..06fb5bd 100644 --- a/meta-efl/recipes-efl/e17/exalt_svn.bb +++ b/meta-efl/recipes-efl/e17/exalt_svn.bb @@ -7,7 +7,6 @@ RDEPENDS_${PN} = "vpnc wpa-supplicant" PV = "0.9+svnr${SRCPV}" SRCREV = "${EFL_SRCREV}" -PR = "r1" inherit e SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep" diff --git a/meta-efl/recipes-efl/e17/expedite.inc b/meta-efl/recipes-efl/e17/expedite.inc new file mode 100644 index 0000000..f529963 --- /dev/null +++ b/meta-efl/recipes-efl/e17/expedite.inc @@ -0,0 +1,27 @@ +DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" +DEPENDS = "eet evas" +LICENSE = "MIT BSD" + +INC_PR = "r0" + +inherit e + +EXTRA_OECONF = "\ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ +\ + --disable-opengl-glew \ + --enable-software-x11 \ + --enable-xrender-x11 \ + --enable-software-16-x11 \ + --enable-opengl-x11 \ + --enable-fb \ + --disable-software-ddraw \ + --disable-software-16-ddraw \ + --disable-direct3d \ + --disable-software-sdl \ +" + +FILES_${PN} += "${datadir}" +RDEPENDS_${PN} = "expedite-themes evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-engine-gl-x11 evas-loader-png" diff --git a/meta-efl/recipes-efl/e17/expedite_1.2.0.bb b/meta-efl/recipes-efl/e17/expedite_1.2.0.bb new file mode 100644 index 0000000..c3890ff --- /dev/null +++ b/meta-efl/recipes-efl/e17/expedite_1.2.0.bb @@ -0,0 +1,10 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "e9dfdf3dc35fdbec189914e3960c9949" +SRC_URI[sha256sum] = "533b18a823c8e417bd3b04db8d4f3ad7dcb4596e14397e38dd1788d39d98fe3d" diff --git a/meta-efl/recipes-efl/e17/expedite_svn.bb b/meta-efl/recipes-efl/e17/expedite_svn.bb index e6dc051..f238d06 100644 --- a/meta-efl/recipes-efl/e17/expedite_svn.bb +++ b/meta-efl/recipes-efl/e17/expedite_svn.bb @@ -1,32 +1,11 @@ -DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" -DEPENDS = "eet evas" -LICENSE = "MIT BSD" +require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.1.0+svnr${SRCPV}" -PR = "r1" +PV = "1.2.0+svnr${SRCPV}" +PR = "${INC_PR}.0" +DEFAULT_PREFERENCE = "-1" -inherit e -SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep" -S = "${WORKDIR}/${SRCNAME}" - -EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ -\ - --disable-opengl-glew \ - --enable-software-x11 \ - --enable-xrender-x11 \ - --enable-software-16-x11 \ - --enable-opengl-x11 \ - --enable-fb \ - --disable-software-ddraw \ - --disable-software-16-ddraw \ - --disable-direct3d \ - --disable-software-sdl \ +SRC_URI = "\ + ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \ " - -FILES_${PN} += "${datadir}" -RDEPENDS_${PN} = "expedite-themes evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-engine-gl-x11 evas-loader-png" - +S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb index 5dabea2..ecb53cc 100644 --- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb +++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454 SECTION = "x11" DEPENDS = "edje-native" PV = "1.0+svnr${SRCPV}" -PR = "r7" SRCREV = "${EFL_SRCREV}" inherit e-base update-alternatives allarch diff --git a/meta-efl/recipes-efl/e17/exquisite_svn.bb b/meta-efl/recipes-efl/e17/exquisite_svn.bb index fcfb65c..a13a300 100644 --- a/meta-efl/recipes-efl/e17/exquisite_svn.bb +++ b/meta-efl/recipes-efl/e17/exquisite_svn.bb @@ -2,7 +2,6 @@ DESCRIPTION = "A psplash replacement for display" LICENSE = "MIT BSD" DEPENDS = "eet evas ecore embryo edje" PV = "0.0.1+svnr${SRCPV}" -PR = "r11" SRCREV = "${EFL_SRCREV}" RRECOMMENDS_${PN} = "exquisite-themes" RCONFLICTS_${PN} = "psplash virtual-psplash" diff --git a/meta-efl/recipes-efl/e17/places_svn.bb b/meta-efl/recipes-efl/e17/places_svn.bb index 103d720..5c19933 100644 --- a/meta-efl/recipes-efl/e17/places_svn.bb +++ b/meta-efl/recipes-efl/e17/places_svn.bb @@ -2,7 +2,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" PV = "0.1.0+svnr${SRCPV}" -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" require e-module.inc diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb b/meta-efl/recipes-efl/e17/screenshot_svn.bb index 0d096fe..465ffcf 100644 --- a/meta-efl/recipes-efl/e17/screenshot_svn.bb +++ b/meta-efl/recipes-efl/e17/screenshot_svn.bb @@ -1,6 +1,6 @@ LICENSE = "MIT" PV = "0.3.0+svnr${SRCREV}" -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" SRC_URI += "file://screenshot-fix-mkinstalldirs.patch" diff --git a/meta-efl/recipes-efl/e17/waker_svn.bb b/meta-efl/recipes-efl/e17/waker_svn.bb index 72ce92a..9eb58fc 100644 --- a/meta-efl/recipes-efl/e17/waker_svn.bb +++ b/meta-efl/recipes-efl/e17/waker_svn.bb @@ -3,7 +3,6 @@ LICENSE = "LGPL" DEPENDS = "ecore edbus" SECTION = "console" PV = "0.0.0+svnr${SRCPV}" -PR = "r1" SRCREV = "${EFL_SRCREV}" inherit efl diff --git a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb b/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb index bfab3c9..6247523 100644 --- a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb +++ b/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb @@ -3,7 +3,6 @@ SECTION = "x11/data" SRCREV = "38fdd9bb0d8296e984bb6443466801eea6f62f00" PV = "1.0+gitr${SRCPV}" PE = "1" -PR = "r0" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2" diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc index 85e0204..bc4758a 100644 --- a/meta-efl/recipes-efl/efl/ecore.inc +++ b/meta-efl/recipes-efl/efl/ecore.inc @@ -10,7 +10,7 @@ DEPENDS_virtclass-native = "eet-native evas-native gettext-native" inherit efl gettext BBCLASSEXTEND = "native" -INC_PR = "r1" +INC_PR = "r0" do_configure_prepend() { touch ${S}/po/Makefile.in.in || true @@ -39,24 +39,6 @@ PACKAGES =+ "\ # 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.* \ ${bindir} \ " diff --git a/meta-efl/recipes-efl/efl/ecore_1.2.0.bb b/meta-efl/recipes-efl/efl/ecore_1.2.0.bb new file mode 100644 index 0000000..39c58d7 --- /dev/null +++ b/meta-efl/recipes-efl/efl/ecore_1.2.0.bb @@ -0,0 +1,11 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ + file://fix-ecore-fb-initialization.patch \ +" + +SRC_URI[md5sum] = "64362b8ab96776a5868db4e6a8919926" +SRC_URI[sha256sum] = "97c0f07180fcf7dec6ce39893b206ff069109ef4569ea6be2fdbb2e05f029aa9" diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb index 078310a..f0e8811 100644 --- a/meta-efl/recipes-efl/efl/ecore_svn.bb +++ b/meta-efl/recipes-efl/efl/ecore_svn.bb @@ -1,8 +1,8 @@ -require ecore.inc +require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.1.0+svnr${SRCPV}" -PR = "${INC_PR}.1" +PV = "1.2.0+svnr${SRCPV}" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" SRC_URI = "\ diff --git a/meta-efl/recipes-efl/efl/edb_svn.bb b/meta-efl/recipes-efl/efl/edb_svn.bb index 8b2338a..3ff9d3c 100644 --- a/meta-efl/recipes-efl/efl/edb_svn.bb +++ b/meta-efl/recipes-efl/efl/edb_svn.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Edb is the Enlightenme |