From 9479fccaa385647b2548da7c53567de63cc0253d Mon Sep 17 00:00:00 2001 From: suhyung Eom Date: Mon, 27 Feb 2017 10:56:56 +0900 Subject: [PATCH] Revert "[Tizen] Replace aul_rsm with screen_connector_provider" This reverts commit b530384d77c1201c5565c7ab153b187089875688. Change-Id: Id1cebcbccbbb94784ad8348fe4eb221b95f68ce7 --- 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, 3 insertions(+), 6 deletions(-) diff --git a/adaptors/tizen/adaptor-impl-tizen.cpp b/adaptors/tizen/adaptor-impl-tizen.cpp index 9972162..cd002cd 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 ); - screen_connector_provider_remote_enable(appId, ecore_wl_window_surface_get(ecoreWlWindow)); + aul_rsm_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 2ac75dd..ea64404 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -394,7 +394,6 @@ libdali_adaptor_la_CXXFLAGS = \ $(CAPI_SYSTEM_SENSOR_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(LIBEXIF_CFLAGS) \ - $(SCREENCONNECTORPROVIDER_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(TPKP_CURL_CFLAGS) \ $(UTILX_CFLAGS) @@ -419,7 +418,6 @@ 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 7e612b3..de27247 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -42,7 +42,6 @@ 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 9291ab8..144a6f4 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -92,7 +92,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig BuildRequires: gawk -BuildRequires: pkgconfig(screen_connector_provider) +BuildRequires: pkgconfig(aul) BuildRequires: giflib-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: libjpeg-turbo-devel -- 2.7.4