Commit 44c7e2627d80f59781a51cf3e05192234f50e4d5
Committed by
Adeel Kazmi
1 parent
fe211667
Seperate dali-adaptor & dali-adaptor-uv packages
- Now dali-demo (and other native dali appplication packages) refers dali-adaptor because native dali apps could not use libuv backend at the moment. - Before this patch, dali-demo only checked dali-adaptor package (which was confusingly named to 'dali') and dali-toolkit package. - In this patch, dali-demo checks dali-core, dali-adaptor, and dali-toolkit packages to make it clearer. Change-Id: Ia9f3f81a35f8df4fdd228d4cf476b9008a287483
Showing
2 changed files
with
8 additions
and
6 deletions
build/tizen/CMakeLists.txt
| @@ -68,7 +68,8 @@ ENDFOREACH(flag) | @@ -68,7 +68,8 @@ ENDFOREACH(flag) | ||
| 68 | 68 | ||
| 69 | INSTALL(FILES ${LOCAL_STYLE_DIR}/demo-theme.json DESTINATION ${STYLE_DIR}) | 69 | INSTALL(FILES ${LOCAL_STYLE_DIR}/demo-theme.json DESTINATION ${STYLE_DIR}) |
| 70 | 70 | ||
| 71 | -SET(PKG_LIST dali | 71 | +SET(PKG_LIST dali-core |
| 72 | + dali-adaptor | ||
| 72 | dali-toolkit) | 73 | dali-toolkit) |
| 73 | 74 | ||
| 74 | INCLUDE(FindPkgConfig) | 75 | INCLUDE(FindPkgConfig) |
packaging/com.samsung.dali-demo.spec
| @@ -11,17 +11,18 @@ Source0: %{name}-%{version}.tar.gz | @@ -11,17 +11,18 @@ Source0: %{name}-%{version}.tar.gz | ||
| 11 | 11 | ||
| 12 | Requires(post): /sbin/ldconfig | 12 | Requires(post): /sbin/ldconfig |
| 13 | Requires(postun): /sbin/ldconfig | 13 | Requires(postun): /sbin/ldconfig |
| 14 | -Requires: dali | ||
| 15 | -Requires: dali-adaptor | ||
| 16 | -Requires: dali-toolkit | 14 | + |
| 17 | BuildRequires: cmake | 15 | BuildRequires: cmake |
| 18 | BuildRequires: pkgconfig | 16 | BuildRequires: pkgconfig |
| 19 | BuildRequires: pkgconfig(capi-appfw-application) | 17 | BuildRequires: pkgconfig(capi-appfw-application) |
| 20 | BuildRequires: pkgconfig(capi-media-player) | 18 | BuildRequires: pkgconfig(capi-media-player) |
| 21 | -BuildRequires: dali-toolkit-devel | ||
| 22 | -BuildRequires: dali-adaptor-devel | ||
| 23 | BuildRequires: pkgconfig(dlog) | 19 | BuildRequires: pkgconfig(dlog) |
| 24 | BuildRequires: gettext-tools | 20 | BuildRequires: gettext-tools |
| 21 | +BuildRequires: pkgconfig(dali-core) | ||
| 22 | +BuildRequires: pkgconfig(dali-toolkit) | ||
| 23 | + | ||
| 24 | +# DALi C++ applications always run on dali-adaptor. | ||
| 25 | +BuildRequires: pkgconfig(dali-adaptor) | ||
| 25 | 26 | ||
| 26 | %description | 27 | %description |
| 27 | The OpenGLES Canvas Core Demo is a collection of examples and demonstrations | 28 | The OpenGLES Canvas Core Demo is a collection of examples and demonstrations |