From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 7 Sep 2012 20:35:51 +0000 (-0300)
Subject: Merge remote branch 'freescale/denzil' into master
X-Git-Tag: 2.1~1726
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a0ae5512e774746e66a01ef38b7e4194012ab4f4;p=meta-freescale.git

Merge remote branch 'freescale/denzil' into master

* freescale/denzil:
  qt4-embedded: enable OpenGL ES2 and OpenVG for mx5 SoCs
  qt4-x11-free: enable OpenGL ES2 and OpenVG for mx5 SoCs
  amd-gpu-x11-bin-mx51: Proper detect the building on Linux
  amd-gpu-x11-bin-mx51: Set compatibility as mx5 SoC family only
---

a0ae5512e774746e66a01ef38b7e4194012ab4f4
diff --cc meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
index 70d890f0,bb32024f..14198146
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
+++ b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
@@@ -5,6 -5,8 +5,8 @@@ SRC_URI_append_mx5 += "file://0001-Add-
  SRC_URI_append_mx6 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
  
  PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
+ QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+ 
  PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
  
--PRINC := "${@int(PRINC) + 2}"
++PRINC := "${@int(PRINC) + 3}"