Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
On 2018年10月09日 09:53, Khem Raj wrote:
On Mon, Oct 8, 2018 at 6:47 PM ChenQi 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 in
order to avoid
// picking up khrplatform.h inclusion that's done in ANGLE.
#include
#endif
#include
#include
#if PLATFORM(IOS)
#import
#elif PLATFORM(MAC)
#include
#elif PLATFORM(WIN)
#include "OpenGLESShims.h"
#elif USE(LIBEPOXY)
// already included above.
#elif USE(OPENGL_ES_2)
#include
#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
OK, I will send V2 since webkitgtk is upgraded to 2.20.5
and the weston backport fix is obsolete since weston is upgraded to 5.0
//Hongxu
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
---
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@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
On Mon, Oct 8, 2018 at 6:47 PM ChenQi 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 in
> order to avoid
> // picking up khrplatform.h inclusion that's done in ANGLE.
> #include
> #endif
>
> #include
> #include
>
> #if PLATFORM(IOS)
> #import
> #elif PLATFORM(MAC)
> #include
> #elif PLATFORM(WIN)
> #include "OpenGLESShims.h"
> #elif USE(LIBEPOXY)
> // already included above.
> #elif USE(OPENGL_ES_2)
> #include
> #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
> > ---
> > 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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
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 in
order to avoid
// picking up khrplatform.h inclusion that's done in ANGLE.
#include
#endif
#include
#include
#if PLATFORM(IOS)
#import
#elif PLATFORM(MAC)
#include
#elif PLATFORM(WIN)
#include "OpenGLESShims.h"
#elif USE(LIBEPOXY)
// already included above.
#elif USE(OPENGL_ES_2)
#include
#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.
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
---
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@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
ping I think webkitgtk does require the 'opengl' distro feature. 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 --- 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@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
2018-09-04 15:29 GMT+02:00 Hongxu Jia : >>> They can't be built without opengl in DISTRO_FEATURES. >>> [snip] > I am afraid whether opengl or not, it always requires virtual/libql > just like Ubuntu/Fedora does. > > [Fedora webkitgtk.spec] > BuildRequires: mesa-libGL-devel > [Fedora webkitgtk.spec] > > [Ubuntu debian/control] > Build-Depends: libgl1-mesa-dev [!armel !armhf !arm64] > [Ubuntu debian/control] Fedora and Ubuntu have elected to enable opengl in their distros, that does not in itself mean it cannot be disabled. So please disable it, and inspect the source code for reasons it breaks the build. That header file you cited in particular is guarded by ENABLE_OPENGL conditional, which should be false when opengl is switched off. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
On 2018年09月03日 17:54, Alexander Kanavin wrote:
2018-09-03 11:35 GMT+02:00 Hongxu Jia :
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]
Apologies, but NAK.
Webkit recipe already has the necessary configuration to handle this:
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'x11', 'wayland' ,d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'webgl opengl', '' ,d)} \
PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
If disabling opengl does not work, then you should look closer into
why, instead of just requiring opengl to be present always.
I am afraid whether opengl or not, it always requires virtual/libql
just like Ubuntu/Fedora does.
[Fedora webkitgtk.spec]
BuildRequires: mesa-libGL-devel
[Fedora webkitgtk.spec]
[Ubuntu debian/control]
Build-Depends: libgl1-mesa-dev [!armel !armhf !arm64]
[Ubuntu debian/control]
I tried to move `virtual/libgl' from PACKAGECONFIG to DEPENDS,
but unfortunately, the provider of `virtual/libgl' -- mesa/mesa-ql,
they require `opengl 'or `vulkan' in distro features check.
//Hongxu
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
On Mon, Sep 3, 2018 at 2:35 AM 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] > whichever source file is including OpenGLShims.h should ensure that openGL is enabled before including this header. you can check that with #if USE(OPENGL) and keep in mind that webkit has enable_opengl which means both openGL and openGLES support but use_opengl and use_opengles are mutually exclusive. So if the component where its failing might be only supported with opengles2 then we need to ensure that we check for that before including the above header e.g. if !USE(OPENGL_ES_2) #include "OpenGLShims.h" #endif > Signed-off-by: Hongxu Jia > --- > 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 \ > -- > 2.7.4 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
2018-09-03 11:35 GMT+02:00 Hongxu Jia :
> 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]
Apologies, but NAK.
Webkit recipe already has the necessary configuration to handle this:
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'x11', 'wayland' ,d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'webgl opengl', '' ,d)} \
PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
If disabling opengl does not work, then you should look closer into
why, instead of just requiring opengl to be present always.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] webkitgtk: add opengl to REQUIRED_DISTRO_FEATURES
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 --- 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 \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
