From 24736f548396417e3cd2adf3b70b74583ad8f678 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Fri, 20 Jan 2017 12:42:37 +0900 Subject: [PATCH] [Tizen] Fix build errors in adaptor-uv by ecore wayland This reverts commit ef6dd24b2723db4c4896455473e7ccba14180d58. Change-Id: If5a0754545b9d3f48439273a33f6488799498e9a --- build/tizen/adaptor-uv/Makefile.am | 15 ++++----------- build/tizen/adaptor-uv/configure.ac | 14 +++----------- 2 files changed, 7 insertions(+), 22 deletions(-) mode change 100644 => 100755 build/tizen/adaptor-uv/Makefile.am mode change 100644 => 100755 build/tizen/adaptor-uv/configure.ac diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am old mode 100644 new mode 100755 index 4e8e1d7..24c1175 --- a/build/tizen/adaptor-uv/Makefile.am +++ b/build/tizen/adaptor-uv/Makefile.am @@ -359,6 +359,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) \ @@ -377,11 +378,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 = \ @@ -419,15 +415,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 -- 2.7.4