aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-11-01 23:04:47 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-11-03 22:22:54 +0900
commit4ed2e01591e1575800d9aa871f76a5f7559060b3 (patch)
treee2ff598e015fecd3f26a9c717a2bae1334e1bb1d /m4
parenteolian: rename is_ref API to is_ptr to match syntax (diff)
downloadefl-4ed2e01591e1575800d9aa871f76a5f7559060b3.tar.gz
remove xcb support in ecore_x and evas engines as per mailing list
as per mailing list discussion about dropping xcb support now. it hasn't been complete for a long time, thus not recommented for being turned on. as we are moving to a wayland world xcbmakes even less sense. as agreed, time to clean up a bit and remove a distraction as well as not well tested code. this also updates po's too. @feature
Diffstat (limited to 'm4')
-rw-r--r--m4/evas_check_engine.m4161
1 files changed, 0 insertions, 161 deletions
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index a7e00851ec..4ab7e4cfa0 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -123,167 +123,6 @@ pthread_create(NULL, NULL, NULL, NULL);
])
])
-dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-
-AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB],
-[
-
-requirement=""
-have_dep="no"
-evas_engine_[]$1[]_cflags=""
-evas_engine_[]$1[]_libs=""
-
-PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
- [
- have_dep="yes"
- requirement="xcb xcb-shm xcb-image >= 0.2.1 pixman-1"
- ],
- [have_dep="no"])
-
-if test "x${have_dep}" = "xyes" ; then
- if test "x$3" = "xstatic" ; then
- requirements_pc_evas="${requirement} ${requirements_pc_evas}"
- requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
- else
- PKG_CHECK_MODULES([XCB], [${requirement}])
- evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
- evas_engine_[]$1[]_libs="${XCB_LIBS}"
- fi
-fi
-
-AC_SUBST([evas_engine_$1_cflags])
-AC_SUBST([evas_engine_$1_libs])
-
-AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
-
-])
-
-
-dnl use: EVAS_CHECK_ENGINE_DEP_GL_XCB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-
-AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
-[
-
-requirement=""
-
-EFL_FIND_X(evas_engine_[]$1, [GL/gl.h],
- [X11 XCreateColormap Xrender XRenderCreatePicture],
- [
- CFLAGS_save="$CFLAGS"
- CFLAGS="$CFLAGS $evas_engine_[]$1[]_cflags"
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $evas_engine_[]$1[]_cflags"
- AC_CHECK_HEADER([GL/glext.h],
- [have_dep="yes"],
- [have_dep="no"],
- [
-#include <GL/gl.h>
-#include <GL/glext.h>
-#include <GL/glx.h>
- ])
- CPPFLAGS=$CPPFLAGS_save
- CFLAGS=$CFLAGS_save
-
- gl_pt_lib="";
- have_gl_pt="no"
-
- AC_MSG_CHECKING([whether pthread_create() is supported])
- CFLAGS_save="${CFLAGS}"
- CFLAGS="${CFLAGS} -pthread"
- LIBS_save="${LIBS}"
- LIBS="${LIBS} -pthread"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[
-#include <pthread.h>
- ]],
- [[
-pthread_create(NULL, NULL, NULL, NULL);
- ]])],
- [have_gl_pt="yes"],
- [have_gl_pt="no"])
- CFLAGS=${CFLAGS_save}
- LIBS=${LIBS_save}
- AC_MSG_RESULT([${have_gl_pt}])
-
- if test "x$have_gl_pt" = "xyes" ; then
- gl_pt_lib=" -pthread"
- fi
-
- if test "x$have_dep" = "xyes" ; then
- LIBS_save="$LIBS"
- LIBS="$LIBS $evas_engine_[]$1[]_libs"
- AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lm $gl_pt_lib])
- LIBS="$LIBS_save"
- fi
- ],[
- have_dep=no
- ])
-
-PKG_CHECK_EXISTS([x11-xcb xcb xcb-glx xcb-render xcb-renderutil],
- [
- have_dep="yes"
- requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
- ],
- [have_dep="no"])
-
-if test "x${have_dep}" = "xyes" ; then
- if test "x$3" = "xstatic" ; then
- requirements_pc_evas="${requirement} ${requirements_pc_evas}"
- requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
- else
- PKG_CHECK_MODULES([XCB_GL], [${requirement}])
- fi
-fi
-
-if test "x${with_opengl}" = "xes" ; then
- have_dep=no
-fi
-
-if test "x${have_dep}" = "xyes" ; then
- evas_engine_[]$1[]_cflags="$evas_engine_[]$1[]_cflags $XCB_GL_CFLAGS"
- evas_engine_[]$1[]_libs="$evas_engine_[]$1[]_libs $XCB_GL_LIBS -lGL $gl_pt_lib"
- evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs -lGL $gl_pt_lib"
-else
- CFLAGS_save="$CFLAGS"
- CFLAGS="$CFLAGS $evas_engine_[]$1[]_cflags"
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $evas_engine_[]$1[]_cflags"
- AC_CHECK_HEADER([GLES2/gl2.h],
- [have_egl="yes"],
- [have_egl="no"],
- [
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <EGL/egl.h>
- ])
- CPPFLAGS=$CPPFLAGS_save
- CFLAGS=$CFLAGS_save
- if test "x${have_egl}" = "xyes" ; then
- LIBS_save="$LIBS"
- LIBS="$LIBS $evas_engine_[]$1[]_libs"
- AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib)
- if test "x${have_glesv2}" = "xyes" ; then
- evas_engine_[]$1[]_cflags="$evas_engine_[]$1[]_cflags $XCB_GL_CFLAGS"
- evas_engine_[]$1[]_libs="$evas_engine_[]$1[]_libs $XCB_GL_LIBS -lGLESv2 -lEGL -lm $gl_pt_lib"
- evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs -lGLESv2 -lm $gl_pt_lib"
- have_dep="yes"
- AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
- gles_variety_sgx="yes"
- fi
- fi
-fi
-
-if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
- requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
- requirements_pc_evas="${requirement} ${requirements_pc_evas}"
- requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
-fi
-
-AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
-
-])
-
-
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_GDI(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_GDI],