Remove ecore-wayland legacy code.

Remove ecore-wayland legacy code and the related code.
Because ecore-wayland will be removed and ecore-wl2 already is prepared.

Change-Id: I4d2fc06c9314654ff436f29e662ddf5547d02451

diff --git a/build/tizen/profiles/common-profile.cmake b/build/tizen/profiles/common-profile.cmake
index 8cd4e1bd57d0c624577177d4e93e980cb2a3a0c5..155c14f8f16d1fea6254189caff8e0763468679a 100644 (file)
--- a/build/tizen/profiles/common-profile.cmake
+++ b/build/tizen/profiles/common-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 \r
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )\r
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)\r
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})\r
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})\r
 \r
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )\r
 ENDIF()\r
 \r
-IF( ENABLE_ECORE_WAYLAND2 )\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
-ELSE()\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)\r
-ENDIF()\r
-\r
 # WAYLAND\r
 IF( ENABLE_WAYLAND )\r
   SET( DALI_CFLAGS ${DALI_CFLAGS}\r

diff --git a/build/tizen/profiles/ivi-profile.cmake b/build/tizen/profiles/ivi-profile.cmake
index 15190ea31b696cd3c7997a64d5ec37b443c5257f..a253e14e91b091c1b2156cf6d6b51bd4b1300812 100644 (file)
--- a/build/tizen/profiles/ivi-profile.cmake
+++ b/build/tizen/profiles/ivi-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 \r
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )\r
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)\r
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})\r
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})\r
 \r
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )\r
 ENDIF()\r
 \r
-IF( ENABLE_ECORE_WAYLAND2 )\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
-ELSE()\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)\r
-ENDIF()\r
-\r
 # WAYLAND\r
 IF( ENABLE_WAYLAND )\r
   SET( DALI_CFLAGS ${DALI_CFLAGS}\r

diff --git a/build/tizen/profiles/mobile-profile.cmake b/build/tizen/profiles/mobile-profile.cmake
index 735955066dce7ee63a980583e3d48da453105d57..bcd4e9bec32e2a88fac52560a275669eaddbd72b 100644 (file)
--- a/build/tizen/profiles/mobile-profile.cmake
+++ b/build/tizen/profiles/mobile-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 \r
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )\r
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)\r
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})\r
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})\r
 \r
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )\r
 ENDIF()\r
 \r
-IF( ENABLE_ECORE_WAYLAND2 )\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
-ELSE()\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)\r
-ENDIF()\r
-\r
 # WAYLAND\r
 IF( ENABLE_WAYLAND )\r
   SET( DALI_CFLAGS ${DALI_CFLAGS}\r

diff --git a/build/tizen/profiles/tv-profile.cmake b/build/tizen/profiles/tv-profile.cmake
index 847e00065ed05018952aefff42467e25f9251a73..efccb1b2df1c258639d632c29c0a2f90e08f6277 100644 (file)
--- a/build/tizen/profiles/tv-profile.cmake
+++ b/build/tizen/profiles/tv-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 \r
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )\r
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)\r
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})\r
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})\r
 \r
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )\r
 ENDIF()\r
 \r
-IF( ENABLE_ECORE_WAYLAND2 )\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
-ELSE()\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)\r
-ENDIF()\r
-\r
 # WAYLAND\r
 IF( ENABLE_WAYLAND )\r
   SET( DALI_CFLAGS ${DALI_CFLAGS}\r

diff --git a/build/tizen/profiles/wearable-profile.cmake b/build/tizen/profiles/wearable-profile.cmake
index 853df5485cea434d44fc4ad3d0a5d04c7ac2af33..d65fae12b926ce48e795953fbbcface0fdd92852 100644 (file)
--- a/build/tizen/profiles/wearable-profile.cmake
+++ b/build/tizen/profiles/wearable-profile.cmake
@@ -8,6 +8,7 @@ SET( SOURCES
 \r
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )\r
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)\r
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})\r
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})\r
 \r
@@ -18,12 +19,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )\r
 ENDIF()\r
 \r
-IF( ENABLE_ECORE_WAYLAND2 )\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)\r
-ELSE()\r
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)\r
-ENDIF()\r
-\r
 IF( ENABLE_PROFILE )\r
   PKG_CHECK_MODULES(DALIWATCHVIEW watch_viewer_dali)\r
   PKG_CHECK_MODULES(DALIWATCHHOLDERBASE watch-holder-base)\r
@@ -57,4 +52,4 @@ SET( PROFILE_INCLUDE_DIRECTORIES
   ${DALIRIVEVIEW_INCLUDE_DIRS}\r
   ${DALIWATCHVIEW_INCLUDE_DIRS}\r
   ${DALIWATCHHOLDERBASE_INCLUDE_DIRS}\r
-)
\ No newline at end of file
+)\r

diff --git a/dali-csharp-binder/dali-adaptor/key-grab-wrap.cpp b/dali-csharp-binder/dali-adaptor/key-grab-wrap.cpp
index ce43697688fb8a30b8146f11cbbe6d3ad5bb9ebc..6f38578b54349a23acf0212afdc0cdb87212d995 100755 (executable)
--- a/dali-csharp-binder/dali-adaptor/key-grab-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/key-grab-wrap.cpp
@@ -27,11 +27,7 @@
 
 
 #ifdef TIZEN_BUILD
-#ifdef ECORE_WL2
 #include <Ecore_Wl2.h>
-#else
-#include <Ecore_Wayland.h>
-#endif
 #endif
 
 #undef LOG
@@ -131,11 +127,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetNativeWindowHandler( void* window )
     try {
       result = _win->GetNativeHandle();
 #ifdef TIZEN_BUILD
-#ifdef ECORE_WL2
       Ecore_Wl2_Window * ecore_win = Dali::AnyCast<Ecore_Wl2_Window*>(result);
-#else
-      Ecore_Wl_Window * ecore_win = Dali::AnyCast<Ecore_Wl_Window*>(result);
-#endif
 #endif
       ret = (void*)ecore_win;
 

diff --git a/dali-csharp-binder/dali-adaptor/keyboard-wrap.cpp b/dali-csharp-binder/dali-adaptor/keyboard-wrap.cpp
index d5bdf41943ab5a89c3e9021bb98b21e6e2b85f97..c78fe4fdd7800a278f440c96096711c4164c5b07 100755 (executable)
--- a/dali-csharp-binder/dali-adaptor/keyboard-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/keyboard-wrap.cpp
@@ -25,11 +25,7 @@
 #include <dali-csharp-binder/common/common.h>
 
 #ifdef TIZEN_BUILD
-#ifdef ECORE_WL2
 #include <Ecore_Wl2.h>
-#else
-#include <Ecore_Wayland.h>
-#endif
 #endif
 
 #undef LOG

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 132c4e84218857c4118c1a9ff7d8944d173149ea..db6a8973203f20a1192ee177702f10c62fd55522 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -59,12 +59,7 @@ BuildRequires: pkgconfig(dali2-extension-rive-animation-view)
 BuildRequires: pkgconfig(widget_viewer_dali)
 BuildRequires: pkgconfig(watch_viewer_dali)
 BuildRequires: pkgconfig(watch-holder-base)
-
-%if 0%{?tizen_version_major} >= 5
 BuildRequires: pkgconfig(ecore-wl2)
-%else
-BuildRequires:  pkgconfig(ecore-wayland)
-%endif
 
 # for multiprofile
 Requires:   %{name}-compat = %{version}-%{release}