diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-08-24 20:07:16 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-25 17:33:44 -0300 |
| commit | f2805add77f9e9d5f7a114ee99a632172d8f3ff6 (patch) | |
| tree | a79b4791df34672337759225085410f60647dd31 /recipes-qt/qt4 | |
| parent | 0c905f1581f331f3156206fa5851b3779445b970 (diff) | |
| download | meta-fsl-arm-f2805add77f9e9d5f7a114ee99a632172d8f3ff6.tar.gz | |
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/qt4')
| -rw-r--r-- | recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 8 | ||||
| -rw-r--r-- | recipes-qt/qt4/qt4-phonon-patches.inc | 8 | ||||
| -rw-r--r-- | recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 5 |
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 @@ | |||
| 1 | #Freescale | 1 | #Freescale |
| 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" | 2 | include qt4-phonon-patches.inc |
| 3 | |||
| 4 | SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" | ||
| 5 | SRC_URI_append_mx6 += " \ | ||
| 6 | file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ | ||
| 7 | file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ | ||
| 8 | " | ||
| 9 | 3 | ||
| 10 | DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" | 4 | DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" |
| 11 | PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" | 5 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" | ||
| 2 | |||
| 3 | SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" | ||
| 4 | SRC_URI_append_mx6 += " \ | ||
| 5 | file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ | ||
| 6 | file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ | ||
| 7 | " | ||
| 8 | |||
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 @@ | |||
| 1 | #Freescale | 1 | #Freescale |
| 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" | 2 | include qt4-phonon-patches.inc |
| 3 | |||
| 4 | SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" | ||
| 5 | SRC_URI_append_mx6 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" | ||
| 6 | 3 | ||
| 7 | DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" | 4 | DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" |
| 8 | PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" | 5 | PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" |