[OE-core] [PATCH 1/1] virtual/libgl: switch back to mesa-xlib for qemuarm/qemumips

[Richard Purdie]

On Wed, 2012-03-28 at 12:58 +0200, Martin Jansa wrote:
> On Wed, Mar 28, 2012 at 06:10:26PM +0800, edwin.zhai at intel.com wrote:
> > From: Martin Jansa <martin.jansa at gmail.com>
> 
> I don't think I've ever sent something like this.
> Actually I've sent patch:
> default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
> * to match default virtual/xserver
> 
> And this just reverts it + adds suspicious COMPATIBLE_MACHINE..
> 
> Cheers,
> 
> > Still need mesa-xlib for emulation of GLX interface on qemuarm/qemumips, where
> > mesa-dri doesn't work for pure qemu emulator.
> > 
> > [YOCTO #2066] fixed.
> > ---
> >  meta/conf/distro/include/default-providers.inc |    2 +-
> >  meta/recipes-graphics/mesa/mesa-xlib.inc       |    2 ++
> >  2 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> > index 54c90d3..3850a2f 100644
> > --- a/meta/conf/distro/include/default-providers.inc
> > +++ b/meta/conf/distro/include/default-providers.inc
> > @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
> >  PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
> >  PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> >  PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> > -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
> > +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
> >  PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
> >  PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
> >  PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > index b720e14..c431eab 100644
> > --- a/meta/recipes-graphics/mesa/mesa-xlib.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
> > @@ -1 +1,3 @@
> >  EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"
> > +
> > +COMPATIBLE_MACHINE = "(qemuarm|qemumips|qemuppc)"


I agree this COMPATIBLE_MACHINE is wrong.

I'd suggest we need to change both xserver-org to xserver-xorg-lite and
libgl to meta-xlib and then this might work better and address Martin's
concerns too.

I'd like to understand why dri can't work under qemu too though.

Cheers,

Richard