[meta-freescale] [meta-fsl-demos][PATCH 2/7] packagegroup-fsl-tools-gpu-external: Use wayland packages for xwayland backend

[Otavio Salvador]

On Fri, Oct 16, 2015 at 1:19 PM, Neena Busireddy
<neena.busireddy at freescale.com> wrote:
> Install wayland packages when both X11 and wayland DISTRO_FEATURES are availiable
> as we will be using x11 on top of wayland (XWayland).
>
> - Add mesa-demos package for wayland backend.
>
> Signed-off-by: Neena Busireddy <neena.busireddy at freescale.com>
> ---
>  .../packagegroups/packagegroup-fsl-tools-gpu-external.bb     | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
> index fb57382..d284606 100644
> --- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
> +++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
> @@ -29,17 +29,19 @@ SOC_GPU_TOOLS_FB_mx6dl = "eglinfo-fb"
>  SOC_GPU_TOOLS_FB_mx6sx = "eglinfo-fb"
>
>  SOC_GPU_TOOLS_WAYLAND = ""
> -SOC_GPU_TOOLS_WAYLAND_mx6q  = "glmark2"
> -SOC_GPU_TOOLS_WAYLAND_mx6dl = "glmark2"
> -SOC_GPU_TOOLS_WAYLAND_mx6sx = "glmark2"
> +SOC_GPU_TOOLS_WAYLAND_mx6q  = "glmark2 mesa-demos"
> +SOC_GPU_TOOLS_WAYLAND_mx6dl = "glmark2 mesa-demos"
> +SOC_GPU_TOOLS_WAYLAND_mx6sx = "glmark2 mesa-demos"
> +SOC_GPU_TOOLS_WAYLAND_mx6sx = "mesa-demos"

SX is duplicated.

>  SOC_GPU_TOOLS_DIRECTFB = ""
>
>  RDEPENDS_${PN} = " \
>      opencv-apps \
>      opencv-samples \
> -    ${@base_contains("DISTRO_FEATURES", "x11", "${SOC_GPU_TOOLS_X11}", \
> -        base_contains("DISTRO_FEATURES", "wayland", "${SOC_GPU_TOOLS_WAYLAND}", \
> +    ${@base_contains("DISTRO_FEATURES", "x11", \
> +        base_contains('DISTRO_FEATURES', "wayland", "${SOC_GPU_TOOLS_WAYLAND}", "${SOC_GPU_TOOLS_X11}", d), \
> +         base_contains("DISTRO_FEATURES", "wayland", "${SOC_GPU_TOOLS_WAYLAND}", \
>              base_contains("DISTRO_FEATURES", "directfb", "${SOC_GPU_TOOLS_DIRECTFB}", \
>                   "${SOC_GPU_TOOLS_FB}", d), d), d)} \
>  "

This can be simplified as Wayland will include same tools in all cases.

-- 
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