EFL core migration revision 69627

Merge remote-tracking branch 'remotes/origin/upstream'

diff --cc m4/evas_check_engine.m4
index 4c85771,6275795..7622da8
--- 1/m4/evas_check_engine.m4
--- 2/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@@ -168,11 -168,11 +168,11 @@@ els
     if test "x${have_egl}" = "xyes" ; then
        AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
        if test "x${have_glesv2}" = "xyes" ; then
-          PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
+          PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
           if test "x${have_dep}" = "xyes" ; then
              evas_engine_[]$1[]_cflags="${x_cflags}"
 -            evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
 -            evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
 +            evas_engine_[]$1[]_libs="${x_libs} -lm $gl_pt_lib"
 +            evas_engine_gl_common_libs="-lm $gl_pt_lib"
              have_dep="yes"
              AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
              gles_variety_sgx="yes"
@@@ -337,11 -337,11 +337,11 @@@ els
     if test "x${have_egl}" = "xyes" ; then
        AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
        if test "x${have_glesv2}" = "xyes" ; then
-          PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
+          PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
           if test "x${have_dep}" = "xyes" ; then
              evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
 -            evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
 -            evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
 +            evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lm $gl_pt_lib"
 +            evas_engine_gl_common_libs="-lm $gl_pt_lib"
              have_dep="yes"
              AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
              gles_variety_sgx="yes"

diff --cc src/lib/canvas/evas_map.c
Simple merge

diff --cc src/lib/canvas/evas_render.c
Simple merge