diff options
author | Jiyun Yang <ji.yang@samsung.com> | 2020-11-25 19:52:22 +0900 |
---|---|---|
committer | Jiyun Yang <ji.yang@samsung.com> | 2020-11-25 19:59:45 +0900 |
commit | 4dbf09a801429f6d01dede341edfceccf702ef2c (patch) | |
tree | 58cc56b21db2cf5912827f4a563e8741dd6a168c | |
parent | 0591059c78bb613fb6204b1267b0f2ddf4c2351a (diff) | |
download | dali-extension-legacy-tizen_6.0.tar.gz dali-extension-legacy-tizen_6.0.tar.bz2 dali-extension-legacy-tizen_6.0.zip |
[Tizen] Remove lwe build dependancy in DA profilesubmit/tizen_6.0/20201126.031245accepted/tizen/6.0/unified/20201126.222222tizen_6.0accepted/tizen_6.0_unified
Change-Id: Id6a732b4172ff47c3debf70d733141a05598340e
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
-rw-r--r-- | build/tizen/web-engine-lwe/configure.ac | 9 | ||||
-rw-r--r-- | dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp | 4 | ||||
-rwxr-xr-x | packaging/dali-extension.spec | 10 |
3 files changed, 22 insertions, 1 deletions
diff --git a/build/tizen/web-engine-lwe/configure.ac b/build/tizen/web-engine-lwe/configure.ac index bbd0d47..8134c8b 100644 --- a/build/tizen/web-engine-lwe/configure.ac +++ b/build/tizen/web-engine-lwe/configure.ac @@ -14,9 +14,18 @@ LT_INIT DALI_EXTENSION_VERSION=dali_version AC_SUBST(DALI_EXTENSION_VERSION) +AC_ARG_WITH([da_profile], + [AC_HELP_STRING([--with-da-profile], + [Use this conditional when use da profile])], + [with_da_profile=yes], + [with_da_profile=no]) + PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit]) + +if test "x$with_da_profile" = "xno"; then PKG_CHECK_MODULES(WAYLAND, libtbm) PKG_CHECK_MODULES([WEB_ENGINE_LWE], [lightweight-web-engine-dali-plugin]) +fi devincludepath=${includedir} AC_SUBST(devincludepath) diff --git a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp index 91fe722..3067731 100644 --- a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp +++ b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp @@ -15,6 +15,8 @@ * */ +#ifndef DA_PROFILE + // CLASS HEADER #include "tizen-web-engine-lwe.h" @@ -806,3 +808,5 @@ bool TizenWebEngineLWE::SendKeyEvent( const Dali::KeyEvent& event ) } // namespace Plugin } // namespace Dali + +#endif // DA_PROFILE diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec index 3f64e49..2c2dc64 100755 --- a/packaging/dali-extension.spec +++ b/packaging/dali-extension.spec @@ -148,7 +148,7 @@ Plugin to load color theme %package web-engine-lwe-plugin Summary: Plugin to support WebView for Dali Group: System/Libraries -%if 0%{?tizen_55_or_greater} +%if 0%{?tizen_55_or_greater} && "%{?_with_da_profile}" != "1" BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(lightweight-web-engine) %endif @@ -185,6 +185,11 @@ CXXFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT" configure_flags="--enable-ecore-wl2" %endif +%if "%{?_with_da_profile}" == "1" +CFLAGS+=" -DDA_PROFILE" +CXXFLAGS+=" -DDA_PROFILE" +%endif + libtoolize --force cd %{_builddir}/%{name}-%{version}/build/tizen autoreconf --install @@ -196,6 +201,9 @@ autoreconf --install %if 0%{?tizen_55_or_greater} --with-tizen-55-or-greater \ %endif +%if "%{?_with_da_profile}" == "1" + --with-da-profile \ +%endif --enable-ecore-wl2 \ --enable-keyextension %if 0%{?use_image_loader} |