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 998de2a055..355f183b87 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 @@ SUMMARY = "Mobile device API extensions for Qt/Embedded 4.x" -DEPENDS = "qt4-embedded" SECTION = "libs" qtm_embedded := "embedded" 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 e7e4b3c62a..380e3cb794 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 @@ SUMMARY = "Mobile device API extensions for Qt/X11 4.x" -DEPENDS = "qt4-x11-free" +DEPENDS = "libxv libxext" SECTION = "x11/libs" qtm_embedded := "" 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 56631bb05c..377d9c7be5 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 @@ HOMEPAGE = "http://qt-project.org/" -DEPENDS = "gstreamer util-linux" + +# This creates the dependency on meta-multimedia, which is wrong, but hopefully +# this will be moved to separate meta-qt4 soon +DEPENDS += "gstreamer util-linux alsa-lib gst-plugins-base" inherit bluetooth PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" +# This is all wrong, but nobody cares about qt-mobility anymore +# add bluez5 just to silence: +# qt-mobility-embedded-1.2.0: qt-mobility-embedded: invalid PACKAGECONFIG: bluez5 [invalid-packageconfig] +# qt-mobility-x11-1.2.0: qt-mobility-x11: invalid PACKAGECONFIG: bluez5 [invalid-packageconfig] +# but without --disable options it still autodetects bluez and pulseaudio from sysroot PACKAGECONFIG[bluez4] = ",,bluez4" +PACKAGECONFIG[bluez5] = ",,bluez5" PACKAGECONFIG[pulseaudio] = ",,pulseaudio" LICENSE = "LGPLv2.1" |