From f8eb411d59bf131572fe827773691cf23c06d811 Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Sat, 24 Aug 2013 20:07:16 +0000 Subject: [PATCH] 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 --- meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 8 +------- meta-fsl-arm/recipes-qt/qt4/qt4-phonon-patches.inc | 8 ++++++++ meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 5 +---- 3 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 meta-fsl-arm/recipes-qt/qt4/qt4-phonon-patches.inc 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 fc166708..007f89b6 100644 --- 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 index 00000000..60bdeea8 --- /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 4c4d0c9e..007f89b6 100644 --- 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}" -- 2.40.1