aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Alonso <aalonso00@gmail.com>2013-02-02 10:01:14 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2013-03-26 09:20:45 -0300
commitae902c9654b87ed9a2a3b5a315dfcae1044eb5f9 (patch)
tree465f8894f47d03cb8ed28ac39ef332dc0ace6ec3
parent1d14e213afbeaad42c8c5bb7c3a73e74d5a4c403 (diff)
downloadmeta-fsl-arm-ae902c9654b87ed9a2a3b5a315dfcae1044eb5f9.tar.gz
meta-fsl-arm-ae902c9654b87ed9a2a3b5a315dfcae1044eb5f9.tar.bz2
meta-fsl-arm-ae902c9654b87ed9a2a3b5a315dfcae1044eb5f9.zip
gpu-viv-bin-mx6q: remove xlib undef macros
* Remove xlib udef macros * Distrubuted header files rename some badly named X defines but this breaks compilation on programs that expect this macros. * Bump PR Change-Id: Iaedbb4506be5f4a641411d9888aa5338b574b7a4 Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
-rw-r--r--recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc3
-rw-r--r--recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch34
2 files changed, 36 insertions, 1 deletions
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 8239697..3105a60 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,12 +7,13 @@ LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c831981a5cbb2673318b77fb2f07014c"
PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
-INC_PR = "r2"
+INC_PR = "r3"
inherit fsl-eula-unpack
SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
file://0001-change-header-path-to-HAL.patch \
+ file://gc_hal_eglplatform-remove-xlib-undefs.patch \
"
PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
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@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@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
+