From: Boram Park <boram1288.park@samsung.com>
Date: Mon, 9 Mar 2015 06:59:38 +0000 (+0900)
Subject: temporary fix for building based on wayland-only
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70841133a94c00fbf805963c582cd6ba26a0cecf;p=platform%2Fupstream%2Fenlightenment.git

temporary fix for building based on wayland-only

Change-Id: I10fada3b235f304e8f28940e409bf60c21f9562f
---

diff --git a/configure.ac b/configure.ac
index 09d9f7f6b1..153b1f977d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,7 +829,7 @@ 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" || test "x${e_cv_want_wayland_clients}" != "xno";then
-  PKG_CHECK_MODULES([WAYLAND], [ecore-wayland wayland-server >= 1.7.0 xkbcommon uuid],
+  PKG_CHECK_MODULES([WAYLAND], [ecore-wayland wayland-server xkbcommon uuid],
     [
       have_wayland=yes
       AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
diff --git a/packaging/enlightenment.spec b/packaging/enlightenment.spec
index fb9ddc302b..fbf0da7474 100644
--- a/packaging/enlightenment.spec
+++ b/packaging/enlightenment.spec
@@ -1,4 +1,5 @@
 %bcond_with x
+%bcond_with wayland
 
 Name:           enlightenment
 Version:        0.19.0
@@ -42,7 +43,7 @@ BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xcb-keysyms)
 BuildRequires:  pkgconfig(ecore-x)
 %else
-ExclusiveArch:
+BuildRequires:  pkgconfig(wayland-server)
 %endif
 Requires:       monotype-fonts
 
@@ -66,9 +67,16 @@ cp %{SOURCE1002} .
 
 %build
 %autogen \
-      --enable-device-udev \
-      --enable-mount-eeze  \
-      --enable-comp
+%if %{with wayland}
+      --enable-wayland-only \
+      --enable-wl-drm \
+      --disable-shot \
+      --disable-xkbswitch \
+      --disable-conf-randr \
+      --disable-wl-x11 \
+%endif
+      --enable-mount-eeze
+
 make %{?_smp_mflags}
 
 %install
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index a53aa6806c..fdfe61939e 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -866,7 +866,9 @@ e_pixmap_validate_check(const E_Pixmap *cp)
          break;
        case E_PIXMAP_TYPE_WL:
 #if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
+#if 0 //TODO_GL77
          _e_pixmap_update_wl(cp);
+#endif
          success = (cp->w > 0) && (cp->h > 0);
 #endif
          break;
diff --git a/src/modules/Makefile_access.mk b/src/modules/Makefile_access.mk
index d98733436b..19024f5f4c 100644
--- a/src/modules/Makefile_access.mk
+++ b/src/modules/Makefile_access.mk
@@ -8,7 +8,7 @@ accesspkgdir = $(MDIR)/access/$(MODULE_ARCH)
 accesspkg_LTLIBRARIES = src/modules/access/module.la
 
 src_modules_access_module_la_LIBADD = $(MOD_LIBS)
-src_modules_access_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X
+src_modules_access_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_access_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_access_module_la_SOURCES = src/modules/access/e_mod_main.c \
 			   src/modules/access/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_bindings.mk b/src/modules/Makefile_conf_bindings.mk
index a13d72570a..db769524ee 100644
--- a/src/modules/Makefile_conf_bindings.mk
+++ b/src/modules/Makefile_conf_bindings.mk
@@ -8,7 +8,7 @@ conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH)
 conf_bindingspkg_LTLIBRARIES = src/modules/conf_bindings/module.la
 
 src_modules_conf_bindings_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_bindings_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_bindings_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_bindings_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_bindings_module_la_SOURCES = src/modules/conf_bindings/e_mod_main.c \
 			     src/modules/conf_bindings/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_display.mk b/src/modules/Makefile_conf_display.mk
index 2ca1cf0e19..e4e560c58a 100644
--- a/src/modules/Makefile_conf_display.mk
+++ b/src/modules/Makefile_conf_display.mk
@@ -8,7 +8,7 @@ conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH)
 conf_displaypkg_LTLIBRARIES = src/modules/conf_display/module.la
 
 src_modules_conf_display_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_display_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_display_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_display_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_display_module_la_SOURCES = src/modules/conf_display/e_mod_main.c \
 				 src/modules/conf_display/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_randr.mk b/src/modules/Makefile_conf_randr.mk
index 280a4021b4..0e2da0529a 100644
--- a/src/modules/Makefile_conf_randr.mk
+++ b/src/modules/Makefile_conf_randr.mk
@@ -10,7 +10,7 @@ conf_randrpkgdir = $(MDIR)/conf_randr/$(MODULE_ARCH)
 conf_randrpkg_LTLIBRARIES = src/modules/conf_randr/module.la
 
 src_modules_conf_randr_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_randr_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_randr_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_randr_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_randr_module_la_SOURCES = src/modules/conf_randr/e_mod_main.c \
 			       src/modules/conf_randr/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_theme.mk b/src/modules/Makefile_conf_theme.mk
