From dc56a790d81eb3dbfba1b3618df4d3f776147387 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 21 Oct 2013 18:00:54 +0200
Subject: [PATCH] amd-gpu-bin-mx51: rework package

To avoid conflicts between the two flavous (X11, framebuffer). Also fix
bitbake parsing error in the buildserver:

ERROR: Nothing PROVIDES 'virtual/libx11' (but
amd-gpu-x11-bin-mx51_11.09.01.bb DEPENDS on or otherwise requires it)

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../0001-fix-linux-build-check.patch          | 70 +++++++++++++++++++
 .../amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb  |  7 +-
 .../amd-gpu-x11-bin-mx51_11.09.01.bbappend    |  8 +++
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch
 create mode 100644 meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend

diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch
new file mode 100644
index 000000000..b3643234f
--- /dev/null
+++ b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch
@@ -0,0 +1,70 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Mon, 21 Oct 2013 17:39:17 +0200
+Subject: [PATCH] fix linux build check
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ usr/include/EGL/eglext.h    | 6 +++---
+ usr/include/EGL/eglfslext.h | 2 +-
+ usr/include/VG/ext.h        | 2 +-
+ usr/include/VG/openvg.h     | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/usr/include/EGL/eglext.h b/usr/include/EGL/eglext.h
+index 6325104..3ef1ad4 100755
+--- a/usr/include/EGL/eglext.h
++++ b/usr/include/EGL/eglext.h
+@@ -164,11 +164,11 @@ typedef void* EGLSyncKHR;
+  * 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 --git a/usr/include/EGL/eglfslext.h b/usr/include/EGL/eglfslext.h
+index 4f05161..47a915b 100755
+--- a/usr/include/EGL/eglfslext.h
++++ b/usr/include/EGL/eglfslext.h
+@@ -65,7 +65,7 @@ typedef struct eglYUV_INFO
+ } eglYUVInfo;
+ #endif
+ 
+-#ifdef _LINUX
++#ifdef __linux__
+ struct EGLImageInfoFSL
+ {
+     void *mem_virt[3]; //virtual addresses for Y/U/V planes
+diff --git a/usr/include/VG/ext.h b/usr/include/VG/ext.h
+index b41c5dc..11f49a8 100755
+--- a/usr/include/VG/ext.h
++++ b/usr/include/VG/ext.h
+@@ -15,7 +15,7 @@
+ extern "C" {
+ #endif
+ 
+-#ifndef _LINUX
++#ifndef __linux__
+ #include <VG/openvg.h>
+ #else
+ #include "openvg.h"
+diff --git a/usr/include/VG/openvg.h b/usr/include/VG/openvg.h
+index bee327a..78e1e48 100755
+--- a/usr/include/VG/openvg.h
++++ b/usr/include/VG/openvg.h
+@@ -449,7 +449,7 @@ typedef enum {
+ #       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/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb
index fa0afd55e..83ec87117 100644
--- a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb
+++ b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb
@@ -13,7 +13,10 @@ LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd7696
 
 PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI = " \
+    ${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+    file://0001-fix-linux-build-check.patch \
+"
 SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46"
 SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9"
 
@@ -84,5 +87,7 @@ FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
 FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
 FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
 
+RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51"
+
 COMPATIBLE_MACHINE = "(mx5)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend
new file mode 100644
index 000000000..62677c781
--- /dev/null
+++ b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend
@@ -0,0 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
+RCONFLICTS_${PN} = "amd-gpu-bin-mx51"
+
+COMPATIBLE_MACHINE = "${@base_contains('DISTRO_FEATURES', 'x11', '(mx5)', 'Invalid!', d)}"