[poky] [PATCH] meta-emenlow: unset preferred providers for virtual/libgles[12]

[Tom Zanussi]

On Thu, 2012-08-30 at 15:19 +0100, Ross Burton wrote:
> The recent changes to enable GLES/EGL in mesa-dri have caused emenlow to fail:
> 
> ERROR: Trying to resolve runtime dependency libglu resulted in conflicting PREFERRED_PROVIDER entries being found.
> The providers found were: ['/srv/home/pokybuild/yocto-autobuilder/yocto-slave/emenlow/build/yocto/meta-intel/meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb', '/srv/home/pokybuild/yocto-autobuilder/yocto-slave/emenlow/build/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb']
> The PREFERRED_PROVIDER entries resulting in this conflict were: ['PREFERRED_PROVIDER_mesa-dri = xpsb-glx', 'PREFERRED_PROVIDER_virtual/libgles1 = mesa-dri']
> 
> Because emenlow's xpsb-glx contains mesa, it needs to entirely replace
> mesa-dri. We'd normally set virtual/libgles1 and virtual/libgles2 to xpsb-glx
> but these drivers don't build the GLES libraries so that would be a lie.
> 
> So, unset the preferred provider entries so that bitbake doesn't look at
> mesa-dri at all.

Pulled into meta-intel/master, thanks.

Tom

> ---
>  meta-emenlow/conf/machine/emenlow.conf |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
> index afb3866..65dcd5a 100644
> --- a/meta-emenlow/conf/machine/emenlow.conf
> +++ b/meta-emenlow/conf/machine/emenlow.conf
> @@ -13,6 +13,8 @@ PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
>  PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
>  PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
>  PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
> +PREFERRED_PROVIDER_virtual/libgles1 = ""
> +PREFERRED_PROVIDER_virtual/libgles2 = ""
>  PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
>  PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
>  PREFERRED_PROVIDER_mesa-dri = "xpsb-glx"