From: Wonsik Jung <sidein@samsung.com>
Date: Fri, 21 Feb 2025 00:33:25 +0000 (+0900)
Subject: Remove ecore-wayland legacy code.
X-Git-Tag: accepted/tizen/unified/20250227.050133~6^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=807ec73a92fd48f047716b39e46dc333193094fd;p=platform%2Fcore%2Fuifw%2Fdali-csharp-binder.git

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 8cd4e1bd..155c14f8 100644
--- a/build/tizen/profiles/common-profile.cmake
+++ b/build/tizen/profiles/common-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})
 
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )
 ENDIF()
 
-IF( ENABLE_ECORE_WAYLAND2 )
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)
-ELSE()
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)
-ENDIF()
-
 # WAYLAND
 IF( ENABLE_WAYLAND )
   SET( DALI_CFLAGS ${DALI_CFLAGS}
diff --git a/build/tizen/profiles/ivi-profile.cmake b/build/tizen/profiles/ivi-profile.cmake
index 15190ea3..a253e14e 100644
--- a/build/tizen/profiles/ivi-profile.cmake
+++ b/build/tizen/profiles/ivi-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})
 
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )
 ENDIF()
 
-IF( ENABLE_ECORE_WAYLAND2 )
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)
-ELSE()
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)
-ENDIF()
-
 # WAYLAND
 IF( ENABLE_WAYLAND )
   SET( DALI_CFLAGS ${DALI_CFLAGS}
diff --git a/build/tizen/profiles/mobile-profile.cmake b/build/tizen/profiles/mobile-profile.cmake
index 73595506..bcd4e9be 100644
--- a/build/tizen/profiles/mobile-profile.cmake
+++ b/build/tizen/profiles/mobile-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})
 
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )
 ENDIF()
 
-IF( ENABLE_ECORE_WAYLAND2 )
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)
-ELSE()
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)
-ENDIF()
-
 # WAYLAND
 IF( ENABLE_WAYLAND )
   SET( DALI_CFLAGS ${DALI_CFLAGS}
diff --git a/build/tizen/profiles/tv-profile.cmake b/build/tizen/profiles/tv-profile.cmake
index 847e0006..efccb1b2 100644
--- a/build/tizen/profiles/tv-profile.cmake
+++ b/build/tizen/profiles/tv-profile.cmake
@@ -7,6 +7,7 @@ SET( SOURCES
 
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})
 
@@ -17,12 +18,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )
 ENDIF()
 
-IF( ENABLE_ECORE_WAYLAND2 )
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)
-ELSE()
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)
-ENDIF()
-
 # WAYLAND
 IF( ENABLE_WAYLAND )
   SET( DALI_CFLAGS ${DALI_CFLAGS}
diff --git a/build/tizen/profiles/wearable-profile.cmake b/build/tizen/profiles/wearable-profile.cmake
index 853df548..d65fae12 100644
--- a/build/tizen/profiles/wearable-profile.cmake
+++ b/build/tizen/profiles/wearable-profile.cmake
@@ -8,6 +8,7 @@ SET( SOURCES
 
 ADD_DEFINITIONS( "-DTIZEN_BUILD" )
 PKG_CHECK_MODULES(DALIWIDGET widget_viewer_dali)
+PKG_CHECK_MODULES(WAYLAND ecore-wl2)
 SET( DALI_CFLAGS ${DALI_CFLAGS} ${DALIWIDGET_CFLAGS})
 SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${DALIWIDGET_LDFLAGS})
 
@@ -18,12 +19,6 @@ IF ( ENABLE_RIVE_ANIMATION )
   SET( SOURCES ${SOURCES} ${dali_csharp_binder_tizen_rive_src_files} )
 ENDIF()
 
-IF( ENABLE_ECORE_WAYLAND2 )
-  PKG_CHECK_MODULES(WAYLAND ecore-wl2)
-ELSE()
-  PKG_CHECK_MODULES(WAYLAND ecore-wayland)
-ENDIF()
-
 IF( ENABLE_PROFILE )
   PKG_CHECK_MODULES(DALIWATCHVIEW watch_viewer_dali)
   PKG_CHECK_MODULES(DALIWATCHHOLDERBASE watch-holder-base)
@@ -57,4 +52,4 @@ SET( PROFILE_INCLUDE_DIRECTORIES
   ${DALIRIVEVIEW_INCLUDE_DIRS}
   ${DALIWATCHVIEW_INCLUDE_DIRS}
   ${DALIWATCHHOLDERBASE_INCLUDE_DIRS}
-)
\ No newline at end of file
+)
diff --git a/dali-csharp-binder/dali-adaptor/key-grab-wrap.cpp b/dali-csharp-binder/dali-adaptor/key-grab-wrap.cpp
index ce436976..6f38578b 100755
--- 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 d5bdf419..c78fe4fd 100755
--- 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 132c4e84..db6a8973 100644
--- 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}