aboutsummaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-12-01 21:42:32 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-17 12:56:21 +0100
commit597615a8cc4909059b787e753e81de5d746bb4eb (patch)
treeb2e5cd2994325cb8ca9d53d5ecccb94405bdac6d /meta-efl
parent66a6c115e2cfe9b9cd7678321e28e7e29f45c42b (diff)
downloadmeta-openembedded-597615a8cc4909059b787e753e81de5d746bb4eb.tar.gz
meta-openembedded-597615a8cc4909059b787e753e81de5d746bb4eb.tar.bz2
meta-openembedded-597615a8cc4909059b787e753e81de5d746bb4eb.zip
efl, elementary, emotion-generic-players, evas-generic-loaders: upgrade
to 1.12.* * announcements: https://phab.enlightenment.org/phame/post/view/96/ https://phab.enlightenment.org/phame/post/view/99/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/efl/efl.inc6
-rw-r--r--meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch10
-rw-r--r--meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch51
-rw-r--r--meta-efl/recipes-efl/efl/efl_1.12.1.bb (renamed from meta-efl/recipes-efl/efl/efl_1.11.4.bb)8
-rw-r--r--meta-efl/recipes-efl/efl/elementary.inc5
-rw-r--r--meta-efl/recipes-efl/efl/elementary_1.12.1.bb (renamed from meta-efl/recipes-efl/efl/elementary_1.11.4.bb)4
-rw-r--r--meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb8
-rw-r--r--meta-efl/recipes-efl/efl/emotion-generic-players_1.12.0.bb8
-rw-r--r--meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.2.bb8
-rw-r--r--meta-efl/recipes-efl/efl/evas-generic-loaders_1.12.0.bb8
10 files changed, 87 insertions, 29 deletions
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc
index 82f8dfe5b..05fe1bdc7 100644
--- a/meta-efl/recipes-efl/efl/efl.inc
+++ b/meta-efl/recipes-efl/efl/efl.inc
@@ -25,10 +25,14 @@ EXTRA_OECONF_append_class-target = " \
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \
--with-eolian-cxx=${STAGING_BINDIR_NATIVE}/eolian_cxx \
+ --with-elua=${STAGING_BINDIR_NATIVE}/elua \
"
EXTRA_OECONF_append_class-native = " \
--disable-fontconfig \
--disable-audio \
+ --disable-physics \
+ --disable-multisense \
+ --disable-cserve \
--with-x11=none \
--disable-image-loader-bmp \
--disable-image-loader-eet \
@@ -42,6 +46,8 @@ EXTRA_OECONF_append_class-native = " \
--disable-image-loader-wbmp \
--disable-image-loader-webp \
--disable-image-loader-xpm \
+ --disable-image-loader-tgv \
+ --disable-image-loader-dds \
"
PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio luajit"
diff --git a/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch b/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
index 012810b1e..f34b9576f 100644
--- a/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
+++ b/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
@@ -1,7 +1,7 @@
-From 7097b46383a6ec96662bf1bf0a04190a38d25a20 Mon Sep 17 00:00:00 2001
+From a7ee62a2e90a346bf9aaf9260c918d87e21cfba6 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 10 Jan 2014 17:07:13 +0100
-Subject: [PATCH] configure.ac: Don't check for Xprint extension
+Subject: [PATCH 1/3] configure.ac: Don't check for Xprint extension
* it's long gone
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 0d8c4cc..0a08330 100644
+index 779763a..57d3601 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2769,7 +2769,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then
+@@ -3445,7 +3445,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then
ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion])
ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens])
@@ -23,5 +23,5 @@ index 0d8c4cc..0a08330 100644
ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
--
-1.8.5.2
+2.1.3
diff --git a/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch b/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch
new file mode 100644
index 000000000..9847c07ff
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch
@@ -0,0 +1,51 @@
+From 9db1f2f9dfe785e3a42445b766e7f4736821264a 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 2/3] 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_3d_eet.c | 1 +
+ src/lib/evas/canvas/evas_3d_mesh_loader_eet.c | 1 +
+ src/lib/evas/canvas/evas_3d_mesh_saver_eet.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/lib/evas/canvas/evas_3d_eet.c b/src/lib/evas/canvas/evas_3d_eet.c
+index 1515f5a..a438217 100644
+--- a/src/lib/evas/canvas/evas_3d_eet.c
++++ b/src/lib/evas/canvas/evas_3d_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/lib/evas/canvas/evas_3d_mesh_loader_eet.c b/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
+index 26c3569..a93efca 100644
+--- a/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
++++ b/src/lib/evas/canvas/evas_3d_mesh_loader_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/lib/evas/canvas/evas_3d_mesh_saver_eet.c b/src/lib/evas/canvas/evas_3d_mesh_saver_eet.c
+index c801ac1..0a4d269 100644
+--- a/src/lib/evas/canvas/evas_3d_mesh_saver_eet.c
++++ b/src/lib/evas/canvas/evas_3d_mesh_saver_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.1.3
+
diff --git a/meta-efl/recipes-efl/efl/efl_1.11.4.bb b/meta-efl/recipes-efl/efl/efl_1.12.1.bb
index 968670549..6b79a1d70 100644
--- a/meta-efl/recipes-efl/efl/efl_1.11.4.bb
+++ b/meta-efl/recipes-efl/efl/efl_1.12.1.bb
@@ -2,10 +2,12 @@ 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] = "eb2bd4a2f6684211dbd5382db024137d"
-SRC_URI[sha256sum] = "3e5aba667b6cdfb2fb89aa637fa8ee92abc2d9950420cf2b4c540809f238fc78"
+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
@@ -21,5 +23,3 @@ PARALLEL_MAKE_class-native = ""
#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.inc b/meta-efl/recipes-efl/efl/elementary.inc
index c5e75b96c..f0a92dfe9 100644
--- a/meta-efl/recipes-efl/efl/elementary.inc
+++ b/meta-efl/recipes-efl/efl/elementary.inc
@@ -12,6 +12,7 @@ EXTRA_OECONF_append_class-target = "\
--with-elementary-codegen=${STAGING_BINDIR_NATIVE}/elementary_codegen \
--with-elm-prefs-cc=${STAGING_BINDIR_NATIVE}/elm_prefs_cc \
--with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \
+ --with-eolian-cxx=${STAGING_BINDIR_NATIVE}/eolian_cxx \
"
BBCLASSEXTEND = "native"
@@ -23,8 +24,8 @@ PACKAGECONFIG[ewebkit] = "--with-elementary-web-backend=ewebkit,--with-elementar
PACKAGECONFIG[c++11] = "--enable-cxx-bindings,--disable-cxx-bindings"
do_configure_prepend() {
- # prefix returned eolian paths with STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
- sed -i "s^DEPS_EOLIAN_FLAGS=\`pkg-config --variable=eolian_flags eo evas edje ecore\`$^DEPS_EOLIAN_FLAGS=\`\$PKG_CONFIG --variable=eolian_flags eo evas edje ecore | sed 's#-I${prefix}#-I${STAGING_DIR_HOST}${prefix}#g'\`^g" ${S}/configure.ac
+ # prefix returned eolian paths with STAGING_DIR_HOST
+ sed -i 's%^\(DEPS_EOLIAN_FLAGS=`.*\)`$%\1 | sed "s#-I\\${prefix}#-I\\${STAGING_DIR_HOST}\\${prefix}#g"`%g' ${S}/configure.ac
}
do_compile_append_class-target() {
diff --git a/meta-efl/recipes-efl/efl/elementary_1.11.4.bb b/meta-efl/recipes-efl/efl/elementary_1.12.1.bb
index 94ffd84de..dd7a9a931 100644
--- a/meta-efl/recipes-efl/efl/elementary_1.11.4.bb
+++ b/meta-efl/recipes-efl/efl/elementary_1.12.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] = "531f5e2a0ccd95235a5d30221ffa7003"
-SRC_URI[sha256sum] = "f3ff9d14ccb8621b93f1fe08522bdf31d54382d7e2ab1bf72359b4e65c9d39e4"
+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
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb
deleted file mode 100644
index 4cb74f5e2..000000000
--- a/meta-efl/recipes-efl/efl/emotion-generic-players_1.11.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI = "\
- ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "432febd580ed1a4d7d7b42984ee4c693"
-SRC_URI[sha256sum] = "5d2e7923a6e4e909df2f9fc3bf7508086ea04b0146e62015dbc93a8bf58bca74"
diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.12.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.12.0.bb
new file mode 100644
index 000000000..1e1bb8f96
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion-generic-players_1.12.0.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "fb67cd4e0c6f13da9cdd864763217a59"
+SRC_URI[sha256sum] = "2f2b3c60b113bb637c6b40b575ceffe4055aa424f4585c64ddef6638dbc2a0da"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.2.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.2.bb
deleted file mode 100644
index 3332d088b..000000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.11.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI = "\
- ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "b7c57c082e6b431ffeabe3803c6546b6"
-SRC_URI[sha256sum] = "c6e729270c1ee79a8785388568eef394a6ba2cbe264c5c7d6c747727e8d9e60e"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.12.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.12.0.bb
new file mode 100644
index 000000000..c172895b5
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.12.0.bb
@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+SRC_URI = "\
+ ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "d60282b9cfad5336e75264767be07179"
+SRC_URI[sha256sum] = "c531c82845b656cb8ea8e2db1e413509d9b4558450be6c5ee27da0cdc781376e"