Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	packaging/dali-adaptor-mobile.spec
	packaging/dali-adaptor.spec

Change-Id: I113860d774b819e67cae356d420faed00f5412fa

diff --cc adaptors/common/style-monitor-impl.cpp
Simple merge

diff --cc build/tizen/adaptor/Makefile.am
Simple merge

diff --cc build/tizen/configure.ac
Simple merge

diff --cc packaging/dali-adaptor-mobile.spec
index 5a95119eacdd563f7f4fe85ecb112e9defbeae2d,88e20c06fda7c38d2edc85134b0a07a9667e5c70..5446692c2bdf3ae0b2531654c758523ca3de214f
--- 1/packaging/dali-adaptor-mobile.spec
--- 2/packaging/dali-adaptor-mobile.spec
+++ b/packaging/dali-adaptor-mobile.spec
@@@ -44,10 -44,11 +44,13 @@@ BuildRequires:  pkgconfig(capi-system-s
  BuildRequires:  pkgconfig(libpng)
  BuildRequires:  pkgconfig(opengl-es-20)
  BuildRequires:  pkgconfig(efl-assist)
- BuildRequires:  pkgconfig(assimp)
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
+ %if 0%{?dali_assimp_plugin}
+ BuildRequires:  pkgconfig(assimp)
+ %endif
+ 
  %description
  The DALi Tizen Adaptor provides a Tizen specific implementation of the dali-core
  platform abstraction and application shell

diff --cc packaging/dali-adaptor-tv.spec
index 92ef19ac0d469570abd6dd7dda9b2c86cf5f236f,3c0e3d1207f77bd8de6b3e7349cc101c3030609a..7926ee0e8077388494f23c375f3ece375530fd6c
--- 1/packaging/dali-adaptor-tv.spec
--- 2/packaging/dali-adaptor-tv.spec
+++ b/packaging/dali-adaptor-tv.spec
@@@ -37,9 -41,11 +41,13 @@@ BuildRequires:  pkgconfig(xfixes
  BuildRequires:  pkgconfig(xdamage)
  BuildRequires:  pkgconfig(utilX)
  BuildRequires:  pkgconfig(gles20)
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
+ %if 0%{?dali_assimp_plugin}
+ BuildRequires:  pkgconfig(assimp)
+ %endif
+ 
  %description
  The DALi Tizen Adaptor provides a Tizen specific implementation of the dali-core
  platform abstraction and application shell

diff --cc packaging/dali-adaptor-wearable.spec
index 93192bc4df21b127a40f590528b3bfe4099539b0,b8db150bc725e48d205944314c0a4dcb087a6f19..ed56e8d9585844991822d6499d422f71672c95cb
--- 1/packaging/dali-adaptor-wearable.spec
--- 2/packaging/dali-adaptor-wearable.spec
+++ b/packaging/dali-adaptor-wearable.spec
@@@ -41,9 -43,11 +43,13 @@@ BuildRequires:  pkgconfig(capi-system-s
  BuildRequires:  pkgconfig(libpng)
  BuildRequires:  pkgconfig(gles20)
  BuildRequires:  pkgconfig(efl-assist)
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
  
+ %if 0%{?dali_assimp_plugin}
+ BuildRequires:  pkgconfig(assimp)
+ %endif
+ 
  %description
  The DALi Tizen Adaptor provides a Tizen specific implementation of the dali-core
  platform abstraction and application shell

diff --cc packaging/dali-adaptor.spec
index 741eae1c42693f189097b4cf172082b70abad124,59f94ec27e9c8ffbeafa37de144778a4b462d294..281c1c46939d1e5ca2cc961b3f609de8c154db26
--- 1/packaging/dali-adaptor.spec
--- 2/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@@ -46,9 -75,10 +75,13 @@@ BuildRequires:  pkgconfig(xi
  BuildRequires:  pkgconfig(xfixes)
  BuildRequires:  pkgconfig(xdamage)
  BuildRequires:  pkgconfig(utilX)
- BuildRequires:  pkgconfig(gles20)
+ %endif
+ 
 +BuildRequires:  pkgconfig(harfbuzz)
 +BuildRequires:  fribidi-devel
++
+ %if 0%{?dali_assimp_plugin}
+ BuildRequires:  pkgconfig(assimp)
  %endif
  
  %description