From 374029acf30a3d81540482d348941e96cbd7999c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 21 Oct 2014 17:13:25 +0200 Subject: efl, elementary, e-wm: upgrade to 1.11.4 and 0.19.1 * announcements: https://phab.enlightenment.org/phame/live/3/post/efl_elementary_1_11_3_and_enlightenment_0_19_1_releases/ https://phab.enlightenment.org/phame/live/3/post/efl_and_elementary_1_11_4_releases/ Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm_0.19.0.bb | 20 -------------------- meta-efl/recipes-efl/e17/e-wm_0.19.1.bb | 20 ++++++++++++++++++++ meta-efl/recipes-efl/efl/efl_1.11.2.bb | 25 ------------------------- meta-efl/recipes-efl/efl/efl_1.11.4.bb | 25 +++++++++++++++++++++++++ meta-efl/recipes-efl/efl/elementary_1.11.2.bb | 16 ---------------- meta-efl/recipes-efl/efl/elementary_1.11.4.bb | 16 ++++++++++++++++ 6 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 meta-efl/recipes-efl/e17/e-wm_0.19.0.bb create mode 100644 meta-efl/recipes-efl/e17/e-wm_0.19.1.bb delete mode 100644 meta-efl/recipes-efl/efl/efl_1.11.2.bb create mode 100644 meta-efl/recipes-efl/efl/efl_1.11.4.bb delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.11.2.bb create mode 100644 meta-efl/recipes-efl/efl/elementary_1.11.4.bb (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/e17/e-wm_0.19.0.bb b/meta-efl/recipes-efl/e17/e-wm_0.19.0.bb deleted file mode 100644 index c1e8deb4c2..0000000000 --- a/meta-efl/recipes-efl/e17/e-wm_0.19.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -require ${BPN}.inc - -SRCNAME = "enlightenment" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -# couple of modules needed for illume2 (mobile) profile were removed in -# http://git.enlightenment.org/core/enlightenment.git/commit/src/modules/Makefile.mk?id=1be76d599ca27f820b58b8186c5f73d9844c67ca -# and replacements aren't included yet, if you want to use e-wm on device with small screen, better stay with 0.18 release -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "\ - ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ - file://0001-configure.ac-add-foreign.patch \ - file://enlightenment_start.oe \ - file://applications.menu \ -" - -SRC_URI[md5sum] = "9571d7e77fdd1ddb877adb063aaf9896" -SRC_URI[sha256sum] = "30a5633be43a9bb33ce397afe0870511e7b148ea9c1f1a8536818354c20f2e31" diff --git a/meta-efl/recipes-efl/e17/e-wm_0.19.1.bb b/meta-efl/recipes-efl/e17/e-wm_0.19.1.bb new file mode 100644 index 0000000000..4c9830fc36 --- /dev/null +++ b/meta-efl/recipes-efl/e17/e-wm_0.19.1.bb @@ -0,0 +1,20 @@ +require ${BPN}.inc + +SRCNAME = "enlightenment" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +# couple of modules needed for illume2 (mobile) profile were removed in +# http://git.enlightenment.org/core/enlightenment.git/commit/src/modules/Makefile.mk?id=1be76d599ca27f820b58b8186c5f73d9844c67ca +# and replacements aren't included yet, if you want to use e-wm on device with small screen, better stay with 0.18 release +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "\ + ${E_RELEASES}/apps/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ + file://0001-configure.ac-add-foreign.patch \ + file://enlightenment_start.oe \ + file://applications.menu \ +" + +SRC_URI[md5sum] = "2c5a110496a867253f31cf7ed1a2143a" +SRC_URI[sha256sum] = "3430d94c3def706de3b421ee48d92f2a475224f2f86111442a5d2d90c2363116" diff --git a/meta-efl/recipes-efl/efl/efl_1.11.2.bb b/meta-efl/recipes-efl/efl/efl_1.11.2.bb deleted file mode 100644 index 6e9a227255..0000000000 --- a/meta-efl/recipes-efl/efl/efl_1.11.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "f1b23b9a4e2ae04a4c0f6d2f924093e9" -SRC_URI[sha256sum] = "f3cc1cd2a77df114a7b76a7e77bc77e88c367ec49462047fca209ee622cb7288" - -# 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}" - -SRC_URI += "file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch" diff --git a/meta-efl/recipes-efl/efl/efl_1.11.4.bb b/meta-efl/recipes-efl/efl/efl_1.11.4.bb new file mode 100644 index 0000000000..9686705494 --- /dev/null +++ b/meta-efl/recipes-efl/efl/efl_1.11.4.bb @@ -0,0 +1,25 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "eb2bd4a2f6684211dbd5382db024137d" +SRC_URI[sha256sum] = "3e5aba667b6cdfb2fb89aa637fa8ee92abc2d9950420cf2b4c540809f238fc78" + +# 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}" + +SRC_URI += "file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch" diff --git a/meta-efl/recipes-efl/efl/elementary_1.11.2.bb b/meta-efl/recipes-efl/efl/elementary_1.11.2.bb deleted file mode 100644 index 60e5468ef2..0000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.11.2.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] = "f6939a24ffc50c2e4eac7ed38663f0f3" -SRC_URI[sha256sum] = "18f7e8fb63fcfd0d5abd213943c0c356b1270a94e20d44b8e6047b1cd0e53010" - -# 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.11.4.bb b/meta-efl/recipes-efl/efl/elementary_1.11.4.bb new file mode 100644 index 0000000000..94ffd84deb --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary_1.11.4.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] = "531f5e2a0ccd95235a5d30221ffa7003" +SRC_URI[sha256sum] = "f3ff9d14ccb8621b93f1fe08522bdf31d54382d7e2ab1bf72359b4e65c9d39e4" + +# 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