summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-09-30 16:58:10 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-09-30 10:14:06 -0700
commitaca435f2381f8ec793074c10533ce9d97a1c578e (patch)
tree02f2dd4fb7f7ed1f84905f4d3b0de3acafc6c5c9
parent1526b9d4d9a77eb2c007d887740756931293edc5 (diff)
downloadpoky-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.bb4
-rw-r--r--meta/recipes-qt/tasks/task-poky-qt.bb4
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"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4SECTION = "multimedia" 4SECTION = "multimedia"
5 5
6DEPENDS = "qt4-x11-free" 6PR = "r1"
7
8DEPENDS = "qt4-x11-free taglib"
7RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" 9RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl"
8 10
9SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2" 11SRC_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
5DESCRIPTION = "Qt Tasks for Poky" 5DESCRIPTION = "Qt Tasks for Poky"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r1" 7PR = "r2"
8 8
9PACKAGES = "\ 9PACKAGES = "\
10 task-poky-qt-demos \ 10 task-poky-qt-demos \
@@ -14,7 +14,7 @@ PACKAGES = "\
14 14
15ALLOW_EMPTY = "1" 15ALLOW_EMPTY = "1"
16 16
17QTDEMOS ?= "fotowall quicky" 17QTDEMOS ?= "fotowall quicky qmmp"
18QTDEMOS_mips ?= "" 18QTDEMOS_mips ?= ""
19QTDEMOS_mipsel ?= "" 19QTDEMOS_mipsel ?= ""
20 20