From: Hyunho Kang Date: Tue, 20 Dec 2016 08:49:49 +0000 (+0900) Subject: Replace aul_rsm with screen_connector_provider X-Git-Tag: accepted/tizen/3.0/common/20161221.180930^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=fd97b4b567d27bd6fbbbdcf0ac28001384737bab;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Replace aul_rsm with screen_connector_provider Change-Id: I6c0ee2699c4ea8ef0b793203c5ea656b18845874 Signed-off-by: Hyunho Kang --- 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 4bf8c97..cc925de 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -400,6 +400,7 @@ libdali_adaptor_la_CXXFLAGS = \ $(CAPI_SYSTEM_SENSOR_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(LIBEXIF_CFLAGS) \ + $(SCREENCONNECTORPROVIDER_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(TPKP_CURL_CFLAGS) \ $(UTILX_CFLAGS) @@ -424,6 +425,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 529179f..441c527 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 154d565..f258d1d 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -91,7 +91,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