X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-adaptor.spec;h=a26b4c6bd6709c5bb024892f3eec3c34aa413ef6;hb=d6f6fa74934abfacd61edb5529c081d890e3be24;hp=fd534ccbf2ff86d2a9df0300d5351c99fd775430;hpb=fe4a0a6f799c3bcf1e6ac0bfc38422a3c29cdf41;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index fd534cc..a26b4c6 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -19,7 +19,7 @@ Name: dali-adaptor Summary: The DALi Tizen Adaptor -Version: 1.3.21 +Version: 1.3.30 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT @@ -96,7 +96,11 @@ BuildRequires: wayland-devel BuildRequires: wayland-extension-client-devel # dali-adaptor uses ecore mainloop +%if 0%{?tizen_version_major} >= 5 +BuildRequires: pkgconfig(ecore-wl2) +%else BuildRequires: pkgconfig(ecore-wayland) +%endif # dali-adaptor needs tbm_surface in tizen 3.0 wayland BuildRequires: pkgconfig(libtbm) @@ -138,12 +142,6 @@ BuildRequires: pkgconfig(mm-sound) BuildRequires: pkgconfig(feedback) %endif -# for Web Engine Lite Plugin -%if 0%{?enable_web_engine_lite} -BuildRequires: lightweight-web-engine -BuildRequires: lightweight-web-engine-devel -%endif - # for multiprofile Requires: %{name}-compat = %{version}-%{release} Recommends: %{name}-profile_common = %{version}-%{release} @@ -374,16 +372,6 @@ Requires: %{name} = %{version}-%{release} %description dali-feedback-plugin Feedback plugin to play haptic and audio feedback for Dali -############################## -# Dali WebEngineLite Plugin -############################## - -%package dali-web-engine-lite-plugin -Summary: Plugin WebEngineLite for Dali -Group: System/Libraries -%description dali-web-engine-lite-plugin -WebEngineLite plugin for Dali - %if !0%{?disable_cxx03_build} ############################## # Dali Feedback Plugin cxx03 @@ -396,15 +384,6 @@ Requires: %{name}-cxx03 = %{version}-%{release} %description dali-feedback-plugin-cxx03 Feedback plugin to play haptic and audio feedback for Dali -############################## -# Dali WebEngineLite Plugin -############################## - -%package dali-web-engine-lite-plugin-cxx03 -Summary: Plugin WebEngineLite for Dali with cxx03 abi -Group: System/Libraries -%description dali-web-engine-lite-plugin-cxx03 -WebEngineLite plugin for Dali %endif ############################## @@ -451,6 +430,18 @@ CXXFLAGS+=" -D_ARCH_ARM_ -lgcc" CFLAGS+=" -DWAYLAND" CXXFLAGS+=" -DWAYLAND" configure_flags="--enable-wayland" + +# Need Ecore-Wayland2 when Tizen version is 5.x or greater +%if 0%{?tizen_version_major} >= 5 +CFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" +CXXFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" +configure_flags+=" --enable-ecore-wayland2" +%endif +%endif + +# Use this conditional when Tizen version is 5.x or greater +%if 0%{?tizen_version_major} >= 5 +CXXFLAGS+=" -DOVER_TIZEN_VERSION_5" %endif # Use this conditional when Tizen version is 4.x or greater @@ -501,9 +492,6 @@ TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TI %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -549,9 +537,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -596,9 +581,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -643,9 +625,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -692,9 +671,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -749,9 +725,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -798,9 +771,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -846,9 +816,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -894,9 +861,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -943,9 +907,6 @@ make clean %else --enable-efl=yes \ %endif -%if 0%{?enable_web_engine_lite} - --enable-web-engine-lite \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -1075,12 +1036,6 @@ exit 0 /sbin/ldconfig exit 0 -#%if %{with wayland} -%post dali-web-engine-lite-plugin -/sbin/ldconfig -exit 0 -#%endif - ############################## # This is for backward-compatibility. This does not deteriorate 4.0 Configurability @@ -1265,14 +1220,6 @@ exit 0 #%endif %if 0%{?tizen_version_major} >= 3 -%if 0%{?enable_web_engine_lite} -%files dali-web-engine-lite-plugin-cxx03 -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%{_libdir}/libdali-web-engine-lite-plugin.so* -%license LICENSE -%endif - %files dali-feedback-plugin-cxx03 %manifest dali-adaptor.manifest %defattr(-,root,root,-) @@ -1284,14 +1231,6 @@ exit 0 ################################################# %if 0%{?tizen_version_major} >= 3 -%if 0%{?enable_web_engine_lite} -%files dali-web-engine-lite-plugin -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%{_libdir}/libdali-web-engine-lite-plugin-cxx11.so* -%license LICENSE -%endif - %files dali-feedback-plugin %manifest dali-adaptor.manifest %defattr(-,root,root,-)