From e5e007e6bf30aecb18fdf1396309a8eb68395fc0 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 20 Jun 2017 16:17:18 +0900 Subject: [PATCH] [Tizen] Replace aul_rsm with screen_connector_provider and enable for only wearable profile Change-Id: I7213ac2fe1cd94fc523cb27de391dc45586974f4 --- adaptors/tizen/adaptor-impl-tizen.cpp | 4 ++-- build/tizen/adaptor/Makefile.am | 4 +++- build/tizen/adaptor/configure.ac | 1 + packaging/dali-adaptor.spec | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/adaptors/tizen/adaptor-impl-tizen.cpp b/adaptors/tizen/adaptor-impl-tizen.cpp index cd002cd..9972162 100644 --- a/adaptors/tizen/adaptor-impl-tizen.cpp +++ b/adaptors/tizen/adaptor-impl-tizen.cpp @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include #ifdef APPCORE_WATCH_AVAILABLE -#include +#include #include #endif @@ -78,7 +78,7 @@ void Adaptor::SurfaceInitialized() app_get_id(&appId); Ecore_Wl_Window* ecoreWlWindow = AnyCast( mNativeWindow ); - aul_rsm_provider_remote_enable(appId, ecore_wl_window_surface_get(ecoreWlWindow)); + screen_connector_provider_remote_enable(appId, ecore_wl_window_surface_get(ecoreWlWindow)); #endif } diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 927c5f0..c153c5e 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -493,10 +493,12 @@ endif if WEARABLE_PROFILE libdali_adaptor_la_CXXFLAGS += \ $(HAPTIC_CFLAGS) \ - $(EFL_ASSIST_CFLAGS) + $(EFL_ASSIST_CFLAGS) \ + $(SCREENCONNECTORPROVIDER_CFLAGS) \ $(APPCORE_WATCH_CFLAGS) libdali_adaptor_la_LIBADD += \ + $(SCREENCONNECTORPROVIDER_LIBS) \ $(APPCORE_WATCH_LIBS) endif diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index de27247..062f15e 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -222,6 +222,7 @@ fi if test "x$enable_profile" = "xWEARABLE"; then PKG_CHECK_MODULES(OPENGLES20, glesv2) +PKG_CHECK_MODULES(SCREENCONNECTORPROVIDER, screen_connector_provider) PKG_CHECK_MODULES(APPFW_WATCH, capi-appfw-watch-application, [watch_available=yes], [watch_available=no] ) PKG_CHECK_MODULES(APPCORE_WATCH, appcore-watch) diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 35ac084..e98034f 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -49,6 +49,7 @@ BuildRequires: pkgconfig(libtzplatform-config) %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" BuildRequires: pkgconfig(capi-appfw-watch-application) BuildRequires: pkgconfig(appcore-watch) +BuildRequires: pkgconfig(screen_connector_provider) %endif BuildRequires: pkgconfig(gles20) @@ -56,7 +57,6 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig BuildRequires: gawk -BuildRequires: pkgconfig(aul) BuildRequires: giflib-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: libjpeg-turbo-devel -- 2.7.4