EFL_UPGRADE: remove ecore-wayland dependency

Change-Id: I7cccfdb47f0625af50b92a1f4730837e1dfdaec6
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5fe6e7..0ca14fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ pkg_check_modules(pkg_watch REQUIRED
                capi-appfw-app-common
                vconf
                elementary
-               ecore-wayland
+               ecore-wl2
                vconf-internal-keys
                libtzplatform-config
                capi-appfw-widget-application

diff --git a/packaging/appcore-watch.spec b/packaging/appcore-watch.spec
index 4cf27b6..b42aec9 100644 (file)
--- a/packaging/appcore-watch.spec
+++ b/packaging/appcore-watch.spec
@@ -18,7 +18,7 @@ BuildRequires:  pkgconfig(capi-appfw-app-common)
 BuildRequires: pkgconfig(capi-appfw-widget-application)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(icu-uc)
-BuildRequires: pkgconfig(ecore-wayland)
+BuildRequires: pkgconfig(ecore-wl2)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(screen_connector_provider)
@@ -56,7 +56,7 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 export CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-function -Wno-unused-but-set-variable"
-
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake -DFULLVER=%{version} \
        -DMAJORVER=${MAJORVER} \

diff --git a/src/watch_app_main.c b/src/watch_app_main.c
index 02fbd99..af5f6e9 100755 (executable)
--- a/src/watch_app_main.c
+++ b/src/watch_app_main.c
@@ -37,13 +37,12 @@
 #include <app_control.h>
 #include <Evas.h>
 #include <Elementary.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 #include <screen_connector_provider.h>
 #include <appcore_efl_base.h>
 #include <alarm.h>
 #include <vconf.h>
 #include <glib-object.h>
-#include <Ecore_Wayland.h>
 #include <app_control.h>
 #include <app_control_internal.h>
 #include <bundle_internal.h>
@@ -754,7 +753,7 @@ static void __on_window_show(int type, void *event, void *data)
 
 static void __on_window_visibility(int type, void *event, void *data)
 {
-       Ecore_Wl_Event_Window_Visibility_Change *ev = event;
+       Ecore_Wl2_Event_Window_Visibility_Change *ev = event;
 
        _D("visibility %u %u",
                        (unsigned int)ev->win,
@@ -1294,7 +1293,8 @@ EXPORT_API int watch_app_get_elm_win(Evas_Object **win)
 {
        Evas_Object *ret_win;
        struct wl_surface *surface;
-       Ecore_Wl_Window *wl_win;
+       Ecore_Wl2_Window *wl_win;
+       Ecore_Evas *ee;
        char buffer[256];
 
        if (!__check_feature())
@@ -1309,11 +1309,12 @@ EXPORT_API int watch_app_get_elm_win(Evas_Object **win)
                return watch_app_error(APP_ERROR_OUT_OF_MEMORY, __FUNCTION__,
                                NULL);
 
-       wl_win = elm_win_wl_window_get(ret_win);
+       ee = ecore_evas_ecore_evas_get(evas_object_evas_get(ret_win));
+       wl_win = ecore_evas_wayland2_window_get(ee);
        if (wl_win == NULL)
                _E("failed to get surface");
 
-       surface = ecore_wl_window_surface_get(wl_win);
+       surface = ecore_wl2_window_surface_get(wl_win);
        screen_connector_provider_remote_enable(__context.appid,
                        surface);