From 539922a6ddb35fb6fef3b754b4999fae61470681 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 Apr 2015 09:15:23 +0200 Subject: efl,elementary,evas-generic-loaders: upgrade to 1.13.2 * announcements: https://phab.enlightenment.org/phame/live/3/post/efl_and_elementary_1_13_1_release/ https://phab.enlightenment.org/phame/live/3/post/efl_elementary_and_evas_generic_loaders_1_13_2_release/ Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/efl.inc | 7 ++++- ..._cc-Avoid-segfault-when-strcmp-NULL-items.patch | 30 ---------------------- meta-efl/recipes-efl/efl/efl_1.13.0.bb | 26 ------------------- meta-efl/recipes-efl/efl/efl_1.13.2.bb | 25 ++++++++++++++++++ meta-efl/recipes-efl/efl/elementary_1.13.0.bb | 16 ------------ meta-efl/recipes-efl/efl/elementary_1.13.2.bb | 16 ++++++++++++ .../recipes-efl/efl/evas-generic-loaders_1.13.0.bb | 8 ------ .../recipes-efl/efl/evas-generic-loaders_1.13.2.bb | 8 ++++++ 8 files changed, 55 insertions(+), 81 deletions(-) delete mode 100644 meta-efl/recipes-efl/efl/efl/0003-edje_cc-Avoid-segfault-when-strcmp-NULL-items.patch delete mode 100644 meta-efl/recipes-efl/efl/efl_1.13.0.bb create mode 100644 meta-efl/recipes-efl/efl/efl_1.13.2.bb delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.13.0.bb create mode 100644 meta-efl/recipes-efl/efl/elementary_1.13.2.bb delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.0.bb create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.2.bb diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index b765bf0d09..ba993af35c 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc @@ -3,7 +3,7 @@ LICENSE = "MIT & BSD & LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130" DEPENDS_class-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native" -DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxdamage libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native" +DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxdamage libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native util-linux" inherit efl gettext pkgconfig @@ -75,6 +75,11 @@ do_configure_prepend_class-native() { sed -i 's/EFL_LIB_START_OPTIONAL(\[Eeze\], \[test "${have_linux}" = "yes"\])/EFL_LIB_START_OPTIONAL([Eeze], [test "${no-we-really-dont-want-native-eeze}" = "yes"])/g' ${S}/configure.ac } +do_install_append() { + # don't ship precompiled lua files + rm -f ${datadir}/elua/*/*.luac +} + PACKAGES =+ "edje-utils embryo-utils embryo-tests efreet-trash efreet-mime libeet libefreet ecore-audio ecore-input-evas ecore-input ecore-imf-evas ecore-imf ecore-file ecore-con ecore-ipc ecore-x ecore-evas libemotion eo ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus elua" # upgrade path from 1.7 diff --git a/meta-efl/recipes-efl/efl/efl/0003-edje_cc-Avoid-segfault-when-strcmp-NULL-items.patch b/meta-efl/recipes-efl/efl/efl/0003-edje_cc-Avoid-segfault-when-strcmp-NULL-items.patch deleted file mode 100644 index 55d7b543c8..0000000000 --- a/meta-efl/recipes-efl/efl/efl/0003-edje_cc-Avoid-segfault-when-strcmp-NULL-items.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 84259714c2376fdb919299e8e01af1ccc6fbe2c0 Mon Sep 17 00:00:00 2001 -From: Stefan Schmidt -Date: Thu, 12 Feb 2015 15:24:27 +0100 -Subject: [PATCH 3/3] edje_cc: Avoid segfault when strcmp NULL items - -Martin reported a porblem with one of the SHR project edc files after an upgrade -to 1.13. The segfault itself is easy enough to fix here but I think there might -be other problems with the edc after this segfault is gone. We will see. - -Fixes T2106 ---- - src/bin/edje/edje_cc_out.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c -index 4f582c7..bc85444 100755 ---- a/src/bin/edje/edje_cc_out.c -+++ b/src/bin/edje/edje_cc_out.c -@@ -386,7 +386,7 @@ check_source_links(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef, Eina_L - EINA_LIST_FOREACH(edje_collections, l, pc_source) - { - /* Find sourced group */ -- if (strcmp(ep->source, pc_source->part) == 0) -+ if (ep->source && pc_source->part && strcmp(ep->source, pc_source->part) == 0) - { - /* Go through every part to find parts with type GROUP */ - for (i = 0; i < pc_source->parts_count; ++i) --- -2.3.0 - diff --git a/meta-efl/recipes-efl/efl/efl_1.13.0.bb b/meta-efl/recipes-efl/efl/efl_1.13.0.bb deleted file mode 100644 index b243b817e4..0000000000 --- a/meta-efl/recipes-efl/efl/efl_1.13.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ - file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch \ - file://0002-evas_3d-Add-Eet.h-includes.patch \ - file://0003-edje_cc-Avoid-segfault-when-strcmp-NULL-items.patch \ -" - -SRC_URI[md5sum] = "c73f00e1e25b3b660e15ef754c76541d" -SRC_URI[sha256sum] = "7ff797d4cd01143edc1258a287be3ddfb11264f0b855878d8f5ad5129dee9357" - -# Temporary disable until error like the one following are fixed -# efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated -# collect2: error: ld returned 1 exit status -# x86_64-linux-libtool: install: error: relink `modules/evas/savers/tiff/module.la' with the above command before installing it -# Makefile:11031: recipe for target 'install-savertiffpkgLTLIBRARIES' failed -PARALLEL_MAKE_class-native = "" - -#EFL_RUN_IN_TREE=1 ../src/bin/eolian/eolian_gen --eo --legacy -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/eo -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/evas/canvas -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/edje -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/ecore_audio --gc -o lib/evas/canvas/evas_line.eo.c /OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/evas/canvas/evas_line.eo -#ERR<32439>:eolian_gen /OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/bin/eolian/main.c:103 _generate_c_file() Couldnt open file lib/evas/canvas/evas_line.eo.c for writing -#Makefile:30738: recipe for target 'lib/evas/canvas/evas_line.eo.c' failed -#make[2]: *** [lib/evas/canvas/evas_line.eo.c] Error 1 -#Makefile:2163: recipe for target 'all-recursive' failed -# autotools-brokensep -B = "${S}" diff --git a/meta-efl/recipes-efl/efl/efl_1.13.2.bb b/meta-efl/recipes-efl/efl/efl_1.13.2.bb new file mode 100644 index 0000000000..176f58aeb2 --- /dev/null +++ b/meta-efl/recipes-efl/efl/efl_1.13.2.bb @@ -0,0 +1,25 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ + file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch \ + file://0002-evas_3d-Add-Eet.h-includes.patch \ +" + +SRC_URI[md5sum] = "dd779050ccc4ad8d7ae71f2dc8c85855" +SRC_URI[sha256sum] = "98404d8de63eea318f748c25708ec989628f025adf12cd54697e5de2fe48c2a4" + +# Temporary disable until error like the one following are fixed +# efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated +# collect2: error: ld returned 1 exit status +# x86_64-linux-libtool: install: error: relink `modules/evas/savers/tiff/module.la' with the above command before installing it +# Makefile:11031: recipe for target 'install-savertiffpkgLTLIBRARIES' failed +PARALLEL_MAKE_class-native = "" + +#EFL_RUN_IN_TREE=1 ../src/bin/eolian/eolian_gen --eo --legacy -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/eo -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/evas/canvas -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/edje -I/OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/ecore_audio --gc -o lib/evas/canvas/evas_line.eo.c /OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/lib/evas/canvas/evas_line.eo +#ERR<32439>:eolian_gen /OE/build/shr-core/tmp-eglibc/work/x86_64-linux/efl-native/2_1.10.0-r0/efl-1.10.0/src/bin/eolian/main.c:103 _generate_c_file() Couldnt open file lib/evas/canvas/evas_line.eo.c for writing +#Makefile:30738: recipe for target 'lib/evas/canvas/evas_line.eo.c' failed +#make[2]: *** [lib/evas/canvas/evas_line.eo.c] Error 1 +#Makefile:2163: recipe for target 'all-recursive' failed +# autotools-brokensep +B = "${S}" diff --git a/meta-efl/recipes-efl/efl/elementary_1.13.0.bb b/meta-efl/recipes-efl/efl/elementary_1.13.0.bb deleted file mode 100644 index e7be246c87..0000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.13.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -# only for target, because configure doesn't default to sane default when -# these paths aren't passed in -native build -SRC_URI_append_class-target = " file://0001-Makefile-Use-elementary_codegen-defined-in-configure.patch" - -SRC_URI[md5sum] = "e8464cc2d89585cfe189584c7081845b" -SRC_URI[sha256sum] = "52f1b4304f22156ab53d2d13b8d8f15c58a110a3bc3f31a13fc357eb9527778c" - -# autotools-brokensep - configure updates Elementary.h correctly in ${B}, but then build is using Elementary.h from ${S} -# which includes #define ELM_EMAP (instead of #undef ELM_EMAP) and building fails -B = "${S}" diff --git a/meta-efl/recipes-efl/efl/elementary_1.13.2.bb b/meta-efl/recipes-efl/efl/elementary_1.13.2.bb new file mode 100644 index 0000000000..db6afdef24 --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary_1.13.2.bb @@ -0,0 +1,16 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +# only for target, because configure doesn't default to sane default when +# these paths aren't passed in -native build +SRC_URI_append_class-target = " file://0001-Makefile-Use-elementary_codegen-defined-in-configure.patch" + +SRC_URI[md5sum] = "0d32d241af1c96c06da6d130020275f0" +SRC_URI[sha256sum] = "312dd63f3c82c9076f0cfe5125990e650d7767a776186631455911a980f91039" + +# autotools-brokensep - configure updates Elementary.h correctly in ${B}, but then build is using Elementary.h from ${S} +# which includes #define ELM_EMAP (instead of #undef ELM_EMAP) and building fails +B = "${S}" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.0.bb deleted file mode 100644 index cae8df70f3..0000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "45df9e4816ceba40219db0167c549e1e" -SRC_URI[sha256sum] = "c3bcb7d418b8cea79bbaf0731d008e527697b44239ff6b69064df785ca94df9b" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.2.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.2.bb new file mode 100644 index 0000000000..162a85b0e0 --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.2.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "b1e3401429b7dadbf70e9472d25c9986" +SRC_URI[sha256sum] = "8455f10b8dd418eaa4d64d3eb6446814d893d96ff083646afbdbdf8626baa81a" -- cgit 1.2.3-korg