diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-27 16:27:21 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 15:34:27 +0200 |
commit | 013763c66bc3a793ec344e2590cb2d55b46e7eca (patch) | |
tree | d327d14d8e0000c2eb9621ce27f79816387b7bbc /meta-efl | |
parent | 10d09386aa2dfd776c8f985c830b2758212c4629 (diff) | |
download | meta-openembedded-contrib-013763c66bc3a793ec344e2590cb2d55b46e7eca.tar.gz |
efl,elementary,emotion-generic-players,evas-generic-loaders: upgrade to 1.15.*
* announcements:
https://phab.enlightenment.org/phame/live/3/post/enlightenment_foundation_libraries_1_15_and_friends_are_out/
https://phab.enlightenment.org/phame/live/3/post/efl_and_elementary_1_15_1_release/
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r-- | meta-efl/recipes-efl/efl/efl.inc | 2 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/efl/0001-evas_3d-Add-Eet.h-includes.patch | 51 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/efl_1.15.1.bb (renamed from meta-efl/recipes-efl/efl/efl_1.14.1.bb) | 6 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/elementary_1.15.1.bb (renamed from meta-efl/recipes-efl/efl/elementary_1.14.1.bb) | 4 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/emotion-generic-players_1.14.0.bb | 8 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/emotion-generic-players_1.15.0.bb | 8 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/evas-generic-loaders_1.14.0.bb | 8 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/evas-generic-loaders_1.15.0.bb | 8 |
8 files changed, 73 insertions, 22 deletions
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index 65c9f37fd80..1948a800b22 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=5cb19adb5be911811c7a4e05152548e8" +LIC_FILES_CHKSUM = "file://COPYING;md5=ca7873210523dcfd32694b94286dca60" 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" diff --git a/meta-efl/recipes-efl/efl/efl/0001-evas_3d-Add-Eet.h-includes.patch b/meta-efl/recipes-efl/efl/efl/0001-evas_3d-Add-Eet.h-includes.patch new file mode 100644 index 00000000000..d0f26c7dd74 --- /dev/null +++ b/meta-efl/recipes-efl/efl/efl/0001-evas_3d-Add-Eet.h-includes.patch @@ -0,0 +1,51 @@ +From 2e50fd2dfc68b77e7acddc79550f22987778a897 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 2 Dec 2014 12:21:10 +0100 +Subject: [PATCH] evas_3d: Add Eet.h includes + +* with some very restrictive options like we use in efl-native, the build is complaining + about missing symbols from Eet.h, add include where needed + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/lib/evas/canvas/evas_canvas3d_eet.c | 1 + + src/modules/evas/model_loaders/eet/evas_model_load_eet.c | 1 + + src/modules/evas/model_savers/eet/evas_model_save_eet.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/lib/evas/canvas/evas_canvas3d_eet.c b/src/lib/evas/canvas/evas_canvas3d_eet.c +index 281f69d..a604076 100644 +--- a/src/lib/evas/canvas/evas_canvas3d_eet.c ++++ b/src/lib/evas/canvas/evas_canvas3d_eet.c +@@ -1,3 +1,4 @@ ++#include <Eet.h> + #include <stdio.h> + #include "evas_common_private.h" + #include "evas_private.h" +diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c +index 803846d..7ebaf8e 100644 +--- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c ++++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c +@@ -3,6 +3,7 @@ + #endif + + #include <Eo.h> ++#include <Eet.h> + #include <stdio.h> + #include "evas_common_private.h" + #include "evas_private.h" +diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c +index 71e094a..4d56977 100644 +--- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c ++++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c +@@ -2,6 +2,7 @@ + #include "config.h" + #endif + ++#include <Eet.h> + #include <stdio.h> + #include "evas_common_private.h" + #include "evas_private.h" +-- +2.5.0 + diff --git a/meta-efl/recipes-efl/efl/efl_1.14.1.bb b/meta-efl/recipes-efl/efl/efl_1.15.1.bb index a17a6850bca..aaebf904076 100644 --- a/meta-efl/recipes-efl/efl/efl_1.14.1.bb +++ b/meta-efl/recipes-efl/efl/efl_1.15.1.bb @@ -3,11 +3,11 @@ 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://0001-evas_3d-Add-Eet.h-includes.patch \ " -SRC_URI[md5sum] = "e0668a93a67be2d59fb40cf71369d82d" -SRC_URI[sha256sum] = "4e7e69c52c4fa6801e271f30bb4fb41fd62abfe1c9a874f502ca077e2d26329b" +SRC_URI[md5sum] = "dc91bcab73275f678e1748a2dea8d88a" +SRC_URI[sha256sum] = "2a6d0ab28020b4741be20b32ad0ffeb8f97f766c5c32175bacc2f2d0dc52f98c" # 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 diff --git a/meta-efl/recipes-efl/efl/elementary_1.14.1.bb b/meta-efl/recipes-efl/efl/elementary_1.15.1.bb index ecb147a6731..f53eb44a7a4 100644 --- a/meta-efl/recipes-efl/efl/elementary_1.14.1.bb +++ b/meta-efl/recipes-efl/efl/elementary_1.15.1.bb @@ -8,8 +8,8 @@ SRC_URI = "\ # 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] = "704adee92de4010b88b89b329d1faaff" -SRC_URI[sha256sum] = "e182d7079100edead934d6d2e9a6ff67ce7d7106f59387d9b7ed146cf8770b80" +SRC_URI[md5sum] = "bde4d85fa10ee8a7c0aeb74e69d7cd06" +SRC_URI[sha256sum] = "ae5540c2103fcdc69fd7469277ce25a8a00a0f701fc2c20771dc0108401e53a0" # 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 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 deleted file mode 100644 index 6a7b9044b36..00000000000 --- a/meta-efl/recipes-efl/efl/emotion-generic-players_1.14.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -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/emotion-generic-players_1.15.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.15.0.bb new file mode 100644 index 00000000000..1a184bd046f --- /dev/null +++ b/meta-efl/recipes-efl/efl/emotion-generic-players_1.15.0.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "68627c1aabf5b7fe084299adcc0b73c1" +SRC_URI[sha256sum] = "10bad633480a691585b0ba470c573b14da0a010008d9d59d0792cea8c621d423" 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 deleted file mode 100644 index c43f6372d6f..00000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.14.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "507f28ef012344d1befa6a86cf39304f" -SRC_URI[sha256sum] = "943b25427c4e77a3aeae72811557a0b1b7ec4c61aa53922a4c4faf17b3dea812" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.15.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.15.0.bb new file mode 100644 index 00000000000..911ce8ca43b --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.15.0.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "3ca8443b8cbf177845595c5e02fbc49c" +SRC_URI[sha256sum] = "caa22c9ba1ae9629c16a3fe809ea927f60b8f0d80cdb7f145159b997b9ae2bcd" |