[OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements

[Adrian Bunk]

On Mon, Feb 24, 2020 at 12:46:35PM +0200, Adrian Bunk wrote:
> On Mon, Feb 24, 2020 at 09:17:56AM +0000, Richard Purdie wrote:
> > On Sun, 2020-02-23 at 20:29 +0200, Adrian Bunk wrote:
> > > opengl is optional.
> > > x11 can be replaced with wayland.
> > > 
> > > Signed-off-by: Adrian Bunk <bunk at stusta.de>
> > > ---
> > >  meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
> > > index a48a976f94..51fba94964 100644
> > > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
> > > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
> > > @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993
> > >  
> > >  inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
> > >  
> > > -REQUIRED_DISTRO_FEATURES = "x11 opengl"
> > > +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> > >  
> > >  CVE_PRODUCT = "webkitgtk webkitgtk\+"
> > 
> > The autobuilder no-x11 build seems unhappy with this patch series
> > unfortunately :(
> > 
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1616
> 
> Sorry for that, I did not test a wayland-only build of webkitgtk.
> 
> I'll take care of that this evening, until then please drop either this 
> first patch or the whole series.

OK, the short-term solution is to drop the first patch.

The original failure is easy to fix (I'll send a patch that moves the 
X libraries from DEPENDS to the x11 config), but the next one is not:

Alexander, wayland support in webkitgtk requires mesa built with x11 
support (otherwise gl.pc is not available).

cu
Adrian