Upgrade efl api

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Icb3f0387f6f9e844365828623317c58eab756604
(cherry picked from commit 64c443db243eca577b12e0e50822a1b3065e8875)

diff --git a/configure.ac b/configure.ac
index a78a071..530f5ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,10 @@ PKG_CHECK_MODULES(EVAS, evas)
 AC_SUBST(EVAS_CFLAGS)
 AC_SUBST(EVAS_LIBS)
 
+PKG_CHECK_MODULES(ECORE_WL2, ecore-wl2)
+AC_SUBST(ECORE_WL2_CFLAGS)
+AC_SUBST(ECORE_WL2_LIBS)
+
 PKG_CHECK_MODULES(TZPLATFORM_CONFIG, libtzplatform-config)
 AC_SUBST(TZPLATFORM_CONFIG_CFLAGS)
 AC_SUBST(TZPLATFORM_CONFIG_LIBS)

diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec
index 9867b89..48b31f2 100644 (file)
--- a/packaging/libmm-wfd.spec
+++ b/packaging/libmm-wfd.spec
@@ -17,7 +17,7 @@ BuildRequires: pkgconfig(capi-network-wifi-direct)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(ecore-wayland)
+BuildRequires: pkgconfig(ecore-wl2)
 BuildRequires: pkgconfig(libtbm)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(capi-system-info)
@@ -48,6 +48,7 @@ export CFLAGS+=" -Wextra -Wno-array-bounds"
 export CFLAGS+=" -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow"
 export CFLAGS+=" -Wwrite-strings -Wswitch-default"
 export CFLAGS+=" -DSYSCONFDIR=\\\"%{_sysconfdir}\\\""
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT"
 ./autogen.sh
 
 CFLAGS+=" -DMMFW_DEBUG_MODE -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "; export CFLAGS

diff --git a/src/Makefile.am b/src/Makefile.am
index cf6cabd..033f2df 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,7 @@ libmmfwfdsink_la_CFLAGS = -I$(srcdir)/include \
                        $(GST_CFLAGS) \
                        $(EVAS_CFLAGS) \
                        $(ELEMENTARY_CFLAGS) \
+                       $(ECORE_WL2_CFLAGS) \
                        $(GST_PLUGINS_BASE_CFLAGS) \
                        $(GST_VIDEO_CFLAGS) \
                        $(TZPLATFORM_CONFIG_CFLAGS) \
@@ -42,6 +43,7 @@ libmmfwfdsink_la_LIBADD = $(GST_LIBS) \
                        $(GST_BASE_LIBS) \
                        $(ELEMENTARY_LIBS) \
                        $(EVAS_LIBS) \
+                       $(ECORE_WL2_LIBS) \
                        $(MMCOMMON_LIBS) \
                        $(AUDIOSESSIONMGR_LIBS) \
                        $(TZPLATFORM_CONFIG_LIBS) \

diff --git a/src/mm_wfd_sink_priv.c b/src/mm_wfd_sink_priv.c
index b2e3060..67ae15f 100644 (file)
--- a/src/mm_wfd_sink_priv.c
+++ b/src/mm_wfd_sink_priv.c
@@ -23,7 +23,7 @@
 #include <gst/gst.h>
 #include <gst/video/videooverlay.h>
 #include <Elementary.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 
 #include "mm_wfd_sink_util.h"
 #include "mm_wfd_sink_priv.h"
@@ -4059,7 +4059,8 @@ static int __mm_wfd_sink_prepare_videosink(mm_wfd_sink_t *wfd_sink, GstElement *
                                int wl_window_height = 0;
                                struct wl_surface *wl_surface = NULL;
                                struct wl_display *wl_display = NULL;
-                               Ecore_Wl_Window *wl_window = NULL;
+                               Ecore_Wl2_Window *wl2_window = NULL;
+                               Ecore_Wl2_Display *wl2_display = NULL;
                                wl_client *wlclient = NULL;
                                Evas_Object *obj = NULL;
                                void *object = NULL;
@@ -4080,12 +4081,13 @@ static int __mm_wfd_sink_prepare_videosink(mm_wfd_sink_t *wfd_sink, GstElement *
                                        wfd_sink_debug("x[%d] y[%d] width[%d] height[%d]", wl_window_x, wl_window_y,
                                                                        wl_window_width, wl_window_height);
 
-                                       wl_window = elm_win_wl_window_get(obj);
-                                       ecore_wl_window_video_has(wl_window, EINA_TRUE);
-                                       wl_surface = (struct wl_surface *) ecore_wl_window_surface_get(wl_window);
+                                       wl2_window = ecore_evas_wayland2_window_get(ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
+                                       ecore_wl2_window_video_has(wl2_window, EINA_TRUE);
+                                       wl_surface = ecore_wl2_window_surface_get(wl2_window);
 
                                        /* get wl_display */
-                                       wl_display = (struct wl_display *) ecore_wl_display_get();
+                                       wl2_display = ecore_wl2_connected_display_get(NULL);
+                                       wl_display = ecore_wl2_display_get(wl2_display);
 
                                        wfd_sink_debug("previous display object : %p current object : %p", display_overlay, object);
                                        if (wl_surface && wl_display && (wl_surface_id == 0 || display_overlay != object)) {