[PATCH] imx-gpu-viv: Fix build break for missing gl headers

[PATCH] imx-gpu-viv: Fix build break for missing gl headers

[Tom Hochstein]

For x11 graphics and Wayland graphics with XWayland support, a build
break is possible due to missing headers. This is because imx-gpu-viv
does not provide everything it needs to for virtual/libgl and depends
on mesa to fill in what is missing. Adding a dependency on mesa
fixes the build break.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index e5aacf3..9c98132 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -9,11 +9,16 @@ LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;
 
 DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
-       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
                                                        '', d), d)} \
     libpng \
 "
 
+# imx-gpu-viv does not provide everything it needs to for virtual/libgl
+# on x11 backend or on Wayland backend with XWayland support.
+# We depend on mesa to fill in what is missing.
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
+
 EXTRA_PROVIDES = ""
 EXTRA_PROVIDES_imxgpu3d = " virtual/libgl virtual/libgles1 virtual/libgles2"
 PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}"
-- 
1.9.1

Re: [PATCH] imx-gpu-viv: Fix build break for missing gl headers

[Otavio Salvador]

On Mon, Mar 6, 2017 at 10:19 PM, Tom Hochstein <tom.hochstein@nxp.com> wrote:
> For x11 graphics and Wayland graphics with XWayland support, a build
> break is possible due to missing headers. This is because imx-gpu-viv
> does not provide everything it needs to for virtual/libgl and depends
> on mesa to fill in what is missing. Adding a dependency on mesa
> fixes the build break.
>
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> ---
>  recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
> index e5aacf3..9c98132 100644
> --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
> +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
> @@ -9,11 +9,16 @@ LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;
>
>  DEPENDS += " \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
> -       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
> +       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
>                                                         '', d), d)} \
>      libpng \
>  "
>
> +# imx-gpu-viv does not provide everything it needs to for virtual/libgl
> +# on x11 backend or on Wayland backend with XWayland support.
> +# We depend on mesa to fill in what is missing.
> +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
> +

You can use bb.utils.filter for a cleaner recipe.


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] imx-gpu-viv: Fix build break for missing gl headers

[Tom Hochstein]

> -----Original Message-----
> From: Otavio Salvador [mailto:otavio.salvador@ossystems.com.br]
> Sent: Tuesday, March 07, 2017 8:25 AM
> To: Tom Hochstein <tom.hochstein@nxp.com>
> Cc: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [PATCH] imx-gpu-viv: Fix build break for missing gl headers
> 
> On Mon, Mar 6, 2017 at 10:19 PM, Tom Hochstein <tom.hochstein@nxp.com> wrote:
> > For x11 graphics and Wayland graphics with XWayland support, a build
> > break is possible due to missing headers. This is because imx-gpu-viv
> > does not provide everything it needs to for virtual/libgl and depends
> > on mesa to fill in what is missing. Adding a dependency on mesa
> > fixes the build break.
> >
> > Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> > ---
> >  recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
> > index e5aacf3..9c98132 100644
> > --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
> > +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
> > @@ -9,11 +9,16 @@ LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;
> >
> >  DEPENDS += " \
> >      ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
> > -       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
> > +       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
> >                                                         '', d), d)} \
> >      libpng \
> >  "
> >
> > +# imx-gpu-viv does not provide everything it needs to for virtual/libgl
> > +# on x11 backend or on Wayland backend with XWayland support.
> > +# We depend on mesa to fill in what is missing.
> > +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
> > +
> 
> You can use bb.utils.filter for a cleaner recipe.

That doesn't work here since "x11" != "mesa", right?

> 
> 
> --
> Otavio Salvador                             O.S. Systems
> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.ossystems.com.br&data=01%7C01%7Ctom.hochstein%40nx
> p.com%7C96da21f697474ab72a8f08d46565c977%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=sBAv6mfwgaH4vYquFh6Zy9maMz
> 6iXj98qLTwNL856x4%3D&reserved=0
> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fcode.ossystems.com.br&data=01%7C01%7Ctom.hochstein%40nxp
> .com%7C96da21f697474ab72a8f08d46565c977%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=q6FqbSAZf6Z%2BcCmcJaQMjORaT
> RNfp47Kzi%2BgbExMLoI%3D&reserved=0
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750