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>

diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
index fc16670811484ad666d1e94087e7d219b8c9f3d5..007f89b68ba23844fc42f60f297c7ee79b8cb782 100644 (file)
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
+++ b/meta-fsl-arm/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/meta-fsl-arm/recipes-qt/qt4/qt4-phonon-patches.inc b/meta-fsl-arm/recipes-qt/qt4/qt4-phonon-patches.inc
new file mode 100644 (file)
index 0000000..60bdeea
--- /dev/null
+++ b/meta-fsl-arm/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/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
index 4c4d0c9eb0a7b18ea14b121517900c27bd532c8b..007f89b68ba23844fc42f60f297c7ee79b8cb782 100644 (file)
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
+++ b/meta-fsl-arm/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}"