Seperate RiveAnimationView package from dali-extension package

To support the RiveAnimationView for TV profile, The RiveAnimationView package should be seperated from the main package.

Change-Id: Ie84b99c254b42fd7be2721a68b6919362cf50ad3

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index 2172fab..eadaff2 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -18,3 +18,4 @@ SUBDIRS = ${subdirs}
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali2-extension.pc
+pkgconfig_DATA += dali2-extension-rive-animation-view.pc

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 5ba5d3a..d509216 100755 (executable)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -50,6 +50,7 @@ fi
 if test "x$with_tizen_65_or_greater" = "xyes"; then
   AC_CONFIG_SUBDIRS(camera-player)
   AC_CONFIG_SUBDIRS(vector-image-renderer)
+  AC_CONFIG_SUBDIRS(rive-animation-view)
 fi
 
 AC_CONFIG_SUBDIRS(dali-extension)
@@ -60,6 +61,7 @@ AC_SUBST(devincludepath)
 AC_CONFIG_FILES([
 Makefile
 dali2-extension.pc
+dali2-extension-rive-animation-view.pc
 ])
 
 AC_OUTPUT

diff --git a/build/tizen/dali-extension/Makefile.am b/build/tizen/dali-extension/Makefile.am
index a070a16..990e570 100755 (executable)
--- a/build/tizen/dali-extension/Makefile.am
+++ b/build/tizen/dali-extension/Makefile.am
@@ -22,10 +22,6 @@ extension_src_dir = ../../../dali-extension
 include ../../../dali-extension/devel-api/evas-plugin/file.list
 include ../../../dali-extension/internal/evas-plugin/file.list
 
-# rive-animation-view
-include ../../../dali-extension/devel-api/rive-animation-view/file.list
-include ../../../dali-extension/internal/rive-animation-view/file.list
-
 lib_LTLIBRARIES =
 
 lib_LTLIBRARIES += libdali2-extension.la
@@ -35,12 +31,6 @@ libdali2_extension_la_SOURCES = \
             $(evas_plugin_devel_src_files) \
             $(evas_plugin_internal_src_files)
 
-if SUPPORT_RIVE
-libdali2_extension_la_SOURCES += \
-            $(rive_animation_view_devel_src_files) \
-            $(rive_animation_view_internal_src_files)
-endif
-
 libdali2_extension_la_DEPENDENCIES =
 
 libdali2_extension_la_CXXFLAGS = \
@@ -63,17 +53,6 @@ libdali2_extension_la_LIBADD = \
             $(EVAS_LIBS) \
             $(WAYLAND_LIBS)
 
-if SUPPORT_RIVE
-libdali2_extension_la_CXXFLAGS += \
-            -I$(includedir)/rive \
-            $(THORVG_CFLAGS) \
-            $(RIVE_TIZEN_CFLAGS)
-
-libdali2_extension_la_LIBADD += \
-            $(THORVG_LIBS) \
-            $(RIVE_TIZEN_LIBS)
-endif
-
 libdali2_extension_la_LDFLAGS = \
             -rdynamic
 
@@ -83,6 +62,3 @@ dali2_extension_HEADERS = ../../../dali-extension/dali-extension.h
 
 dali2_extension_evasplugindir = $(devincludepath)/dali-extension/devel-api/evas-plugin
 dali2_extension_evasplugin_HEADERS = $(evas_plugin_devel_header_files)
-
-dali2_extension_rive_animation_viewdir = $(devincludepath)/dali-extension/devel-api/rive-animation-view
-dali2_extension_rive_animation_view_HEADERS = $(rive_animation_view_devel_header_files)

diff --git a/build/tizen/dali-extension/configure.ac b/build/tizen/dali-extension/configure.ac
index 0df9a6a..423d19a 100755 (executable)
--- a/build/tizen/dali-extension/configure.ac
+++ b/build/tizen/dali-extension/configure.ac
@@ -26,15 +26,6 @@ PKG_CHECK_MODULES(ELEMENTARY, elementary)
 PKG_CHECK_MODULES(EVAS, evas)
 PKG_CHECK_MODULES(WAYLAND, [ecore-wl2])
 
-# For rive animation
-if test "x$with_tizen_65_or_greater" = "xyes"; then
-  PKG_CHECK_MODULES(THORVG, thorvg)
-  PKG_CHECK_MODULES(RIVE_TIZEN, rive_tizen)
-  AM_CONDITIONAL([SUPPORT_RIVE], [true])
-else
-  AM_CONDITIONAL([SUPPORT_RIVE], [false])
-fi
-
 devincludepath=${includedir}
 AC_SUBST(devincludepath)
 AC_SUBST(DALI_CFLAGS)

diff --git a/build/tizen/dali2-extension-rive-animation-view.pc.in b/build/tizen/dali2-extension-rive-animation-view.pc.in
new file mode 100644 (file)
index 0000000..eebe8f1
--- /dev/null
+++ b/build/tizen/dali2-extension-rive-animation-view.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@devincludepath@
+
+Name: DALi extension rive animation view
+Description: The DALi Extension Rive Animation View Libaray
+Version: @DALI_EXTENSION_VERSION@
+Requires: dali2-adaptor dali2-toolkit thorvg rive_tizen
+Libs: -L${libdir} -ldali2-extension-rive-animation-view
+Cflags: -I${includedir}/dali-extension

