From 4cfc615dc18d64bb4662cd0f22bd2cf773ba3f53 Mon Sep 17 00:00:00 2001
From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 14 Aug 2017 11:16:12 +0900
Subject: [PATCH] [3.0] Fix build error

Change-Id: I6996adef5d51c3ac663bb2b922bd2d99444084a4
---
 adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp | 8 ++++++++
 packaging/dali-adaptor.spec                               | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp b/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
index 87df6e8..40a135e 100644
--- a/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
@@ -174,6 +174,7 @@ void WindowRenderSurface::CreateEglSurface( EglInterface& eglIf )
   EGLNativeWindowType windowType( mEglWindow );
   eglImpl.CreateSurfaceWindow( windowType, mColorDepth );
 
+#ifdef SCREEN_ROTATION_ENABLED
   // Check capability
   wl_egl_window_capability capability = static_cast< wl_egl_window_capability >( wl_egl_window_get_capabilities( mEglWindow ) );
   if( capability == WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED )
@@ -183,6 +184,7 @@ void WindowRenderSurface::CreateEglSurface( EglInterface& eglIf )
   }
 
   DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::CreateEglSurface: w = %d h = %d angle = %d screen rotation = %d\n", mPositionSize.width, mPositionSize.height, mRotationAngle, mScreenRotationAngle );
+#endif
 }
 
 void WindowRenderSurface::DestroyEglSurface( EglInterface& eglIf )
@@ -269,6 +271,7 @@ void WindowRenderSurface::StartRender()
 
 bool WindowRenderSurface::PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, bool resizingSurface )
 {
+#ifdef SCREEN_ROTATION_ENABLED
   if( resizingSurface )
   {
     // Window rotate or screen rotate
@@ -359,12 +362,14 @@ bool WindowRenderSurface::PreRender( EglInterface& egl, Integration::GlAbstracti
       wl_egl_window_set_window_transform( mEglWindow, windowTransform );
     }
   }
+#endif
 
   return true;
 }
 
 void WindowRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface, bool resizingSurface )
 {
+#ifdef SCREEN_ROTATION_ENABLED
   if( resizingSurface )
   {
     if( !mRotationFinished )
@@ -380,6 +385,7 @@ void WindowRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstract
       }
     }
   }
+#endif
 
   Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
   eglImpl.SwapBuffers();
@@ -460,6 +466,7 @@ void WindowRenderSurface::ReleaseLock()
 
 void WindowRenderSurface::ProcessRotationRequest()
 {
+#ifdef SCREEN_ROTATION_ENABLED
   mRotationFinished = true;
 
   ecore_wl_window_rotation_change_done_send( mWlWindow );
@@ -470,6 +477,7 @@ void WindowRenderSurface::ProcessRotationRequest()
   {
     mThreadSynchronization->PostRenderComplete();
   }
+#endif
 }
 
 } // namespace ECore
diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 0a07d43..c04564a 100644
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -259,7 +259,11 @@ CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffun
 LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections -Wl,-Bsymbolic-functions "
 
 %ifarch %{arm}
-CXXFLAGS+=" -D_ARCH_ARM_ -lgcc"
+CXXFLAGS+=" -D_ARCH_ARM_ -lgcc -DSCREEN_ROTATION_ENABLED"
+%endif
+
+%if "%{?_with_emulator}" == "1"
+CXXFLAGS+=" -DSCREEN_ROTATION_ENABLED"
 %endif
 
 %if %{with wayland}
-- 
2.7.4