From 375a03469cf0d68056ed99dfa6247a8867964722 Mon Sep 17 00:00:00 2001 From: suhyung Eom Date: Tue, 21 Feb 2017 16:08:41 +0900 Subject: [PATCH 1/1] [3.0] Modified not to reference screen connector provider except for wearable profile Signed-off-by: suhyung Eom Change-Id: I612cb0386e33524abe42bad264722dd2d9934945 --- build/tizen/adaptor/Makefile.am | 8 +++++--- build/tizen/adaptor/configure.ac | 2 +- packaging/dali-adaptor.spec | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index cc925de..4cb9a14 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -400,7 +400,6 @@ libdali_adaptor_la_CXXFLAGS = \ $(CAPI_SYSTEM_SENSOR_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(LIBEXIF_CFLAGS) \ - $(SCREENCONNECTORPROVIDER_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(TPKP_CURL_CFLAGS) \ $(UTILX_CFLAGS) @@ -425,7 +424,6 @@ libdali_adaptor_la_LIBADD = \ $(CAPI_SYSTEM_SENSOR_LIBS) \ $(LIBDRM_LIBS) \ $(LIBEXIF_LIBS) \ - $(SCREENCONNECTORPROVIDER_LIBS) \ $(LIBCURL_LIBS) \ $(HARFBUZZ_LIBS) \ $(TPKP_CURL_LIBS) \ @@ -498,7 +496,11 @@ endif if WEARABLE_PROFILE libdali_adaptor_la_CXXFLAGS += \ $(HAPTIC_CFLAGS) \ - $(EFL_ASSIST_CFLAGS) + $(EFL_ASSIST_CFLAGS) \ + $(SCREENCONNECTORPROVIDER_CFLAGS) + +libdali_adaptor_la_LIBADD += \ + $(SCREENCONNECTORPROVIDER_LIBS) endif if TV_PROFILE diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index 441c527..f0ff169 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) @@ -223,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 f258d1d..01272bc 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -64,6 +64,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(gles20) BuildRequires: pkgconfig(capi-appfw-watch-application) BuildRequires: pkgconfig(appcore-watch) +BuildRequires: pkgconfig(screen_connector_provider) %define gles_requirement_setup 1 %endif @@ -91,7 +92,6 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig BuildRequires: gawk -BuildRequires: pkgconfig(screen_connector_provider) BuildRequires: giflib-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: libjpeg-turbo-devel -- 2.7.4