RiveAnimationView: add build configuration not to support TV AV Profile

Change-Id: Ib1344f99eef948d1ee1d14ff309cced7b8939abc

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index 1f61da8..fe724a6 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -79,6 +79,10 @@ LIBDALI_CSHARP_BINDER_LA_SOURCES = \
                         $(dali_csharp_binder_tizen_wearable_src_files)
 endif
 
+if RIVE_ANIMATION
+LIBDALI_CSHARP_BINDER_RIVE_LA_SOURCES = \
+                        $(dali_csharp_binder_tizen_rive_src_files)
+endif
 
 LIBDALI_CSHARP_BINDER_LA_includes = \
         -I../../
@@ -112,12 +116,6 @@ endif
 
 endif
 
-if MOBILE_PROFILE
-LIBDALI_CSHARP_BINDER_LA_CXXFLAGS += -DTIZEN_BUILD \
-                            $(DALIRIVEVIEW_CFLAGS)
-LIBDALI_CSHARP_BINDER_LA_LIBADD += $(DALIRIVEVIEW_LIBS)
-endif
-
 if WEARABLE_PROFILE
 LIBDALI_CSHARP_BINDER_LA_CXXFLAGS += -DTIZEN_BUILD \
                             $(DALIWATCHVIEW_CFLAGS)
@@ -126,19 +124,9 @@ LIBDALI_CSHARP_BINDER_LA_LIBADD += $(DALIWATCHVIEW_LIBS)
 LIBDALI_CSHARP_BINDER_LA_CXXFLAGS += -DTIZEN_BUILD \
                             $(DALIWATCHHOLDERBASE_CFLAGS)
 LIBDALI_CSHARP_BINDER_LA_LIBADD += $(DALIWATCHHOLDERBASE_LIBS)
-
-LIBDALI_CSHARP_BINDER_LA_CXXFLAGS += -DTIZEN_BUILD \
-                            $(DALIRIVEVIEW_CFLAGS)
-LIBDALI_CSHARP_BINDER_LA_LIBADD += $(DALIRIVEVIEW_LIBS)
 endif
 
-if TV_PROFILE
-LIBDALI_CSHARP_BINDER_LA_CXXFLAGS += -DTIZEN_BUILD \
-                            $(DALIRIVEVIEW_CFLAGS)
-LIBDALI_CSHARP_BINDER_LA_LIBADD += $(DALIRIVEVIEW_LIBS)
-endif
-
-if COMMON_PROFILE
+if RIVE_ANIMATION
 LIBDALI_CSHARP_BINDER_LA_CXXFLAGS += -DTIZEN_BUILD \
                             $(DALIRIVEVIEW_CFLAGS)
 LIBDALI_CSHARP_BINDER_LA_LIBADD += $(DALIRIVEVIEW_LIBS)
@@ -147,6 +135,9 @@ endif
 lib_LTLIBRARIES = libdali2-csharp-binder.la
 
 libdali2_csharp_binder_la_SOURCES = $(LIBDALI_CSHARP_BINDER_LA_SOURCES)
+if RIVE_ANIMATION
+libdali2_csharp_binder_la_SOURCES += $(LIBDALI_CSHARP_BINDER_RIVE_LA_SOURCES)
+endif
 libdali2_csharp_binder_la_includes = $(LIBDALI_CSHARP_BINDER_LA_INCLUDES)
 libdali2_csharp_binder_ladir = $(libdir)
 libdali2_csharp_binder_la_LDFLAGS = ${LDFLAGS}

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 40102f0..849f8e0 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -52,6 +52,13 @@ AC_ARG_ENABLE(ecore_wayland2,
               enable_ecore_wayland2=yes,
               enable_ecore_wayland2=no)
 
+AC_ARG_ENABLE([rive-animation-view],
+              [AC_HELP_STRING([--enable-rive-animation-view],
+              [enables the rive animation view])],
+              [enable_rive_animation_view=yes],
+              [enable_rive_animation_view=no])
+
+
 DALI_CSHARP_BINDER_CFLAGS="$DALI_CSHARP_BINDER_CFLAGS -DDALI_PROFILE_${enable_profile}"
 DALI_PROFILE_CFLAGS=" -DDALI_PROFILE_${enable_profile}"
 AM_CONDITIONAL([COMMON_PROFILE], [test x$enable_profile = xCOMMON])
