Patchwork [meta-fsl-arm] qt4-x11: Allow use of Qt Media Player in multi-headed system

login
register
mail settings
Submitter Eric Nelson
Date Aug. 24, 2013, 8:07 p.m.
Message ID <1377374836-12835-1-git-send-email-eric.nelson@boundarydevices.com>
Download mbox | patch
Permalink /patch/56557/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Eric Nelson - Aug. 24, 2013, 8:07 p.m.
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>
---
 recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 8 +-------
 recipes-qt/qt4/qt4-phonon-patches.inc      | 8 ++++++++
 recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 5 +----
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 recipes-qt/qt4/qt4-phonon-patches.inc
Otavio Salvador - Aug. 25, 2013, 8:35 p.m.
On Sat, Aug 24, 2013 at 5:07 PM, Eric Nelson
<eric.nelson@boundarydevices.com> wrote:
> 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>

Applied to master.

Patch

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}"