Patchwork [meta-fsl-arm] gpu-viv-bin-mx6q.inc: Add libEGL.so in libegl-mx6

login
register
mail settings
Submitter Otavio Salvador
Date July 26, 2013, 4:43 p.m.
Message ID <1374857026-8806-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/54611/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - July 26, 2013, 4:43 p.m.
There're examples, provided by Freescale, which links wrongly against
the .so file (instead of the .so.1 one as expected) and this cannot be
fixed without source code.

We workaround this for now deploying the libEGL.so file inside
libegl-mx6 binary.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Otavio Salvador - July 26, 2013, 4:48 p.m.
On Fri, Jul 26, 2013 at 1:43 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> There're examples, provided by Freescale, which links wrongly against
> the .so file (instead of the .so.1 one as expected) and this cannot be
> fixed without source code.
>
> We workaround this for now deploying the libEGL.so file inside
> libegl-mx6 binary.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Eric and Philip,

I think this solves the issue. Please give it a try and I can push it.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
Eric Nelson - July 26, 2013, 6:08 p.m.
On 07/26/2013 09:43 AM, Otavio Salvador wrote:
> There're examples, provided by Freescale, which links wrongly against
> the .so file (instead of the .so.1 one as expected) and this cannot be
> fixed without source code.
>
> We workaround this for now deploying the libEGL.so file inside
> libegl-mx6 binary.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 6 ++++--
>   1 file changed, 4 insertions(+), 2 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 70a9b2d..d897cec 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
> @@ -136,8 +136,10 @@ FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
>   FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
>   FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
>
> -FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS}"
> -FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV} ${libdir}/pkgconfig/egl.pc"
> +# libEGL.so is used by some demo apps from Freescale
> +INSANE_SKIP_libegl-mx6 += "dev-so"
> +FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
> +FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
>   FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
>
>   FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
>

Tested-by: Eric Nelson <eric.nelson@boundarydevices.com>

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 70a9b2d..d897cec 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
@@ -136,8 +136,10 @@  FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
 FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
 FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
 
-FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS}"
-FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV} ${libdir}/pkgconfig/egl.pc"
+# libEGL.so is used by some demo apps from Freescale
+INSANE_SKIP_libegl-mx6 += "dev-so"
+FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
+FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
 FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
 
 FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"