summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongmo Yang <jm80.yang@samsung.com>2018-01-10 09:50:17 +0900
committerJeongmo Yang <jm80.yang@samsung.com>2018-01-11 10:47:42 +0900
commit2f17b59cb699af9584dac4f97e4299a54feb7807 (patch)
tree28627bf6ddca4c193b8b6ced9eeffc06e506b486
parent5111aa6cb29e9673eb3436df4855b0fa98e04adb (diff)
downloadlibmm-display-sandbox/upgrade/efl120.tar.gz
libmm-display-sandbox/upgrade/efl120.tar.bz2
libmm-display-sandbox/upgrade/efl120.zip
Update code to replace ecore-wayland by ecore-wl2sandbox/upgrade/efl120
[Version] 0.0.3 [Profile] Common [Issue Type] Update [Dependency module] N/A Change-Id: I35a69306ece05b22eccdb6aacdfc11f2f589fbb2 Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r--configure.ac6
-rw-r--r--packaging/libmm-display.spec4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/mm_display.c22
4 files changed, 22 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index f4da5be..838d66e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,9 +59,9 @@ PKG_CHECK_MODULES(ECORE_EVAS, ecore-evas)
AC_SUBST(ECORE_EVAS_CFLAGS)
AC_SUBST(ECORE_EVAS_LIBS)
-PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
-AC_SUBST(ECORE_WAYLAND_CFLAGS)
-AC_SUBST(ECORE_WAYLAND_LIBS)
+PKG_CHECK_MODULES(ECORE_WL2, ecore-wl2)
+AC_SUBST(ECORE_WL2_CFLAGS)
+AC_SUBST(ECORE_WL2_LIBS)
PKG_CHECK_MODULES(TIZEN_EXTENSION_CLIENT, tizen-extension-client)
AC_SUBST(TIZEN_EXTENSION_CLIENT_CFLAGS)
diff --git a/packaging/libmm-display.spec b/packaging/libmm-display.spec
index 32e6263..3b74978 100644
--- a/packaging/libmm-display.spec
+++ b/packaging/libmm-display.spec
@@ -16,7 +16,7 @@ BuildRequires: pkgconfig(capi-media-tool)
BuildRequires: pkgconfig(evas)
BuildRequires: pkgconfig(elementary)
BuildRequires: pkgconfig(ecore-evas)
-BuildRequires: pkgconfig(ecore-wayland)
+BuildRequires: pkgconfig(ecore-wl2)
BuildRequires: pkgconfig(tizen-extension-client)
%if "%{tizen_profile_name}" != "tv"
BuildRequires: pkgconfig(mm-evas-renderer)
@@ -50,7 +50,7 @@ Multimedia framework display library for develpment.
%build
-export CFLAGS+=" -D_LARGEFILE64_SOURCE -DMM_DISPLAY_LIBDIR=\\\"%{_libdir}\\\""
+export CFLAGS+=" -D_LARGEFILE64_SOURCE -DMM_DISPLAY_LIBDIR=\\\"%{_libdir}\\\" -DEFL_BETA_API_SUPPORT"
./autogen.sh
%configure \
%if "%{tizen_profile_name}" != "tv"
diff --git a/src/Makefile.am b/src/Makefile.am
index fc40995..58b4ae4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ libmmfdisplay_la_CFLAGS = -I$(srcdir)/include \
$(EVAS_CFLAGS) \
$(ELEMENTARY_CFLAGS) \
$(ECORE_EVAS_CFLAGS) \
- $(ECORE_WAYLAND_CFLAGS) \
+ $(ECORE_WL2_CFLAGS) \
$(TIZEN_EXTENSION_CLIENT_CFLAGS) \
$(DLOG_CFLAGS)
@@ -33,7 +33,7 @@ libmmfdisplay_la_LIBADD = \
$(EVAS_LIBS) \
$(ELEMENTARY_LIBS) \
$(ECORE_EVAS_LIBS) \
- $(ECORE_WAYLAND_LIBS) \
+ $(ECORE_WL2_LIBS) \
$(TIZEN_EXTENSION_CLIENT_LIBS) \
$(DLOG_LIBS)
diff --git a/src/mm_display.c b/src/mm_display.c
index 0ea6278..a2121bd 100644
--- a/src/mm_display.c
+++ b/src/mm_display.c
@@ -22,7 +22,7 @@
#include <Evas.h>
#include <Elementary.h>
#include <Ecore_Evas.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
#include <tizen-extension-client-protocol.h>
#ifdef TIZEN_FEATURE_EVAS_RENDERER
#include <mm_evas_renderer.h>
@@ -113,7 +113,8 @@ static const struct tizen_resource_listener _mm_display_tz_resource_listener = {
int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id)
{
int ret = MM_ERROR_NONE;
- Ecore_Wl_Window *window = NULL;
+ Ecore_Wl2_Window *wl2_window = NULL;
+ Ecore_Wl2_Display *wl2_display = NULL;
struct wl_display *display = NULL;
struct wl_surface *surface = NULL;
struct wl_registry *registry = NULL;
@@ -125,23 +126,30 @@ int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id)
return MM_ERROR_INVALID_ARGUMENT;
}
- window = elm_win_wl_window_get(obj);
- if (!window) {
+ wl2_window = ecore_evas_wayland2_window_get(ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
+ if (!wl2_window) {
LOGE("failed to get wayland window");
ret = MM_ERROR_UNKNOWN;
goto _DONE;
}
- ecore_wl_window_video_has(window, EINA_TRUE);
+ ecore_wl2_window_video_has(wl2_window, EINA_TRUE);
- surface = (struct wl_surface *)ecore_wl_window_surface_get(window);
+ surface = (struct wl_surface *)ecore_wl2_window_surface_get(wl2_window);
if (!surface) {
LOGE("failed to get wayland surface");
ret = MM_ERROR_UNKNOWN;
goto _DONE;
}
- display = (struct wl_display *)ecore_wl_display_get();
+ wl2_display = ecore_wl2_connected_display_get(NULL);
+ if (!wl2_display) {
+ LOGE("failed to get wl2 display");
+ ret = MM_ERROR_UNKNOWN;
+ goto _DONE;
+ }
+
+ display = (struct wl_display *)ecore_wl2_display_get(wl2_display);
if (!display) {
LOGE("failed to get wayland display");
ret = MM_ERROR_UNKNOWN;