discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9173deb1fcacef16c262512b8f61b3c66515b7f0
commit 9173deb1fcacef16c262512b8f61b3c66515b7f0 Author: Mike Blumenkrantz <[email protected]> Date: Fri Jul 14 18:44:23 2017 -0400 remove egl from build not needed --- configure.ac | 22 ---------------------- src/bin/Makefile.mk | 5 ++--- src/bin/e.h | 4 ---- src/bin/e_fm/Makefile.mk | 1 - src/modules/Makefile.mk | 1 - 5 files changed, 2 insertions(+), 31 deletions(-) diff --git a/configure.ac b/configure.ac index 242676225..376a54d9f 100644 --- a/configure.ac +++ b/configure.ac @@ -682,14 +682,6 @@ AC_SUBST(SHM_OPEN_LIBS) AC_SUBST([SOUND_CFLAGS]) AC_SUBST([SOUND_LIBS]) -have_wayland_egl=no -AC_ARG_ENABLE([wayland-egl], - AS_HELP_STRING([--enable-wayland-egl],[enable wayland to render using EGL @<:@default=disabled@:>@]), - [e_cv_want_wayland_egl=$enableval], - [e_cv_want_wayland_egl=no]) -AC_MSG_CHECKING([whether wayland EGL support is enabled]) -AC_MSG_RESULT([${e_cv_want_wayland_egl}]) - if test "x${e_cv_want_wayland_only}" != "xno" ;then PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 wayland-protocols >= 1.7 wayland-scanner >= 1.11.0 xkbcommon uuid], [ @@ -710,21 +702,7 @@ else have_wayland=no fi -if test "x${have_wayland}" = "xyes"; then - if test "x${e_cv_want_wayland_egl}" != "xno";then - PKG_CHECK_MODULES([WAYLAND_EGL], [egl >= 7.10], - [ - have_wayland_egl=yes - AC_DEFINE_UNQUOTED([HAVE_WAYLAND_EGL],[1],[enable wayland client EGL support]) - ], - [have_wayland_egl=no]) - else - have_wayland_egl=no - fi -fi - AM_CONDITIONAL([HAVE_WAYLAND], [test "x${have_wayland}" = "xyes"]) -AM_CONDITIONAL([HAVE_WAYLAND_EGL], [test "x${have_wayland_egl}" = "xyes"]) if test "x${e_cv_want_wayland_only}" != "xyes"; then PKG_CHECK_MODULES([ECORE_X], [ecore-x >= ${efl_version}]) diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 6106b22f2..ce078156f 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -27,7 +27,6 @@ E_CPPFLAGS = \ @VALGRIND_CFLAGS@ \ @EDJE_DEF@ \ @WAYLAND_CFLAGS@ \ -@WAYLAND_EGL_CFLAGS@ \ -DE_BINDIR=\"$(bindir)\" \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ @@ -469,7 +468,7 @@ src/bin/e_comp_wl_dmabuf.c: \ endif -src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ +src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @ECORE_X_CFLAGS@ src_bin_enlightenment_SOURCES = \ src/bin/e_main.c \ $(enlightenment_src) @@ -477,7 +476,7 @@ $(enlightenment_src) nodist_src_bin_enlightenment_SOURCES = $(enlightenment_gen_src) src_bin_enlightenment_LDFLAGS = -export-dynamic -src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ @WAYLAND_EGL_LIBS@ -lm @SHM_OPEN_LIBS@ @ECORE_X_LIBS@ +src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ -lm @SHM_OPEN_LIBS@ @ECORE_X_LIBS@ src_bin_enlightenment_imc_SOURCES = \ src/bin/e.h \ diff --git a/src/bin/e.h b/src/bin/e.h index 0ed24231d..62294bad6 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -106,10 +106,6 @@ void *alloca (size_t); // XXX: FIXME: TMP solution for window stack until api is settled #define EFL_BETA_API_SUPPORT -/* egl.h must come before Evas_GL.h otherwise they will conflict */ -# ifdef HAVE_WAYLAND_EGL -# include <EGL/egl.h> -# endif # include <setjmp.h> # include <Eo.h> diff --git a/src/bin/e_fm/Makefile.mk b/src/bin/e_fm/Makefile.mk index 63c35c147..218329f31 100644 --- a/src/bin/e_fm/Makefile.mk +++ b/src/bin/e_fm/Makefile.mk @@ -9,7 +9,6 @@ EFM_CPPFLAGS = \ @VALGRIND_CFLAGS@ \ @EDJE_DEF@ \ @WAYLAND_CFLAGS@ \ -@WAYLAND_EGL_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index bb2a65ffe..4bc293ace 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -8,7 +8,6 @@ MOD_CPPFLAGS = -I. \ -I$(top_srcdir)/src/modules \ @e_cflags@ \ @WAYLAND_CFLAGS@ \ -@WAYLAND_EGL_CFLAGS@ \ -DE_BINDIR=\"$(bindir)\" MOD_LIBS = @e_libs@ @dlopen_libs@ --