index 1326ec85a2..6b0ca744ee 100644
--- a/src/modules/Makefile_conf_theme.mk
+++ b/src/modules/Makefile_conf_theme.mk
@@ -8,7 +8,7 @@ conf_themepkgdir = $(MDIR)/conf_theme/$(MODULE_ARCH)
 conf_themepkg_LTLIBRARIES = src/modules/conf_theme/module.la
 
 src_modules_conf_theme_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_theme_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_theme_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_theme_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_theme_module_la_SOURCES = src/modules/conf_theme/e_mod_main.c \
 			       src/modules/conf_theme/e_mod_main.h \
diff --git a/src/modules/Makefile_contact.mk b/src/modules/Makefile_contact.mk
index 2e949d197d..ac98ffd7d1 100644
--- a/src/modules/Makefile_contact.mk
+++ b/src/modules/Makefile_contact.mk
@@ -9,7 +9,7 @@ contactpkgdir = $(MDIR)/contact/$(MODULE_ARCH)
 contactpkg_LTLIBRARIES = src/modules/contact/module.la
 
 src_modules_contact_module_la_LIBADD = $(MOD_LIBS)
-src_modules_contact_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X
+src_modules_contact_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_contact_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_contact_module_la_SOURCES = src/modules/contact/e_mod_main.c \
 			    src/modules/contact/e_mod_main.h \
diff --git a/src/modules/Makefile_everything.mk b/src/modules/Makefile_everything.mk
index 4838af7186..b7419d19eb 100644
--- a/src/modules/Makefile_everything.mk
+++ b/src/modules/Makefile_everything.mk
@@ -15,7 +15,7 @@ EVRYHEADERS = src/modules/everything/evry_api.h \
 	      src/modules/everything/evry_types.h
 
 src_modules_everything_module_la_LIBADD = $(MOD_LIBS)
-src_modules_everything_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_everything_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_everything_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_everything_module_la_SOURCES = $(EVRYHEADERS) \
 			       src/modules/everything/e_mod_main.c \
diff --git a/src/modules/Makefile_fileman.mk b/src/modules/Makefile_fileman.mk
index d1e29dfc08..3889f58a53 100644
--- a/src/modules/Makefile_fileman.mk
+++ b/src/modules/Makefile_fileman.mk
@@ -10,7 +10,7 @@ filemanpkgdir = $(MDIR)/fileman/$(MODULE_ARCH)
 filemanpkg_LTLIBRARIES = src/modules/fileman/module.la
 
 src_modules_fileman_module_la_LIBADD = $(MOD_LIBS)
-src_modules_fileman_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_fileman_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_fileman_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_fileman_module_la_SOURCES = src/modules/fileman/e_mod_main.c \
 			    src/modules/fileman/e_mod_main.h \
diff --git a/src/modules/Makefile_pager.mk b/src/modules/Makefile_pager.mk
index 18ea68e165..a77198e848 100644
--- a/src/modules/Makefile_pager.mk
+++ b/src/modules/Makefile_pager.mk
@@ -10,7 +10,7 @@ pagerpkgdir = $(MDIR)/pager/$(MODULE_ARCH)
 pagerpkg_LTLIBRARIES = src/modules/pager/module.la
 
 src_modules_pager_module_la_LIBADD = $(MOD_LIBS)
-src_modules_pager_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_pager_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_pager_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_pager_module_la_SOURCES = src/modules/pager/e_mod_main.h \
 			  src/modules/pager/e_mod_main.c \
diff --git a/src/modules/Makefile_pager_plain.mk b/src/modules/Makefile_pager_plain.mk
index 73615843fe..d9ba717290 100644
--- a/src/modules/Makefile_pager_plain.mk
+++ b/src/modules/Makefile_pager_plain.mk
@@ -10,7 +10,7 @@ pager_plainpkgdir = $(MDIR)/pager_plain/$(MODULE_ARCH)
 pager_plainpkg_LTLIBRARIES = src/modules/pager_plain/module.la
 
 src_modules_pager_plain_module_la_LIBADD = $(MOD_LIBS)
-src_modules_pager_plain_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_pager_plain_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_pager_plain_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_pager_plain_module_la_SOURCES = src/modules/pager_plain/e_mod_main.h \
 			  src/modules/pager_plain/e_mod_main.c \
diff --git a/src/modules/Makefile_shot.mk b/src/modules/Makefile_shot.mk
index c9a7eefae6..62d224ad64 100644
--- a/src/modules/Makefile_shot.mk
+++ b/src/modules/Makefile_shot.mk
@@ -10,7 +10,7 @@ shotpkgdir = $(MDIR)/shot/$(MODULE_ARCH)
 shotpkg_LTLIBRARIES = src/modules/shot/module.la
 
 src_modules_shot_module_la_LIBADD = $(MOD_LIBS)
-src_modules_shot_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_shot_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_shot_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_shot_module_la_SOURCES = src/modules/shot/e_mod_main.c
 
diff --git a/src/modules/Makefile_systray.mk b/src/modules/Makefile_systray.mk
index f7d1cbfbc2..052688262e 100644
--- a/src/modules/Makefile_systray.mk
+++ b/src/modules/Makefile_systray.mk
@@ -10,7 +10,7 @@ systraypkgdir = $(MDIR)/systray/$(MODULE_ARCH)
 systraypkg_LTLIBRARIES = src/modules/systray/module.la
 
 src_modules_systray_module_la_LIBADD = $(MOD_LIBS)
-src_modules_systray_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_systray_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_systray_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_systray_module_la_SOURCES = src/modules/systray/e_mod_main.h \
 			    src/modules/systray/e_mod_main.c \
diff --git a/src/modules/Makefile_tiling.mk b/src/modules/Makefile_tiling.mk
index 6ece181bb2..ce3617917a 100644
--- a/src/modules/Makefile_tiling.mk
+++ b/src/modules/Makefile_tiling.mk
@@ -19,7 +19,7 @@ src/modules/tiling/%.edj: src/modules/tiling/%.edc Makefile
 	$(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@
 
 src_modules_tiling_module_la_LIBADD = $(MOD_LIBS)
-src_modules_tiling_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_tiling_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_tiling_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_tiling_module_la_SOURCES = src/modules/tiling/e_mod_tiling.c \
 				       src/modules/tiling/e_mod_tiling.h \
diff --git a/src/modules/Makefile_winlist.mk b/src/modules/Makefile_winlist.mk
index b2f59e085f..7f3a4edc51 100644
--- a/src/modules/Makefile_winlist.mk
+++ b/src/modules/Makefile_winlist.mk
@@ -10,7 +10,7 @@ winlistpkgdir = $(MDIR)/winlist/$(MODULE_ARCH)
 winlistpkg_LTLIBRARIES = src/modules/winlist/module.la
 
 src_modules_winlist_module_la_LIBADD = $(MOD_LIBS)
-src_modules_winlist_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_winlist_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_winlist_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_winlist_module_la_SOURCES = src/modules/winlist/e_mod_main.h \
 			    src/modules/winlist/e_mod_main.c \
diff --git a/src/modules/Makefile_wizard.mk b/src/modules/Makefile_wizard.mk
index 8cde723dca..eac37f8322 100644
--- a/src/modules/Makefile_wizard.mk
+++ b/src/modules/Makefile_wizard.mk
@@ -128,7 +128,7 @@ src_modules_wizard_page_130_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_wizard_page_130_la_SOURCES = src/modules/wizard/page_130.c
 
 src_modules_wizard_page_150_la_LIBADD = $(MOD_LIBS)
-src_modules_wizard_page_150_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_wizard_page_150_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_wizard_page_150_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_wizard_page_150_la_SOURCES = src/modules/wizard/page_150.c
 
diff --git a/src/modules/Makefile_xkbswitch.mk b/src/modules/Makefile_xkbswitch.mk
index c7a0a63438..1b4df52875 100644
--- a/src/modules/Makefile_xkbswitch.mk
+++ b/src/modules/Makefile_xkbswitch.mk
@@ -10,7 +10,7 @@ xkbswitchpkgdir = $(MDIR)/xkbswitch/$(MODULE_ARCH)
 xkbswitchpkg_LTLIBRARIES = src/modules/xkbswitch/module.la
 
 src_modules_xkbswitch_module_la_LIBADD = $(MOD_LIBS)
-src_modules_xkbswitch_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_xkbswitch_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_xkbswitch_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_xkbswitch_module_la_SOURCES = src/modules/xkbswitch/e_mod_main.c \
 			      src/modules/xkbswitch/e_mod_main.h \
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index e5c7c6f1af..5cc32b3ec0 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -54,6 +54,7 @@ end:
    return ECORE_CALLBACK_PASS_ON;
 }
 
+#if 0 //TODO_GL77
 static Eina_Bool
 _e_mod_drm_cb_output(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 {
@@ -72,6 +73,7 @@ _e_mod_drm_cb_output(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 end:
    return ECORE_CALLBACK_PASS_ON;
 }
+#endif
 
 EAPI void *
 e_modapi_init(E_Module *m)
@@ -164,9 +166,11 @@ e_modapi_init(E_Module *m)
       ecore_event_handler_add(ECORE_DRM_EVENT_ACTIVATE,
                               _e_mod_drm_cb_activate, comp);
 
+#if 0 //TODO_GL77
    output_handler =
       ecore_event_handler_add(ECORE_DRM_EVENT_OUTPUT,
                               _e_mod_drm_cb_output, comp);
+#endif
 
    return m;
 }