From 7810db64ebabdfad9312bfaf251cbe5fb629255b Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 23 Sep 2020 16:29:31 +0900 Subject: [PATCH] Enable VectorImageRender only when tizen 6.5 or above. * ThorVG package is not supported in Tizen 6.0 Change-Id: Ia473cde11b936ab938254dd64f617a3d85c721d9 --- build/tizen/configure.ac | 12 +++++++++++- packaging/dali-extension.spec | 19 +++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index e931c3a..dfd4850 100755 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -20,6 +20,12 @@ AC_ARG_WITH([tizen_55_or_greater], [with_tizen_55_or_greater=yes], [with_tizen_55_or_greater=no]) +AC_ARG_WITH([tizen_65_or_greater], + [AC_HELP_STRING([--with-tizen-65-or-greater], + [Use this conditional when Tizen version is 6.5 or greater])], + [with_tizen_65_or_greater=yes], + [with_tizen_65_or_greater=no]) + PKG_CHECK_MODULES([DALI], [dali2-core dali2-adaptor dali2-toolkit]) AC_CONFIG_SUBDIRS(key) @@ -29,10 +35,14 @@ AC_CONFIG_SUBDIRS(color-controller) if test "x$with_tizen_55_or_greater" = "xyes"; then AC_CONFIG_SUBDIRS(vector-animation-renderer) - AC_CONFIG_SUBDIRS(vector-image-renderer) AC_CONFIG_SUBDIRS(web-engine-chromium) AC_CONFIG_SUBDIRS(web-engine-lwe) fi + +if test "x$with_tizen_65_or_greater" = "xyes"; then + AC_CONFIG_SUBDIRS(vector-image-renderer) +fi + AC_CONFIG_SUBDIRS(dali-extension) devincludepath=${includedir} diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec index 0ec8263..9ea33c9 100755 --- a/packaging/dali-extension.spec +++ b/packaging/dali-extension.spec @@ -44,6 +44,11 @@ dali-extension %define tizen_55_or_greater 1 %endif +%if ( 0%{?tizen_version_major} == 6 && 0%{?tizen_version_minor} >= 5 ) || 0%{?tizen_version_major} >= 7 +%define tizen_65_or_greater 1 +%endif + + # # Note # %if 0%{?tizen_version_major} >= 6 # %define tizen_60_or_greater 1 @@ -130,20 +135,22 @@ BuildRequires: pkgconfig(rlottie) %description vector-animation-renderer-plugin Plugin to render a vector animation +# tizen_65 is temporary +%if 0%{?tizen_65_or_greater} #################################### # Vector Image Renderer Plugin #################################### %package vector-image-renderer-plugin Summary: Plugin to render a vector image Group: System/Libraries -# tizen_55 is temporary -%if 0%{?tizen_55_or_greater} BuildRequires: pkgconfig(thorvg) -%endif +#define enable_vector_image_renderer_build 1 %description vector-image-renderer-plugin Plugin to render a vector image +%endif + #################################### # color controller Plugin #################################### @@ -269,7 +276,7 @@ exit 0 exit 0 %endif -%if 0%{?tizen_60_or_greater} +%if 0%{?tizen_65_or_greater} %post vector-image-renderer-plugin /sbin/ldconfig exit 0 @@ -322,7 +329,7 @@ exit 0 exit 0 %endif -%if 0%{?tizen_60_or_greater} +%if 0%{?tizen_65_or_greater} %postun vector-image-renderer-plugin /sbin/ldconfig exit 0 @@ -390,7 +397,7 @@ exit 0 %license LICENSE %endif -%if 0%{?tizen_60_or_greater} +%if 0%{?tizen_65_or_greater} %files vector-image-renderer-plugin %manifest dali-extension.manifest %defattr(-,root,root,-) -- 2.7.4