Modified: trunk/Tools/ChangeLog (174106 => 174107)
--- trunk/Tools/ChangeLog 2014-09-30 14:30:34 UTC (rev 174106)
+++ trunk/Tools/ChangeLog 2014-09-30 15:19:16 UTC (rev 174107)
@@ -1,3 +1,16 @@
+2014-09-30 Tibor Meszaros <[email protected]>
+
+ [EFL] Bump EFL version to 1.11.2
+ https://bugs.webkit.org/show_bug.cgi?id=137118
+
+ Reviewed by Gyuyoung Kim.
+
+ Disable NEON for EFL build because the build system doesn't pass the necessary -mfpu=neon flag to the compiler.
+ Tools/efl/patches/ecore.patch: Removed, because this fix is already in EFL.
+
+ * efl/jhbuild.modules:
+ * efl/patches/ecore.patch: Removed.
+
2014-09-30 Carlos Garcia Campos <[email protected]>
REGRESSION(r173929): [GTK] TestInspector fails after r173929
Modified: trunk/Tools/efl/jhbuild.modules (174106 => 174107)
--- trunk/Tools/efl/jhbuild.modules 2014-09-30 14:30:34 UTC (rev 174106)
+++ trunk/Tools/efl/jhbuild.modules 2014-09-30 15:19:16 UTC (rev 174107)
@@ -161,17 +161,16 @@
</autotools>
<autotools id="efl" autogen-sh="configure"
- autogenargs="--disable-fribidi --disable-audio --disable-libmount --disable-physics --enable-lua-old --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa">
+ autogenargs="--disable-fribidi --disable-audio --disable-libmount --disable-physics --enable-lua-old --disable-neon --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba">
<dependencies>
<dep package="fontconfig"/>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
</dependencies>
- <branch module="rel/libs/efl/efl-1.9.2.tar.bz2" version="1.9.2"
+ <branch module="rel/libs/efl/efl-1.11.2.tar.gz" version="1.11.2"
repo="download.enlightenment.org"
- hash="sha256:5dbeb99e1d26ccc74c9d054de5607a7e1020052b313c4b60c9a9794b45307501"
- md5sum="51222f49d8faa7e72f097075fec223f5">
- <patch file="ecore.patch" strip="1"/>
+ hash="sha256:f3cc1cd2a77df114a7b76a7e77bc77e88c367ec49462047fca209ee622cb7288"
+ md5sum="f1b23b9a4e2ae04a4c0f6d2f924093e9">
<patch file="ecore_remove_warnings.patch" strip="1"/>
</branch>
</autotools>
@@ -190,10 +189,10 @@
<autotools id="elementary"
autogen-sh="configure"
autogenargs="--disable-emap --disable-eweather --with-elementary-web-backend=none">
- <branch module="rel/libs/elementary/elementary-1.9.2.tar.bz2" version="1.9.2"
+ <branch module="rel/libs/elementary/elementary-1.11.2.tar.gz" version="1.11.2"
repo="download.enlightenment.org"
- hash="e1a8a77e5ff7ac934b5622131301787bc6cfc068b7117ffdbd5e1d855448f3cf"
- md5sum="0709699bd3b92660b946137f45c57add">
+ hash="sha256:18f7e8fb63fcfd0d5abd213943c0c356b1270a94e20d44b8e6047b1cd0e53010"
+ md5sum="f6939a24ffc50c2e4eac7ed38663f0f3">
</branch>
<dependencies>
<dep package="efl"/>
Deleted: trunk/Tools/efl/patches/ecore.patch (174106 => 174107)
--- trunk/Tools/efl/patches/ecore.patch 2014-09-30 14:30:34 UTC (rev 174106)
+++ trunk/Tools/efl/patches/ecore.patch 2014-09-30 15:19:16 UTC (rev 174107)
@@ -1,102 +0,0 @@
-diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
-index 705673b..44af8ad 100644
---- a/src/lib/ecore/ecore_pipe.c
-+++ b/src/lib/ecore/ecore_pipe.c
-@@ -586,12 +586,21 @@ _ecore_pipe_handler_call(Ecore_Pipe *p,
- size_t len)
- {
- void *data = "" p->data;
-+
-+ // clear all values of pipe first.
-+ p->passed_data = NULL;
-+ p->already_read = 0;
-+ p->len = 0;
-+ p->message++;
-+
- if (!p->delete_me)
- {
- _ecore_unlock();
- p->handler(data, buf, len);
- _ecore_lock();
- }
-+ // free p->passed_data
-+ free(buf);
- }
-
- static Eina_Bool
-@@ -634,11 +643,6 @@ _ecore_pipe_read(void *data,
- {
- /* no data on first try through means an error */
- _ecore_pipe_handler_call(p, NULL, 0);
-- if (p->passed_data) free(p->passed_data);
-- p->passed_data = NULL;
-- p->already_read = 0;
-- p->len = 0;
-- p->message++;
- pipe_close(p->fd_read);
- p->fd_read = PIPE_FD_INVALID;
- p->fd_handler = NULL;
-@@ -673,11 +677,6 @@ _ecore_pipe_read(void *data,
- if (WSAGetLastError() != WSAEWOULDBLOCK)
- {
- _ecore_pipe_handler_call(p, NULL, 0);
-- if (p->passed_data) free(p->passed_data);
-- p->passed_data = NULL;
-- p->already_read = 0;
-- p->len = 0;
-- p->message++;
- pipe_close(p->fd_read);
- p->fd_read = PIPE_FD_INVALID;
- p->fd_handler = NULL;
-@@ -694,12 +693,6 @@ _ecore_pipe_read(void *data,
- if (p->len == 0)
- {
- _ecore_pipe_handler_call(p, NULL, 0);
-- /* reset all values to 0 */
-- if (p->passed_data) free(p->passed_data);
-- p->passed_data = NULL;
-- p->already_read = 0;
-- p->len = 0;
-- p->message++;
- _ecore_pipe_unhandle(p);
- return ECORE_CALLBACK_RENEW;
- }
-@@ -713,9 +706,6 @@ _ecore_pipe_read(void *data,
- {
- _ecore_pipe_handler_call(p, NULL, 0);
- /* close the pipe */
-- p->already_read = 0;
-- p->len = 0;
-- p->message++;
- pipe_close(p->fd_read);
- p->fd_read = PIPE_FD_INVALID;
- p->fd_handler = NULL;
-@@ -732,15 +722,7 @@ _ecore_pipe_read(void *data,
- /* catch the non error case first */
- /* if we read enough data to finish the message/buffer */
- if (ret == (ssize_t)(p->len - p->already_read))
-- {
-- _ecore_pipe_handler_call(p, p->passed_data, p->len);
-- free(p->passed_data);
-- /* reset all values to 0 */
-- p->passed_data = NULL;
-- p->already_read = 0;
-- p->len = 0;
-- p->message++;
-- }
-+ _ecore_pipe_handler_call(p, p->passed_data, p->len);
- else if (ret > 0)
- {
- /* more data left to read */
-@@ -775,11 +757,6 @@ _ecore_pipe_read(void *data,
- if (WSAGetLastError() != WSAEWOULDBLOCK)
- {
- _ecore_pipe_handler_call(p, NULL, 0);
-- if (p->passed_data) free(p->passed_data);
-- p->passed_data = NULL;
-- p->already_read = 0;
-- p->len = 0;
-- p->message++;
- pipe_close(p->fd_read);
- p->fd_read = PIPE_FD_INVALID;
- p->fd_handler = NULL;
