[OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES

[Khem Raj]

On Mon, Oct 8, 2018 at 6:47 PM ChenQi <Qi.Chen at windriver.com> wrote:
>
> ping
>
> I think webkitgtk does require the 'opengl' distro feature.
>
> We have in mesa.inc:
> PACKAGECONFIG ??= ".... \
>                     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
> 'opengl egl gles gbm dri', '', d)} \
>                     ..."
>
> PROVIDES = " \
>      ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl',
> '', d)} \
>      ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1
> virtual/libgles2', '', d)} \
>      ..."
>
> And webkitgtk's source codes are like:
> #if USE(LIBEPOXY)
> // libepoxy headers have to be included before <ANGLE/ShaderLang.h> in
> order to avoid
> // picking up khrplatform.h inclusion that's done in ANGLE.
> #include <epoxy/gl.h>
> #endif
>
> #include <ANGLE/ShaderLang.h>
> #include <wtf/text/WTFString.h>
>
> #if PLATFORM(IOS)
> #import <OpenGLES/ES2/glext.h>
> #elif PLATFORM(MAC)
> #include <OpenGL/gl.h>
> #elif PLATFORM(WIN)
> #include "OpenGLESShims.h"
> #elif USE(LIBEPOXY)
> // <epoxy/gl.h> already included above.
> #elif USE(OPENGL_ES_2)
> #include <GLES2/gl2.h>
> #else
> #include "OpenGLShims.h"
> #endif
>
> And libepoxy is wrapper around libgl.
>
> So I think we can conclude 'opengl' is required distro feature for
> webkitgkt? At least this is the current situation in OE.

some sort of GL is needed yes. We indicate that with opengl losely
in OE

>
> Best Regards,
> Chen Qi
>
> On 09/03/2018 05:35 PM, Hongxu Jia wrote:
> > They can't be built without opengl in DISTRO_FEATURES.
> > [snip]
> > |webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
> > fatal error: GL/gl.h: No such file or directory
> > [snip]
> >
> > Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> > ---
> >   meta/recipes-sato/webkit/webkitgtk_2.20.3.bb | 3 +--
> >   1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
> > index a528c5d..93d74bb 100644
> > --- a/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
> > +++ b/meta/recipes-sato/webkit/webkitgtk_2.20.3.bb
> > @@ -29,8 +29,7 @@ SRC_URI[sha256sum] = "579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48
> >
> >   inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
> >
> > -# depends on libxt
> > -REQUIRED_DISTRO_FEATURES = "x11"
> > +REQUIRED_DISTRO_FEATURES = "x11 opengl"
> >
> >   DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
> >              gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core