discomfitor pushed a commit to branch enlightenment-0.19.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d9501096bfaf626699dd6a61b49be2fb96ee6713
commit d9501096bfaf626699dd6a61b49be2fb96ee6713
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Sep 25 22:53:16 2015 -0400
completely remove all wayland support from build system
this is unmaintained and out of date. the protocol versions are old,
and it's extremely unlikely that any client will work and be in a
usable state given the development progress since E19 was originally
released.
use E20+ for wayland support.
fix T2746
---
configure.ac | 91 --------------------------------------
src/bin/Makefile.mk | 24 +---------
src/modules/Makefile.mk | 8 ++--
src/modules/Makefile_everything.mk | 2 -
src/modules/Makefile_systray.mk | 2 -
5 files changed, 6 insertions(+), 121 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1a152d1..aa0e1db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -812,54 +812,6 @@ define([CHECK_MODULE_BLUEZ4],
AC_SUBST([EBLUEZ4_CFLAGS])
AC_SUBST([EBLUEZ4_LIBS])
-have_wayland_clients=no
-AC_ARG_ENABLE([wayland-clients],
- AS_HELP_STRING([--enable-wayland-clients],[enable wayland clients in
composite module @<:@default=disabled@:>@]),
- [e_cv_want_wayland_clients=$enableval],
- [e_cv_want_wayland_clients=no])
-AC_MSG_CHECKING([whether wayland client support is enabled])
-AC_MSG_RESULT([${e_cv_want_wayland_clients}])
-
-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_clients}" != "xno";then
- PKG_CHECK_MODULES([WAYLAND], [ecore-wayland wayland-server xkbcommon uuid],
- [
- have_wayland=yes
- AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
- ])
-else
- have_wayland=no
-fi
-
-if test "x${have_wayland}" = "xyes"; then
- if test "x${e_cv_want_wayland_clients}" != "xno"; then
- have_wayland_clients=yes
- AC_DEFINE_UNQUOTED([HAVE_WAYLAND_CLIENTS],[1],[enable wayland clients in
composite module])
- fi
- 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_ONLY], [false])
-AM_CONDITIONAL([HAVE_WAYLAND_CLIENTS], [test "x${have_wayland_clients}" =
"xyes"])
-AM_CONDITIONAL([HAVE_WAYLAND_EGL], [test "x${have_wayland_egl}" = "xyes"])
-
PKG_CHECK_MODULES([ECORE_X], [ecore-x >= ${efl_version}])
if test -n "$ECORE_X_CFLAGS" ; then
ecore_x=true
@@ -867,42 +819,6 @@ else
ecore_x=false
fi
-if test "x${ecore_x}" = "xtrue" && test -n "$WAYLAND_CFLAGS" ; then
- wl_x11=true
-else
- wl_x11=false
-fi
-
-define([CHECK_MODULE_WL_DESKTOP_SHELL],
-[
- if test "x${have_wayland_clients}" = "xyes" ; then
- AC_E_CHECK_PKG(WL_DESKTOP_SHELL, [ ecore >= $efl_version eina >=
$efl_version ], [WL_DESKTOP_SHELL=true], [WL_DESKTOP_SHELL=false])
- else
- WL_DESKTOP_SHELL=false
- fi
-])
-AM_CONDITIONAL([HAVE_WL_DESKTOP_SHELL], [test "x${WL_DESKTOP_SHELL}" =
"xtrue"])
-
-define([CHECK_MODULE_WL_FB],
-[
- if test "x${have_wayland_clients}" = "xyes"; then
- AC_E_CHECK_PKG(WL_FB, [ ecore-fb >= $efl_version ecore >= $efl_version
eina >= $efl_version ], [WL_FB=true], [WL_FB=false])
- else
- WL_FB=false
- fi
-])
-AM_CONDITIONAL([HAVE_WL_FB], [test "x${WL_FB}" = "xtrue"])
-
-define([CHECK_MODULE_WL_DRM],
-[
- if test "x${have_wayland}" = "xyes" ; then
- AC_E_CHECK_PKG(WL_DRM, [ ecore-drm >= $efl_version ecore >= $efl_version
eina >= $efl_version ], [WL_DRM=true], [WL_DRM=false])
- else
- WL_DRM=false
- fi
-])
-AM_CONDITIONAL([HAVE_WL_DRM], [test "x${WL_DRM}" = "xtrue"])
-
AC_E_OPTIONAL_MODULE([ibar], true)
AC_E_OPTIONAL_MODULE([clock], true)
AC_E_OPTIONAL_MODULE([pager], true)
@@ -953,11 +869,6 @@ AC_E_OPTIONAL_MODULE([tiling], true)
#AC_E_OPTIONAL_MODULE([access], false, $ecore_x)
AC_E_OPTIONAL_MODULE([music_control], true, [CHECK_MODULE_MUSIC_CONTROL])
AC_E_OPTIONAL_MODULE([packagekit], true)
-AC_E_OPTIONAL_MODULE([wl_desktop_shell], $have_wayland,
[CHECK_MODULE_WL_DESKTOP_SHELL])
-AC_E_OPTIONAL_MODULE([wl_x11], $have_wayland, $wl_x11)
-AC_E_OPTIONAL_MODULE([wl_fb], $have_wayland, [CHECK_MODULE_WL_FB])
-AC_E_OPTIONAL_MODULE([wl_drm], $have_wayland, [CHECK_MODULE_WL_DRM])
-#AC_E_OPTIONAL_MODULE([wl_screenshot], true, [CHECK_MODULE_WL_SCREENSHOT])
AC_E_OPTIONAL_MODULE([policy_mobile], true)
HALT="/sbin/shutdown -h now"
@@ -1069,8 +980,6 @@ src/modules/xkbswitch/module.desktop
src/modules/tiling/module.desktop
src/modules/music-control/module.desktop
src/modules/packagekit/module.desktop
-src/modules/wl_desktop_shell/module.desktop
-src/modules/wl_screenshot/module.desktop
data/xsession/enlightenment.desktop
data/etc/sysactions.conf
data/units/enlightenment.service
diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 55f125d..ea78965 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -9,8 +9,6 @@ E_CPPFLAGS = \
@cf_cflags@ \
@VALGRIND_CFLAGS@ \
@EDJE_DEF@ \
-@WAYLAND_CFLAGS@ \
-@WAYLAND_EGL_CFLAGS@ \
-DE_BINDIR=\"$(bindir)\" \
-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
@@ -201,14 +199,6 @@ src/bin/e_xsettings.h \
src/bin/e_zoomap.h \
src/bin/e_zone.h
-if HAVE_WAYLAND
-ENLIGHTENMENTHEADERS += \
-src/bin/e_uuid_store.h \
-src/bin/e_comp_wl_data.h \
-src/bin/e_comp_wl_input.h \
-src/bin/e_comp_wl.h
-endif
-
enlightenment_src = \
src/bin/e_about.c \
@@ -369,28 +359,18 @@ src/bin/e_zoomap.c \
src/bin/e_zone.c \
$(ENLIGHTENMENTHEADERS)
-if ! HAVE_WAYLAND_ONLY
enlightenment_src += \
src/bin/e_comp_x.c \
src/bin/e_randr.c \
src/bin/e_xsettings.c
-endif
-
-if HAVE_WAYLAND
-enlightenment_src += \
-src/bin/e_uuid_store.c \
-src/bin/e_comp_wl_data.c \
-src/bin/e_comp_wl_input.c \
-src/bin/e_comp_wl.c
-endif
-src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT
-DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@
@ECORE_X_CFLAGS@ -DNEED_X=1 -DNEED_WL
+src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT
-DEFL_EO_API_SUPPORT -DE_LOGGING=1 @ECORE_X_CFLAGS@ -DNEED_X=1 -DNEED_WL
src_bin_enlightenment_SOURCES = \
src/bin/e_main.c \
$(enlightenment_src)
src_bin_enlightenment_LDFLAGS = -export-dynamic
-src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
@WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm @ECORE_X_LIBS@ @SHM_OPEN_LIBS@
+src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
-lm @ECORE_X_LIBS@ @SHM_OPEN_LIBS@
src_bin_enlightenment_imc_SOURCES = \
src/bin/e.h \
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index 22fe425..1ca4920 100644
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -118,13 +118,13 @@ include src/modules/Makefile_music_control.mk
include src/modules/Makefile_packagekit.mk
-include src/modules/Makefile_wl_drm.mk
+#include src/modules/Makefile_wl_drm.mk
-include src/modules/Makefile_wl_desktop_shell.mk
+#include src/modules/Makefile_wl_desktop_shell.mk
-include src/modules/Makefile_wl_x11.mk
+#include src/modules/Makefile_wl_x11.mk
-include src/modules/Makefile_wl_fb.mk
+#include src/modules/Makefile_wl_fb.mk
#if HAVE_WAYLAND_SCREENSHOT
#include src/modules/Makefile_wl_screenshot.mk
diff --git a/src/modules/Makefile_everything.mk
b/src/modules/Makefile_everything.mk
index db2169a..89c454b 100644
--- a/src/modules/Makefile_everything.mk
+++ b/src/modules/Makefile_everything.mk
@@ -41,9 +41,7 @@ src_modules_everything_module_la_SOURCES = $(EVRYHEADERS) \
src/modules/everything/evry_plug_settings.c \
src/modules/everything/evry_plug_calc.c
-if ! HAVE_WAYLAND_ONLY
src_modules_everything_module_la_SOURCES +=
src/modules/everything/evry_plug_clipboard.c
-endif
everything_headersdir = $(pkgincludedir)
dist_everything_headers_DATA = $(EVRYHEADERS)
diff --git a/src/modules/Makefile_systray.mk b/src/modules/Makefile_systray.mk
index 02b4c92..552eb75 100644
--- a/src/modules/Makefile_systray.mk
+++ b/src/modules/Makefile_systray.mk
@@ -19,9 +19,7 @@ src_modules_systray_module_la_SOURCES =
src/modules/systray/e_mod_main.h \
src/modules/systray/e_mod_notifier_host_dbus.c \
src/modules/systray/e_mod_notifier_watcher.c
-if ! HAVE_WAYLAND_ONLY
src_modules_systray_module_la_SOURCES += src/modules/systray/e_mod_xembed.c
-endif
PHONIES += systray install-systray
systray: $(systraypkg_LTLIBRARIES) $(systray_DATA)
--
