Patchwork [meta-fsl-arm,2/3] qt4: Use kernel staging include files

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 19, 2013, 12:37 p.m.
Message ID <1361277447-6186-3-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/44843/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Feb. 19, 2013, 12:37 p.m.
This allow the Phonon backend to proper build while using the
linux-libc-headers provided by Yocto.

Change-Id: I648a01ffb638e2ac42962d4599857e621379f8cb
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/qt4/qt4-embedded_4.8.4.bbappend | 7 +++++--
 recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

Patch

diff --git a/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
index 3a4cff1..041f1eb 100644
--- a/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
+++ b/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
@@ -4,10 +4,13 @@  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"
 
-DEPENDS_append_mx5 = " virtual/libgles2"
+DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
 PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
+DEPENDS_append_mx6 = " virtual/kernel"
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
index 3a4cff1..041f1eb 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
+++ b/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
@@ -4,10 +4,13 @@  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"
 
-DEPENDS_append_mx5 = " virtual/libgles2"
+DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
 PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
+DEPENDS_append_mx6 = " virtual/kernel"
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"