qt-mobility: fix dependencies and PACKAGECONFIG

* this isn't proper fix, just to silence various QA issues
* nobody cares about qt-mobility, this is just last step before adding
  PNBLACKLIST for this (or moving it to separate meta-qt4)
* "Fixes"
  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]
  qt-mobility doesn't really support bluez5, so we'll just silence the
  QA warning, existing PACKAGECONFIGs for bluez4 and pulseaudio are
  useless as well, because without disable option both are still
  autodetected from ssysroot
* "Fixes"
  WARN: qt-mobility-embedded: qt-mobility-embedded rdepends on glib-2.0, but it isn't a build dependency?
  WARN: qt-mobility-embedded: qt-mobility-embedded rdepends on gstreamer, but it isn't a build dependency?
  WARN: qt-mobility-embedded: qt-mobility-embedded rdepends on libasound, but it isn't a build dependency?
  WARN: qt-mobility-embedded: qt-mobility-embedded rdepends on libgstapp-0.10, but it isn't a build dependency?
  WARN: qt-mobility-embedded: qt-mobility-embedded rdepends on libgstvideo-0.10, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on glib-2.0, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on gstreamer, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on libasound, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on libgstapp-0.10, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on libgstinterfaces-0.10, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on libgstvideo-0.10, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on libxext, but it isn't a build dependency?
  WARN: qt-mobility-x11: qt-mobility-x11 rdepends on libxv, but it isn't a build dependency?
  but it adds dependency on meta-multimedia layer (which isn't in meta-oe dependencies),
  so it's not correct, but won't make things worse then they already are since
  qt-mobility was moved from oe-core, hopefully it will move to separate meta-qt4
  soon. gstreamer was already in DEPENDS, but DEPENDS was overwritten by
  qt-mobility_1.2.0.inc which was included later, also drop qt4* dependencies
  because these are already taken care of in qt4(e).bbclass.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

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"