From ecf70ab45d7e07e249dd0454112b015dd5063f89 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 13 Jun 2017 10:59:52 +0900 Subject: [PATCH] [Tizen] Replace aul_rsm with screen_connector_provider This reverts commit d4b32aff653c38f809c4969372758b91b0303b23. Change-Id: Ifd8fe1749250e24f56eb1d34b9e413377212e242 --- adaptors/tizen/adaptor-impl-tizen.cpp | 4 ++-- build/tizen/adaptor/Makefile.am | 2 ++ build/tizen/adaptor/configure.ac | 1 + packaging/dali-adaptor.spec | 2 +- 4 files changed, 6 insertions(+), 3 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..c06be0d 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -395,6 +395,7 @@ libdali_adaptor_la_CXXFLAGS = \ $(CAPI_SYSTEM_SENSOR_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(LIBEXIF_CFLAGS) \ + $(SCREENCONNECTORPROVIDER_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(TPKP_CURL_CFLAGS) \ $(UTILX_CFLAGS) @@ -422,6 +423,7 @@ libdali_adaptor_la_LIBADD = \ $(CAPI_SYSTEM_SENSOR_LIBS) \ $(LIBDRM_LIBS) \ $(LIBEXIF_LIBS) \ + $(SCREENCONNECTORPROVIDER_LIBS) \ $(LIBCURL_LIBS) \ $(HARFBUZZ_LIBS) \ $(TPKP_CURL_LIBS) \ diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index de27247..7e612b3 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -42,6 +42,7 @@ PKG_CHECK_MODULES(FREETYPE_BITMAP_SUPPORT, [freetype2 >= $FREETYPE_BITMAP_SUPPOR PKG_CHECK_MODULES(FONTCONFIG, fontconfig) PKG_CHECK_MODULES(PNG, libpng) PKG_CHECK_MODULES(LIBEXIF, libexif) +PKG_CHECK_MODULES(SCREENCONNECTORPROVIDER, screen_connector_provider) PKG_CHECK_MODULES(LIBDRM, libdrm) PKG_CHECK_MODULES(LIBCURL, libcurl) PKG_CHECK_MODULES(HARFBUZZ, harfbuzz) diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 80b693b..1805808 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -92,7 +92,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig BuildRequires: gawk -BuildRequires: pkgconfig(aul) +BuildRequires: pkgconfig(screen_connector_provider) BuildRequires: giflib-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: libjpeg-turbo-devel -- 2.7.4