EFL_UPGRADE: remove ecore-wayland dependency

Change-Id: I9199bf6485d10606d5ec711c2c9f14481c78add6
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f070b7..9f16917 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(requires "dlog capi-base-common ecore ecore-input evas ecore-wayland")
+SET(requires "dlog capi-base-common ecore ecore-input evas ecore-wl2")
 SET(pc_requires "capi-base-common")
 
 INCLUDE(FindPkgConfig)

diff --git a/packaging/capi-system-media-key.spec b/packaging/capi-system-media-key.spec
index a1c4a9d..66b8479 100644 (file)
--- a/packaging/capi-system-media-key.spec
+++ b/packaging/capi-system-media-key.spec
@@ -12,7 +12,7 @@ BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(ecore-input)
 BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(ecore-wayland)
+BuildRequires:  pkgconfig(ecore-wl2)
 
 %description
 %{summary}.
@@ -30,6 +30,7 @@ Requires: %{name} = %{version}-%{release}
 cp %{SOURCE1001} .
 
 %build
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake -DFULLVER=%{version} \
        -DMAJORVER=${MAJORVER} \

diff --git a/src/media_key.c b/src/media_key.c
index 3800ad4..36ac7c7 100644 (file)
--- a/src/media_key.c
+++ b/src/media_key.c
@@ -20,7 +20,7 @@
 #include <Evas.h>
 #include <Ecore.h>
 #include <Ecore_Input.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 
 #include <dlog.h>
 
@@ -62,7 +62,7 @@ static int _media_key_init(void)
        if (_media_key_initialized)
                return 0;
 
-       ecore_wl_init(NULL);
+       ecore_wl2_init();
        _media_key_initialized = 1;
 
        return 0;
@@ -70,7 +70,7 @@ static int _media_key_init(void)
 
 static void _media_key_fini(void)
 {
-       ecore_wl_shutdown();
+       ecore_wl2_shutdown();
        _media_key_initialized = 0;
 }
 
@@ -126,12 +126,12 @@ static int _grab_media_key(void)
        Eina_Bool ret;
 
        for (i = 0; media_keys[i].key_str; i++) {
-               ret = ecore_wl_window_keygrab_set(NULL, media_keys[i].key_str,
-                               0, 0, 0, ECORE_WL_WINDOW_KEYGRAB_OVERRIDE_EXCLUSIVE);
+               ret = ecore_wl2_window_keygrab_set(NULL, media_keys[i].key_str,
+                               0, 0, 0, ECORE_WL2_WINDOW_KEYGRAB_OVERRIDE_EXCLUSIVE);
                if (ret != EINA_TRUE) {
                        LOGE("failed to grab key: %s", media_keys[i].key_str);
                        for (i = i - 1; i >= 0; i--)
-                               ecore_wl_window_keygrab_unset(NULL, media_keys[i].key_str, 0, 0);
+                               ecore_wl2_window_keygrab_unset(NULL, media_keys[i].key_str, 0, 0);
 
                        return -1;
                }
@@ -146,7 +146,7 @@ static int _ungrab_media_key(void)
        Eina_Bool ret;
 
        for (i = 0; media_keys[i].key_str; i++) {
-               ret = ecore_wl_window_keygrab_unset(NULL, media_keys[i].key_str, 0, 0);
+               ret = ecore_wl2_window_keygrab_unset(NULL, media_keys[i].key_str, 0, 0);
                if (ret != EINA_TRUE)
                        LOGE("failed to ungrab key: %s", media_keys[i].key_str);
        }