qt5multimedia: fix plugins videonode egl x11 header related compile failure

Hello,

package/qt5/qt5multimedia/5.8.0/0001-plugins-videonode-egl-fix-x11-header-related-compile.patch line 24

Quoted 11 lines · Peter Seiderer

package/qt5/qt5multimedia/5.8.0/0001-plugins-videonode-egl-fix-x11-header-related-compile.patch new file +11 -0

+diff --git a/src/plugins/videonode/egl/egl.pro b/src/plugins/videonode/egl/egl.pro
+index 7151123..08ec149 100644
+--- a/src/plugins/videonode/egl/egl.pro
++++ b/src/plugins/videonode/egl/egl.pro
+@@ -3,6 +3,9 @@ TARGET = eglvideonode
+ QT += multimedia-private qtmultimediaquicktools-private
+ CONFIG += egl
+ 
++# Avoid X11 header collision, use generic EGL native types
++DEFINES += MESA_EGL_NO_X11_HEADERS
++

I am not really convinced by this patch. Indeed, I believe it should be the OpenGL providers that define this constant when needed. If you look at the config that generated the build failure you're trying to fix
(http://autobuild.buildroot.net/results/364/364a76bbf90251f9cae2abd3ef2e382758eae538),
you'll see that the OpenGL provider used is mali-t76x. However, package/mali-t76x/glesv2.pc contains:

Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS

So, I would expect that Qt5 should not need to redefine it again. Obviously, what worries me is that fixing Qt5 will fix just Qt5, and not any other package using the same OpenGL provider.

What do you think?

Thomas

Same fixing pattern as for qt5base (and for qtbase accepted upstream, see e.g. [1]),

but in general your are right, honor the given provider provided flags would be the better solution...maybe something as suggested on the yocto meta-freescale mailing list will work, see [2], [3]: 'egl.prf: Fix build error when egl headers need platform definition'?

Hello,

Quoted 1 line · Peter Seiderer

Same fixing pattern as for qt5base (and for qtbase accepted upstream, see e.g. [1]),

Well, [1] is about adding QT_EGL_NO_X11, which is a QT definition. It is very different from MESA_EGL_NO_X11_HEADERS, which is an OpenGL-level definition.

Quoted 5 lines

but in general your are right, honor the given provider provided flags would be the better solution...maybe something as suggested on the yocto meta-freescale mailing list will work, see [2], [3]: 'egl.prf: Fix build error when egl headers need platform definition'?

I'm not sure I fully understand those patches, but apparently they use more pkg-config flags from OpenGL, which is exactly the approach I suggest to investigate indeed.

BTW, the same thing should be done for Qt instead of package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch.

Best regards,

Thomas

Quoted 9 lines · Thomas Petazzoni

Hello,

Quoted 1 line · Peter Seiderer

Same fixing pattern as for qt5base (and for qtbase accepted upstream, see e.g. [1]),

Well, [1] is about adding QT_EGL_NO_X11, which is a QT definition. It is very different from MESA_EGL_NO_X11_HEADERS, which is an OpenGL-level definition.

The missing link is in file src/platformsupport/eglconvenience/qt_egl_p.h line 54ff:

54 #ifdef QT_EGL_NO_X11
55 # define MESA_EGL_NO_X11_HEADERS // MESA
56 # define WIN_INTERFACE_CUSTOM // NV
57 #endif // QT_EGL_NO_X11
58
59 #ifdef QT_EGL_WAYLAND
60 # define WAYLAND // NV
61 #endif // QT_EGL_WAYLAND
62
63 #include <EGL/egl.h>
64 #include <EGL/eglext.h>

QT_EGL_NO_X11 forces MESA_EGL_NO_X11_HEADERS before the egl headers are included...

Hello,

Quoted 1 line · Peter Seiderer

Same fixing pattern as for qt5base (and for qtbase accepted upstream, see e.g. [1]),

Well, [1] is about adding QT_EGL_NO_X11, which is a QT definition. It is very different from MESA_EGL_NO_X11_HEADERS, which is an OpenGL-level definition.

Quoted 4 lines

but in general your are right, honor the given provider provided flags would be the better solution...maybe something as suggested on the yocto meta-freescale mailing list will work, see [2], [3]: 'egl.prf: Fix build error when egl headers need platform definition'?

I'm not sure I fully understand those patches, but apparently they use more pkg-config flags from OpenGL, which is exactly the approach I suggest to investigate indeed.

BTW, the same thing should be done for Qt instead of package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch.

Best regards,

Thomas

Quoted 4 lines

Quoted 4 lines

but in general your are right, honor the given provider provided flags would be the better solution...maybe something as suggested on the yocto meta-freescale mailing list will work, see [2], [3]: 'egl.prf: Fix build error when egl headers need platform definition'?

And two links to the upstream suggestion/discussion:

- QTBUG-61712: qtbase: A build error was occurring due to missing EGL configuration
https://bugreports.qt.io/browse/QTBUG-61712

- Patch: qtbase: Fix build error when using EGL
https://codereview.qt-project.org/#/c/198906/