X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-adaptor.spec;h=70c4b306eecfd3e7b71f8c04a3adf0a9c4f13892;hb=78f80c3c36200b384863c5bc3d705368638fbc99;hp=604de5397dc103a663c4ccf238c9d4f465e915ca;hpb=d44e8530f0ffa9e68e51df5b9a3726076d361bb0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 604de53..70c4b30 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -15,12 +15,11 @@ %global __provides_exclude_from ^.*\\.(wearable|mobile|tv|ivi|common)$ %endif -%bcond_without wayland -%bcond_with x +%bcond_with wayland Name: dali-adaptor Summary: The DALi Tizen Adaptor -Version: 1.3.21 +Version: 1.3.40 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT @@ -143,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} @@ -379,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 @@ -401,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 ############################## @@ -455,18 +429,26 @@ CXXFLAGS+=" -D_ARCH_ARM_ -lgcc" %if %{with wayland} 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_WL2 -DEFL_BETA_API_SUPPORT" -CXXFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT" +CFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" +CXXFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" +configure_flags+=" --enable-ecore-wayland2" %endif -configure_flags="--enable-wayland" %endif -# Use this conditional when Tizen version is 4.x or greater +# 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 +%if 0%{?tizen_version_major} >= 4 +CXXFLAGS+=" -DOVER_TIZEN_VERSION_4" +%endif + %if 0%{?tizen_2_2_compatibility} CFLAGS+=" -DTIZEN_SDK_2_2_COMPATIBILITY" CXXFLAGS+=" -DTIZEN_SDK_2_2_COMPATIBILITY" @@ -510,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 @@ -558,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 @@ -605,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 @@ -652,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 @@ -701,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 @@ -758,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 @@ -807,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 @@ -855,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 @@ -903,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 @@ -952,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 @@ -1084,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 @@ -1274,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,-) @@ -1293,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,-)