From 56d621dafa0ca46683fafaf4e7dda18e41d9bd92 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 14 Mar 2013 14:50:50 -0300 Subject: [PATCH] gpu-viv-bin-mx6q: Fix conflicting type definition in HAL header Change-Id: I37567a888ee02bfb55a34f36fe623938f7a07c18 Signed-off-by: Otavio Salvador --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 6 +--- .../fix-conflicting-TLS-definition.patch | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index e0a8fb9b..80ab5e44 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -14,6 +14,7 @@ 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 \ + file://fix-conflicting-TLS-definition.patch \ " GPU_XLIBS = "libegl-x11-mx6 libegl-x11-mx6-dev libegl-x11-mx6-dbg \ @@ -30,7 +31,6 @@ GPU_DFBLIBS = "libegl-dfb-mx6 libegl-dfb-mx6-dev libegl-dfb-mx6-dbg \ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ - libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \ libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ @@ -134,10 +134,6 @@ FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" RDEPENDS_libgles2-mx6 = "libglslc-mx6" -FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}" -FILES_libgl-mx6-dev = "${includedir}/GL ${libdir}/libGL${SOLIBSDEV}" -FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL${SOLIBS}" - FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}" FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}" diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch new file mode 100644 index 00000000..3eac1166 --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch @@ -0,0 +1,31 @@ +Avoid conflicting types with Xorg newer code + +Upstream-Status: Pending +Signed-off-by: Otavio Salvador + +Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h +=================================================================== +--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h ++++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h +@@ -101,7 +101,7 @@ extern gcsPLS gcPLS; + typedef struct _gcsTLS * gcsTLS_PTR; + + typedef void (* gctTLS_DESTRUCTOR) ( +- gcsTLS_PTR TLS ++ gcsTLS_PTR pTLS + ); + + typedef struct _gcsTLS +@@ -648,10 +648,10 @@ gcoOS_SetPLSValue( + /* Get access to the thread local storage. */ + gceSTATUS + gcoOS_GetTLS( +- OUT gcsTLS_PTR * TLS ++ OUT gcsTLS_PTR * pTLS + ); + +- /* Copy the TLS from a source thread. */ ++ /* Copy the pTLS from a source thread. */ + gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source); + + /* Destroy the objects associated with the current thread. */ -- 2.40.1