- Remove dali-adaptor dependency from dali-toolkit.
- Add dali-adaptor-uv dependency to dali-addon because DALi JS apps always
run the libuv-based adaptor.
- Before this patch, dali-addon only checked dali-adaptor package (which was
confusingly named to 'dali') and dali-toolkit package.
- Now dali-addon checks dali-core, dali-adaptor-uv, and dali-toolkit packages to make it clearer.
Change-Id: Iaca57047a250ee863bbe6963c31168a7bdbacd68
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
dali-core
- dali
+ dali-adaptor
dali-toolkit
)
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
dali-core
- dali
+ dali-adaptor
dali-toolkit
)
AC_SUBST(DALI_TOOLKIT_VERSION)
PKG_CHECK_MODULES(DALICORE, dali-core)
-PKG_CHECK_MODULES(DALI, dali)
DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
-I../../../ \
$(DALI_TOOLKIT_CFLAGS) \
$(DALICORE_CFLAGS) \
- $(DALI_CFLAGS) \
$(DLOG_CFLAGS) \
$(FRIBIDI_CFLAGS) \
$(HTMLCXX_CFLAGS)
libdali_toolkit_la_LIBADD = \
$(DALICORE_LIBS) \
- $(DALI_LIBS) \
$(DLOG_LIBS) \
$(FRIBIDI_LIBS) \
$(HTMLCXX_LIBS)
'cflags': [
'-fPIC',
'-frtti',
- '<!@(pkg-config --cflags dali dali-toolkit)'
+ '<!@(pkg-config --cflags dali-core dali-adaptor-uv dali-toolkit)'
],
'cflags_cc': [
'-frtti' # needed for typeinfo with dali-any
],
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other dali dali-toolkit)'
+ '<!@(pkg-config --libs-only-L --libs-only-other dali-core dali-adaptor-uv dali-toolkit)'
],
'libraries': [
- '<!@(pkg-config --libs-only-l dali dali-toolkit)'
+ '<!@(pkg-config --libs-only-l dali-core dali-adaptor-uv dali-toolkit)'
]
}]
}
set_target_properties(dali_addon PROPERTIES EXCLUDE_FROM_ALL "FALSE")
-SET(PKG_LIST dali
+SET(PKG_LIST dali-core
+ dali-adaptor-uv
dali-toolkit)
INCLUDE(FindPkgConfig)
URL: https://review.tizen.org/gerrit/#/q/project:platform/core/uifw/dali-toolkit
Distribution: Tizen
Source0: %{name}-%{version}.tar.gz
-Requires: dali
-# Do NOT put an adaptor here - it is an application choice which adaptor to use
BuildRequires: pkgconfig
BuildRequires: pkgconfig(dlog)
BuildRequires: cmake
-BuildRequires: pkgconfig(dali)
BuildRequires: pkgconfig(dali-core)
BuildRequires: pkgconfig(dali-toolkit)
BuildRequires: nodejs-devel
+# DALi JS applications using dali-addon always run on dali-adaptor-uv.
+BuildRequires: pkgconfig(dali-adaptor-uv)
+
%description
DALi Node.JS addon
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-Requires: dali
-# Do NOT put an adaptor here - it is an application choice which adaptor to use
+
BuildRequires: pkgconfig
BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(dali)
BuildRequires: pkgconfig(dali-core)
+# dali-toolkit only need to know the interfaces(APIs) of dali-adaptor(the devel package).
+# It doesn't need to know which adaptor will be used by applications.
+# Applications or dali-addon will decide which one they will use.
+BuildRequires: dali-adaptor-devel
+
#############################
# profile setup
#############################