Commit d57218f5a8fe928cebc423d4f3b4b5dcce24ca09
[dali_1.3.31] Merge branch 'devel/master'
Change-Id: I59d87de13a7bc4a8f69dc75f2b5e07687638b39e
Showing
2 changed files
with
3 additions
and
5 deletions
build/tizen/CMakeLists.txt
| ... | ... | @@ -135,7 +135,7 @@ MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/im |
| 135 | 135 | |
| 136 | 136 | SET(PKG_LIST dali-core |
| 137 | 137 | dali-adaptor |
| 138 | - dali-toolkit ) | |
| 138 | + dali-toolkit) | |
| 139 | 139 | |
| 140 | 140 | INCLUDE(FindPkgConfig) |
| 141 | 141 | pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST}) | ... | ... |
packaging/com.samsung.dali-demo.spec
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | |
| 3 | 3 | Name: com.samsung.dali-demo |
| 4 | 4 | Summary: The OpenGLES Canvas Core Demo |
| 5 | -Version: 1.3.30 | |
| 5 | +Version: 1.3.31 | |
| 6 | 6 | Release: 1 |
| 7 | 7 | Group: System/Libraries |
| 8 | 8 | License: Apache-2.0 |
| ... | ... | @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(capi-media-player) |
| 19 | 19 | BuildRequires: pkgconfig(dlog) |
| 20 | 20 | BuildRequires: gettext-tools |
| 21 | 21 | BuildRequires: pkgconfig(dali-core) |
| 22 | +BuildRequires: pkgconfig(dali-adaptor) | |
| 22 | 23 | BuildRequires: pkgconfig(dali-toolkit) |
| 23 | 24 | |
| 24 | 25 | #need libtzplatform-config for directory if tizen version is 3.x |
| ... | ... | @@ -26,9 +27,6 @@ BuildRequires: pkgconfig(dali-toolkit) |
| 26 | 27 | BuildRequires: pkgconfig(libtzplatform-config) |
| 27 | 28 | %endif |
| 28 | 29 | |
| 29 | -# DALi C++ applications always run on dali-adaptor. | |
| 30 | -BuildRequires: pkgconfig(dali-adaptor) | |
| 31 | - | |
| 32 | 30 | %description |
| 33 | 31 | The OpenGLES Canvas Core Demo is a collection of examples and demonstrations |
| 34 | 32 | of the capability of the toolkit. | ... | ... |