[meta-freescale] [meta-fsl-arm][PATCH 13/16] imx-gpu-viv: Upgrade to 3.10.53-1.1.0 GA release

Thu Jan 22 07:13:29 PST 2015

Hello Lauren, Hello Neena,

Just minor things...

On Wed, Jan 21, 2015 at 12:44 PM, Lauren Post <lauren.post at freescale.com> wrote:
> From: Neena Busireddy <neena.busireddy at freescale.com>
>
> - Graphics recipe is renamed from gpu-viv-bin-mx6q to imx-gpu-viv
> - Recipe version is changed to use Vivante version
> - gpu-viv-g2d shares same package with imx-gpu-viv
> - imx-gpu-viv includes separate sub packages for demos and tools
>   to support flexible package additions
> - Graphics package is reorganized to improve library layout
> - New GPU tool apitrace is added - supported only for X11 backend
>
> Signed-off-by: Neena Busireddy <neena.busireddy at freescale.com>

> ---
>  conf/machine/include/imx-base.inc                  |   20 ++--
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/Vivante.icd  |    1 -
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/directfbrc   |   10 --
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc       |   12 --
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc   |   12 --
>  .../gpu-viv-bin-mx6q/gc_wayland_protocol.pc        |   10 --
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc |   12 --
>  .../gpu-viv-bin-mx6q/glesv1_cm_x11.pc              |   12 --
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc    |   12 --
>  .../gpu-viv-bin-mx6q/glesv2_x11.pc                 |   12 --
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc        |   12 --
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc    |   12 --
>  .../gpu-viv-bin-mx6q/wayland-egl.pc                |   10 --
>  .../gpu-viv-bin-mx6q/wayland-viv.pc                |   10 --
>  .../gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb          |    9 --
>  .../gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb          |   12 --
>  recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc       |   47 --------
>  .../gpu-viv-g2d/gpu-viv-g2d_3.10.31-1.1.0.bb       |    6 -
>  .../imx-gpu-viv.inc}                               |  120 +++++++++++---------
>  .../imx-gpu-viv}/egl_directfb.pc                   |    0
>  .../imx-gpu-viv}/egl_linuxfb.pc                    |    0
>  .../imx-gpu-viv}/egl_wayland.pc                    |    0
>  .../imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb     |    9 ++
>  .../imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb     |   12 ++
>  .../gstreamer/gst-plugins-gl_%.bbappend            |    2 +-
>  .../gstreamer/gst1.0-fsl-plugin_4.0.1.bb           |    2 +-
>  .../gstreamer/gstreamer1.0-plugins-imx_0.10.0.bb   |    2 +-
>  27 files changed, 100 insertions(+), 278 deletions(-)
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/Vivante.icd
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/directfbrc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb
>  delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb
>  delete mode 100644 recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
>  delete mode 100644 recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.31-1.1.0.bb
>  rename recipes-graphics/{gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc => imx-gpu-viv/imx-gpu-viv.inc} (74%)
>  rename recipes-graphics/{gpu-viv-bin-mx6q/gpu-viv-bin-mx6q => imx-gpu-viv/imx-gpu-viv}/egl_directfb.pc (100%)
>  rename recipes-graphics/{gpu-viv-bin-mx6q/gpu-viv-bin-mx6q => imx-gpu-viv/imx-gpu-viv}/egl_linuxfb.pc (100%)
>  rename recipes-graphics/{gpu-viv-bin-mx6q/gpu-viv-bin-mx6q => imx-gpu-viv/imx-gpu-viv}/egl_wayland.pc (100%)
>  create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb
>  create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb
>
> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
> index 21e4738..9bfc247 100644
> --- a/conf/machine/include/imx-base.inc
> +++ b/conf/machine/include/imx-base.inc
> @@ -93,18 +93,18 @@ PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
>  PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
>
>  # mx6 GPU libraries
> -PREFERRED_PROVIDER_virtual/egl_mx6 ?= "gpu-viv-bin-mx6q"
> -PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "gpu-viv-bin-mx6q"
> -PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "gpu-viv-bin-mx6q"
> -PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "gpu-viv-bin-mx6q"
> +PREFERRED_PROVIDER_virtual/egl_mx6 ?= "imx-gpu-viv"
> +PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv"
> +PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv"
> +PREFERRED_PROVIDER_virtual/libgles1_mx6sx ?= "imx-gpu-viv"
>  PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa"
> -PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "gpu-viv-bin-mx6q"
> -PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "gpu-viv-bin-mx6q"
> -PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "gpu-viv-bin-mx6q"
> +PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv"
> +PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv"
> +PREFERRED_PROVIDER_virtual/libgles2_mx6sx ?= "imx-gpu-viv"
>  PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa"
> -PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "gpu-viv-bin-mx6q"
> -PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "gpu-viv-bin-mx6q"
> -PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "gpu-viv-bin-mx6q"
> +PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv"
> +PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv"
> +PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv"
>  PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa"

You should add virtual/libg2d here as well.

...

> --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
> +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
> @@ -1,17 +1,17 @@
...
> -S = "${WORKDIR}/${PN}-${@'${PV}'.replace('1.1.0', '1.1.0-beta')}"
> +S = "${WORKDIR}/${PN}-${PV}"

This is the default value, please drop the line.

>  PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
>         libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
>         libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
>         libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
> +       libgles3-mx6-dev \

What about the other libgles3 related libraries?

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