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

4 files changed, 66 insertions, 4 deletions

diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch
new file mode 100644
index 0000000..946bfac
--- /dev/null
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch
@@ -0,0 +1,54 @@
+diff -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglext.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglext.h
+--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglext.h 2012-08-18 12:43:19.431788396 -0300
++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglext.h      2012-08-18 12:43:50.799909873 -0300
+@@ -164,11 +164,11 @@
+  * nanoseconds (unadjusted standard time).  Here, it is defined as
+  * appropriate for an ISO C compiler.
+  */
+-#ifndef _LINUX
++#ifndef __linux__
+ typedef uint64_t EGLTimeKHR;
+-#else   // _LINUX
++#else   // __linux__
+ typedef unsigned long long EGLTimeKHR;
+-#endif  // _LINUX
++#endif  // __linux__
+ 
+ #define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR            0xFFF8
+ #define EGL_SYNC_STATUS_KHR                             0xFFF7                                  
+diff -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglfslext.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglfslext.h
+--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglfslext.h      2012-08-18 12:43:19.431788396 -0300
++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglfslext.h   2012-08-18 12:43:50.759785714 -0300
+@@ -65,7 +65,7 @@
+ } eglYUVInfo;
+ #endif
+ 
+-#ifdef _LINUX
++#ifdef __linux__
+ struct EGLImageInfoFSL
+ {
+     void *mem_virt[3]; //virtual addresses for Y/U/V planes
+diff -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/ext.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/ext.h
+--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/ext.h     2012-08-18 12:43:19.431788396 -0300
++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/ext.h  2012-08-18 12:43:50.799909873 -0300
+@@ -15,7 +15,7 @@
+ extern "C" {
+ #endif
+ 
+-#ifndef _LINUX
++#ifndef __linux__
+ #include <VG/openvg.h>
+ #else
+ #include "openvg.h"
+diff -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/openvg.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/openvg.h
+--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/openvg.h  2012-08-18 12:43:19.431788396 -0300
++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/openvg.h       2012-08-18 12:43:50.799909873 -0300
+@@ -449,7 +449,7 @@
+ #       endif
+ #   elif defined(__APPLE__)
+ #       define VG_API_CALL extern
+-#   elif defined(_LINUX)
++#   elif defined(__linux__)
+ #       if defined (OPENVG_DLL_EXPORTS)
+ #           define VG_API_CALL extern
+ #       else
diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
index 10f2e6e..49fdaab 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
@@ -4,14 +4,15 @@
 DESCRIPTION = "GPU driver and apps for x11 on mx51"
 LICENSE = "MIT"
 SECTION = "libs"
-PR = "r6"
+PR = "r8"
 
 #todo: Replace for correct AMD license
 LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
 DEPENDS = "virtual/libx11 libz160"
 RDEPENDS = "libz160"
 
-SRC_URI = "file://${PN}-${PV}.tar.gz"
+SRC_URI = "file://${PN}-${PV}.tar.gz \
+           file://fix-linux-build-check.patch"
 SRC_URI[md5sum] = "499a2cc08dd48a6c5f7db8d231428548"
 SRC_URI[sha256sum] = "6150d3d72a3f8abb26df1e31cee0f07f53c106c8d5de014c1175c8cb721fac29"
 
@@ -40,3 +41,6 @@ FILES_${PN}-dev = "\
     ${includedir}/KHR/*.h \
     ${includedir}/VG/*.h"
 FILES_${PN}-staticdev = "${libdir}/*.a"
+
+COMPATIBLE_MACHINE = "(mx5)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend
index 70d890f..1419814 100644
--- a/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend
+++ b/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend
@@ -5,6 +5,8 @@ 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"
 
 PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
+QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
index 70d890f..1419814 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
+++ b/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
@@ -5,6 +5,8 @@ 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"
 
 PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
+QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"