[meta-freescale] [meta-fsl-arm][PATCH] gpu-viv-bin-mx6q: Adding support to install Wayland GPU libs

[Otavio Salvador]

Hello Abhijit,

On Fri, Jul 19, 2013 at 8:47 AM, Abhijit Potnis <abhijitpotnis at gmail.com> wrote:
> This patch installs wayland GPU libs if the DISTRO_FEATURES contains
> wayland variable. If both X11 and wayland are present in DISTRO_FEATURES
> then wayland is picked as the default backend.
>
> Signed-off-by: Abhijit Potnis <abhijitpotnis at gmail.com>

Please check the comments below ...

> ---
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc          |   41 ++++++++++++++++----
>  .../gpu-viv-bin-mx6q/gc_wayland_protocol.pc        |   10 +++++
>  .../gpu-viv-bin-mx6q/wayland-egl.pc                |   10 +++++
>  .../gpu-viv-bin-mx6q/wayland-viv.pc                |   10 +++++
>  4 files changed, 63 insertions(+), 8 deletions(-)
>  create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
>  create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
>  create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
>
> 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 3354854..1c96347 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
> @@ -7,9 +7,9 @@ SECTION = "libs"
>  LICENSE = "Proprietary"
>  LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
>  DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes', '', d)} mesa"
> -PROVIDES += "virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2"
> +PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2"
>
> -INC_PR = "r5"
> +INC_PR = "r6"

Don't change PR as it is not need anymore.

>  inherit fsl-eula-unpack
>
> @@ -23,6 +23,9 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
>             file://glesv1_cm_x11.pc \
>             file://glesv2.pc \
>             file://glesv2_x11.pc \
> +           file://gc_wayland_protocol.pc \
> +           file://wayland-egl.pc \
> +           file://wayland-viv.pc \
>            "
>
>  PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
> @@ -37,10 +40,14 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
>         libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \
>         libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \
>         libvivante-dri-mx6 \
> +       libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \
> +       libgc_wayland_protocol-mx6 libgc_wayland_protocol-mx6-dev libgc_wayland_protocol-mx6-dbg \
> +       libwayland-egl-mx6-dev \
>  "

Use libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev
libgc-wayland-protocol-mx6-dbg

>  USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
>  USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}"
> +USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}"
>
>  # Inhibit warnings about files being stripped.
>  INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
> @@ -67,13 +74,19 @@ do_install () {
>      cp -axr ${S}/opt ${D}
>
>      install -d ${D}${libdir}/pkgconfig
> +
> +#If both X11 and Wayland are set in DISTRO_FEATURES then use Wayland as base window system
> +    if [ "${USE_WL}" = "yes" ]; then
> +        backend=wl

It seems wl can be used side by side with X11, can you test this?

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