[meta-fsl-arm][PATCH v2] gpu-viv-bin-mx6q: fix gc_vdk_types include path

[meta-fsl-arm][PATCH v2] gpu-viv-bin-mx6q: fix gc_vdk_types include path

[Jeremy Stashluk]

The Freescale 12.09 release of the Vivante GPU binaries for i.MX6 bundles the
gc_hal_*.h headers into the /usr/include/HAL directory. As packaged,
inclusion of gc_vdk_types.h causes compilation to fail. Problem also exists
when building with LTIB.

Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
---
 .../0001-change-header-path-to-HAL.patch           |   33 ++++++++++++++++++++
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb  |    5 +++
 2 files changed, 38 insertions(+)
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
new file mode 100644
index 0000000..31fad1e
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
@@ -0,0 +1,33 @@
+From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001
+From: Jeremy Stashluk <jstashluk@dekaresearch.com>
+Date: Wed, 30 Jan 2013 13:16:53 -0500
+Subject: [PATCH] change header path to HAL
+
+The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL
+directory under the system. I think this is a problem in the LTIB release as
+well.
+
+Upstream-Status: Pending
+
+Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
+
+---
+ usr/include/gc_vdk_types.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/include/gc_vdk_types.h b/usr/include/gc_vdk_types.h
+index 11514f9..8e3dfe4 100644
+--- a/usr/include/gc_vdk_types.h
++++ b/usr/include/gc_vdk_types.h
+@@ -26,7 +26,7 @@ extern "C" {
+ #endif
+ 
+ #include <EGL/egl.h>
+-#include "gc_hal_eglplatform.h"
++#include <HAL/gc_hal_eglplatform.h>
+ 
+ /*******************************************************************************
+ ** vdkPrivate. *****************************************************************
+-- 
+1.7.9.5
+
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
index c54ad19..358971e 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
@@ -7,3 +7,8 @@ include gpu-viv-bin-mx6q.inc
 
 SRC_URI[md5sum] = "9f2c43b6eae468df6cc6fd75efd00bc5"
 SRC_URI[sha256sum] = "2cec10c1d69bce75a7c2a4482eb3ed29b171578c3b01c5b4ef2cc868ca327330"
+
+SRC_URI_append_mx6 = " \
+   file://0001-change-header-path-to-HAL.patch \
+   "
+
-- 
1.7.9.5

Re: [meta-fsl-arm][PATCH v2] gpu-viv-bin-mx6q: fix gc_vdk_types include path

[Otavio Salvador]

On Fri, Feb 8, 2013 at 12:02 PM, Jeremy Stashluk <stashluk@gmail.com> wrote:
> The Freescale 12.09 release of the Vivante GPU binaries for i.MX6 bundles the
> gc_hal_*.h headers into the /usr/include/HAL directory. As packaged,
> inclusion of gc_vdk_types.h causes compilation to fail. Problem also exists
> when building with LTIB.
>
> Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
> ---
>  .../0001-change-header-path-to-HAL.patch           |   33 ++++++++++++++++++++
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb  |    5 +++
>  2 files changed, 38 insertions(+)
>  create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
>
> diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
> new file mode 100644
> index 0000000..31fad1e
> --- /dev/null
> +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
> @@ -0,0 +1,33 @@
> +From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001
> +From: Jeremy Stashluk <jstashluk@dekaresearch.com>
> +Date: Wed, 30 Jan 2013 13:16:53 -0500
> +Subject: [PATCH] change header path to HAL
> +
> +The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL
> +directory under the system. I think this is a problem in the LTIB release as
> +well.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
> +
> +---
> + usr/include/gc_vdk_types.h |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/usr/include/gc_vdk_types.h b/usr/include/gc_vdk_types.h
> +index 11514f9..8e3dfe4 100644
> +--- a/usr/include/gc_vdk_types.h
> ++++ b/usr/include/gc_vdk_types.h
> +@@ -26,7 +26,7 @@ extern "C" {
> + #endif
> +
> + #include <EGL/egl.h>
> +-#include "gc_hal_eglplatform.h"
> ++#include <HAL/gc_hal_eglplatform.h>
> +
> + /*******************************************************************************
> + ** vdkPrivate. *****************************************************************
> +--
> +1.7.9.5
> +
> diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
> index c54ad19..358971e 100644
> --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
> +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
> @@ -7,3 +7,8 @@ include gpu-viv-bin-mx6q.inc
>
>  SRC_URI[md5sum] = "9f2c43b6eae468df6cc6fd75efd00bc5"
>  SRC_URI[sha256sum] = "2cec10c1d69bce75a7c2a4482eb3ed29b171578c3b01c5b4ef2cc868ca327330"
> +
> +SRC_URI_append_mx6 = " \
> +   file://0001-change-header-path-to-HAL.patch \
> +   "

Move this to the .inc file as this is not fixed in 1.1.0 version as
well. You should drop the _append as it ought to be applied for  all
machines building this recipe (and it is only build for mx6 after
all).

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br