diff --git a/build/tizen/rive-animation-view/Makefile.am b/build/tizen/rive-animation-view/Makefile.am
new file mode 100755 (executable)
index 0000000..018d331
--- /dev/null
+++ b/build/tizen/rive-animation-view/Makefile.am
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2021 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Build the Dali extension library
+
+extension_src_dir = ../../../dali-extension
+
+# rive-animation-view
+include ../../../dali-extension/devel-api/rive-animation-view/file.list
+include ../../../dali-extension/internal/rive-animation-view/file.list
+
+lib_LTLIBRARIES =
+
+lib_LTLIBRARIES += libdali2-extension-rive-animation-view.la
+
+libdali2_extension_rive_animation_view_la_SOURCES = \
+            $(rive_animation_view_devel_src_files) \
+            $(rive_animation_view_internal_src_files)
+
+libdali2_extension_rive_animation_view_la_DEPENDENCIES =
+
+libdali2_extension_rive_animation_view_la_CXXFLAGS = \
+            -I$(includedir)/rive \
+            -DEFL_BETA_API_SUPPORT \
+            -I../../../ \
+            -Werror -Wall
+            $(DLOG_CFLAGS) \
+            $(DALI_CFLAGS) \
+            $(DALI_EXTENSION_CFLAGS) \
+            $(DALI_ADAPTOR_INTEGRATION_CFLAGS) \
+            $(THORVG_CFLAGS) \
+            $(RIVE_TIZEN_CFLAGS)
+
+libdali2_extension_rive_animation_view_la_LIBADD = \
+            $(DLOG_LIBS) \
+            $(DALI_LIBS) \
+            $(DALI_ADAPTOR_INTEGRATION_LIBS) \
+            $(THORVG_LIBS) \
+            $(RIVE_TIZEN_LIBS)
+
+libdali2_extension_rive_animation_view_la_LDFLAGS = \
+            -rdynamic
+
+#install headers
+
+dali2_extension_rive_animation_viewdir = $(devincludepath)/dali-extension/devel-api/rive-animation-view
+dali2_extension_rive_animation_view_HEADERS = $(rive_animation_view_devel_header_files)

diff --git a/build/tizen/rive-animation-view/configure.ac b/build/tizen/rive-animation-view/configure.ac
new file mode 100755 (executable)
index 0000000..7764a8d
--- /dev/null
+++ b/build/tizen/rive-animation-view/configure.ac
@@ -0,0 +1,35 @@
+4_define([dali_version],[0.1.0])
+AC_INIT([dali], [dali_version])
+AM_INIT_AUTOMAKE([-Wall foreign])
+
+AC_CONFIG_MACRO_DIRS([m4 ../m4])
+
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
+
+LT_INIT
+
+DALI_EXTENSION_VERSION=dali_version
+AC_SUBST(DALI_EXTENSION_VERSION)
+
+if test "x$enable_debug" = "xyes"; then
+  DALI_CFLAGS="$DALI_CFLAGS -DDEBUG_ENABLED"
+fi
+
+# For rive animation
+PKG_CHECK_MODULES(THORVG, thorvg)
+PKG_CHECK_MODULES(RIVE_TIZEN, rive_tizen)
+
+devincludepath=${includedir}
+AC_SUBST(devincludepath)
+AC_SUBST(DALI_CFLAGS)
+
+AC_CONFIG_FILES([
+Makefile
+])
+
+AC_OUTPUT

diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec
index 2d7530c..c6ec9d0 100755 (executable)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -188,6 +188,20 @@ BuildRequires: pkgconfig(lightweight-web-engine)
 %description web-engine-lwe-plugin
 Web Engine LWE(Light-weight Web Engine) plugin to support WebView for Dali
 
+####################################
+# Rive Animation View Plugin
+####################################
+%package rive-animation-view
+Summary:    Plugin to render a rive animation
+Group:      System/Libraries
+%if 0%{?tizen_65_or_greater}
+BuildRequires:  pkgconfig(thorvg)
+BuildRequires:  pkgconfig(rive_tizen)
+%endif
+
+%description rive-animation-view
+Plugin to render a rive animation
+
 ##############################
 # Preparation
 ##############################
@@ -391,7 +405,7 @@ exit 0
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/dali-extension/*
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/dali2-extension.pc
 
 %files key-extension
 %manifest dali-extension.manifest
@@ -445,6 +459,15 @@ exit 0
 %license LICENSE
 %endif
 
+%if 0%{?tizen_65_or_greater}
+%files rive-animation-view
+%manifest dali-extension.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libdali2-extension-rive-animation-view.so*
+%{_libdir}/pkgconfig/dali2-extension-rive-animation-view.pc
+%license LICENSE
+%endif
+
 %files color-controller-plugin
 %manifest dali-extension.manifest
 %defattr(-,root,root,-)