Merge "Add native render surface for wayland" into devel/master

diff --cc adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp
index 49d293c17afadfa011abc7a323960ab14275752f,68c7c4f431f5d102a3b8bf82ec26b71be1c813b2..eb262c576f71d0eb41f6f6a5c2e0ad37352a18a5
--- 1/adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp
--- 2/adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/display-connection-impl-ecore-wl.cpp
@@@ -65,9 -66,9 +66,9 @@@ bool DisplayConnection::InitializeEgl(E
  {
    EglImplementation& eglImpl = static_cast<EglImplementation&>(egl);
  
-   if (!eglImpl.InitializeGles(reinterpret_cast<EGLNativeDisplayType>(mDisplay)))
+   if( !eglImpl.InitializeGles( mDisplay ) )
    {
 -    DALI_LOG_ERROR("Failed to initialize GLES.");
 +    DALI_LOG_ERROR("Failed to initialize GLES.\n");
      return false;
    }
  

diff --cc adaptors/wayland/render-surface/render-surface-wl.cpp
Simple merge

diff --cc adaptors/x11/display-connection-impl-x.cpp
Simple merge

diff --cc build/tizen/adaptor-uv/Makefile.am
index 3c0607477b41480dcb510de61d2def9002f7deb9,4b20350cbaf7fb85365f456f7cd6d99ec0b0cccf..15b99dfb19ae3dbb1f65c5f716dd1fd8aa434a45
--- 1/build/tizen/adaptor-uv/Makefile.am
--- 2/build/tizen/adaptor-uv/Makefile.am
+++ b/build/tizen/adaptor-uv/Makefile.am
@@@ -418,16 -392,9 +418,14 @@@ libdali_adaptor_uv_la_LIBADD += $(ELEME
  
  else
  
- if MOBILE_PROFILE
  libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
  libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
- endif
  
 +if IVI_PROFILE
 +libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
 +libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
 +endif
 +
  endif
  
  if USE_APPFW

diff --cc build/tizen/adaptor-uv/configure.ac
index c2a125b5611818d3950c5e6da5cdfc03bc06c4ed,119e3f22826d871b486deda9d7469deca59fe42b..3e546327a11b330c28e8c2cb336e0e8549c629af
--- 1/build/tizen/adaptor-uv/configure.ac
--- 2/build/tizen/adaptor-uv/configure.ac
+++ b/build/tizen/adaptor-uv/configure.ac
@@@ -289,16 -284,9 +289,13 @@@ f
  
  else
  
- # dali-adaptor-uv for MOBILE profile needs ecore-wayland even if enable_efl==no
- # because adaptors/mobile/pixmap-render-surface-factory.cpp uses it.
- if test "x$enable_profile" = "xMOBILE"; then
+ # For adaptors/mobile/native-render-surface-factory.cpp
  PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
- fi
  
 +if test "x$enable_profile" = "xIVI"; then
 +PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
 +fi
 +
  fi
  # Using Wayland API directly  ( main loop agnostic, typically for running on libuv)
  #  wayland-extension-client include xdg-shell-client

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