[meta-freescale] [meta-fsl-arm][PATCH 1/2] gpu-viv-bin-mx6q: remove xlib undef macros

[Adrian Alonso]

From: Adrian Alonso <aalonso00 at gmail.com>

* Remove xlib udef macros
* Distrubuted header files rename some badly named X defines
  but this breaks compilation on programs that expect this
  macros.

Signed-off-by: Adrian Alonso <aalonso00 at gmail.com>
---
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc          |  7 +++--
 .../eglvivante-remove-Xlib-undefs.patch            | 31 ++++++++++++++++++++
 .../gc_hal_eglplatform-remove-xlib-undefs.patch    | 34 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/eglvivante-remove-Xlib-undefs.patch
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 1f63a0b..686f244 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -7,11 +7,14 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=092bc28e13d678ceaebe1a40559275fb"
 PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+	file://eglvivante-remove-Xlib-undefs.patch \
+	file://gc_hal_eglplatform-remove-xlib-undefs.patch \
+	"
 
 PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
 	libegl-fb-mx6 libegl-fb-mx6-dev libegl-fb-mx6-dbg \
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/eglvivante-remove-Xlib-undefs.patch b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/eglvivante-remove-Xlib-undefs.patch
new file mode 100644
index 0000000..4e244f9
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/eglvivante-remove-Xlib-undefs.patch
@@ -0,0 +1,31 @@
+From 40c6f04695f81a0250783de8977f55dfbb90cbd9 Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso00 at gmail.com>
+Date: Sat, 26 Jan 2013 17:50:14 -0600
+Subject: [PATCH 1/2] eglvivante: remove Xlib undefs
+
+* Remove header undefs for Always and Status definitions
+
+Signed-off-by: Adrian Alonso <aalonso00 at gmail.com>
+---
+ usr/include/EGL/eglvivante.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/usr/include/EGL/eglvivante.h b/usr/include/EGL/eglvivante.h
+index e697306..23b85eb 100644
+--- a/usr/include/EGL/eglvivante.h
++++ b/usr/include/EGL/eglvivante.h
+@@ -154,11 +154,9 @@ typedef Pixmap      EGLNativePixmapType;
+ /* Rename some badly named X defines. */
+ #ifdef Status
+ #   define XStatus      int
+-#   undef Status
+ #endif
+ #ifdef Always
+ #   define XAlways      2
+-#   undef Always
+ #endif
+ 
+ #undef CurrentTime
+-- 
+1.8.1
+
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
new file mode 100644
index 0000000..732a073
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
@@ -0,0 +1,34 @@
+From c59f9640d185759208f9d55a93b6602936dcb5e8 Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso00 at gmail.com>
+Date: Sat, 26 Jan 2013 17:52:04 -0600
+Subject: [PATCH 2/2] gc_hal_eglplatform: remove xlib undefs
+
+* Remove header undefs for Always and Status definitions
+
+Signed-off-by: Adrian Alonso <aalonso00 at gmail.com>
+---
+ usr/include/HAL/gc_hal_eglplatform.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/usr/include/HAL/gc_hal_eglplatform.h b/usr/include/HAL/gc_hal_eglplatform.h
+index a968fe7..e80c65a 100644
+--- a/usr/include/HAL/gc_hal_eglplatform.h
++++ b/usr/include/HAL/gc_hal_eglplatform.h
+@@ -341,14 +341,11 @@ typedef Pixmap      HALNativePixmapType;
+ /* Rename some badly named X defines. */
+ #ifdef Status
+ #   define XStatus      int
+-#   undef Status
+ #endif
+ #ifdef Always
+ #   define XAlways      2
+-#   undef Always
+ #endif
+ #ifdef CurrentTime
+-#   undef CurrentTime
+ #   define XCurrentTime 0
+ #endif
+ 
+-- 
+1.8.1
+
-- 
1.8.1