[oe-commits] Peter A. Bigot : qt-mobility: select distro preference for bluez provider
git at git.openembedded.org
git at git.openembedded.org
Tue Feb 17 13:44:43 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 47d31abef49494b408f6ba004638bac007782947
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=47d31abef49494b408f6ba004638bac007782947
Author: Peter A. Bigot <pab at pabigot.com>
Date: Tue Feb 17 15:08:04 2015 +0200
qt-mobility: select distro preference for bluez provider
Signed-off-by: Peter A. Bigot <pab at pabigot.com>
Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index ae1769d..5758e1e 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -1,9 +1,11 @@
HOMEPAGE = "http://qt-project.org/"
DEPENDS = "gstreamer util-linux"
+inherit bluetooth
+
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
-PACKAGECONFIG[bluetooth] = ",,bluez4"
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG[bluez4] = ",,bluez4"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
LICENSE = "LGPLv2.1"
@@ -65,7 +67,7 @@ maemo5-contacts_enabled = no
maemo5-calendar_enabled = no
maemo6-landmarks_enabled = no
bme_enabled = no
-bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)}
+bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluez4', 'yes', 'no', d)}
proj_enabled = no
gstreamer-photography_enabled = no
gstreamer-appsrc_enabled = yes
More information about the Openembedded-commits
mailing list