On Mon, Apr 05, 2021 at 03:39:27PM -0500, Gowtham Tammana wrote: > qtwebkit build is failing to set EGL_NO_X11 on platforms with no x11 > support causing below failure. > > ```{.package=qtwebkit .version=dunfell} > In file included from > tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/egl.h:39, > from > tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/git/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp:36: > tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/eglplatform.h:134:10: > fatal error: X11/Xlib.h: No such file or directory > 134 | #include <X11/Xlib.h> > | ^~~~~~~~~~~~ > compilation terminated. > ``` > > Setting up the flag EGL_NO_X11 when X11 target is disabled. > > Signed-off-by: Gowtham Tammana <g-tamm...@ti.com>
Reviewed-by: Denys Dmytriyenko <de...@konsulko.com> > --- > ...re-PlatformQt.cmake-Fix-no-x11-build.patch | 46 +++++++++++++++++++ > .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +- > 2 files changed, 48 insertions(+), 1 deletion(-) > create mode 100644 > meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch > > diff --git > a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch > > b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch > new file mode 100644 > index 00000000..c70b3dc0 > --- /dev/null > +++ > b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch > @@ -0,0 +1,46 @@ > +From 82b7ec12b768ba9de4b7a4ae71500a3de6574bfd Mon Sep 17 00:00:00 2001 > +From: Gowtham Tammana <g-tamm...@ti.com> > +Date: Thu, 1 Apr 2021 10:45:13 -0500 > +Subject: [PATCH] WebCore/PlatformQt.cmake: Fix no x11 build > + > +For platforms with no x11 support, egl package config sets up EGL_NO_X11 > +flag. However the build is not picking up this flag at the moment > +causing below build failure. > + > +```{.package=qtwebkit .version=dunfell} > +In file included from > +tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/egl.h:39, > + from > tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/git/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp:36: > +tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/eglplatform.h:134:10: > fatal error: X11/Xlib.h: No such file or directory > + 134 | #include <X11/Xlib.h> > + | ^~~~~~~~~~~~ > +compilation terminated. > +``` > + > +Set this flag explicitly when there is no X11 target enable. > + > +Upstream-Status: Pending > + > +Signed-off-by: Gowtham Tammana <g-tamm...@ti.com> > +--- > + Source/WebCore/PlatformQt.cmake | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/Source/WebCore/PlatformQt.cmake > b/Source/WebCore/PlatformQt.cmake > +index 99c625dc3..375d28a47 100644 > +--- a/Source/WebCore/PlatformQt.cmake > ++++ b/Source/WebCore/PlatformQt.cmake > +@@ -350,6 +350,10 @@ if (ENABLE_OPENGL) > + ${Qt5Gui_EGL_LIBRARIES} > + ${Qt5Gui_OPENGL_LIBRARIES} > + ) > ++ if (NOT ENABLE_X11_TARGET) > ++ # EGL definitions are not getting detected. Add the EGL_NO_X11 > flag. > ++ add_definitions("-DEGL_NO_X11") > ++ endif () > + else () > + list(APPEND WebCore_SOURCES > + platform/graphics/opengl/Extensions3DOpenGL.cpp > +-- > +2.31.1 > + > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend > b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend > index 75213487..308f3f25 100644 > --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend > @@ -6,9 +6,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > SRC_URI += " \ > file://GraphicsSurfaceGL_NoX.cpp.patch \ > + file://0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch \ > " > > -PR_append = ".arago7" > +PR_append = ".arago8" > > EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release" > > -- > 2.31.1 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > -- Regards, Denys Dmytriyenko <de...@denix.org> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964 _______________________________________________ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago