From: Gwanglim Lee <gl77.lee@samsung.com>
Date: Wed, 4 May 2016 02:04:38 +0000 (+0900)
Subject: removed wayland-client dependency
X-Git-Tag: accepted/tizen/common/20160505.140315~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc32f2301e921ccd18f9028416c8644edac1b699;p=platform%2Fupstream%2Fenlightenment.git

removed wayland-client dependency

Change-Id: I17599ffab85a39f8611172ea27c174395529d19b
---

diff --git a/configure.ac b/configure.ac
index 522bbae..74893ef 100755
--- a/configure.ac
+++ b/configure.ac
@@ -344,7 +344,7 @@ AC_MSG_RESULT([${have_shm_open}])
 AC_SUBST(SHM_OPEN_LIBS)
                            
 if test "x${e_cv_want_wayland_only}" != "xno" || test "x${e_cv_want_wayland_clients}" != "xno";then
-  PKG_CHECK_MODULES([WAYLAND], [ecore-wayland >= 1.16 wayland-server >= 1.8.0 wayland-client >= 1.8.0 xkbcommon uuid xdg-shell-server scaler-server transform-server screenshooter-server screenshooter-client tizen-extension-server],
+  PKG_CHECK_MODULES([WAYLAND], [wayland-server >= 1.8.0 xkbcommon uuid xdg-shell-server scaler-server transform-server screenshooter-server tizen-extension-server],
     [
       have_wayland=yes
       AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index eda1edd..4398f51 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -4361,20 +4361,6 @@ e_comp_wl_shutdown(void)
    /* free handlers */
    E_FREE_LIST(handlers, ecore_event_handler_del);
 
-   while (e_comp_wl->wl.globals)
-     {
-        Ecore_Wl_Global *global;
-
-        global =
-          EINA_INLIST_CONTAINER_GET(e_comp_wl->wl.globals, Ecore_Wl_Global);
-
-        e_comp_wl->wl.globals =
-          eina_inlist_remove(e_comp_wl->wl.globals, e_comp_wl->wl.globals);
-
-        free(global->interface);
-        free(global);
-     }
-   if (e_comp_wl->wl.shm) wl_shm_destroy(e_comp_wl->wl.shm);
    _e_comp_wl_gl_shutdown();
 
 #ifdef HAVE_WAYLAND_TBM
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index b6fc268..98d92bb 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -161,10 +161,7 @@ struct _E_Comp_Wl_Data
    struct
      {
         struct wl_display *disp;
-        struct wl_registry *registry; // only used for nested wl compositors
         struct wl_event_loop *loop;
-        Eina_Inlist *globals;  // only used for nested wl compositors
-        struct wl_shm *shm;  // only used for nested wl compositors
         Evas_GL *gl;
         Evas_GL_Config *glcfg;
         Evas_GL_Context *glctx;