From f552863ec0c6cdcea48192dab166255c8ea42f99 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 6 Jan 2015 14:19:33 +0100 Subject: efl, elementary: upgrade to 1.12.2 * announcement: https://phab.enlightenment.org/phame/live/3/post/efl_and_elementary_1_12_2_releases/ Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/efl_1.12.1.bb | 25 ------------------------- meta-efl/recipes-efl/efl/efl_1.12.2.bb | 25 +++++++++++++++++++++++++ meta-efl/recipes-efl/efl/elementary_1.12.1.bb | 16 ---------------- meta-efl/recipes-efl/efl/elementary_1.12.2.bb | 16 ++++++++++++++++ 4 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 meta-efl/recipes-efl/efl/efl_1.12.1.bb create mode 100644 meta-efl/recipes-efl/efl/efl_1.12.2.bb delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.12.1.bb create mode 100644 meta-efl/recipes-efl/efl/elementary_1.12.2.bb diff --git a/meta-efl/recipes-efl/efl/efl_1.12.1.bb b/meta-efl/recipes-efl/efl/efl_1.12.1.bb deleted file mode 100644 index 6b79a1d70c..0000000000 --- a/meta-efl/recipes-efl/efl/efl_1.12.1.bb +++ /dev/null @@ -1,25 +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 \ -" - -SRC_URI[md5sum] = "ac784b11bd1854459c05a78d783aae57" -SRC_URI[sha256sum] = "c1074c91e98e15fead0e1999bf7bc7dc5e7205a790655cd9b0ba332c38835fce" - -# 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.12.2.bb b/meta-efl/recipes-efl/efl/efl_1.12.2.bb new file mode 100644 index 0000000000..0d5b09022f --- /dev/null +++ b/meta-efl/recipes-efl/efl/efl_1.12.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] = "27b8578e5797ee2c484d886fb49704f2" +SRC_URI[sha256sum] = "dc4a3fe448e0a8019030fe7c045de30d9ac1e92033620fbfbefb761c3ba9ddce" + +# 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.12.1.bb b/meta-efl/recipes-efl/efl/elementary_1.12.1.bb deleted file mode 100644 index dd7a9a931e..0000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.12.1.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] = "26af05e3c30676cc761566a3cb7e5611" -SRC_URI[sha256sum] = "65a5274e21355dcdf9182447013c5874391faa2791d46aa96551050d298208dc" - -# 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.12.2.bb b/meta-efl/recipes-efl/efl/elementary_1.12.2.bb new file mode 100644 index 0000000000..9e6f2eab11 --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary_1.12.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] = "b01329104e8eb61be1581e24a1951eaf" +SRC_URI[sha256sum] = "b1b84dd061b6e93f38bbba4c91ea4c9b5de5d190828b5c00fb051a6e61834b62" + +# 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}" -- cgit 1.2.3-korg