From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 16 Feb 2013 17:39:26 +0000 (-0200)
Subject: qt4: Use kernel staging include files
X-Git-Tag: 2.1~1512
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b0e2faec7ef0d99dd465e2429c620e95d67ee079;p=meta-freescale.git

qt4: Use kernel staging include files

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

diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
index 3a4cff1f..041f1ebc 100644
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
+++ b/meta-fsl-arm/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/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
index 3a4cff1f..041f1ebc 100644
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
+++ b/meta-fsl-arm/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}"