Merge branch 'master' of ssh://165.213.149.219:29418/slp/pkgs/e/evas

Conflicts:
	src/lib/Evas_GL.h
	src/lib/canvas/evas_object_image.c
	src/modules/engines/gl_x11/evas_engine.c
	src/modules/engines/gl_x11/evas_x_main.c

diff --cc m4/evas_check_engine.m4
index 30ccd5b,67db8fa..7f4bf20
--- 1/m4/evas_check_engine.m4
--- 2/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@@ -171,9 -171,10 +171,9 @@@ els
           PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.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"
 -            gl_flavor_gles="no"
              AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
              gles_variety_sgx="yes"
           fi
@@@ -340,9 -341,10 +340,9 @@@ els
           PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.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"
 -            gl_flavor_gles="no"
              AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
              gles_variety_sgx="yes"
           fi

diff --cc src/lib/Evas_GL.h
Simple merge

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

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

diff --cc src/modules/engines/gl_x11/evas_engine.c
index 5edbb19,9c83c21..4c9b587
--- 1/src/modules/engines/gl_x11/evas_engine.c
--- 2/src/modules/engines/gl_x11/evas_engine.c
+++ b/src/modules/engines/gl_x11/evas_engine.c
@@@ -3107,20 -3002,20 +3002,22 @@@ eng_gl_surface_destroy(void *data, voi
  
     // Delete FBO/RBO and Texture here
     if (sfc->rt_tex)
-       glDeleteTextures(1, &sfc->rt_tex);
+       glsym_glDeleteTextures(1, &sfc->rt_tex);
  
     if (sfc->rb_depth)
-       glDeleteRenderbuffers(1, &sfc->rb_depth);
+       glsym_glDeleteRenderbuffers(1, &sfc->rb_depth);
  
     if (sfc->rb_stencil)
-       glDeleteRenderbuffers(1, &sfc->rb_stencil);
+       glsym_glDeleteRenderbuffers(1, &sfc->rb_stencil);
+ 
+ 
  
 +
 +
  #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-    ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    ret = glsym_eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
  #else
-    ret = glXMakeCurrent(re->info->info.display, None, NULL);
+    ret = glsym_glXMakeCurrent(re->info->info.display, None, NULL);
  #endif
     if (!ret)
       {