fix build-error for wayland-only env
authorBoram Park <boram1288.park@samsung.com>
Tue, 17 Mar 2015 08:42:10 +0000 (17:42 +0900)
committerBoram Park <boram1288.park@samsung.com>
Wed, 18 Mar 2015 04:03:45 +0000 (13:03 +0900)
Change-Id: I949cc283c2bbe2f85d8a600846acbbaad0ff2b88

configure.ac
src/bin/e_pixmap.c
src/modules/wl_drm/e_mod_main.c

index 09d9f7f6b17525b4e87bb5096dcba88d5a8cf713..153b1f977d97e7a7d3a8faf57a8bb282295449d5 100644 (file)
@@ -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])
index a53aa6806c12fcd92c07f2f54b7c57ace16aecc7..fdfe61939e5f44341d35e9fce444a0990a5daad1 100644 (file)
@@ -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;
index e5c7c6f1afd7c8c6502ac6a4a76541554d20e7b3..5cc32b3ec016b18869ea0ea6e464217b8a400f0d 100644 (file)
@@ -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;
 }