@@ -63,7 +70,7 @@ AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU])
 AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes])
 AM_CONDITIONAL([ECORE_WAYLAND2], [test x$enable_ecore_wayland2 = xyes])
 AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
-
+AM_CONDITIONAL([RIVE_ANIMATION], [test x$enable_rive_animation_view = xyes])
 
 ### AM_CONDITIONAL([TIZENBUILD], [test x$enable_tizenBuild = xyes])
 ### AM_CONDITIONAL([ECOREWL2], [test x$enable_ecoreWl2 = xyes])
@@ -74,7 +81,10 @@ PKG_CHECK_MODULES(DALITOOLKIT, dali2-toolkit)
 
 if test "x$enable_profile" = "xMOBILE" -o "x$enable_profile" = "xWEARABLE" -o "x$enable_profile" = "xTV" -o "x$enable_profile" = "xIVI" -o "x$enable_profile" = "xCOMMON"; then
   PKG_CHECK_MODULES(DALIWIDGET, widget_viewer_dali)
-  PKG_CHECK_MODULES(DALIRIVEVIEW, dali2-extension-rive-animation-view)
+  if test "x$enable_rive_animation_view" = "xyes"; then
+    PKG_CHECK_MODULES(DALIRIVEVIEW, dali2-extension-rive-animation-view)
+  fi
+
   if test x$enable_ecore_wayland2 = xyes; then
     PKG_CHECK_MODULES(ECORE_WL2, ecore-wl2)
   else

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index c7957d7..ad6182b 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -57,7 +57,11 @@ dali_csharp_binder_tizen_src_files = \
   ${dali_csharp_binder_dir}/src/transition-effects-wrap.cpp \
   ${dali_csharp_binder_dir}/src/atspi-wrap.cpp \
   ${dali_csharp_binder_dir}/src/component-application-wrap.cpp \
-  ${dali_csharp_binder_dir}/src/tizen-dependency-wrap.cpp \
+  ${dali_csharp_binder_dir}/src/tizen-dependency-wrap.cpp
+
+# added for rive animation view for tizen
+# module: csharp-binder, backend: mobile,tv,ivi
+dali_csharp_binder_tizen_rive_src_files = \
   ${dali_csharp_binder_dir}/src/rive-animation-view-wrap.cpp
 
 # module: csharp-binder, backend: tizen-wearable

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index fee9997..b54f0b7 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -45,7 +45,12 @@ BuildRequires: pkgconfig
 BuildRequires: pkgconfig(dali2-core)
 BuildRequires: pkgconfig(dali2-adaptor)
 BuildRequires: pkgconfig(dali2-toolkit)
+%if "%{_vd_cfg_product_type}" != "AUDIO" && "%{_vd_cfg_product_type}" !="AV"
+%define rive_animation_view 1
 BuildRequires: pkgconfig(dali2-extension-rive-animation-view)
+%endif
+
+
 BuildRequires: pkgconfig(widget_viewer_dali)
 BuildRequires: pkgconfig(watch_viewer_dali)
 BuildRequires: pkgconfig(watch-holder-base)
@@ -205,6 +210,9 @@ TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TI
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?rive_animation_view}
+           --enable-rive-animation-view \
+%endif
            $configure_flags --libdir=%{_libdir}
 
 # Build.
@@ -234,6 +242,9 @@ make clean
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?rive_animation_view}
+           --enable-rive-animation-view \
+%endif
            $configure_flags --libdir=%{_libdir}
 
 # Build.
@@ -263,6 +274,9 @@ make clean
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?rive_animation_view}
+           --enable-rive-animation-view \
+%endif
            $configure_flags --libdir=%{_libdir}
 
 # Build.
@@ -292,6 +306,9 @@ make clean
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?rive_animation_view}
+           --enable-rive-animation-view \
+%endif
            $configure_flags --libdir=%{_libdir}
 
 # Build.
@@ -322,6 +339,9 @@ make clean
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?rive_animation_view}
+           --enable-rive-animation-view \
+%endif
            $configure_flags --libdir=%{_libdir}
 
 # Build.