diff options
Diffstat (limited to 'meta-oe/recipes-qt/qt-mobility')
3 files changed, 11 insertions, 3 deletions
diff --git a/meta-oe/recipes-qt/qt-mobility/qt-mobility-embedded_1.2.0.bb b/meta-oe/recipes-qt/qt-mobility/qt-mobility-embedded_1.2.0.bb index 998de2a05..355f183b8 100644 --- a/meta-oe/recipes-qt/qt-mobility/qt-mobility-embedded_1.2.0.bb +++ b/meta-oe/recipes-qt/qt-mobility/qt-mobility-embedded_1.2.0.bb | |||
@@ -1,5 +1,4 @@ | |||
1 | SUMMARY = "Mobile device API extensions for Qt/Embedded 4.x" | 1 | SUMMARY = "Mobile device API extensions for Qt/Embedded 4.x" |
2 | DEPENDS = "qt4-embedded" | ||
3 | SECTION = "libs" | 2 | SECTION = "libs" |
4 | qtm_embedded := "embedded" | 3 | qtm_embedded := "embedded" |
5 | qtm_dir = "qtopia" | 4 | qtm_dir = "qtopia" |
diff --git a/meta-oe/recipes-qt/qt-mobility/qt-mobility-x11_1.2.0.bb b/meta-oe/recipes-qt/qt-mobility/qt-mobility-x11_1.2.0.bb index e7e4b3c62..380e3cb79 100644 --- a/meta-oe/recipes-qt/qt-mobility/qt-mobility-x11_1.2.0.bb +++ b/meta-oe/recipes-qt/qt-mobility/qt-mobility-x11_1.2.0.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | SUMMARY = "Mobile device API extensions for Qt/X11 4.x" | 1 | SUMMARY = "Mobile device API extensions for Qt/X11 4.x" |
2 | DEPENDS = "qt4-x11-free" | 2 | DEPENDS = "libxv libxext" |
3 | SECTION = "x11/libs" | 3 | SECTION = "x11/libs" |
4 | qtm_embedded := "" | 4 | qtm_embedded := "" |
5 | qtm_dir = "qt4" | 5 | qtm_dir = "qt4" |
diff --git a/meta-oe/recipes-qt/qt-mobility/qt-mobility_1.2.0.inc b/meta-oe/recipes-qt/qt-mobility/qt-mobility_1.2.0.inc index 56631bb05..377d9c7be 100644 --- a/meta-oe/recipes-qt/qt-mobility/qt-mobility_1.2.0.inc +++ b/meta-oe/recipes-qt/qt-mobility/qt-mobility_1.2.0.inc | |||
@@ -1,11 +1,20 @@ | |||
1 | HOMEPAGE = "http://qt-project.org/" | 1 | HOMEPAGE = "http://qt-project.org/" |
2 | DEPENDS = "gstreamer util-linux" | 2 | |
3 | # This creates the dependency on meta-multimedia, which is wrong, but hopefully | ||
4 | # this will be moved to separate meta-qt4 soon | ||
5 | DEPENDS += "gstreamer util-linux alsa-lib gst-plugins-base" | ||
3 | 6 | ||
4 | inherit bluetooth | 7 | inherit bluetooth |
5 | 8 | ||
6 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 9 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
7 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" | 10 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" |
11 | # This is all wrong, but nobody cares about qt-mobility anymore | ||
12 | # add bluez5 just to silence: | ||
13 | # qt-mobility-embedded-1.2.0: qt-mobility-embedded: invalid PACKAGECONFIG: bluez5 [invalid-packageconfig] | ||
14 | # qt-mobility-x11-1.2.0: qt-mobility-x11: invalid PACKAGECONFIG: bluez5 [invalid-packageconfig] | ||
15 | # but without --disable options it still autodetects bluez and pulseaudio from sysroot | ||
8 | PACKAGECONFIG[bluez4] = ",,bluez4" | 16 | PACKAGECONFIG[bluez4] = ",,bluez4" |
17 | PACKAGECONFIG[bluez5] = ",,bluez5" | ||
9 | PACKAGECONFIG[pulseaudio] = ",,pulseaudio" | 18 | PACKAGECONFIG[pulseaudio] = ",,pulseaudio" |
10 | 19 | ||
11 | LICENSE = "LGPLv2.1" | 20 | LICENSE = "LGPLv2.1" |