summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2015-05-18 16:58:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-20 21:41:08 +0100
commit4c67abd709c4c18fc3f066e2214052849e81e233 (patch)
tree876c0e05673adcc9016e05d71a9ba8dcfc9be5b1
parentb2365c4e186bc57155edd68eed06e468b3aabdf4 (diff)
downloadpoky-4c67abd709c4c18fc3f066e2214052849e81e233.tar.gz
qt4: disable Phonon framework
This allows removal of gstreamer 0.10 dependency from Qt4 recipe https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 (From OE-Core rev: 096b71a5c24378a449bc38063316555f02af8e18) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 09f6d93757..6d679940d4 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,6 @@
1inherit qmake_base 1inherit qmake_base
2 2
3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu" 3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 sqlite3 tiff icu"
4DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 4DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
5 5
6require qt4_arch.inc 6require qt4_arch.inc
@@ -16,7 +16,7 @@ QT_GLFLAGS ?= ""
16QT_QT3SUPPORT ?= "-qt3support" 16QT_QT3SUPPORT ?= "-qt3support"
17QT_XML ?= "-xmlpatterns" 17QT_XML ?= "-xmlpatterns"
18QT_WEBKIT ?= "-webkit" 18QT_WEBKIT ?= "-webkit"
19QT_PHONON ?= "-phonon" 19QT_PHONON ?= "-no-phonon"
20QT_DBUS ?= "-qdbus" 20QT_DBUS ?= "-qdbus"
21QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" 21QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"
22 22