diff options
author | Yu Ke <ke.yu@intel.com> | 2010-09-30 16:58:10 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-09-30 10:14:06 -0700 |
commit | aca435f2381f8ec793074c10533ce9d97a1c578e (patch) | |
tree | 02f2dd4fb7f7ed1f84905f4d3b0de3acafc6c5c9 | |
parent | 1526b9d4d9a77eb2c007d887740756931293edc5 (diff) | |
download | poky-aca435f2381f8ec793074c10533ce9d97a1c578e.tar.gz |
qmmp: add qmmp into image (Bug 301)
qmmp is not included any image before, because it depends on one moblin recipe taglib. Since now the taglib is included into meta/recipes-support, it is safely to add qmmp into the task-poky-qt.
This commit also add an build time dependency for qmmp, because qmmp use some head files from taglib. Without this, qmmp build failure is occationally observed.
Fix [BUGID #301]
Signed-off-by: Yu Ke <ke.yu@intel.com>
-rw-r--r-- | meta/recipes-qt/qt-apps/qmmp_0.4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-qt/tasks/task-poky-qt.bb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb index 5f971e8b47..fd4586c0f2 100644 --- a/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb +++ b/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb | |||
@@ -3,7 +3,9 @@ HOMEPAGE = "http://qmmp.ylsoftware.com" | |||
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | SECTION = "multimedia" | 4 | SECTION = "multimedia" |
5 | 5 | ||
6 | DEPENDS = "qt4-x11-free" | 6 | PR = "r1" |
7 | |||
8 | DEPENDS = "qt4-x11-free taglib" | ||
7 | RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" | 9 | RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" |
8 | 10 | ||
9 | SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2" | 11 | SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2" |
diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-poky-qt.bb index 95d06fdd6a..5990d4df05 100644 --- a/meta/recipes-qt/tasks/task-poky-qt.bb +++ b/meta/recipes-qt/tasks/task-poky-qt.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | DESCRIPTION = "Qt Tasks for Poky" | 5 | DESCRIPTION = "Qt Tasks for Poky" |
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | PR = "r1" | 7 | PR = "r2" |
8 | 8 | ||
9 | PACKAGES = "\ | 9 | PACKAGES = "\ |
10 | task-poky-qt-demos \ | 10 | task-poky-qt-demos \ |
@@ -14,7 +14,7 @@ PACKAGES = "\ | |||
14 | 14 | ||
15 | ALLOW_EMPTY = "1" | 15 | ALLOW_EMPTY = "1" |
16 | 16 | ||
17 | QTDEMOS ?= "fotowall quicky" | 17 | QTDEMOS ?= "fotowall quicky qmmp" |
18 | QTDEMOS_mips ?= "" | 18 | QTDEMOS_mips ?= "" |
19 | QTDEMOS_mipsel ?= "" | 19 | QTDEMOS_mipsel ?= "" |
20 | 20 | ||