[meta-freescale] [meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Eric Bénard]

Hi Andrei,

Le Sun, 13 Jan 2013 18:28:40 +0200,
Andrei Gherzan <andrei.gherzan at windriver.com> a écrit :

> * Split glx PACKAGECONFIG flag in glx and dri. The one from oe-core includes
> configs for dri and glx in the same PACKAGECONFIG[glx].
> * There is no libgl in imx6 graphic libraries so don't compile xserver with glx.
> * xserver driver for imx6 needs dri.h so compile xserver with dri for these
> machines
> 
> Signed-off-by: Andrei Gherzan <andrei.gherzan at windriver.com>
> ---
>  .../xorg-xserver/xserver-xorg_1.13.1.bbappend      |   15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>  create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> 
> diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> new file mode 100644
> index 0000000..c8b4a44
> --- /dev/null
> +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> @@ -0,0 +1,15 @@
> +PRINC := "${@int(PRINC) + 1}"
> +
> +# There are no libgl binaries for imx6 - don't compile with glx
> +PACKAGECONFIG_imx6qsabrelite := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
> +PACKAGECONFIG_imx6qsabreauto := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
> +# dri is needed for xf86-video-imxfb-vivante - xserver driver
> +PACKAGECONFIG_append_imx6qsabrelite = " dri"
> +PACKAGECONFIG_append_imx6qsabreauto = " dri"
> +
> +PACKAGECONFIG[dri] = "--enable-dri, \
> +                      --disable-dri, \
> +                      xf86driproto dri2proto"
> +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,\
> +                      --disable-glx,\
> +                      virtual/libgl"

in openembedded-core, dri (and glx) are enabled only if opengl is a
DISTRO_FEATURE so the choice to enable these feature is done at distro
level and not at machine level.
So to be consistent with that, you could split dri/glx but I think
dri should be enabled only when the distro has enabled opengl.

Note that we have the same problem in the qt4 recipes : in oe-core,
opengl is enabled ony if DISTRO_FEATURE has opengl, in meta-fsl-arm
opengl (and openvg) are enabled by default. I'm not sure a BSP should
force these settings if the distro doesn't want them.

Eric