EFL 1.20 migration

Change-Id: I8ebba4d77d72cd7bb1a06c26e1dbd81206616c18

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6c3ec4..7dbe4ae 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ SET(PKGS_CHECK_MODULES
 
 IF (with_wayland)
         ADD_DEFINITIONS("-DWAYLAND")
-        SET(PKGS_CHECK_MODULES ${PKGS_CHECK_MODULES} ecore-wayland)
+        SET(PKGS_CHECK_MODULES ${PKGS_CHECK_MODULES} ecore-wl2)
 ENDIF(with_wayland)
 
 pkg_check_modules(pkgs REQUIRED ${PKGS_CHECK_MODULES})

diff --git a/packaging/libscl-ui.spec b/packaging/libscl-ui.spec
index 8b29386..2644dc6 100644 (file)
--- a/packaging/libscl-ui.spec
+++ b/packaging/libscl-ui.spec
@@ -11,7 +11,7 @@ Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(elementary)
 %if %{with wayland}
-BuildRequires:  pkgconfig(ecore-wayland)
+BuildRequires:  pkgconfig(ecore-wl2)
 %else
 BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(x11)

diff --git a/scl/gwes/efl/sclwindows-efl.cpp b/scl/gwes/efl/sclwindows-efl.cpp
index 6721b81..2853f70 100644 (file)
--- a/scl/gwes/efl/sclwindows-efl.cpp
+++ b/scl/gwes/efl/sclwindows-efl.cpp
@@ -28,7 +28,8 @@
 #include <Elementary.h>
 #include <malloc.h>
 #ifdef WAYLAND
-#include <Ecore_Wayland.h>
+#define EFL_BETA_API_SUPPORT
+#include <Ecore_Wl2.h>
 #else
 #include <Ecore_X.h>
 #include <X11/Xlib.h>
@@ -186,13 +187,14 @@ CSCLWindowsImplEfl::create_window(const sclwindow parent, SclWindowContext *wind
 #endif
 
 #ifdef WAYLAND
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    Ecore_Wl2_Window *wl_window = (Ecore_Wl2_Window *)(elm_win_wl_window_get(win));
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_0], 0, 0, new_width, new_height);
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_90_CW], 0, 0, new_width, new_height);
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_180], 0, 0, new_width, new_height);
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_90_CCW], 0, 0, new_width, new_height);
 #else
     /*
@@ -271,13 +273,14 @@ CSCLWindowsImplEfl::create_magnifier_window(const sclwindow parent, SclWindowCon
 #endif
 
 #ifdef WAYLAND
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    Ecore_Wl2_Window *wl_window = (Ecore_Wl2_Window *)(elm_win_wl_window_get(win));
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_0], 0, 0, width, height);
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_90_CW], 0, 0, height, width);
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_180], 0, 0, width, height);
-    ecore_wl_window_rotation_geometry_set(elm_win_wl_window_get(win),
+    ecore_wl2_window_rotation_geometry_set(wl_window,
         rotation_values_EFL[ROTATION_90_CCW], 0, 0, height, width);
 #else
     /*