From 2a4de1a544ef16e581d41965107bc9d84cd387bb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 19 Jul 2012 11:53:45 +0200 Subject: [PATCH 01/52] meta-efl: unify tabs/spaces usage Signed-off-by: Martin Jansa --- meta-efl/classes/e.bbclass | 4 +-- meta-efl/classes/efl.bbclass | 8 ++--- .../recipes-devtools/python/python-efl.inc | 30 +++++++++---------- .../e17/e-wm-theme-illume-efenniht_svn.bb | 6 ++-- .../recipes-efl/e17/e-wm/applications.menu | 6 ++-- meta-efl/recipes-efl/e17/e-wm_svn.bb | 2 +- meta-efl/recipes-efl/e17/enjoy_svn.bb | 10 +++---- meta-efl/recipes-efl/e17/exalt-client_svn.bb | 4 +-- meta-efl/recipes-efl/e17/exalt_svn.bb | 12 ++++---- .../e17/illume-keyboards-shr_git.bb | 4 +-- meta-efl/recipes-efl/e17/news_svn.bb | 4 +-- meta-efl/recipes-efl/e17/places_svn.bb | 2 +- meta-efl/recipes-efl/e17/rain_svn.bb | 4 +-- meta-efl/recipes-efl/e17/screenshot_svn.bb | 2 +- meta-efl/recipes-efl/efl/ecore.inc | 4 +-- meta-efl/recipes-efl/efl/edje-fpu.inc | 6 ++-- meta-efl/recipes-efl/efl/edje.inc | 14 ++++----- .../efl/elementary-theme-efenniht_svn.bb | 6 ++-- meta-efl/recipes-efl/efl/imlib2_svn.bb | 4 +-- 19 files changed, 66 insertions(+), 66 deletions(-) diff --git a/meta-efl/classes/e.bbclass b/meta-efl/classes/e.bbclass index 375f914752..4bcc2bc7e1 100644 --- a/meta-efl/classes/e.bbclass +++ b/meta-efl/classes/e.bbclass @@ -3,12 +3,12 @@ SECTION = "e/apps" inherit e-base autotools pkgconfig binconfig do_prepsources () { - make clean distclean || true + make clean distclean || true } addtask prepsources after do_patch before do_configure do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config" diff --git a/meta-efl/classes/efl.bbclass b/meta-efl/classes/efl.bbclass index 792343b695..7cf8556746 100644 --- a/meta-efl/classes/efl.bbclass +++ b/meta-efl/classes/efl.bbclass @@ -10,13 +10,13 @@ inherit e-base autotools # evas-native looks at this var, so keep it do_configure_prepend() { - autopoint || touch config.rpath + autopoint || touch config.rpath } do_install_prepend () { - for i in `find ${S}/ -name "*.pc" -type f` ; do \ - sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i - done + for i in `find ${S}/ -name "*.pc" -type f` ; do \ + sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i + done } PACKAGES =+ "${PN}-themes" diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc index 6ca5e3f7f4..a4df6a6952 100644 --- a/meta-efl/recipes-devtools/python/python-efl.inc +++ b/meta-efl/recipes-devtools/python/python-efl.inc @@ -20,24 +20,24 @@ S = "${WORKDIR}/${SRCNAME}" do_configure_prepend() { - # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly - sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac + # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly + sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac } do_install_append() { - if [ -e examples ]; then - for i in `find examples -name "*.edc"`; do - cd ${S}/`dirname $i` - echo "Generating .edj file for $i..." - edje_cc `basename $i` - echo "Removing sources in this directory..." - rm -f *.edc *.png *.ttf *.jpeg - done - cd ${S} - install -d ${D}${datadir}/${PN}/ - cp -a examples ${D}${datadir}/${PN}/ - find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf - fi + if [ -e examples ]; then + for i in `find examples -name "*.edc"`; do + cd ${S}/`dirname $i` + echo "Generating .edj file for $i..." + edje_cc `basename $i` + echo "Removing sources in this directory..." + rm -f *.edc *.png *.ttf *.jpeg + done + cd ${S} + install -d ${D}${datadir}/${PN}/ + cp -a examples ${D}${datadir}/${PN}/ + find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf + fi } FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug" 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 5ff068143d..1bf5f1de09 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 @@ -24,12 +24,12 @@ SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http \ S = "${WORKDIR}/${SRCNAME}" do_compile() { - ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images ${S}/efenniht.edc -o ${S}/efenniht.edj + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images ${S}/efenniht.edc -o ${S}/efenniht.edj } do_install() { - install -d ${D}${datadir}/enlightenment/data/themes/ - install -m 0644 ${S}/efenniht.edj ${D}${datadir}/enlightenment/data/themes/ + install -d ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/efenniht.edj ${D}${datadir}/enlightenment/data/themes/ } FILES_${PN} = "${datadir}/enlightenment/data/themes/" diff --git a/meta-efl/recipes-efl/e17/e-wm/applications.menu b/meta-efl/recipes-efl/e17/e-wm/applications.menu index 77c6f0429c..ed9b906621 100644 --- a/meta-efl/recipes-efl/e17/e-wm/applications.menu +++ b/meta-efl/recipes-efl/e17/e-wm/applications.menu @@ -85,10 +85,10 @@ Accessories.directory - + Applications - Utility - + Utility + System Office diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index 6f5fab1410..7cc21675df 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -25,7 +25,7 @@ EXTRA_OECONF = "\ " do_configure_prepend() { - autopoint || true + autopoint || true } do_install_append() { diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb index 81be734a73..470f03d88c 100644 --- a/meta-efl/recipes-efl/e17/enjoy_svn.bb +++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb @@ -35,9 +35,9 @@ do_configure_prepend() { } pkg_postinst_${PN} () { - echo "enjoy: SCAN and LIBRARY MANAGER are not implemeted yet!" - echo "enjoy: Meanwhile please run:" - echo "enjoy: test-lms -m mono -p id3 -i 5000 -s /path/to/your/music/dir /home/root/.config/enjoy/media.db" - echo "enjoy:" - echo "enjoy: Use test-lms -P to see available formats that can be scanned" + echo "enjoy: SCAN and LIBRARY MANAGER are not implemeted yet!" + echo "enjoy: Meanwhile please run:" + echo "enjoy: test-lms -m mono -p id3 -i 5000 -s /path/to/your/music/dir /home/root/.config/enjoy/media.db" + echo "enjoy:" + echo "enjoy: Use test-lms -P to see available formats that can be scanned" } diff --git a/meta-efl/recipes-efl/e17/exalt-client_svn.bb b/meta-efl/recipes-efl/e17/exalt-client_svn.bb index c5219b7be2..49389006a8 100644 --- a/meta-efl/recipes-efl/e17/exalt-client_svn.bb +++ b/meta-efl/recipes-efl/e17/exalt-client_svn.bb @@ -8,8 +8,8 @@ DEPENDS += "elementary exalt edje-native" CFLAGS += " -I${STAGING_INCDIR}/exalt -I${STAGING_INCDIR}/exalt_dbus" do_configure_prepend() { - sed -i -e /po/d configure.ac - sed -i -e s:\ po::g Makefile.am + sed -i -e /po/d configure.ac + sed -i -e s:\ po::g Makefile.am } FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \ diff --git a/meta-efl/recipes-efl/e17/exalt_svn.bb b/meta-efl/recipes-efl/e17/exalt_svn.bb index 3207a4ba2a..a5590e1452 100644 --- a/meta-efl/recipes-efl/e17/exalt_svn.bb +++ b/meta-efl/recipes-efl/e17/exalt_svn.bb @@ -19,13 +19,13 @@ EXTRA_OECONF = " \ " do_install_append() { - # install dbus config file - install -d ${D}${sysconfdir}/dbus-1/system.d/ - install -m 0644 data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf + # install dbus config file + install -d ${D}${sysconfdir}/dbus-1/system.d/ + install -m 0644 data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf - # install dbus service file - install -d ${D}${datadir}/dbus-1/system-services/ - install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/ + # install dbus service file + install -d ${D}${datadir}/dbus-1/system-services/ + install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/ } FILES_${PN} += "${datadir}/dbus-1" diff --git a/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb b/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb index 36e85058d3..55f3282b7b 100644 --- a/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb +++ b/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb @@ -2,7 +2,7 @@ SECTION = "x11/data" SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master \ file://0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch \ - file://LICENSE" + file://LICENSE" S = "${WORKDIR}/git" SRCREV = "4064489f359a1addf572089b582f317dff5f50e1" @@ -93,6 +93,6 @@ DESCRIPTION_illume-keyboard-persian = "Illume keyboard with persian layout" FILES_illume-keyboard-persian = "${KEYBOARDS_DIR}/Persian.kbd ${KEYBOARDS_DIR}/Persian.png" do_install() { - make DESTDIR=${D} install + make DESTDIR=${D} install } diff --git a/meta-efl/recipes-efl/e17/news_svn.bb b/meta-efl/recipes-efl/e17/news_svn.bb index 1e429e7dd1..e45cd44c05 100644 --- a/meta-efl/recipes-efl/e17/news_svn.bb +++ b/meta-efl/recipes-efl/e17/news_svn.bb @@ -5,8 +5,8 @@ PR = "${INC_PR}.0" require e-module.inc do_configure_prepend() { - sed -i -e /po/d configure.ac - sed -i -e s:\ po::g Makefile.am + sed -i -e /po/d configure.ac + sed -i -e s:\ po::g Makefile.am } diff --git a/meta-efl/recipes-efl/e17/places_svn.bb b/meta-efl/recipes-efl/e17/places_svn.bb index 5c199332f3..6a6184be72 100644 --- a/meta-efl/recipes-efl/e17/places_svn.bb +++ b/meta-efl/recipes-efl/e17/places_svn.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" require e-module.inc do_configure_prepend() { - autopoint || touch config.rpath + autopoint || touch config.rpath } # Calls /usr/bin/eject for media diff --git a/meta-efl/recipes-efl/e17/rain_svn.bb b/meta-efl/recipes-efl/e17/rain_svn.bb index 8738f3507d..917fe389df 100644 --- a/meta-efl/recipes-efl/e17/rain_svn.bb +++ b/meta-efl/recipes-efl/e17/rain_svn.bb @@ -5,8 +5,8 @@ PR = "${INC_PR}.0" require e-module.inc do_configure_prepend() { - sed -i -e /po/d configure.ac - sed -i -e s:\ po::g Makefile.am + sed -i -e /po/d configure.ac + sed -i -e s:\ po::g Makefile.am } diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb b/meta-efl/recipes-efl/e17/screenshot_svn.bb index 465ffcfea5..9689f4679a 100644 --- a/meta-efl/recipes-efl/e17/screenshot_svn.bb +++ b/meta-efl/recipes-efl/e17/screenshot_svn.bb @@ -10,7 +10,7 @@ DEPENDS += "emprint" RDEPENDS_${PN} += "emprint" do_configure_prepend() { - sed -i -e 's:AC_MSG_ERROR(emprint not found):echo foo:g' ${S}/configure.ac + sed -i -e 's:AC_MSG_ERROR(emprint not found):echo foo:g' ${S}/configure.ac } diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc index bc4758acdc..e2fff0ea26 100644 --- a/meta-efl/recipes-efl/efl/ecore.inc +++ b/meta-efl/recipes-efl/efl/ecore.inc @@ -13,8 +13,8 @@ BBCLASSEXTEND = "native" INC_PR = "r0" do_configure_prepend() { - touch ${S}/po/Makefile.in.in || true - sed -i -e 's: po::g' ${S}/Makefile.am + touch ${S}/po/Makefile.in.in || true + sed -i -e 's: po::g' ${S}/Makefile.am } FILESPATHPKG =. "${BPN}-${PV}:${BPN}:" diff --git a/meta-efl/recipes-efl/efl/edje-fpu.inc b/meta-efl/recipes-efl/efl/edje-fpu.inc index 1af86e3cc0..dc39fa9c04 100644 --- a/meta-efl/recipes-efl/efl/edje-fpu.inc +++ b/meta-efl/recipes-efl/efl/edje-fpu.inc @@ -1,6 +1,6 @@ def get_edje_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--enable-fixed-point" - return "" + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--enable-fixed-point" + return "" diff --git a/meta-efl/recipes-efl/efl/edje.inc b/meta-efl/recipes-efl/efl/edje.inc index 311fb52688..b3011b4d21 100644 --- a/meta-efl/recipes-efl/efl/edje.inc +++ b/meta-efl/recipes-efl/efl/edje.inc @@ -12,19 +12,19 @@ BBCLASSEXTEND = "native nativesdk" INC_PR = "r0" do_configure_prepend_virtclass-native() { - 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: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 } # The new lua stuff is a bit broken... do_configure_append() { - for i in $(find "${S}" -name "Makefile") ; do - sed -i -e 's:-L/usr/local/lib::g' $i - done + for i in $(find "${S}" -name "Makefile") ; do + sed -i -e 's:-L/usr/local/lib::g' $i + done } do_compile_append() { - sed -i -e s:local/::g -e 's:-L${STAGING_LIBDIR}::g' ${S}/edje.pc + sed -i -e s:local/::g -e 's:-L${STAGING_LIBDIR}::g' ${S}/edje.pc } # gain some extra performance at the expense of RAM - generally i'd say bad diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb index d764e96f2a..8fb2dab043 100644 --- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb @@ -26,12 +26,12 @@ SRC_URI += "file://LICENSE" S = "${WORKDIR}/${SRCNAME}" do_compile() { - ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images -id ${WORKDIR}/themes/ ${S}/elm-efenniht.edc -o ${S}/elm-efenniht.edj + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images -id ${WORKDIR}/themes/ ${S}/elm-efenniht.edc -o ${S}/elm-efenniht.edj } do_install() { - install -d ${D}${datadir}/elementary/themes/ - install -m 0644 ${S}/elm-efenniht.edj ${D}${datadir}/elementary/themes/ + install -d ${D}${datadir}/elementary/themes/ + install -m 0644 ${S}/elm-efenniht.edj ${D}${datadir}/elementary/themes/ } FILES_${PN} = "${datadir}/elementary/themes/" diff --git a/meta-efl/recipes-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_svn.bb index 83de3fedca..4cc124e10a 100644 --- a/meta-efl/recipes-efl/efl/imlib2_svn.bb +++ b/meta-efl/recipes-efl/efl/imlib2_svn.bb @@ -12,8 +12,8 @@ SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" S = "${WORKDIR}/${SRCNAME}" EXTRA_OECONF = "--with-x \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} " + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} " # TODO: Use more fine granular version #OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" From 7b87afdfa47feb960500d1bcc6ab3a0aea0046be Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 08:32:33 +0200 Subject: [PATCH 02/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 27dd2ebcba..c1e564f668 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "70490" +EFL_SRCREV ?= "74035" ARM_INSTRUCTION_SET = "arm" From 56e8bed5d6cfe3dae153265616b43e15920453a1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 09:05:26 +0200 Subject: [PATCH 03/52] ecore: update fix-ecore-fb-initialization.patch for svn recipe Signed-off-by: Martin Jansa --- .../fix-ecore-fb-initialization.patch | 41 +++++++++++++++++++ .../ecore/fix-ecore-fb-initialization.patch | 24 +++++------ 2 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch diff --git a/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch new file mode 100644 index 0000000000..a2ce285266 --- /dev/null +++ b/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch @@ -0,0 +1,41 @@ +From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 29 Oct 2011 00:16:55 +0200 +Subject: [PATCH] ecore-fb: fix ts init + +Upstream-Status: Pending + +The whole ecore-fb init logic is somewhat flawed; with this patch we +get at least a working touchscreen w/ tslib again. + +Signed-off-by: Michael 'Mickey' Lauer +Signed-off-by: Martin Jansa +--- + src/lib/ecore_fb/ecore_fb.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c +index ca7d73d..5b99989 100644 +--- a/src/lib/ecore_fb/ecore_fb.c ++++ b/src/lib/ecore_fb/ecore_fb.c +@@ -39,6 +39,9 @@ ecore_fb_init(const char *name __UNUSED__) + if (!ecore_fb_vt_init()) + return --_ecore_fb_init_count; + ++ if (!ecore_fb_ts_init()) ++ return --_ecore_fb_init_count; ++ + _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h); + + return _ecore_fb_init_count; +@@ -59,6 +62,7 @@ ecore_fb_shutdown(void) + if (--_ecore_fb_init_count != 0) + return _ecore_fb_init_count; + ++ ecore_fb_ts_shutdown(); + ecore_fb_vt_shutdown(); + + return _ecore_fb_init_count; +-- +1.7.7.1 + diff --git a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch index a2ce285266..55773a3b98 100644 --- a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch +++ b/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch @@ -1,4 +1,4 @@ -From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001 +From 657571197c9d369e12ae31b6777a1929fe3680ef Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 29 Oct 2011 00:16:55 +0200 Subject: [PATCH] ecore-fb: fix ts init @@ -11,31 +11,31 @@ get at least a working touchscreen w/ tslib again. Signed-off-by: Michael 'Mickey' Lauer Signed-off-by: Martin Jansa --- - src/lib/ecore_fb/ecore_fb.c | 4 ++++ + ecore/src/lib/ecore_fb/ecore_fb.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c -index ca7d73d..5b99989 100644 +index 5b2b84b..a1904b3 100644 --- a/src/lib/ecore_fb/ecore_fb.c +++ b/src/lib/ecore_fb/ecore_fb.c -@@ -39,6 +39,9 @@ ecore_fb_init(const char *name __UNUSED__) +@@ -46,6 +46,9 @@ ecore_fb_init(const char *name __UNUSED__) if (!ecore_fb_vt_init()) return --_ecore_fb_init_count; + if (!ecore_fb_ts_init()) + return --_ecore_fb_init_count; + - _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h); - - return _ecore_fb_init_count; -@@ -59,6 +62,7 @@ ecore_fb_shutdown(void) - if (--_ecore_fb_init_count != 0) - return _ecore_fb_init_count; - + if (!oldhand) + { + oldhand = signal(SIGINT, nosigint); +@@ -77,6 +80,7 @@ ecore_fb_shutdown(void) + oldhand = NULL; + } + + ecore_fb_ts_shutdown(); ecore_fb_vt_shutdown(); return _ecore_fb_init_count; -- -1.7.7.1 +1.7.8.6 From c15edc6ebb115cae9fc14341893cc2b2ebe78027 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 09:15:43 +0200 Subject: [PATCH 04/52] efl: update PV in svn recipes to sort higher then release * now when we have newer EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/ecore_svn.bb | 2 +- meta-efl/recipes-efl/efl/edbus_svn.bb | 2 +- meta-efl/recipes-efl/efl/edje_svn.bb | 2 +- meta-efl/recipes-efl/efl/eet_svn.bb | 2 +- meta-efl/recipes-efl/efl/eeze_svn.bb | 2 +- meta-efl/recipes-efl/efl/efreet_svn.bb | 2 +- meta-efl/recipes-efl/efl/eina_svn.bb | 2 +- meta-efl/recipes-efl/efl/eio_svn.bb | 2 +- meta-efl/recipes-efl/efl/elementary_svn.bb | 2 +- meta-efl/recipes-efl/efl/embryo_svn.bb | 2 +- meta-efl/recipes-efl/efl/emotion_svn.bb | 2 +- meta-efl/recipes-efl/efl/ethumb_svn.bb | 2 +- meta-efl/recipes-efl/efl/evas_svn.bb | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb index 05cc9db196..ad724d0e7d 100644 --- a/meta-efl/recipes-efl/efl/ecore_svn.bb +++ b/meta-efl/recipes-efl/efl/ecore_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index 594de4a16f..720703e7c3 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb index 594de4a16f..720703e7c3 100644 --- a/meta-efl/recipes-efl/efl/edje_svn.bb +++ b/meta-efl/recipes-efl/efl/edje_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb index e9de45c8ac..de8af5fe86 100644 --- a/meta-efl/recipes-efl/efl/eet_svn.bb +++ b/meta-efl/recipes-efl/efl/eet_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.6.0+svnr${SRCPV}" +PV = "1.6.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb index 594de4a16f..720703e7c3 100644 --- a/meta-efl/recipes-efl/efl/eeze_svn.bb +++ b/meta-efl/recipes-efl/efl/eeze_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb index 594de4a16f..720703e7c3 100644 --- a/meta-efl/recipes-efl/efl/efreet_svn.bb +++ b/meta-efl/recipes-efl/efl/efreet_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb index 594de4a16f..720703e7c3 100644 --- a/meta-efl/recipes-efl/efl/eina_svn.bb +++ b/meta-efl/recipes-efl/efl/eina_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/eio_svn.bb b/meta-efl/recipes-efl/efl/eio_svn.bb index f43c47fc5a..eb28d9ae19 100644 --- a/meta-efl/recipes-efl/efl/eio_svn.bb +++ b/meta-efl/recipes-efl/efl/eio_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.0+svnr${SRCPV}" +PV = "1.0.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb index f43c47fc5a..eb28d9ae19 100644 --- a/meta-efl/recipes-efl/efl/elementary_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.0+svnr${SRCPV}" +PV = "1.0.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb index 594de4a16f..720703e7c3 100644 --- a/meta-efl/recipes-efl/efl/embryo_svn.bb +++ b/meta-efl/recipes-efl/efl/embryo_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb index f43c47fc5a..eb28d9ae19 100644 --- a/meta-efl/recipes-efl/efl/emotion_svn.bb +++ b/meta-efl/recipes-efl/efl/emotion_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.0+svnr${SRCPV}" +PV = "1.0.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb index ac030144a3..f6b3f3e07c 100644 --- a/meta-efl/recipes-efl/efl/ethumb_svn.bb +++ b/meta-efl/recipes-efl/efl/ethumb_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.0+svnr${SRCPV}" +PV = "1.0.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb index 594de4a16f..720703e7c3 100644 --- a/meta-efl/recipes-efl/efl/evas_svn.bb +++ b/meta-efl/recipes-efl/efl/evas_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" From 8d3bc9e594647b13d26dd50a8e8385d2886f8539 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 09:20:25 +0200 Subject: [PATCH 05/52] efl-from-svn-recipes: update to match PV from svn recipes Signed-off-by: Martin Jansa --- meta-efl/conf/distro/include/efl-from-svn-recipes.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc index b2d27fad1b..9af3b6d4ba 100644 --- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc +++ b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc @@ -1,6 +1,6 @@ -EFL_PREFERRED_VERSION ?= "1.2.0+svn%" -EFL_PREFERRED_VERSION_1.0 ?= "1.0.0+svn%" -EFL_PREFERRED_VERSION_EET ?= "1.6.0+svn%" +EFL_PREFERRED_VERSION ?= "1.2.1+svn%" +EFL_PREFERRED_VERSION_1.0 ?= "1.0.1+svn%" +EFL_PREFERRED_VERSION_EET ?= "1.6.1+svn%" PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}" From ad60dcda32c9e2b3f29d9b0cbfb55dde814ce57b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 09:16:09 +0200 Subject: [PATCH 06/52] terminology: add recipe for terminal emulator Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/terminology_svn.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 meta-efl/recipes-efl/e17/terminology_svn.bb diff --git a/meta-efl/recipes-efl/e17/terminology_svn.bb b/meta-efl/recipes-efl/e17/terminology_svn.bb new file mode 100644 index 0000000000..2bb4f7cf8d --- /dev/null +++ b/meta-efl/recipes-efl/e17/terminology_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Enlightenment Terminal Emulator" +LICENSE = "MIT BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7" +DEPENDS = "evas ecore edje elementary eina eet emotion" + +PV = "0.1.0+svnr${SRCPV}" +SRCREV = "${EFL_SRCREV}" + +inherit e gettext +SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" +S = "${WORKDIR}/${SRCNAME}" + +EXTRA_OECONF = "\ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ +" + +FILES_${PN} += "\ + ${datadir}/icons/terminology.png \ +" From 4dd36a7c0126cbbf1acf79dad8ae9c54450ca5b6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 09:43:13 +0200 Subject: [PATCH 07/52] evas: package cserve2 and its loaders * cserve2 introduced in http://www.mail-archive.com/enlightenment-devel@lists.sourceforge.net/msg40703.html Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/evas.inc | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc index b0a42ea6aa..5254ee428e 100644 --- a/meta-efl/recipes-efl/efl/evas.inc +++ b/meta-efl/recipes-efl/efl/evas.inc @@ -8,7 +8,7 @@ DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-na inherit efl BBCLASSEXTEND = "native" -INC_PR = "r0" +INC_PR = "r1" FILESPATHPKG =. "${BPN}-${PV}:${BPN}:" python populate_packages_prepend () { @@ -20,6 +20,15 @@ python populate_packages_prepend () { output_pattern = 'evas-' + plugin_type[:-1] + "-%s", description = 'Evas module %s', allow_dirs=True, recursive=False, extra_depends="" ) + + plugin_type = "cserve2" + bb.note( "splitting packages for evas %s..." % plugin_type ) + basedir = bb.data.expand( '${libdir}/evas/%s/loaders' % plugin_type, d ) + + do_split_packages(d, basedir, '^(.*)', + output_pattern = 'evas-' + plugin_type + "-%s", + description = 'Evas csever2 loader module %s', + allow_dirs=True, recursive=False, extra_depends="" ) } do_install_append() { @@ -27,9 +36,11 @@ do_install_append() { } FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" -FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" +FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/ ${libdir}/evas/cserve2/loaders/*/*/.debug/" +FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave" -PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*" +PACKAGES += "${PN}-cserve2" +PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*" RRECOMMENDS_${PN} = " \ evas-engine-fb \ From c090b1a94328940bf265223eabca4cf85b0fcb56 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 10:03:29 +0200 Subject: [PATCH 08/52] efreet: inherit gettext Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/efreet_svn.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb index 720703e7c3..503dc528af 100644 --- a/meta-efl/recipes-efl/efl/efreet_svn.bb +++ b/meta-efl/recipes-efl/efl/efreet_svn.bb @@ -1,5 +1,7 @@ require ${BPN}.inc +inherit gettext + SRCREV = "${EFL_SRCREV}" PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" From 27d63aedf3e24133fdae1060c8e06292f07333c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 10:19:17 +0200 Subject: [PATCH 09/52] e-wm: update LIC_FILES_CHKSUM * Copyright year was updated in r73192 Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index 7cc21675df..7cc072e620 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas eina ecore edje efreet edbus eeze" LICENSE = "MIT BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f" +LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" PR = "r2" From 5f1431d03871c94c64824ccb0c5c1833014931af Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 11:13:08 +0200 Subject: [PATCH 10/52] e-wm: packaging: include flags in PN-images, add catch-all PN-backgrounds package Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_svn.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index 7cc072e620..c2bb1e7e9b 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -72,6 +72,7 @@ PACKAGES =+ "\ ${PN}-theme-default \ ${PN}-background-dark-gradient \ ${PN}-background-light-gradient \ + ${PN}-backgrounds \ ${PN}-images \ ${PN}-icons \ ${PN}-other \ @@ -123,7 +124,8 @@ FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj" FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj" -FILES_${PN}-images = "${datadir}/enlightenment/data/images" +FILES_${PN}-backgrounds = "${datadir}/enlightenment/data/backgrounds/*.edj" +FILES_${PN}-images = "${datadir}/enlightenment/data/images ${datadir}/enlightenment/data/flags" FILES_${PN}-icons = "${datadir}/enlightenment/data/icons" FILES_${PN}-other = "${datadir}/enlightenment/data/other" FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods" @@ -133,6 +135,7 @@ FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" FILES_efm-desktop-icon = "\ ${datadir}/applications/efm.desktop \ + ${datadir}/applications/enlightenment_filemanager.desktop \ ${datadir}/icons/e-module-fileman.png \ " From aae1f884d888d778f9b744e363fefa7f33ff4104 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Jul 2012 23:06:05 +0200 Subject: [PATCH 11/52] terminology: add terminology-themes to RDEPENDS Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/terminology_svn.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-efl/recipes-efl/e17/terminology_svn.bb b/meta-efl/recipes-efl/e17/terminology_svn.bb index 2bb4f7cf8d..48d229b4e7 100644 --- a/meta-efl/recipes-efl/e17/terminology_svn.bb +++ b/meta-efl/recipes-efl/e17/terminology_svn.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7" DEPENDS = "evas ecore edje elementary eina eet emotion" PV = "0.1.0+svnr${SRCPV}" +PR = "r1" SRCREV = "${EFL_SRCREV}" inherit e gettext @@ -17,3 +18,8 @@ EXTRA_OECONF = "\ FILES_${PN} += "\ ${datadir}/icons/terminology.png \ " + +# doesn't start without own theme +# ERR<770>:terminology utils.c:26 theme_apply() Could not load any theme for group=terminology/background: No Error +# CRI<770>:terminology main.c:448 elm_main() Couldn't find terminology theme! Forgot 'make install'? +RDEPENDS_${PN} += "${PN}-themes" From 6d175440566485f67547aa7900d5441eb7a4c920 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 26 Jul 2012 09:46:22 +0200 Subject: [PATCH 12/52] edbus: add eina to DEPENDS * it's using that | performance.c:2:18: fatal error: Eina.h: No such file or directory | compilation terminated. | make[3]: *** [e_dbus_performance-performance.o] Error 1 | make[3]: *** Waiting for unfinished jobs.... | make[3]: Leaving directory /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/edbus-2_1.2.1+svnr74419-r0.0/e_dbus/src/bin Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/edbus.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/efl/edbus.inc b/meta-efl/recipes-efl/efl/edbus.inc index ad20c8c783..cca9c5ea24 100644 --- a/meta-efl/recipes-efl/efl/edbus.inc +++ b/meta-efl/recipes-efl/efl/edbus.inc @@ -1,5 +1,5 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" -DEPENDS = "dbus ecore" +DEPENDS = "dbus ecore eina" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=550b8cea13dacc4bf00508a8cce1074c" From ef5df8eecc1b01c8423e3f60dc7552d09e3e565c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 26 Jul 2012 09:52:44 +0200 Subject: [PATCH 13/52] eve: drop patch applied upstream Signed-off-by: Martin Jansa --- ...0001-eve-update-for-newer-webkit-efl.patch | 38 ------------------- meta-efl/recipes-efl/e17/eve_svn.bb | 2 - 2 files changed, 40 deletions(-) delete mode 100644 meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch diff --git a/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch deleted file mode 100644 index a1f14df39b..0000000000 --- a/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 18 Jul 2012 17:54:50 +0200 -Subject: [PATCH] eve: update for newer webkit-efl - -* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get - in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438) - -Signed-off-by: Martin Jansa ---- - src/bin/chrome.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/bin/chrome.c b/src/bin/chrome.c -index e402cad..ee8f0c4 100644 ---- a/src/bin/chrome.c -+++ b/src/bin/chrome.c -@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view) - if (old_icon) evas_object_del(old_icon); - if (url) - { -- favicon = ewk_settings_icon_database_icon_object_add(url, canvas); -+ favicon = ewk_settings_icon_database_icon_object_get(url, canvas); - if (favicon) - elm_object_part_content_set(text_url, "icon", favicon); - } -@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part) - { - Evas_Object *chrome = evas_object_data_get(obj, "chrome"); - Evas *canvas = evas_object_evas_get(chrome); -- icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas); -+ icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas); - } - return icon; - } --- -1.7.8.6 - diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb index 9528ff3fbc..d760c4a85a 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 = "r1" SRCREV = "${EFL_SRCREV}" inherit e gettext @@ -15,7 +14,6 @@ do_configure_prepend() { } SRC_URI += "file://eve-theme-for-smaller-screens.patch \ - file://0001-eve-update-for-newer-webkit-efl.patch \ " EXTRA_OECONF = "\ From c7e2aad3cd732b986269f040ac8ff84259d5a846 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 26 Jul 2012 10:44:44 +0200 Subject: [PATCH 14/52] edbus: add patch to fixup performance_test autotools config and disable it * it fails to find Eina.h anyway, will enabled it when fix is upstream Signed-off-by: Martin Jansa --- ...-configure.ac-fixup-performance_test.patch | 51 +++++++++++++++++++ meta-efl/recipes-efl/efl/edbus_svn.bb | 2 + 2 files changed, 53 insertions(+) create mode 100644 meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch diff --git a/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch b/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch new file mode 100644 index 0000000000..db1b15ddeb --- /dev/null +++ b/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch @@ -0,0 +1,51 @@ +From 133d67d43fc21674f525da9ecd530f2b73fbdeea Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 26 Jul 2012 10:35:35 +0200 +Subject: [PATCH] edbus: configure.ac fixup performance_test + +Signed-off-by: Martin Jansa +--- + configure.ac | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d798484..d0fc4ee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,6 +69,7 @@ want_ehal="yes" + want_enotify="yes" + want_eofono="yes" + want_eukit="yes" ++want_performance_test="yes" + + case "$host_os" in + mingw*) +@@ -78,6 +79,7 @@ case "$host_os" in + want_enotify="no" + want_eofono="no" + want_eukit="no" ++ want_performance_test="no" + ;; + esac + +@@ -127,7 +129,7 @@ AC_ARG_ENABLE([eukit], + AC_ARG_ENABLE([performance_test], + [AC_HELP_STRING([--disable-performance_test], [Disable performance build])], + [enable_performance_test=$enableval], +- [enable_performance_test="${want_eukit}"]) ++ [enable_performance_test="${want_performance_test}"]) + + + ### Checks for programs +@@ -277,7 +279,7 @@ fi + + if test "x${have_edbus_performance_test}" = "xyes" ; then + PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST], +- [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62 ecore-evas >= 1.2.0 elementary], ++ [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 elementary >= 1.6.99], + [have_edbus_performance_test="yes"], + [have_edbus_performance_test="no"]) + fi +-- +1.7.8.6 + diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index 720703e7c3..c22fcaf9bf 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb @@ -5,7 +5,9 @@ PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" +EXTRA_OECONF += "--disable-performance_test" SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ + file://0001-edbus-configure.ac-fixup-performance_test.patch \ " S = "${WORKDIR}/${SRCNAME}" From a69f5e0fe5e31c2d394ae9329a45cf543cecf72a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 26 Jul 2012 10:52:29 +0200 Subject: [PATCH 15/52] e-wm: add eio to DEPENDS * it's needed since r74373 Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index c2bb1e7e9b..b97cb5016b 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" -DEPENDS = "eet evas eina ecore edje efreet edbus eeze" +DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" SRCNAME = "e" From a87b248abc48f79b01265f98795c30741722c730 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 26 Jul 2012 09:27:57 +0200 Subject: [PATCH 16/52] e-base: bump EFL_SRCREV again Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index c1e564f668..d52b4dc615 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "74035" +EFL_SRCREV ?= "74419" ARM_INSTRUCTION_SET = "arm" From f11e9d2a3bffcd4b8e5db47b683eafed62176989 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Jul 2012 15:03:51 +0200 Subject: [PATCH 17/52] edbus: drop patch applied upstream r74447 Signed-off-by: Martin Jansa --- ...-configure.ac-fixup-performance_test.patch | 51 ------------------- meta-efl/recipes-efl/efl/edbus_svn.bb | 1 - 2 files changed, 52 deletions(-) delete mode 100644 meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch diff --git a/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch b/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch deleted file mode 100644 index db1b15ddeb..0000000000 --- a/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 133d67d43fc21674f525da9ecd530f2b73fbdeea Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 26 Jul 2012 10:35:35 +0200 -Subject: [PATCH] edbus: configure.ac fixup performance_test - -Signed-off-by: Martin Jansa ---- - configure.ac | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d798484..d0fc4ee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,6 +69,7 @@ want_ehal="yes" - want_enotify="yes" - want_eofono="yes" - want_eukit="yes" -+want_performance_test="yes" - - case "$host_os" in - mingw*) -@@ -78,6 +79,7 @@ case "$host_os" in - want_enotify="no" - want_eofono="no" - want_eukit="no" -+ want_performance_test="no" - ;; - esac - -@@ -127,7 +129,7 @@ AC_ARG_ENABLE([eukit], - AC_ARG_ENABLE([performance_test], - [AC_HELP_STRING([--disable-performance_test], [Disable performance build])], - [enable_performance_test=$enableval], -- [enable_performance_test="${want_eukit}"]) -+ [enable_performance_test="${want_performance_test}"]) - - - ### Checks for programs -@@ -277,7 +279,7 @@ fi - - if test "x${have_edbus_performance_test}" = "xyes" ; then - PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST], -- [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62 ecore-evas >= 1.2.0 elementary], -+ [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 elementary >= 1.6.99], - [have_edbus_performance_test="yes"], - [have_edbus_performance_test="no"]) - fi --- -1.7.8.6 - diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index c22fcaf9bf..d40deb2634 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb @@ -8,6 +8,5 @@ DEFAULT_PREFERENCE = "-1" EXTRA_OECONF += "--disable-performance_test" SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ - file://0001-edbus-configure.ac-fixup-performance_test.patch \ " S = "${WORKDIR}/${SRCNAME}" From 15304778d96f63eb16b06c43a784d500f03440d3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Jul 2012 15:50:40 +0200 Subject: [PATCH 18/52] python-edje: add evas to DEPENDS * fixes: ./edje/edit/c_edit.c:235:18: fatal error: Evas.h: No such file or directory Signed-off-by: Martin Jansa --- meta-efl/recipes-devtools/python/python-edje_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/recipes-devtools/python/python-edje_svn.bb b/meta-efl/recipes-devtools/python/python-edje_svn.bb index 1607d8700e..f527959fbc 100644 --- a/meta-efl/recipes-devtools/python/python-edje_svn.bb +++ b/meta-efl/recipes-devtools/python/python-edje_svn.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" PR = "${INC_PR}.2" SRCREV = "${EFL_SRCREV}" -DEPENDS += "edje python-evas" +DEPENDS += "edje python-evas evas" RDEPENDS_${PN} += "python-evas" SRC_URI += "file://0001-fix-unicode-conversion.patch" From 0c194f4e8d233ae92ea10860049e304dbe449bc7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Jul 2012 12:36:45 +0200 Subject: [PATCH 19/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index d52b4dc615..4a06d4a8d0 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "74419" +EFL_SRCREV ?= "74527" ARM_INSTRUCTION_SET = "arm" From 3dafca66492c3f696b6348df6262d69e81718de6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Jul 2012 22:32:26 +0200 Subject: [PATCH 20/52] elementary: add eio to DEPENDS * fixes: | /bin/grep: /OE/shr-core/tmp-eglibc/sysroots/spitz/usr/lib/libeio.la: No such file or directory | /bin/sed: can't read /OE/shr-core/tmp-eglibc/sysroots/spitz/usr/lib/libeio.la: No such file or directory | arm-oe-linux-gnueabi-libtool: link: `/OE/shr-core/tmp-eglibc/sysroots/spitz/usr/lib/libeio.la' is not a valid libtool archive | make[3]: *** [module.la] Error 1 | make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/elementary-2_1.0.1+svnr74527-r1.0/elementary/src/edje_externals' Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/elementary_svn.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb index eb28d9ae19..fa8a8e85aa 100644 --- a/meta-efl/recipes-efl/efl/elementary_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary_svn.bb @@ -4,6 +4,7 @@ SRCREV = "${EFL_SRCREV}" PV = "1.0.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" +DEPENDS += "eio" SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ From e0f7398e19955c1c3deadb52579526c5f1226a11 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Jul 2012 23:08:47 +0200 Subject: [PATCH 21/52] meta-efl: evas-generic-loaders: add new recipes to cope with missing SVG support in newer evas Signed-off-by: Martin Jansa --- .../distro/include/efl-from-svn-recipes.inc | 1 + .../recipes-efl/efl/evas-generic-loaders.inc | 33 +++++++++++++++++++ .../efl/evas-generic-loaders_1.2.0.bb | 10 ++++++ .../efl/evas-generic-loaders_svn.bb | 11 +++++++ 4 files changed, 55 insertions(+) create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders.inc create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc index 9af3b6d4ba..38c2dd357e 100644 --- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc +++ b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc @@ -18,6 +18,7 @@ PREFERRED_VERSION_eina-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_embryo ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_embryo-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_evas-generic-loaders ?= "1.2.0+svn%" PREFERRED_VERSION_evas-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_expedite ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_expedite-native ?= "${EFL_PREFERRED_VERSION}" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc new file mode 100644 index 0000000000..7556eb2ac3 --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "Evas generic loaders" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=06568fc31423f3c8ad84f375e061c342" +DEPENDS = "eina poppler librsvg cairo" + +inherit efl + +INC_PR = "r0" + +SRCNAME = "evas_generic_loaders" + +EXTRA_OECONF = " \ + --enable-poppler \ + --enable-svg \ + --disable-gstreamer \ + --disable-libraw \ + --disable-spectre \ +" + +python populate_packages_prepend () { + bb.note( "splitting packages for evas generic loaders" ) + basedir = bb.data.expand( '${libdir}/evas/utils', d ) + + do_split_packages(d, basedir, '^evas_image_loader\.(.*)$', + output_pattern = "evas-generic-loader-%s", + description = 'Evas generic loaders - module %s', + allow_dirs=True, recursive=False, extra_depends="" ) +} + +FILES_evas-generic-loader-xcf += "${libdir}/evas/utils/*.xcf.gz" +FILES_${PN}-dbg += "${libdir}/evas/utils/.debug" + +PACKAGES_DYNAMIC = "evas-generic-loader-*" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb new file mode 100644 index 0000000000..de0ce1c05d --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_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] = "340a8c2f42c82ecd10f0204cdb291a70" +SRC_URI[sha256sum] = "9a3aad43269f34513765b04ed3e8db5a18d3545da010b2f6066aeaf90bf442d4" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb new file mode 100644 index 0000000000..594de4a16f --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb @@ -0,0 +1,11 @@ +require ${BPN}.inc + +SRCREV = "${EFL_SRCREV}" +PV = "1.2.0+svnr${SRCPV}" +PR = "${INC_PR}.0" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "\ + ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ +" +S = "${WORKDIR}/${SRCNAME}" From dd3da4078228d4fd6ba165ad30273bc2b1999cd8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Jul 2012 17:23:30 +0200 Subject: [PATCH 22/52] evas: add evas-loader-generic + evas-generic-loader-svn to RRECOMMENDS in svn version which doesn't support librsvg loader Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/evas_svn.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb index 720703e7c3..a869caffdd 100644 --- a/meta-efl/recipes-efl/efl/evas_svn.bb +++ b/meta-efl/recipes-efl/efl/evas_svn.bb @@ -2,9 +2,14 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" PV = "1.2.1+svnr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" +# evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon +# http://www.intesis.hr/news/16-esvg-source +# http://blog.gmane.org/gmane.comp.window-managers.enlightenment.user/page=3 +RRECOMMENDS_${BPN} += "evas-loader-generic evas-generic-loader-svn" + SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " From 1a6b3c90846c8a0ed045107d7449812937e60690 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Jul 2012 12:13:35 +0200 Subject: [PATCH 23/52] meta-efl: efl.bbclass: package only ${datadir}/${PE} in ${PN}-tests, it was stealing files from ${PN}-locale-* Signed-off-by: Martin Jansa --- meta-efl/classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/efl.bbclass b/meta-efl/classes/efl.bbclass index 7cf8556746..bc2f640cf0 100644 --- a/meta-efl/classes/efl.bbclass +++ b/meta-efl/classes/efl.bbclass @@ -60,4 +60,4 @@ FILES_${PN}-dbg += "${libdir}/${PN}/.debug \ FILES_${PN}-tests = "${bindir}/${PN} \ ${bindir}/*_* \ - ${datadir}" + ${datadir}/${PN}" From cb71d1abcc50953b8bc4c26e24d57947eb35daa6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Jul 2012 12:16:04 +0200 Subject: [PATCH 24/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 4a06d4a8d0..5198c4be82 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "74527" +EFL_SRCREV ?= "74542" ARM_INSTRUCTION_SET = "arm" From cc522d66adfbe18519cbfb817e45b0fec6c9387a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Jul 2012 12:36:44 +0200 Subject: [PATCH 25/52] edje: add unpackaged /usr/share/mime/packages/edje.xml to PN Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/edje_svn.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb index 720703e7c3..ffc8cf758b 100644 --- a/meta-efl/recipes-efl/efl/edje_svn.bb +++ b/meta-efl/recipes-efl/efl/edje_svn.bb @@ -9,3 +9,5 @@ SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" + +FILES_${PN} += "${datadir}/mime/packages/edje.xml" From b19d1dddc29d569d1fa843a5800255ded2efdf06 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Jul 2012 13:11:58 +0200 Subject: [PATCH 26/52] edbus: option to disable performance-test was renamed and package logo.png in PN Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/edbus_svn.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index d40deb2634..b99f79dad6 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb @@ -5,8 +5,12 @@ PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -EXTRA_OECONF += "--disable-performance_test" +# it needs to be disabled, because creates circular dependency on elementary +EXTRA_OECONF += "--disable-edbus-performance-test" + SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" + +FILES_${PN} += "${datadir}/e_dbus/logo.png" From 14b3bdd390fb782786dd88ce7250b5f424604065 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Jul 2012 14:09:29 +0200 Subject: [PATCH 27/52] emotion: add eio dependency * fixes: emotion_smart.c:10:18: fatal error: Eio.h: No such file or directory Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/emotion_svn.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb index eb28d9ae19..bf75d9eeb4 100644 --- a/meta-efl/recipes-efl/efl/emotion_svn.bb +++ b/meta-efl/recipes-efl/efl/emotion_svn.bb @@ -5,6 +5,8 @@ PV = "1.0.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" +DEPENDS += "eio" + SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " From de7125c0aa3101605b818a69348ca696a45645e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Jul 2012 14:18:49 +0200 Subject: [PATCH 28/52] e-wm: add elementary dependency * fixes: e_main.c:22:24: fatal error: Elementary.h: No such file or directory Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index b97cb5016b..6d4656b331 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" -DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio" +DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio elementary" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" SRCNAME = "e" From 9f5cda65b4580e17c91e4bc38a8725c173ac1682 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Jul 2012 22:41:21 +0200 Subject: [PATCH 29/52] e-wm: add some evas-loaders to RDEPENDS * it doesn't even start without those Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_svn.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index 6d4656b331..cce5ad171f 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -4,7 +4,7 @@ LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRCREV = "${EFL_SRCREV}" inherit e update-alternatives gettext @@ -54,6 +54,10 @@ RDEPENDS_${PN} += "\ edje-utils \ ${PN}-utils \ dbus-x11 \ + evas-loader-png \ + evas-loader-jpeg \ + evas-loader-gif \ + evas-generic-loader-svg \ " # Uclibc build don't have 'glibc-utils' From 3dd8a1a8745f89330f176d0cb115021287efade5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Jul 2012 22:43:04 +0200 Subject: [PATCH 30/52] evas: use PN instead of BPN? Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/evas_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb index a869caffdd..fb0342f76b 100644 --- a/meta-efl/recipes-efl/efl/evas_svn.bb +++ b/meta-efl/recipes-efl/efl/evas_svn.bb @@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1" # evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon # http://www.intesis.hr/news/16-esvg-source # http://blog.gmane.org/gmane.comp.window-managers.enlightenment.user/page=3 -RRECOMMENDS_${BPN} += "evas-loader-generic evas-generic-loader-svn" +RRECOMMENDS_${PN} += "evas-loader-generic evas-generic-loader-svn" SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ From f07b04dc28b01a2845d1f5ec8f483468a45bd587 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 1 Aug 2012 08:28:16 +0200 Subject: [PATCH 31/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 5198c4be82..990ce5ac76 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "74542" +EFL_SRCREV ?= "74702" ARM_INSTRUCTION_SET = "arm" From 04e96a281d1049f0612d76a0549ffca4c20df169 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 1 Aug 2012 08:28:52 +0200 Subject: [PATCH 32/52] enjoy: update LIC_FILES_CHKSUM, typos fixed in r74611 Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/enjoy_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb index 470f03d88c..06998cfb02 100644 --- a/meta-efl/recipes-efl/e17/enjoy_svn.bb +++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Enjoy music player" LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=0f507c68d42d1cc0fcb507d007112bf2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" DEPENDS = "evas ecore edje elementary emotion lightmediascanner" SRCREV = "${EFL_SRCREV}" PV = "0.0+svnr${SRCPV}" From 44806f13289f181749e59e8bb4fe553469b05c90 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 1 Aug 2012 08:33:46 +0200 Subject: [PATCH 33/52] edje: add eio to DEPENDS Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/edje_svn.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb index ffc8cf758b..435b899cb3 100644 --- a/meta-efl/recipes-efl/efl/edje_svn.bb +++ b/meta-efl/recipes-efl/efl/edje_svn.bb @@ -5,6 +5,8 @@ PV = "1.2.1+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" +DEPENDS += "eio" + SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " From 04aacfdf3d1c63d4be05a4f73fb221923182a0f3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 2 Aug 2012 14:27:00 +0200 Subject: [PATCH 34/52] eet: move eet binary to own PN-utils package * nobody would expect it in libeet-tests Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/eet.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/efl/eet.inc b/meta-efl/recipes-efl/efl/eet.inc index de17e058f8..089e92e220 100644 --- a/meta-efl/recipes-efl/efl/eet.inc +++ b/meta-efl/recipes-efl/efl/eet.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953" inherit efl BBCLASSEXTEND = "native" -INC_PR = "r0" +INC_PR = "r1" EXTRA_OECONF = "\ --enable-openssl \ @@ -16,3 +16,9 @@ EXTRA_OECONF = "\ --enable-old-eet-file-format \ --disable-assert \ " + +PACKAGES =+ "${PN}-utils" + +FILES_${PN}-utils = "\ + ${bindir}/${PN} \ +" From ba542373abc3bd45472f309fbd1f6eecfba31166 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 Aug 2012 09:51:44 +0200 Subject: [PATCH 35/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 990ce5ac76..1ee7ca8155 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "74702" +EFL_SRCREV ?= "74879" ARM_INSTRUCTION_SET = "arm" From 2645400f7cd7582012fd25298204e4cfa12639db Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 Aug 2012 10:22:20 +0200 Subject: [PATCH 36/52] e-wm: include unpackaged data/favourites in PN Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_svn.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index cce5ad171f..bbe5ef9644 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -4,7 +4,7 @@ LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r3" +PR = "r4" SRCREV = "${EFL_SRCREV}" inherit e update-alternatives gettext @@ -110,6 +110,7 @@ FILES_${PN} = "\ ${libdir}/enlightenment/*plugins/*/*/* \ ${libdir}/enlightenment/preload/e_precache.so \ ${datadir}/enlightenment/data/icons \ + ${datadir}/enlightenment/data/favorites \ ${datadir}/enlightenment/data/input_methods \ ${datadir}/enlightenment/data/config/profile.cfg \ ${datadir}/enlightenment/AUTHORS \ From 9e01451f6efe5dd8481a1fbabe350cbde8d3c881 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 Aug 2012 10:27:23 +0200 Subject: [PATCH 37/52] ecore: add gnutls to DEPENDS * we explicitly disable openssl, but gnutls is autodetected http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=7c2972a614cb2811962b95e1f0398cf07aafb7a0 Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/ecore.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc index e2fff0ea26..1c8da18225 100644 --- a/meta-efl/recipes-efl/efl/ecore.inc +++ b/meta-efl/recipes-efl/efl/ecore.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Ecore is the Enlightenment application framework library" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=d6ff2c3c85de2faf5fd7dcd9ccfc8886" -DEPENDS = "virtual/libiconv tslib curl eet evas glib-2.0 \ +DEPENDS = "virtual/libiconv tslib curl eet evas glib-2.0 gnutls \ libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil" DEPENDS_virtclass-native = "eet-native evas-native gettext-native" # optional @@ -10,7 +10,7 @@ DEPENDS_virtclass-native = "eet-native evas-native gettext-native" inherit efl gettext BBCLASSEXTEND = "native" -INC_PR = "r0" +INC_PR = "r1" do_configure_prepend() { touch ${S}/po/Makefile.in.in || true From fef70759e59a2b472459340a68875d1d93860970 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 Aug 2012 13:58:18 +0200 Subject: [PATCH 38/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 1ee7ca8155..3621217340 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "74879" +EFL_SRCREV ?= "74924" ARM_INSTRUCTION_SET = "arm" From b2ea6dab6a1c436fe0c516be805a5c53e44257a5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 Aug 2012 19:28:36 +0200 Subject: [PATCH 39/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 3621217340..53f2347222 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "74924" +EFL_SRCREV ?= "75056" ARM_INSTRUCTION_SET = "arm" From 2eaeef30edbde7d1280c8350d4d02e8a0848f124 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 Aug 2012 20:01:48 +0200 Subject: [PATCH 40/52] e-wm: illume2 profile was renamed to mobile Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_svn.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index bbe5ef9644..8e70507b32 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -4,7 +4,7 @@ LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r4" +PR = "r5" SRCREV = "${EFL_SRCREV}" inherit e update-alternatives gettext @@ -66,9 +66,13 @@ RDEPENDS_${PN}_append_libc-glibc = " glibc-utils " # The systray module used to be external, but is part of e-wm now RREPLACES_${PN} = "systray" +RREPLACES_${PN}-config-mobile = "${PN}-config-illume2" +RCONFLICTS_${PN}-config-mobile = "${PN}-config-illume2" +RPROVIDES_${PN}-config-mobile = "${PN}-config-illume2" + PACKAGES =+ "\ ${PN}-config-default \ - ${PN}-config-illume2 \ + ${PN}-config-mobile \ ${PN}-config-minimalist \ ${PN}-config-netbook \ ${PN}-config-scaleable \ @@ -120,7 +124,7 @@ FILES_${PN} = "\ " FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" -FILES_${PN}-config-illume2 = "${datadir}/enlightenment/data/config/illume" +FILES_${PN}-config-mobile = "${datadir}/enlightenment/data/config/mobile" FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist" FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook" FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable" From e823cd104ce6341f8d27ac411d84856f549d80d3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 11:54:21 +0200 Subject: [PATCH 41/52] e-base: bump EFL_SRCREV Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 53f2347222..439e5bfb10 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "75056" +EFL_SRCREV ?= "75077" ARM_INSTRUCTION_SET = "arm" From 886738268ae524dc9345c00f1e33fc9ced4939a9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 11:55:35 +0200 Subject: [PATCH 42/52] elsa: rename to entrance * elsa was killed in r75060 and reintroduced in r75061 with old name - entrance Signed-off-by: Martin Jansa --- ...e-common-auth-instead-of-system-auth.patch | 19 ++++++++----------- .../efl/{elsa_svn.bb => entrance_svn.bb} | 4 +--- 2 files changed, 9 insertions(+), 14 deletions(-) rename meta-efl/recipes-efl/efl/{elsa => entrance}/0001-pam-use-common-auth-instead-of-system-auth.patch (64%) rename meta-efl/recipes-efl/efl/{elsa_svn.bb => entrance_svn.bb} (92%) diff --git a/meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch similarity index 64% rename from meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch rename to meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch index a9beea0b74..a82d1ed3c8 100644 --- a/meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch +++ b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch @@ -1,21 +1,18 @@ -From 27dc9147a822d69be90edd0d137b80c0c609d5d2 Mon Sep 17 00:00:00 2001 +From 14396c52a2556b1ab778a310a318ec19c2829735 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 24 Nov 2011 13:25:33 +0100 Subject: [PATCH] pam: use common-auth instead of system-auth Signed-off-by: Martin Jansa --- - PROTO/elsa/data/elsa | 8 ++++---- + PROTO/entrance/data/entrance | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/data/elsa b/data/elsa -index 3476d55..47d29222 100644 ---- a/data/elsa -+++ b/data/elsa -@@ -1,7 +1,7 @@ - # File autogenerated by pamd_mimic in pam eclass - - +diff --git a/data/entrance b/data/entrance +index 872c83d..2b98c3a 100644 +--- a/data/entrance ++++ b/data/entrance +@@ -1,4 +1,4 @@ -auth include system-auth -account include system-auth -password include system-auth @@ -25,5 +22,5 @@ index 3476d55..47d29222 100644 +password include common-password +session include common-session -- -1.7.8.rc3 +1.7.8.6 diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb similarity index 92% rename from meta-efl/recipes-efl/efl/elsa_svn.bb rename to meta-efl/recipes-efl/efl/entrance_svn.bb index e23a694dbb..585d552c2c 100644 --- a/meta-efl/recipes-efl/efl/elsa_svn.bb +++ b/meta-efl/recipes-efl/efl/entrance_svn.bb @@ -4,8 +4,6 @@ LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "e/apps" -PR = "r2" - inherit e gettext SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \ file://0001-pam-use-common-auth-instead-of-system-auth.patch \ @@ -18,6 +16,6 @@ PV = "0.0.4+svnr${SRCPV}" SRCREV = "${EFL_SRCREV}" RDEPENDS_${PN} += "${PN}-themes sessreg xauth" -CONFFILES_${PN} += "${sysconfdir}/elsa.conf" +CONFFILES_${PN} += "${sysconfdir}/entrance.conf" RCONFLICTS_${PN} += "xserver-nodm-init" RREPLACES_${PN} += "xserver-nodm-init" From 9af01097c29b70e248a619b751bf3b23cb0ee840 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 12:14:18 +0200 Subject: [PATCH 43/52] meta-systemd: elsa: rename to entrance * elsa was killed in r75060 and reintroduced in r75061 with old name - entrance * also use Alias=display-manager.service like gdm does now Signed-off-by: Martin Jansa --- .../recipes-efl/efl/{elsa => entrance}/xserver-nodm.service | 4 ++-- .../efl/{elsa_svn.bbappend => entrance_svn.bbappend} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename meta-systemd/meta-efl/recipes-efl/efl/{elsa => entrance}/xserver-nodm.service (55%) rename meta-systemd/meta-efl/recipes-efl/efl/{elsa_svn.bbappend => entrance_svn.bbappend} (100%) diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service similarity index 55% rename from meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service rename to meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service index 0b9c0f559b..4828686952 100644 --- a/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service +++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service @@ -2,7 +2,7 @@ Description=Login manager for Enlightenment [Service] -ExecStart=/usr/sbin/elsa +ExecStart=/usr/sbin/entrance [Install] -WantedBy=multi-user.target +Alias=display-manager.service diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend similarity index 100% rename from meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend rename to meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend From e904c699d9068ab5bee8fc00d68bf397c4b138c8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 12:52:20 +0200 Subject: [PATCH 44/52] e-base: bump EFL_SRCREV for 1.6.99-alpha Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 439e5bfb10..4708fdd9f9 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" -EFL_SRCREV ?= "75077" +EFL_SRCREV ?= "75097" ARM_INSTRUCTION_SET = "arm" From 1b69dded38c7acd4bce1e31debcc8fcb0d55765f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 13:13:33 +0200 Subject: [PATCH 45/52] meta-efl: introduce 1.6.99-alpha releases Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 3 ++ meta-efl/recipes-efl/e17/expedite_1.2.0.bb | 10 ----- .../recipes-efl/e17/expedite_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/e17/expedite_svn.bb | 2 +- .../fix-ecore-fb-initialization.patch | 41 ----------------- meta-efl/recipes-efl/efl/ecore.inc | 2 +- ...ore_exe-fix-compilation-on-fedora-18.patch | 45 ------------------- meta-efl/recipes-efl/efl/ecore_1.2.1.bb | 12 ----- .../recipes-efl/efl/ecore_1.6.99-alpha.bb | 13 ++++++ meta-efl/recipes-efl/efl/ecore_svn.bb | 2 +- meta-efl/recipes-efl/efl/edbus.inc | 4 ++ meta-efl/recipes-efl/efl/edbus_1.2.0.bb | 11 ----- .../recipes-efl/efl/edbus_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/edbus_svn.bb | 7 +-- meta-efl/recipes-efl/efl/edje.inc | 5 ++- meta-efl/recipes-efl/efl/edje_1.2.1.bb | 10 ----- meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/edje_svn.bb | 6 +-- meta-efl/recipes-efl/efl/eet.inc | 2 +- meta-efl/recipes-efl/efl/eet_1.6.1.bb | 10 ----- meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/eet_svn.bb | 2 +- meta-efl/recipes-efl/efl/eeze.inc | 2 +- meta-efl/recipes-efl/efl/eeze_1.2.0.bb | 10 ----- meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/eeze_svn.bb | 2 +- meta-efl/recipes-efl/efl/efreet.inc | 2 +- meta-efl/recipes-efl/efl/efreet_1.2.0.bb | 10 ----- .../recipes-efl/efl/efreet_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/efreet_svn.bb | 4 +- meta-efl/recipes-efl/efl/eina_1.2.1.bb | 10 ----- meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/eina_svn.bb | 2 +- meta-efl/recipes-efl/efl/eio_1.0.1.bb | 10 ----- meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/eio_svn.bb | 2 +- meta-efl/recipes-efl/efl/elementary.inc | 4 +- meta-efl/recipes-efl/efl/elementary_1.0.1.bb | 10 ----- .../efl/elementary_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/elementary_svn.bb | 3 +- meta-efl/recipes-efl/efl/embryo_1.2.0.bb | 10 ----- .../recipes-efl/efl/embryo_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/embryo_svn.bb | 2 +- meta-efl/recipes-efl/efl/emotion.inc | 4 +- meta-efl/recipes-efl/efl/emotion_1.0.1.bb | 10 ----- .../recipes-efl/efl/emotion_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/emotion_svn.bb | 4 +- meta-efl/recipes-efl/efl/ethumb.inc | 2 +- meta-efl/recipes-efl/efl/ethumb_1.0.1.bb | 10 ----- .../recipes-efl/efl/ethumb_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/ethumb_svn.bb | 2 +- .../efl/evas-generic-loaders_1.2.0.bb | 10 ----- .../efl/evas-generic-loaders_1.6.99-alpha.bb | 12 +++++ .../efl/evas-generic-loaders_svn.bb | 2 +- meta-efl/recipes-efl/efl/evas.inc | 7 ++- meta-efl/recipes-efl/efl/evas_1.2.1.bb | 10 ----- meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb | 12 +++++ meta-efl/recipes-efl/efl/evas_svn.bb | 9 +--- 58 files changed, 222 insertions(+), 286 deletions(-) delete mode 100644 meta-efl/recipes-efl/e17/expedite_1.2.0.bb create mode 100644 meta-efl/recipes-efl/e17/expedite_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch delete mode 100644 meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch delete mode 100644 meta-efl/recipes-efl/efl/ecore_1.2.1.bb create mode 100644 meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/edbus_1.2.0.bb create mode 100644 meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/edje_1.2.1.bb create mode 100644 meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/eet_1.6.1.bb create mode 100644 meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/eeze_1.2.0.bb create mode 100644 meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.2.0.bb create mode 100644 meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/eina_1.2.1.bb create mode 100644 meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/eio_1.0.1.bb create mode 100644 meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.0.1.bb create mode 100644 meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.2.0.bb create mode 100644 meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.0.1.bb create mode 100644 meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.0.1.bb create mode 100644 meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb delete mode 100644 meta-efl/recipes-efl/efl/evas_1.2.1.bb create mode 100644 meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 4708fdd9f9..4213098913 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -1,6 +1,9 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" +SRCVER ?= "${PV}" EFL_SRCREV ?= "75097" ARM_INSTRUCTION_SET = "arm" + +S = "${WORKDIR}/${SRCNAME}-${SRCVER}" diff --git a/meta-efl/recipes-efl/e17/expedite_1.2.0.bb b/meta-efl/recipes-efl/e17/expedite_1.2.0.bb deleted file mode 100644 index c3890ffe96..0000000000 --- a/meta-efl/recipes-efl/e17/expedite_1.2.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -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_1.6.99-alpha.bb b/meta-efl/recipes-efl/e17/expedite_1.6.99-alpha.bb new file mode 100644 index 0000000000..ffe654647d --- /dev/null +++ b/meta-efl/recipes-efl/e17/expedite_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "fdd425395b8380b5c3b39186f9ef7ff3" +SRC_URI[sha256sum] = "738eed02cefa2c57cb7ac0fc8103d1680b6d3a4a17d620dd5fc503b0128bf1a5" diff --git a/meta-efl/recipes-efl/e17/expedite_svn.bb b/meta-efl/recipes-efl/e17/expedite_svn.bb index 594de4a16f..06cf950634 100644 --- a/meta-efl/recipes-efl/e17/expedite_svn.bb +++ b/meta-efl/recipes-efl/e17/expedite_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch deleted file mode 100644 index a2ce285266..0000000000 --- a/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 29 Oct 2011 00:16:55 +0200 -Subject: [PATCH] ecore-fb: fix ts init - -Upstream-Status: Pending - -The whole ecore-fb init logic is somewhat flawed; with this patch we -get at least a working touchscreen w/ tslib again. - -Signed-off-by: Michael 'Mickey' Lauer -Signed-off-by: Martin Jansa ---- - src/lib/ecore_fb/ecore_fb.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c -index ca7d73d..5b99989 100644 ---- a/src/lib/ecore_fb/ecore_fb.c -+++ b/src/lib/ecore_fb/ecore_fb.c -@@ -39,6 +39,9 @@ ecore_fb_init(const char *name __UNUSED__) - if (!ecore_fb_vt_init()) - return --_ecore_fb_init_count; - -+ if (!ecore_fb_ts_init()) -+ return --_ecore_fb_init_count; -+ - _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h); - - return _ecore_fb_init_count; -@@ -59,6 +62,7 @@ ecore_fb_shutdown(void) - if (--_ecore_fb_init_count != 0) - return _ecore_fb_init_count; - -+ ecore_fb_ts_shutdown(); - ecore_fb_vt_shutdown(); - - return _ecore_fb_init_count; --- -1.7.7.1 - diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc index 1c8da18225..9faaf3a533 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 diff --git a/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch b/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch deleted file mode 100644 index 613cf5e478..0000000000 --- a/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2ad957d5da1fc91faf7c2c6562139d19f29f5b9c Mon Sep 17 00:00:00 2001 -From: caro -Date: Fri, 22 Jun 2012 05:36:00 +0000 -Subject: [PATCH] ecore_exe: fix compilation on fedora 18. - -setpriority needs sys/resource.h. See: - -http://linux.die.net/man/2/setpriority - -I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems. - - -git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk@72684 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 ---- - src/lib/ecore/ecore_exe.c | 7 ++----- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c -index 7931a96..6db32a9 100644 ---- a/src/lib/ecore/ecore_exe.c -+++ b/src/lib/ecore/ecore_exe.c -@@ -2,11 +2,6 @@ - # include - #endif - --#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) --# include --# include --#endif -- - #include - #include - #include -@@ -14,6 +9,8 @@ - #include - #include - #include -+#include -+#include - - #ifdef HAVE_SYS_PRCTL_H - # include --- -1.7.8.6 - diff --git a/meta-efl/recipes-efl/efl/ecore_1.2.1.bb b/meta-efl/recipes-efl/efl/ecore_1.2.1.bb deleted file mode 100644 index bec47a7e68..0000000000 --- a/meta-efl/recipes-efl/efl/ecore_1.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.1" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ - file://fix-ecore-fb-initialization.patch \ - file://0001-ecore_exe-fix-compilation-on-fedora-18.patch \ -" - -SRC_URI[md5sum] = "557f8411d323b14ed7bf1be368ab302a" -SRC_URI[sha256sum] = "78d8374e5f901f1dd4c89e99508a5a3470b8a0cb2510ab5b7e45d670e6621ef8" diff --git a/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb new file mode 100644 index 0000000000..33e39764a6 --- /dev/null +++ b/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb @@ -0,0 +1,13 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + file://fix-ecore-fb-initialization.patch \ +" + +SRC_URI[md5sum] = "c40c25f2638677191bb95a628743209d" +SRC_URI[sha256sum] = "8742fdcb725ac1494650577f75bbd36d3bf42d8d5c1f8d96a9d541f310a46c44" diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb index ad724d0e7d..e00a0ccac2 100644 --- a/meta-efl/recipes-efl/efl/ecore_svn.bb +++ b/meta-efl/recipes-efl/efl/ecore_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/edbus.inc b/meta-efl/recipes-efl/efl/edbus.inc index cca9c5ea24..ae558f00de 100644 --- a/meta-efl/recipes-efl/efl/edbus.inc +++ b/meta-efl/recipes-efl/efl/edbus.inc @@ -14,6 +14,8 @@ INC_PR = "r0" SRCNAME = "e_dbus" EXTRA_OECONF += "--enable-build-test-gui" +# it needs to be disabled, because creates circular dependency on elementary +EXTRA_OECONF += "--disable-edbus-performance-test" PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-econnman ${PN}-eofono ${PN}-eukit ${PN}-ebluez ${PN}-test-gui" FILES_${PN}-enotify = "${libdir}/libenotify.so.* ${bindir}/e-notify-send" @@ -25,3 +27,5 @@ FILES_${PN}-eofono = "${libdir}/libeofono.so.*" FILES_${PN}-eukit = "${libdir}/libeukit.so.*" FILES_${PN}-ebluez = "${libdir}/libebluez.so.*" FILES_${PN}-test-gui = "${bindir}/e_dbus_hal" +FILES_${PN} += "${datadir}/e_dbus/logo.png" + diff --git a/meta-efl/recipes-efl/efl/edbus_1.2.0.bb b/meta-efl/recipes-efl/efl/edbus_1.2.0.bb deleted file mode 100644 index 91371157dd..0000000000 --- a/meta-efl/recipes-efl/efl/edbus_1.2.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -SRC_URI[md5sum] = "19dc0e43cd9defd5b8fdc7c8610bfe2c" -SRC_URI[sha256sum] = "2f72b3710ae66604e37e6f6b20857caae9e2ddc7002fa402806dce14b6acbd4c" diff --git a/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb new file mode 100644 index 0000000000..7b56e128d9 --- /dev/null +++ b/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "6833e32681db6630a4a50d98cf5cac88" +SRC_URI[sha256sum] = "8810a40568df9c068c1606821f24a95fb409e0f99459a45b18ee07077f432cc2" diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index b99f79dad6..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb @@ -1,16 +1,11 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -# it needs to be disabled, because creates circular dependency on elementary -EXTRA_OECONF += "--disable-edbus-performance-test" - SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" - -FILES_${PN} += "${datadir}/e_dbus/logo.png" diff --git a/meta-efl/recipes-efl/efl/edje.inc b/meta-efl/recipes-efl/efl/edje.inc index b3011b4d21..6f50ea8fbc 100644 --- a/meta-efl/recipes-efl/efl/edje.inc +++ b/meta-efl/recipes-efl/efl/edje.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" -DEPENDS = "lua5.1 eet evas ecore embryo edje-native eina libsndfile1" +DEPENDS = "lua5.1 eet evas ecore embryo edje-native eina libsndfile1 eio" DEPENDS_virtclass-native = "lua5.1-native evas-native ecore-native eet-native embryo-native eina-native" DEPENDS_virtclass-nativesdk = "evas-native ecore-native eet-native embryo-native eina-native" # GPLv2 because of epp in PN-utils @@ -60,6 +60,7 @@ FILES_${PN}-utils = "\ ${datadir}/edje/include/edje.inc \ " -FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so" +FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so \ + ${datadir}/mime/packages/edje.xml" FILES_${PN}-dev += "${libdir}/${PN}/modules/*/*/module.la" FILES_${PN}-dbg += "${libdir}/${PN}/modules/*/*/.debug" diff --git a/meta-efl/recipes-efl/efl/edje_1.2.1.bb b/meta-efl/recipes-efl/efl/edje_1.2.1.bb deleted file mode 100644 index 8f22e50972..0000000000 --- a/meta-efl/recipes-efl/efl/edje_1.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "b9df053b327cb41d2de2485bd596bb44" -SRC_URI[sha256sum] = "b793e98e9f65dfe7d007563e9d4cba84807a4473dfa9c94cdaee1ed9752cf6e0" diff --git a/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb new file mode 100644 index 0000000000..1ba83c01e8 --- /dev/null +++ b/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "b4c063f673394bda3f24b1a894001224" +SRC_URI[sha256sum] = "4b8aeb5e59b493e9cfce30c91acf9b55f4774b417349c8291fda6e35265ee311" diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb index 435b899cb3..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/edje_svn.bb +++ b/meta-efl/recipes-efl/efl/edje_svn.bb @@ -1,15 +1,11 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -DEPENDS += "eio" - SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" - -FILES_${PN} += "${datadir}/mime/packages/edje.xml" diff --git a/meta-efl/recipes-efl/efl/eet.inc b/meta-efl/recipes-efl/efl/eet.inc index 089e92e220..0f6a9fe105 100644 --- a/meta-efl/recipes-efl/efl/eet.inc +++ b/meta-efl/recipes-efl/efl/eet.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953" inherit efl BBCLASSEXTEND = "native" -INC_PR = "r1" +INC_PR = "r0" EXTRA_OECONF = "\ --enable-openssl \ diff --git a/meta-efl/recipes-efl/efl/eet_1.6.1.bb b/meta-efl/recipes-efl/efl/eet_1.6.1.bb deleted file mode 100644 index 36894eac90..0000000000 --- a/meta-efl/recipes-efl/efl/eet_1.6.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "eaa6c1088b60d2177b57554690507eb7" -SRC_URI[sha256sum] = "376056473e2d5d1873381b5782f50f7755ab8d1243f113f02c0e147f36203807" diff --git a/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb new file mode 100644 index 0000000000..39663f9ace --- /dev/null +++ b/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "06a65f37117607ba24e4f4a9d3420f0a" +SRC_URI[sha256sum] = "29b6717404131b30882ae5f7947f5705da972f07576ad4c6c6c378a7592b5f68" diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb index de8af5fe86..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/eet_svn.bb +++ b/meta-efl/recipes-efl/efl/eet_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.6.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/eeze.inc b/meta-efl/recipes-efl/efl/eeze.inc index 1b0f489371..5d523c9916 100644 --- a/meta-efl/recipes-efl/efl/eeze.inc +++ b/meta-efl/recipes-efl/efl/eeze.inc @@ -6,7 +6,7 @@ DEPENDS = "ecore eet udev" inherit efl BBCLASSEXTEND = "native" -INC_PR = "r1" +INC_PR = "r0" # Some upgrade path tweaking AUTO_LIBNAME_PKGS = "" diff --git a/meta-efl/recipes-efl/efl/eeze_1.2.0.bb b/meta-efl/recipes-efl/efl/eeze_1.2.0.bb deleted file mode 100644 index 9fb4e89a57..0000000000 --- a/meta-efl/recipes-efl/efl/eeze_1.2.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "4a5a12514e8c2de5d88d31bf4c34cac4" -SRC_URI[sha256sum] = "4df8ace51385ab15932c856b121b14fb93f2f5a87a08004078fdff5fee451cec" diff --git a/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb new file mode 100644 index 0000000000..4f8ecb4f1c --- /dev/null +++ b/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "25c36ea710d61b2f6a732ec44f9f5dbb" +SRC_URI[sha256sum] = "3440e11e9edbe234d207a8791a6c6502968ce642bd8d4821da77be71c11bd432" diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb index 720703e7c3..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/eeze_svn.bb +++ b/meta-efl/recipes-efl/efl/eeze_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/efreet.inc b/meta-efl/recipes-efl/efl/efreet.inc index 9aaeaa72da..6c6852606e 100644 --- a/meta-efl/recipes-efl/efl/efreet.inc +++ b/meta-efl/recipes-efl/efl/efreet.inc @@ -3,7 +3,7 @@ DEPENDS = "ecore" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=9594ec75c5a57e71fccedcbe10dd3ef4" -inherit efl +inherit efl gettext INC_PR = "r0" diff --git a/meta-efl/recipes-efl/efl/efreet_1.2.0.bb b/meta-efl/recipes-efl/efl/efreet_1.2.0.bb deleted file mode 100644 index d1c850a592..0000000000 --- a/meta-efl/recipes-efl/efl/efreet_1.2.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "20fc8b8d364f518adf6d92c2e31650f9" -SRC_URI[sha256sum] = "cc23bfc65528e3bc7ba078db739653d95bd9b255d565b09745a161d338d699e4" diff --git a/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb new file mode 100644 index 0000000000..afe123a45b --- /dev/null +++ b/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "d18062fb8831334323b00123fe93ac5b" +SRC_URI[sha256sum] = "28372b8b3c064fc0f6c50964d1199aee28b06102d796c1546de7c7bf8d41b97c" diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb index 503dc528af..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/efreet_svn.bb +++ b/meta-efl/recipes-efl/efl/efreet_svn.bb @@ -1,9 +1,7 @@ require ${BPN}.inc -inherit gettext - SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/eina_1.2.1.bb b/meta-efl/recipes-efl/efl/eina_1.2.1.bb deleted file mode 100644 index 4714db8c87..0000000000 --- a/meta-efl/recipes-efl/efl/eina_1.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "5dc2712b71f202d32c07394ad253a071" -SRC_URI[sha256sum] = "013ee257f4be3acfb94ef3f2e5b06aedd48ed528e66833fb5e3ca71479912bea" diff --git a/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb new file mode 100644 index 0000000000..ba7bab3e82 --- /dev/null +++ b/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "b4fdbb79b92496829b921d46762344ac" +SRC_URI[sha256sum] = "51a7799ba61036072be646e1fcaa742d9c5f39bb499155012bc177a9f561f2b5" diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb index 720703e7c3..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/eina_svn.bb +++ b/meta-efl/recipes-efl/efl/eina_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/eio_1.0.1.bb b/meta-efl/recipes-efl/efl/eio_1.0.1.bb deleted file mode 100644 index 54a35a8a08..0000000000 --- a/meta-efl/recipes-efl/efl/eio_1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "a079913877d79417bc06dfecbf57c949" -SRC_URI[sha256sum] = "8a7079bf1e980e0d00fa9656e641e4a8a5aabf66986e76dcf06882ccf9623ed0" diff --git a/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb new file mode 100644 index 0000000000..f4de7af5ea --- /dev/null +++ b/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "741d2a2211a66cba0986b1dbcc12118f" +SRC_URI[sha256sum] = "1d3cbbc48b0970a8b7327d1d74ca44bc0a6f5852e26d348bc9793421675ca23f" diff --git a/meta-efl/recipes-efl/efl/eio_svn.bb b/meta-efl/recipes-efl/efl/eio_svn.bb index eb28d9ae19..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/eio_svn.bb +++ b/meta-efl/recipes-efl/efl/eio_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc index 50c708dbd2..34338e865d 100644 --- a/meta-efl/recipes-efl/efl/elementary.inc +++ b/meta-efl/recipes-efl/efl/elementary.inc @@ -1,11 +1,11 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=10a051c72424b80bc784a3903651b43b" -DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb poppler" +DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb poppler eio" inherit efl gettext -INC_PR = "r1" +INC_PR = "r0" EXTRA_OECONF = "\ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ diff --git a/meta-efl/recipes-efl/efl/elementary_1.0.1.bb b/meta-efl/recipes-efl/efl/elementary_1.0.1.bb deleted file mode 100644 index d4e3960fde..0000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "df978462103b1b6a5af374ea22296d80" -SRC_URI[sha256sum] = "24af1521fee4a18e1039a908e5f9aefa2f767854c5075d06bb5d268cfde1e2be" diff --git a/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb new file mode 100644 index 0000000000..235136038d --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "7509fb6bc2d814066deed3d97c2d0118" +SRC_URI[sha256sum] = "a262b9723f4491e4fbb43b285d7845a6dc8daab53d97e68cd8b0df69737ff69e" diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb index fa8a8e85aa..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/elementary_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary_svn.bb @@ -1,10 +1,9 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -DEPENDS += "eio" SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ diff --git a/meta-efl/recipes-efl/efl/embryo_1.2.0.bb b/meta-efl/recipes-efl/efl/embryo_1.2.0.bb deleted file mode 100644 index d3956acdd9..0000000000 --- a/meta-efl/recipes-efl/efl/embryo_1.2.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "6c070a16d61141d695397fc248e6176e" -SRC_URI[sha256sum] = "432838f5f02c86da785beff0a1e0210a1d3f28121bfb6d6c70300839df31a70c" diff --git a/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb new file mode 100644 index 0000000000..8cd4f8cb11 --- /dev/null +++ b/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "1505a60e8e446d55ab1887f3832063f2" +SRC_URI[sha256sum] = "6b6999e29836c56f079f84617133cc9b8d9bb1ea826577eebdc29f7ebeb6ffe5" diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb index 720703e7c3..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/embryo_svn.bb +++ b/meta-efl/recipes-efl/efl/embryo_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/emotion.inc b/meta-efl/recipes-efl/efl/emotion.inc index 20a88525e9..08a24b26f6 100644 --- a/meta-efl/recipes-efl/efl/emotion.inc +++ b/meta-efl/recipes-efl/efl/emotion.inc @@ -2,9 +2,9 @@ DESCRIPTION = "The Enlightenment multimedia library" LICENSE = "MIT BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd" # we no longer build the libxine backend, since the gstreamer backend seems more promising -DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base" +DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base eio" -INC_PR = "r1" +INC_PR = "r0" inherit efl diff --git a/meta-efl/recipes-efl/efl/emotion_1.0.1.bb b/meta-efl/recipes-efl/efl/emotion_1.0.1.bb deleted file mode 100644 index c142b5bd0b..0000000000 --- a/meta-efl/recipes-efl/efl/emotion_1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "6bed064cc88b060e79e9418c557eac8c" -SRC_URI[sha256sum] = "e8f95696c87731b26a199990f190476acd94da103c6538f76ade30abd0db850d" diff --git a/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb new file mode 100644 index 0000000000..d5f9412295 --- /dev/null +++ b/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "55bea7e3c3e5d503a98f336d829b47bb" +SRC_URI[sha256sum] = "b54e9ea93c248885b56e5b6dbf8161bf9cd04103dcd06d72eb2579d83a48ad7f" diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb index bf75d9eeb4..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/emotion_svn.bb +++ b/meta-efl/recipes-efl/efl/emotion_svn.bb @@ -1,12 +1,10 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -DEPENDS += "eio" - SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " diff --git a/meta-efl/recipes-efl/efl/ethumb.inc b/meta-efl/recipes-efl/efl/ethumb.inc index 0c3080c053..92a83eee4f 100644 --- a/meta-efl/recipes-efl/efl/ethumb.inc +++ b/meta-efl/recipes-efl/efl/ethumb.inc @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=e6a6db9e80255adbafa16e817d9a4d8c" DEPENDS = "libexif eet-native evas ecore edje eet edbus emotion epdf" -INC_PR = "r1" +INC_PR = "r0" inherit efl diff --git a/meta-efl/recipes-efl/efl/ethumb_1.0.1.bb b/meta-efl/recipes-efl/efl/ethumb_1.0.1.bb deleted file mode 100644 index e976238a91..0000000000 --- a/meta-efl/recipes-efl/efl/ethumb_1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "20bd55bfa05d0c20e985f1031a683677" -SRC_URI[sha256sum] = "67449d0521d3c806b57e4d8ea121089dcbdf4fbcc2fb451ae881bd05025f6715" diff --git a/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb new file mode 100644 index 0000000000..69f8e33fde --- /dev/null +++ b/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "356b996537136c6504daf1358509e5a8" +SRC_URI[sha256sum] = "1bdeff24945f67c5685bd526a2ba7a951a97fe3aff8aea2f6efc9cf8503c431b" diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb index f6b3f3e07c..892b298605 100644 --- a/meta-efl/recipes-efl/efl/ethumb_svn.bb +++ b/meta-efl/recipes-efl/efl/ethumb_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.0.1+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb deleted file mode 100644 index de0ce1c05d..0000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "340a8c2f42c82ecd10f0204cdb291a70" -SRC_URI[sha256sum] = "9a3aad43269f34513765b04ed3e8db5a18d3545da010b2f6066aeaf90bf442d4" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb new file mode 100644 index 0000000000..5ac0b94e28 --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "e8444bb1ddebd337a8d0bd8a14d83951" +SRC_URI[sha256sum] = "84f1d1e3b8a232c849f91ff70e2b5ad2154a5c2e9904469b3b1ec5b41dd700c7" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb index 594de4a16f..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb @@ -1,7 +1,7 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.0+svnr${SRCPV}" +PV = "1.6.99+svnr${SRCPV}" PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc index 5254ee428e..89ae1a47fe 100644 --- a/meta-efl/recipes-efl/efl/evas.inc +++ b/meta-efl/recipes-efl/efl/evas.inc @@ -8,7 +8,7 @@ DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-na inherit efl BBCLASSEXTEND = "native" -INC_PR = "r1" +INC_PR = "r0" FILESPATHPKG =. "${BPN}-${PV}:${BPN}:" python populate_packages_prepend () { @@ -42,6 +42,11 @@ FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave" PACKAGES += "${PN}-cserve2" PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*" +# evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon +# http://www.intesis.hr/news/16-esvg-source +# http://blog.gmane.org/gmane.comp.window-managers.enlightenment.user/page=3 +RRECOMMENDS_${PN} += "evas-loader-generic evas-generic-loader-svn" + RRECOMMENDS_${PN} = " \ evas-engine-fb \ evas-engine-software-generic \ diff --git a/meta-efl/recipes-efl/efl/evas_1.2.1.bb b/meta-efl/recipes-efl/efl/evas_1.2.1.bb deleted file mode 100644 index ddac920bb0..0000000000 --- a/meta-efl/recipes-efl/efl/evas_1.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "830161bd790c2c5f17aa47e3a1c3abe1" -SRC_URI[sha256sum] = "a019b410dba86e616163bafb6524d8734ac8c97aab7c41409f5176f23944bae6" diff --git a/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb new file mode 100644 index 0000000000..df777f5406 --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-alpha" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "3f4f1f87fa16dd4db121ce9c2e056131" +SRC_URI[sha256sum] = "25a905c90650e8d53a2b0cf90ef453dc7410f0143fd2fe1c11f5ccd50e107f70" diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb index fb0342f76b..06cf950634 100644 --- a/meta-efl/recipes-efl/efl/evas_svn.bb +++ b/meta-efl/recipes-efl/efl/evas_svn.bb @@ -1,15 +1,10 @@ require ${BPN}.inc SRCREV = "${EFL_SRCREV}" -PV = "1.2.1+svnr${SRCPV}" -PR = "${INC_PR}.1" +PV = "1.6.99+svnr${SRCPV}" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -# evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon -# http://www.intesis.hr/news/16-esvg-source -# http://blog.gmane.org/gmane.comp.window-managers.enlightenment.user/page=3 -RRECOMMENDS_${PN} += "evas-loader-generic evas-generic-loader-svn" - SRC_URI = "\ ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ " From 14361d93dbe3d0e6d224aea371d90bd85b64870c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 13:14:59 +0200 Subject: [PATCH 46/52] efl-from-svn-recipes: update P_Vs, now all svn recipes have 1.6.99+svn Signed-off-by: Martin Jansa --- .../distro/include/efl-from-svn-recipes.inc | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc index 38c2dd357e..b703b4190f 100644 --- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc +++ b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc @@ -1,6 +1,4 @@ -EFL_PREFERRED_VERSION ?= "1.2.1+svn%" -EFL_PREFERRED_VERSION_1.0 ?= "1.0.1+svn%" -EFL_PREFERRED_VERSION_EET ?= "1.6.1+svn%" +EFL_PREFERRED_VERSION ?= "1.6.99+svn%" PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}" @@ -18,16 +16,16 @@ PREFERRED_VERSION_eina-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_embryo ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_embryo-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}" -PREFERRED_VERSION_evas-generic-loaders ?= "1.2.0+svn%" +PREFERRED_VERSION_evas-generic-loaders ?= "${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 ?= "${EFL_PREFERRED_VERSION_EET}" -PREFERRED_VERSION_eet-native ?= "${EFL_PREFERRED_VERSION_EET}" +PREFERRED_VERSION_eet ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_eet-native ?= "${EFL_PREFERRED_VERSION}" -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}" +PREFERRED_VERSION_eio ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_eio-native ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION}" From 7c28fa0c71de1b487d05695b8401333140bc76b5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 13 Aug 2012 15:17:08 +0200 Subject: [PATCH 47/52] python-efl: bump PV and reset PR Signed-off-by: Martin Jansa --- meta-efl/recipes-devtools/python/python-ecore_svn.bb | 2 +- meta-efl/recipes-devtools/python/python-edbus_svn.bb | 2 +- meta-efl/recipes-devtools/python/python-edje_svn.bb | 2 +- meta-efl/recipes-devtools/python/python-efl.inc | 4 ++-- meta-efl/recipes-devtools/python/python-elementary_svn.bb | 2 +- meta-efl/recipes-devtools/python/python-emotion_svn.bb | 2 +- meta-efl/recipes-devtools/python/python-evas_svn.bb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-efl/recipes-devtools/python/python-ecore_svn.bb b/meta-efl/recipes-devtools/python/python-ecore_svn.bb index 2edf864717..a6ec5e6045 100644 --- a/meta-efl/recipes-devtools/python/python-ecore_svn.bb +++ b/meta-efl/recipes-devtools/python/python-ecore_svn.bb @@ -1,7 +1,7 @@ require python-efl.inc LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -PR = "${INC_PR}.2" +PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" DEPENDS += "python-evas ecore" RDEPENDS_${PN} += "python-evas" diff --git a/meta-efl/recipes-devtools/python/python-edbus_svn.bb b/meta-efl/recipes-devtools/python/python-edbus_svn.bb index 256a52aaf7..518f7c2102 100644 --- a/meta-efl/recipes-devtools/python/python-edbus_svn.bb +++ b/meta-efl/recipes-devtools/python/python-edbus_svn.bb @@ -1,7 +1,7 @@ require python-efl.inc LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" DEPENDS += "edbus python-dbus" RDEPENDS_${PN} += "python-dbus" diff --git a/meta-efl/recipes-devtools/python/python-edje_svn.bb b/meta-efl/recipes-devtools/python/python-edje_svn.bb index f527959fbc..a6b376c2c2 100644 --- a/meta-efl/recipes-devtools/python/python-edje_svn.bb +++ b/meta-efl/recipes-devtools/python/python-edje_svn.bb @@ -1,7 +1,7 @@ require python-efl.inc LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -PR = "${INC_PR}.2" +PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" DEPENDS += "edje python-evas evas" RDEPENDS_${PN} += "python-evas" diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc index a4df6a6952..498c3be65e 100644 --- a/meta-efl/recipes-devtools/python/python-efl.inc +++ b/meta-efl/recipes-devtools/python/python-efl.inc @@ -6,8 +6,8 @@ AUTHOR = "Gustavo Sverzut Barbieri " # the extension modules. DEPENDS = "python-cython-native python-pyrex-native python-numeric eina" RDEPENDS_${PN} += "python-lang" -PV = "0.7.3+svnr${SRCPV}" -INC_PR = "r2" +PV = "1.6.99+svnr${SRCPV}" +INC_PR = "r0" # necessary to let the call for python-config succeed export BUILD_SYS diff --git a/meta-efl/recipes-devtools/python/python-elementary_svn.bb b/meta-efl/recipes-devtools/python/python-elementary_svn.bb index 911ed6f088..ffb6d5e7c5 100644 --- a/meta-efl/recipes-devtools/python/python-elementary_svn.bb +++ b/meta-efl/recipes-devtools/python/python-elementary_svn.bb @@ -1,7 +1,7 @@ require python-efl.inc LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" -PR = "${INC_PR}.6" +PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" DEPENDS += "elementary python-evas" RDEPENDS_${PN} += "python-evas python-ecore python-edje" diff --git a/meta-efl/recipes-devtools/python/python-emotion_svn.bb b/meta-efl/recipes-devtools/python/python-emotion_svn.bb index a39c0c8817..89002c3b71 100644 --- a/meta-efl/recipes-devtools/python/python-emotion_svn.bb +++ b/meta-efl/recipes-devtools/python/python-emotion_svn.bb @@ -1,7 +1,7 @@ require python-efl.inc LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" DEPENDS += "emotion python-evas" RDEPENDS_${PN} += "python-ecore" diff --git a/meta-efl/recipes-devtools/python/python-evas_svn.bb b/meta-efl/recipes-devtools/python/python-evas_svn.bb index 8d719ce852..79844beb58 100644 --- a/meta-efl/recipes-devtools/python/python-evas_svn.bb +++ b/meta-efl/recipes-devtools/python/python-evas_svn.bb @@ -1,6 +1,6 @@ require python-efl.inc LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -PR = "${INC_PR}.2" +PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" DEPENDS += "evas" From ab19e33a9d9c77074def6e74ac72e84439cd0bee Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 13 Aug 2012 15:27:52 +0200 Subject: [PATCH 48/52] python-efl: introduce recipes for 1.6.99-alpha release and add negative D_P to svn recipes Signed-off-by: Martin Jansa --- .../conf/distro/include/efl-from-svn-recipes.inc | 7 +++++++ meta-efl/recipes-devtools/python/python-ecore.inc | 5 +++++ .../python/python-ecore_1.6.99-alpha.bb | 6 ++++++ meta-efl/recipes-devtools/python/python-ecore_svn.bb | 11 ++++++----- meta-efl/recipes-devtools/python/python-edbus.inc | 6 ++++++ .../python/python-edbus_1.6.99-alpha.bb | 6 ++++++ meta-efl/recipes-devtools/python/python-edbus_svn.bb | 12 ++++++------ meta-efl/recipes-devtools/python/python-edje.inc | 5 +++++ .../python/python-edje_1.6.99-alpha.bb | 7 +++++++ meta-efl/recipes-devtools/python/python-edje_svn.bb | 11 ++++++----- meta-efl/recipes-devtools/python/python-efl.inc | 9 ++++++--- .../recipes-devtools/python/python-elementary.inc | 5 +++++ .../python/python-elementary_1.6.99-alpha.bb | 6 ++++++ .../recipes-devtools/python/python-elementary_svn.bb | 11 ++++++----- meta-efl/recipes-devtools/python/python-emotion.inc | 5 +++++ .../python/python-emotion_1.6.99-alpha.bb | 6 ++++++ .../recipes-devtools/python/python-emotion_svn.bb | 11 ++++++----- meta-efl/recipes-devtools/python/python-evas.inc | 4 ++++ .../python/python-evas_1.6.99-alpha.bb | 6 ++++++ meta-efl/recipes-devtools/python/python-evas_svn.bb | 10 ++++++---- 20 files changed, 116 insertions(+), 33 deletions(-) create mode 100644 meta-efl/recipes-devtools/python/python-ecore.inc create mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-edbus.inc create mode 100644 meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-edje.inc create mode 100644 meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-elementary.inc create mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-emotion.inc create mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-evas.inc create mode 100644 meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc index b703b4190f..4625b1972a 100644 --- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc +++ b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc @@ -29,3 +29,10 @@ PREFERRED_VERSION_eio-native ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION}" PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION}" + +PREFERRED_VERSION_python-elementary ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_python-ecore ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_python-edbus ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_python-edje ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_python-emotion ?= "${EFL_PREFERRED_VERSION}" +PREFERRED_VERSION_python-evas ?= "${EFL_PREFERRED_VERSION}" diff --git a/meta-efl/recipes-devtools/python/python-ecore.inc b/meta-efl/recipes-devtools/python/python-ecore.inc new file mode 100644 index 0000000000..79aaeeccd1 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-ecore.inc @@ -0,0 +1,5 @@ +require python-efl.inc +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS += "python-evas ecore" +RDEPENDS_${PN} += "python-evas" diff --git a/meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb new file mode 100644 index 0000000000..a76c44f5c8 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-alpha" + +SRC_URI[md5sum] = "86ba753726881b9bfcaa0fdc0827cd1e" +SRC_URI[sha256sum] = "b47a155c0bfad6fad68bc0f925c54a8736a61ca72f6a71bd5138ea3298a35c95" diff --git a/meta-efl/recipes-devtools/python/python-ecore_svn.bb b/meta-efl/recipes-devtools/python/python-ecore_svn.bb index a6ec5e6045..a0298e8596 100644 --- a/meta-efl/recipes-devtools/python/python-ecore_svn.bb +++ b/meta-efl/recipes-devtools/python/python-ecore_svn.bb @@ -1,7 +1,8 @@ -require python-efl.inc -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +require ${BPN}.inc PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" -DEPENDS += "python-evas ecore" -RDEPENDS_${PN} += "python-evas" +PV = "1.6.99+svnr${SRCPV}" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http" +S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-devtools/python/python-edbus.inc b/meta-efl/recipes-devtools/python/python-edbus.inc new file mode 100644 index 0000000000..86ae773436 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-edbus.inc @@ -0,0 +1,6 @@ +require python-efl.inc +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS += "edbus python-dbus" +RDEPENDS_${PN} += "python-dbus" +SRCNAME = "python-e_dbus" diff --git a/meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb new file mode 100644 index 0000000000..c643141efc --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-alpha" + +SRC_URI[md5sum] = "bd68e260e1a23fc14313afa48e70bebd" +SRC_URI[sha256sum] = "63e823c8366f293db1940524ac76d6f91109a7202cf38ad6407d414d15e09aca" diff --git a/meta-efl/recipes-devtools/python/python-edbus_svn.bb b/meta-efl/recipes-devtools/python/python-edbus_svn.bb index 518f7c2102..a0298e8596 100644 --- a/meta-efl/recipes-devtools/python/python-edbus_svn.bb +++ b/meta-efl/recipes-devtools/python/python-edbus_svn.bb @@ -1,8 +1,8 @@ -require python-efl.inc -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +require ${BPN}.inc PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" -DEPENDS += "edbus python-dbus" -RDEPENDS_${PN} += "python-dbus" -SRCNAME = "python-e_dbus" +PV = "1.6.99+svnr${SRCPV}" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http" +S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-devtools/python/python-edje.inc b/meta-efl/recipes-devtools/python/python-edje.inc new file mode 100644 index 0000000000..473b92e873 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-edje.inc @@ -0,0 +1,5 @@ +require python-efl.inc +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS += "edje python-evas evas" +RDEPENDS_${PN} += "python-evas" diff --git a/meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb new file mode 100644 index 0000000000..1d7bb069fe --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb @@ -0,0 +1,7 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-alpha" +SRC_URI += "file://0001-fix-unicode-conversion.patch" + +SRC_URI[md5sum] = "fbe5105abb5b2d3de71302ff3973945a" +SRC_URI[sha256sum] = "f5004d9b784b0ca37436daacff7f4f21bb3094b9fdfc5abc95f8e57e90ecb242" diff --git a/meta-efl/recipes-devtools/python/python-edje_svn.bb b/meta-efl/recipes-devtools/python/python-edje_svn.bb index a6b376c2c2..3d392d0ff8 100644 --- a/meta-efl/recipes-devtools/python/python-edje_svn.bb +++ b/meta-efl/recipes-devtools/python/python-edje_svn.bb @@ -1,9 +1,10 @@ -require python-efl.inc -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +require ${BPN}.inc PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" -DEPENDS += "edje python-evas evas" -RDEPENDS_${PN} += "python-evas" +PV = "1.6.99+svnr${SRCPV}" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http" +S = "${WORKDIR}/${SRCNAME}" SRC_URI += "file://0001-fix-unicode-conversion.patch" diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc index 498c3be65e..77d4114ca7 100644 --- a/meta-efl/recipes-devtools/python/python-efl.inc +++ b/meta-efl/recipes-devtools/python/python-efl.inc @@ -6,7 +6,6 @@ AUTHOR = "Gustavo Sverzut Barbieri " # the extension modules. DEPENDS = "python-cython-native python-pyrex-native python-numeric eina" RDEPENDS_${PN} += "python-lang" -PV = "1.6.99+svnr${SRCPV}" INC_PR = "r0" # necessary to let the call for python-config succeed @@ -15,8 +14,12 @@ export HOST_SYS inherit e-base autotools pkgconfig distutils-base -SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http" -S = "${WORKDIR}/${SRCNAME}" +SRCVER = "${PV}" + +SRC_URI = "\ + ${E_MIRROR}/BINDINGS/python/${SRCNAME}-${SRCVER}.tar.bz2 \ +" +S = "${WORKDIR}/${SRCNAME}-${SRCVER}" do_configure_prepend() { diff --git a/meta-efl/recipes-devtools/python/python-elementary.inc b/meta-efl/recipes-devtools/python/python-elementary.inc new file mode 100644 index 0000000000..3f1d123c3a --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-elementary.inc @@ -0,0 +1,5 @@ +require python-efl.inc +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" +DEPENDS += "elementary python-evas" +RDEPENDS_${PN} += "python-evas python-ecore python-edje" diff --git a/meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb new file mode 100644 index 0000000000..8ed363e507 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-alpha" + +SRC_URI[md5sum] = "bad3bd52e79aeea1ee9ffa0ab8a54855" +SRC_URI[sha256sum] = "32ded2fb4e66aa543ae9274076d031f8465167a0cc1af3fcd26bcda85b2e7094" diff --git a/meta-efl/recipes-devtools/python/python-elementary_svn.bb b/meta-efl/recipes-devtools/python/python-elementary_svn.bb index ffb6d5e7c5..a0298e8596 100644 --- a/meta-efl/recipes-devtools/python/python-elementary_svn.bb +++ b/meta-efl/recipes-devtools/python/python-elementary_svn.bb @@ -1,7 +1,8 @@ -require python-efl.inc -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" +require ${BPN}.inc PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" -DEPENDS += "elementary python-evas" -RDEPENDS_${PN} += "python-evas python-ecore python-edje" +PV = "1.6.99+svnr${SRCPV}" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http" +S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-devtools/python/python-emotion.inc b/meta-efl/recipes-devtools/python/python-emotion.inc new file mode 100644 index 0000000000..ac64676f08 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-emotion.inc @@ -0,0 +1,5 @@ +require python-efl.inc +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS += "emotion python-evas" +RDEPENDS_${PN} += "python-ecore" diff --git a/meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb new file mode 100644 index 0000000000..a2ad303771 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-alpha" + +SRC_URI[md5sum] = "34249ce9ee6602205ede16e311c2712c" +SRC_URI[sha256sum] = "f121a801c213d5014cde17df49107407bd60be362f98bab3530c14c9c8a54e03" diff --git a/meta-efl/recipes-devtools/python/python-emotion_svn.bb b/meta-efl/recipes-devtools/python/python-emotion_svn.bb index 89002c3b71..a0298e8596 100644 --- a/meta-efl/recipes-devtools/python/python-emotion_svn.bb +++ b/meta-efl/recipes-devtools/python/python-emotion_svn.bb @@ -1,7 +1,8 @@ -require python-efl.inc -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +require ${BPN}.inc PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" -DEPENDS += "emotion python-evas" -RDEPENDS_${PN} += "python-ecore" +PV = "1.6.99+svnr${SRCPV}" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http" +S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-devtools/python/python-evas.inc b/meta-efl/recipes-devtools/python/python-evas.inc new file mode 100644 index 0000000000..3211b14418 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-evas.inc @@ -0,0 +1,4 @@ +require python-efl.inc +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS += "evas" diff --git a/meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb new file mode 100644 index 0000000000..8fa82dad5f --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-alpha" + +SRC_URI[md5sum] = "c3e02d8e897508db2d6365dc3b83ae20" +SRC_URI[sha256sum] = "5af43a770e0edaf01c679c8eaecef38c747c8801980f1d9423d040cf36220d76" diff --git a/meta-efl/recipes-devtools/python/python-evas_svn.bb b/meta-efl/recipes-devtools/python/python-evas_svn.bb index 79844beb58..a0298e8596 100644 --- a/meta-efl/recipes-devtools/python/python-evas_svn.bb +++ b/meta-efl/recipes-devtools/python/python-evas_svn.bb @@ -1,6 +1,8 @@ -require python-efl.inc -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +require ${BPN}.inc PR = "${INC_PR}.0" SRCREV = "${EFL_SRCREV}" -DEPENDS += "evas" +PV = "1.6.99+svnr${SRCPV}" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http" +S = "${WORKDIR}/${SRCNAME}" From 68d065a9bce16fd9e00cdf8d7d791ba9dd4bf3cb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 17 Aug 2012 09:09:23 +0200 Subject: [PATCH 49/52] e-base: bump EFL_SRCREV for 1.6.99-beta Signed-off-by: Martin Jansa --- meta-efl/classes/e-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass index 4213098913..e701fb54d5 100644 --- a/meta-efl/classes/e-base.bbclass +++ b/meta-efl/classes/e-base.bbclass @@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org" SRCNAME ?= "${BPN}" SRCVER ?= "${PV}" -EFL_SRCREV ?= "75097" +EFL_SRCREV ?= "75359" ARM_INSTRUCTION_SET = "arm" From 7808cc020723c3f7fd715f579d5379224fbdecac Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 17 Aug 2012 09:21:34 +0200 Subject: [PATCH 50/52] recipes-efl: upgrade to 1.6.99-beta Signed-off-by: Martin Jansa --- ...dite_1.6.99-alpha.bb => expedite_1.6.99-beta.bb} | 0 meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb | 13 ------------- meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb | 13 +++++++++++++ meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb | 12 ++++++++++++ .../efl/evas-generic-loaders_1.6.99-alpha.bb | 12 ------------ .../efl/evas-generic-loaders_1.6.99-beta.bb | 12 ++++++++++++ meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb | 12 ------------ meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb | 12 ++++++++++++ 29 files changed, 169 insertions(+), 169 deletions(-) rename meta-efl/recipes-efl/e17/{expedite_1.6.99-alpha.bb => expedite_1.6.99-beta.bb} (100%) delete mode 100644 meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb diff --git a/meta-efl/recipes-efl/e17/expedite_1.6.99-alpha.bb b/meta-efl/recipes-efl/e17/expedite_1.6.99-beta.bb similarity index 100% rename from meta-efl/recipes-efl/e17/expedite_1.6.99-alpha.bb rename to meta-efl/recipes-efl/e17/expedite_1.6.99-beta.bb diff --git a/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb deleted file mode 100644 index 33e39764a6..0000000000 --- a/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb +++ /dev/null @@ -1,13 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ - file://fix-ecore-fb-initialization.patch \ -" - -SRC_URI[md5sum] = "c40c25f2638677191bb95a628743209d" -SRC_URI[sha256sum] = "8742fdcb725ac1494650577f75bbd36d3bf42d8d5c1f8d96a9d541f310a46c44" diff --git a/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb new file mode 100644 index 0000000000..084b00888f --- /dev/null +++ b/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb @@ -0,0 +1,13 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + file://fix-ecore-fb-initialization.patch \ +" + +SRC_URI[md5sum] = "12360540b2b8d46022cbf228c3bdef07" +SRC_URI[sha256sum] = "e3683d4b9be01347c564065bed36a77c6f42db56be7ea3cb6029a3b532afa1cb" diff --git a/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb deleted file mode 100644 index 7b56e128d9..0000000000 --- a/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "6833e32681db6630a4a50d98cf5cac88" -SRC_URI[sha256sum] = "8810a40568df9c068c1606821f24a95fb409e0f99459a45b18ee07077f432cc2" diff --git a/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb new file mode 100644 index 0000000000..c070549f0d --- /dev/null +++ b/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "542a8931b85675e497df0c290103ca87" +SRC_URI[sha256sum] = "e63fe9c67d3ec5b6bed06a4c49f70fbb93e30481f36f35ca2ee9810cbaf85868" diff --git a/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb deleted file mode 100644 index 1ba83c01e8..0000000000 --- a/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "b4c063f673394bda3f24b1a894001224" -SRC_URI[sha256sum] = "4b8aeb5e59b493e9cfce30c91acf9b55f4774b417349c8291fda6e35265ee311" diff --git a/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb new file mode 100644 index 0000000000..eaccde9cf5 --- /dev/null +++ b/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "07c1bdb6766391fa972e2f1a4c480413" +SRC_URI[sha256sum] = "7bbad4db88e82a6e0206942c859d4bbbba261cbaa4530f343664538456eef7c9" diff --git a/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb deleted file mode 100644 index 39663f9ace..0000000000 --- a/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "06a65f37117607ba24e4f4a9d3420f0a" -SRC_URI[sha256sum] = "29b6717404131b30882ae5f7947f5705da972f07576ad4c6c6c378a7592b5f68" diff --git a/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb new file mode 100644 index 0000000000..7c5a655953 --- /dev/null +++ b/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "1103a2a0e5022c42dcb4ccacc5db8881" +SRC_URI[sha256sum] = "156aa6ef6880cf45b25c6cb45bf659ebb2e9bb207c11a479f504cd795c030c6b" diff --git a/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb deleted file mode 100644 index 4f8ecb4f1c..0000000000 --- a/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "25c36ea710d61b2f6a732ec44f9f5dbb" -SRC_URI[sha256sum] = "3440e11e9edbe234d207a8791a6c6502968ce642bd8d4821da77be71c11bd432" diff --git a/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb new file mode 100644 index 0000000000..446503e66d --- /dev/null +++ b/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "b557e2e6c5988abf0695474b5763520b" +SRC_URI[sha256sum] = "b9c1262bc8e45b83c7b3643f9aefcebc88518953e4d4967ca655f1b325aac6ea" diff --git a/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb deleted file mode 100644 index afe123a45b..0000000000 --- a/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "d18062fb8831334323b00123fe93ac5b" -SRC_URI[sha256sum] = "28372b8b3c064fc0f6c50964d1199aee28b06102d796c1546de7c7bf8d41b97c" diff --git a/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb new file mode 100644 index 0000000000..330de4e676 --- /dev/null +++ b/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "35f4475b81da6b9bf9b3c022fd0947ab" +SRC_URI[sha256sum] = "b24ee9d2624804b3828b6458eddaf3e74c3d2deac58e15e33e6b183d60989a75" diff --git a/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb deleted file mode 100644 index ba7bab3e82..0000000000 --- a/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "b4fdbb79b92496829b921d46762344ac" -SRC_URI[sha256sum] = "51a7799ba61036072be646e1fcaa742d9c5f39bb499155012bc177a9f561f2b5" diff --git a/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb new file mode 100644 index 0000000000..1a3632c839 --- /dev/null +++ b/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "f5e123fdb6fb905c69f2f1f54bfe6257" +SRC_URI[sha256sum] = "051ebf7c4534c4d12f1aaaac7aa91cd877a2498e4c22336db8b07433c27f18c4" diff --git a/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb deleted file mode 100644 index f4de7af5ea..0000000000 --- a/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "741d2a2211a66cba0986b1dbcc12118f" -SRC_URI[sha256sum] = "1d3cbbc48b0970a8b7327d1d74ca44bc0a6f5852e26d348bc9793421675ca23f" diff --git a/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb new file mode 100644 index 0000000000..01613183ae --- /dev/null +++ b/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "5346403eca950b6f8f1c886451e75ab8" +SRC_URI[sha256sum] = "2cc78170277654e57cc69b49856da3c8ede425f4c8fdf4df702f46184806ac3f" diff --git a/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb deleted file mode 100644 index 235136038d..0000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "7509fb6bc2d814066deed3d97c2d0118" -SRC_URI[sha256sum] = "a262b9723f4491e4fbb43b285d7845a6dc8daab53d97e68cd8b0df69737ff69e" diff --git a/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb new file mode 100644 index 0000000000..c0ba6fa620 --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "cd0bbf6e93e521b0416d91e521bf81fd" +SRC_URI[sha256sum] = "f52ef395c341eaf68f844c038ce25512869ebd22f9abc86c9d32f1cf5e91c1df" diff --git a/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb deleted file mode 100644 index 8cd4f8cb11..0000000000 --- a/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "1505a60e8e446d55ab1887f3832063f2" -SRC_URI[sha256sum] = "6b6999e29836c56f079f84617133cc9b8d9bb1ea826577eebdc29f7ebeb6ffe5" diff --git a/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb new file mode 100644 index 0000000000..f9391bdb40 --- /dev/null +++ b/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "2236f174981c94c4ad22c8e488d2187e" +SRC_URI[sha256sum] = "fe5339132ec514070af52243954bcb20408a12adfbe07d67d1c338fa3b1dc154" diff --git a/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb deleted file mode 100644 index d5f9412295..0000000000 --- a/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "55bea7e3c3e5d503a98f336d829b47bb" -SRC_URI[sha256sum] = "b54e9ea93c248885b56e5b6dbf8161bf9cd04103dcd06d72eb2579d83a48ad7f" diff --git a/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb new file mode 100644 index 0000000000..4ad06900d2 --- /dev/null +++ b/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "7b8719248d5745683201bbf11b8d510f" +SRC_URI[sha256sum] = "f802272d9a7a4678aef736ca24ef1818dbd9f8524c963da6c5680abdf71d05e4" diff --git a/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb deleted file mode 100644 index 69f8e33fde..0000000000 --- a/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "356b996537136c6504daf1358509e5a8" -SRC_URI[sha256sum] = "1bdeff24945f67c5685bd526a2ba7a951a97fe3aff8aea2f6efc9cf8503c431b" diff --git a/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb new file mode 100644 index 0000000000..0da0fb7965 --- /dev/null +++ b/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "37ec5542731ad088c495e0ee6d7889c8" +SRC_URI[sha256sum] = "66bf53cee15549c4089307843f27a6a7e0c3bf7e576ab5091950ecc05009644a" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb deleted file mode 100644 index 5ac0b94e28..0000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "e8444bb1ddebd337a8d0bd8a14d83951" -SRC_URI[sha256sum] = "84f1d1e3b8a232c849f91ff70e2b5ad2154a5c2e9904469b3b1ec5b41dd700c7" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb new file mode 100644 index 0000000000..00956a83df --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "f4353d2743d255cf30cd7b6f946087e3" +SRC_URI[sha256sum] = "3dcc04689f89048ce1147698370dd51b854182b70c20704901ee1b3f03d4bd2a" diff --git a/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb deleted file mode 100644 index df777f5406..0000000000 --- a/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRCVER = "1.7.0-alpha" - -SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "3f4f1f87fa16dd4db121ce9c2e056131" -SRC_URI[sha256sum] = "25a905c90650e8d53a2b0cf90ef453dc7410f0143fd2fe1c11f5ccd50e107f70" diff --git a/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb new file mode 100644 index 0000000000..c76185288a --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +PR = "${INC_PR}.0" + +SRCVER = "1.7.0-beta" + +SRC_URI = "\ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "0978e24b5ea5a0d0b5eb79a7f6d7d1af" +SRC_URI[sha256sum] = "5bd52116499a5686023a563ed9102e815292786dff19d617d3cc92829c624caf" From 162776afa47a9dea8487ed68431dcba7155acb66 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 17 Aug 2012 09:22:44 +0200 Subject: [PATCH 51/52] expedite: move to efl subdir Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/{e17 => efl}/expedite.inc | 0 meta-efl/recipes-efl/{e17 => efl}/expedite_1.6.99-beta.bb | 0 meta-efl/recipes-efl/{e17 => efl}/expedite_svn.bb | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename meta-efl/recipes-efl/{e17 => efl}/expedite.inc (100%) rename meta-efl/recipes-efl/{e17 => efl}/expedite_1.6.99-beta.bb (100%) rename meta-efl/recipes-efl/{e17 => efl}/expedite_svn.bb (100%) diff --git a/meta-efl/recipes-efl/e17/expedite.inc b/meta-efl/recipes-efl/efl/expedite.inc similarity index 100% rename from meta-efl/recipes-efl/e17/expedite.inc rename to meta-efl/recipes-efl/efl/expedite.inc diff --git a/meta-efl/recipes-efl/e17/expedite_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb similarity index 100% rename from meta-efl/recipes-efl/e17/expedite_1.6.99-beta.bb rename to meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb diff --git a/meta-efl/recipes-efl/e17/expedite_svn.bb b/meta-efl/recipes-efl/efl/expedite_svn.bb similarity index 100% rename from meta-efl/recipes-efl/e17/expedite_svn.bb rename to meta-efl/recipes-efl/efl/expedite_svn.bb From d19953e28e630de55caefba81571c31b6c358102 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 17 Aug 2012 10:51:42 +0200 Subject: [PATCH 52/52] python-efl: upgrade to 1.6.99-beta Signed-off-by: Martin Jansa --- .../recipes-devtools/python/python-ecore_1.6.99-alpha.bb | 6 ------ .../recipes-devtools/python/python-ecore_1.6.99-beta.bb | 6 ++++++ .../recipes-devtools/python/python-edbus_1.6.99-alpha.bb | 6 ------ .../recipes-devtools/python/python-edbus_1.6.99-beta.bb | 6 ++++++ .../recipes-devtools/python/python-edje_1.6.99-alpha.bb | 7 ------- .../recipes-devtools/python/python-edje_1.6.99-beta.bb | 7 +++++++ .../python/python-elementary_1.6.99-alpha.bb | 6 ------ .../python/python-elementary_1.6.99-beta.bb | 6 ++++++ .../recipes-devtools/python/python-emotion_1.6.99-alpha.bb | 6 ------ .../recipes-devtools/python/python-emotion_1.6.99-beta.bb | 6 ++++++ .../recipes-devtools/python/python-evas_1.6.99-alpha.bb | 6 ------ .../recipes-devtools/python/python-evas_1.6.99-beta.bb | 6 ++++++ 12 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb delete mode 100644 meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb create mode 100644 meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb diff --git a/meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb deleted file mode 100644 index a76c44f5c8..0000000000 --- a/meta-efl/recipes-devtools/python/python-ecore_1.6.99-alpha.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc -PR = "${INC_PR}.0" -SRCVER = "1.7.0-alpha" - -SRC_URI[md5sum] = "86ba753726881b9bfcaa0fdc0827cd1e" -SRC_URI[sha256sum] = "b47a155c0bfad6fad68bc0f925c54a8736a61ca72f6a71bd5138ea3298a35c95" diff --git a/meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb new file mode 100644 index 0000000000..f2c775011f --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-beta" + +SRC_URI[md5sum] = "7cd483e817e41017adcd23cea4ce462d" +SRC_URI[sha256sum] = "09a99f728b946c44955ad91e3ac072643e533ded74110f481e27b8f035877a95" diff --git a/meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb deleted file mode 100644 index c643141efc..0000000000 --- a/meta-efl/recipes-devtools/python/python-edbus_1.6.99-alpha.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc -PR = "${INC_PR}.0" -SRCVER = "1.7.0-alpha" - -SRC_URI[md5sum] = "bd68e260e1a23fc14313afa48e70bebd" -SRC_URI[sha256sum] = "63e823c8366f293db1940524ac76d6f91109a7202cf38ad6407d414d15e09aca" diff --git a/meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb new file mode 100644 index 0000000000..b3d0e2ef6a --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-beta" + +SRC_URI[md5sum] = "d6140208bb2608bd320a70298c0c4234" +SRC_URI[sha256sum] = "468bc77dc1b64d04c688b2f07ddcbeac406d984121b90e78ba802c92e58e4daf" diff --git a/meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb deleted file mode 100644 index 1d7bb069fe..0000000000 --- a/meta-efl/recipes-devtools/python/python-edje_1.6.99-alpha.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${BPN}.inc -PR = "${INC_PR}.0" -SRCVER = "1.7.0-alpha" -SRC_URI += "file://0001-fix-unicode-conversion.patch" - -SRC_URI[md5sum] = "fbe5105abb5b2d3de71302ff3973945a" -SRC_URI[sha256sum] = "f5004d9b784b0ca37436daacff7f4f21bb3094b9fdfc5abc95f8e57e90ecb242" diff --git a/meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb new file mode 100644 index 0000000000..3d8842594c --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb @@ -0,0 +1,7 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-beta" +SRC_URI += "file://0001-fix-unicode-conversion.patch" + +SRC_URI[md5sum] = "eac613c2f3d88d30ba1adf4acd5090bf" +SRC_URI[sha256sum] = "6ce7b57a4afaddf8dbf423543380cdc798c954b31ffd9d47e6af9536786abc05" diff --git a/meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb deleted file mode 100644 index 8ed363e507..0000000000 --- a/meta-efl/recipes-devtools/python/python-elementary_1.6.99-alpha.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc -PR = "${INC_PR}.0" -SRCVER = "1.7.0-alpha" - -SRC_URI[md5sum] = "bad3bd52e79aeea1ee9ffa0ab8a54855" -SRC_URI[sha256sum] = "32ded2fb4e66aa543ae9274076d031f8465167a0cc1af3fcd26bcda85b2e7094" diff --git a/meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb new file mode 100644 index 0000000000..be63412acd --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-beta" + +SRC_URI[md5sum] = "f2b801aa8fe53914abbcfdf14aa1d325" +SRC_URI[sha256sum] = "1255bab89b824754c1a0909f2646ff63fd0e12478e0bfbfbdc3cfd48ea9bfa25" diff --git a/meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb deleted file mode 100644 index a2ad303771..0000000000 --- a/meta-efl/recipes-devtools/python/python-emotion_1.6.99-alpha.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc -PR = "${INC_PR}.0" -SRCVER = "1.7.0-alpha" - -SRC_URI[md5sum] = "34249ce9ee6602205ede16e311c2712c" -SRC_URI[sha256sum] = "f121a801c213d5014cde17df49107407bd60be362f98bab3530c14c9c8a54e03" diff --git a/meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb new file mode 100644 index 0000000000..976cf5693f --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-beta" + +SRC_URI[md5sum] = "3cfd52e8415f48d77fdb1fe73244c2b2" +SRC_URI[sha256sum] = "76d673b99e5e894b469bb04f67a14492a6021edc95762ba71da7b24c36fa660a" diff --git a/meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb b/meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb deleted file mode 100644 index 8fa82dad5f..0000000000 --- a/meta-efl/recipes-devtools/python/python-evas_1.6.99-alpha.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc -PR = "${INC_PR}.0" -SRCVER = "1.7.0-alpha" - -SRC_URI[md5sum] = "c3e02d8e897508db2d6365dc3b83ae20" -SRC_URI[sha256sum] = "5af43a770e0edaf01c679c8eaecef38c747c8801980f1d9423d040cf36220d76" diff --git a/meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb new file mode 100644 index 0000000000..cabc9c8899 --- /dev/null +++ b/meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc +PR = "${INC_PR}.0" +SRCVER = "1.7.0-beta" + +SRC_URI[md5sum] = "19262c0baac27f35f136e4aaa3ca0171" +SRC_URI[sha256sum] = "6784109dc637bd8a50f31eb3a9ff31e0eece0fba04c8a2a527d6bd83c1b02cf8"