aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2013-08-24 20:07:16 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2013-08-25 17:33:44 -0300
commitf2805add77f9e9d5f7a114ee99a632172d8f3ff6 (patch)
treea79b4791df34672337759225085410f60647dd31 /recipes-qt
parent0c905f1581f331f3156206fa5851b3779445b970 (diff)
downloadmeta-fsl-arm-f2805add77f9e9d5f7a114ee99a632172d8f3ff6.tar.gz
meta-fsl-arm-f2805add77f9e9d5f7a114ee99a632172d8f3ff6.tar.bz2
meta-fsl-arm-f2805add77f9e9d5f7a114ee99a632172d8f3ff6.zip
qt4-x11: Allow use of Qt Media Player in multi-headed system
This patch applies commit 0c905f15 to X11 builds as well as embedded builds. Since both of the Phonon patches are common to both uses, this patch also moves them into an include file. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt4/qt4-embedded_4.8.5.bbappend8
-rw-r--r--recipes-qt/qt4/qt4-phonon-patches.inc8
-rw-r--r--recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend5
3 files changed, 10 insertions, 11 deletions
diff --git a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
index fc16670..007f89b 100644
--- a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
+++ b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
@@ -1,11 +1,5 @@
#Freescale
-FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
-
-SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
-SRC_URI_append_mx6 += " \
- file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
- file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
-"
+include qt4-phonon-patches.inc
DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
diff --git a/recipes-qt/qt4/qt4-phonon-patches.inc b/recipes-qt/qt4/qt4-phonon-patches.inc
new file mode 100644
index 0000000..60bdeea
--- /dev/null
+++ b/recipes-qt/qt4/qt4-phonon-patches.inc
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
+
+SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
+SRC_URI_append_mx6 += " \
+ file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
+ file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
+"
+
diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
index 4c4d0c9..007f89b 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
+++ b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
@@ -1,8 +1,5 @@
#Freescale
-FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
-
-SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
-SRC_URI_append_mx6 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
+include qt4-phonon-patches.inc
DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"