From: taeyoon0.lee <taeyoon0.lee@samsung.com>
Date: Mon, 13 Mar 2017 08:10:10 +0000 (+0900)
Subject: [Tizen] Fix build errors in adaptor-uv by ecore wayland
X-Git-Tag: accepted/tizen/common/20170313.162641~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F118588%2F1;hp=c374b4e9228657117409c8761063dd3cba715b07;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[Tizen] Fix build errors in adaptor-uv by ecore wayland

This reverts commit e09d8dbf0451412d29c9c43687c6dab3fa306bc8.

Change-Id: Icaa6167b5cb398d90a93aea38f47db0e01f9062b
---

diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am
old mode 100644
new mode 100755
index 7747336..e3aab67
--- a/build/tizen/adaptor-uv/Makefile.am
+++ b/build/tizen/adaptor-uv/Makefile.am
@@ -364,6 +364,7 @@ libdali_adaptor_uv_la_CXXFLAGS = \
                       -DTIZEN_PLATFORM_CONFIG_SUPPORTED=${tizenPlatformConfigSupported} \
                       -DNON_POWER_OF_TWO_TEXTURES \
                       -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
+                      -DWAYLAND_EXTENSIONS_SUPPORTED \
                       -Werror -Wall -lgcc \
                       $(libdali_adaptor_uv_la_includes) \
                       $(DALI_ADAPTOR_CFLAGS) \
@@ -382,11 +383,6 @@ libdali_adaptor_uv_la_CXXFLAGS = \
                       $(LIBCURL_CFLAGS) \
                       $(TPKP_CURL_CFLAGS)
 
-# Todo, as soon as common repos are updated on build server remove this.
-if !COMMON_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED
-endif
-
 libdali_adaptor_uv_la_CFLAGS = $(libdali_adaptor_uv_la_CXXFLAGS)
 
 libdali_adaptor_uv_la_LIBADD = \
@@ -424,15 +420,12 @@ libdali_adaptor_uv_la_LIBADD += $(ELEMENTARY_LIBS) \
 
 else
 
+if !UBUNTU_PROFILE
 libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
 libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
+endif # !UBUNTU_PROFILE
 
-if IVI_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
-
-endif
+endif # USE_EFL
 
 if USE_APPFW
 
diff --git a/build/tizen/adaptor-uv/configure.ac b/build/tizen/adaptor-uv/configure.ac
old mode 100644
new mode 100755
index e61fccf..1f847b1
--- a/build/tizen/adaptor-uv/configure.ac
+++ b/build/tizen/adaptor-uv/configure.ac
@@ -289,10 +289,9 @@ fi
 
 else
 
-# For adaptors/mobile/native-render-surface-factory.cpp
-PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
-
-if test "x$enable_profile" = "xIVI"; then
+# dali-adaptor-uv needs ecore-wayland even if enable_efl==no
+# because NativeRenderSurface uses it.
+if test "x$enable_profile" != "xUBUNTU"; then
 PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
 fi
 
@@ -307,13 +306,6 @@ PKG_CHECK_MODULES(WAYLAND, [ egl wayland-egl wayland-client >= 1.2.0 xkbcommon l
 fi
 fi
 
-# remove this when we update common repos
-# common profile currently does not have wayland extensions like xdg-shell
-if test "x$enable_wayland" = "xyes"; then
-if test "x$enable_profile" != "xCOMMON"; then
-PKG_CHECK_MODULES(WAYLAND_EXTENSION, xdg-shell-client text-client input-method-client)
-fi
-fi
 AM_CONDITIONAL([USE_ECORE_WAYLAND], [test "$DALI_USE_ECORE_WAYLAND" -eq 1])
 
 if test x$DALI_DATA_RW_DIR != x; then