From 4d8ef1b13f39dd38d8fe5218c045ee36f36fa43d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 13 May 2015 15:11:32 +0200 Subject: efl, elementary, emotion-generic-players, evas-generic-loaders: upgrade to 1.14.0 * announcement: https://phab.enlightenment.org/phame/live/3/post/enlightenment_foundation_libraries_1_14_and_friends_are_out/ * LIC_FILES_CHKSUM update is caused only by new emile module listed there: emile: licenses/COPYING.LGPL Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/efl.inc | 9 +++----- meta-efl/recipes-efl/efl/efl_1.13.2.bb | 25 ---------------------- meta-efl/recipes-efl/efl/efl_1.14.0.bb | 25 ++++++++++++++++++++++ meta-efl/recipes-efl/efl/elementary_1.13.2.bb | 16 -------------- meta-efl/recipes-efl/efl/elementary_1.14.0.bb | 16 ++++++++++++++ .../efl/emotion-generic-players_1.13.0.bb | 8 ------- .../efl/emotion-generic-players_1.14.0.bb | 8 +++++++ .../recipes-efl/efl/evas-generic-loaders_1.13.2.bb | 8 ------- .../recipes-efl/efl/evas-generic-loaders_1.14.0.bb | 8 +++++++ 9 files changed, 60 insertions(+), 63 deletions(-) delete mode 100644 meta-efl/recipes-efl/efl/efl_1.13.2.bb create mode 100644 meta-efl/recipes-efl/efl/efl_1.14.0.bb delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.13.2.bb create mode 100644 meta-efl/recipes-efl/efl/elementary_1.14.0.bb delete mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players_1.13.0.bb create mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players_1.14.0.bb delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.2.bb create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.14.0.bb diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index ba993af35c..65c9f37fd8 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc @@ -1,6 +1,6 @@ SUMMARY = "EFL" LICENSE = "MIT & BSD & LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130" +LIC_FILES_CHKSUM = "file://COPYING;md5=5cb19adb5be911811c7a4e05152548e8" 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 util-linux" @@ -33,6 +33,7 @@ EXTRA_OECONF_append_class-native = " \ --disable-physics \ --disable-multisense \ --disable-cserve \ + --disable-libeeze \ --with-x11=none \ --disable-image-loader-bmp \ --disable-image-loader-eet \ @@ -70,11 +71,6 @@ PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" # currently we don't provide doxygen-native PACKAGECONFIG[doc] = "--enable-doc,--disable-doc,doxygen-native" -# new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need -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 @@ -201,6 +197,7 @@ FILES_efreet = " \ " FILES_eet = " \ ${bindir}/eet \ + ${bindir}/eetpack \ ${bindir}/vieet \ ${bindir}/diffeet \ ${libdir}/libeet${SOLIBS} \ diff --git a/meta-efl/recipes-efl/efl/efl_1.13.2.bb b/meta-efl/recipes-efl/efl/efl_1.13.2.bb deleted file mode 100644 index 176f58aeb2..0000000000 --- a/meta-efl/recipes-efl/efl/efl_1.13.2.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] = "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/efl_1.14.0.bb b/meta-efl/recipes-efl/efl/efl_1.14.0.bb new file mode 100644 index 0000000000..c891f0d01a --- /dev/null +++ b/meta-efl/recipes-efl/efl/efl_1.14.0.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] = "b0813fe92cb6eaf861e3c179a19d8e41" +SRC_URI[sha256sum] = "30a8a239449e0d068a39787b5a4769dd26ddf0476f58f094c85e65b108086269" + +# 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.2.bb b/meta-efl/recipes-efl/efl/elementary_1.13.2.bb deleted file mode 100644 index db6afdef24..0000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.13.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] = "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/elementary_1.14.0.bb b/meta-efl/recipes-efl/efl/elementary_1.14.0.bb new file mode 100644 index 0000000000..99d58e6038 --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary_1.14.0.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] = "e77075b8a80e9a931b91388d608c211c" +SRC_URI[sha256sum] = "aa06ca1b332b3cd29ffd136c1f10edf08a06906b3532785ce7e390c1cad6090e" + +# 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/emotion-generic-players_1.13.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.13.0.bb deleted file mode 100644 index e42c5163b7..0000000000 --- a/meta-efl/recipes-efl/efl/emotion-generic-players_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] = "36e5fc6a2bc83b1ab90c5c72b344f00e" -SRC_URI[sha256sum] = "23a3966d38cafece2c39d1e9904f26da11b9b282676f2d1fd8e54807251b363e" diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.14.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.14.0.bb new file mode 100644 index 0000000000..6a7b9044b3 --- /dev/null +++ b/meta-efl/recipes-efl/efl/emotion-generic-players_1.14.0.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "9713c54888c355b5f29d1dc099138b49" +SRC_URI[sha256sum] = "8345c7d8c3cdf062b5df4500c0d4c557b6109c67667ac2e5431699c8852d2ad8" 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 deleted file mode 100644 index 162a85b0e0..0000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.13.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "b1e3401429b7dadbf70e9472d25c9986" -SRC_URI[sha256sum] = "8455f10b8dd418eaa4d64d3eb6446814d893d96ff083646afbdbdf8626baa81a" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.14.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.14.0.bb new file mode 100644 index 0000000000..c43f6372d6 --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.14.0.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "507f28ef012344d1befa6a86cf39304f" +SRC_URI[sha256sum] = "943b25427c4e77a3aeae72811557a0b1b7ec4c61aa53922a4c4faf17b3dea812" -- cgit v1.2.3-54-g00ecf