egl-x11.patch

   1 From f42186815187be1a0c5c0f9d6acc657872d3d533 Mon Sep 17 00:00:00 2001
   2 From: Laszlo Agocs <laszlo.agocs@qt.io>
   3 Date: Mon, 20 Sep 2021 11:16:09 +0200
   4 Subject: [PATCH] Cater for upstream changes in eglplatform.h
   5
   6 EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing
   7 code out there, including Qt:
   8 https://github.com/KhronosGroup/EGL-Registry/pull/130
   9
  10 Fix this by defining USE_X11 whenever we do not define EGL_NO_X11.
  11
  12 Fixes: QTBUG-96392
  13 Pick-to: 6.2
  14 Change-Id: If8b68caa8c9022477d87169ca2e2a0121a9313e0
  15 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
  16 (cherry picked from commit 4cc5428548cb8ab973e4b0281dd123d59bfaf6a0)
  17 ---
  18  src/gui/configure.json                        | 3 ++-
  19  src/platformsupport/eglconvenience/qt_egl_p.h | 6 +++++-
  20  2 files changed, 7 insertions(+), 2 deletions(-)
  21
  22 diff --git a/src/gui/configure.json b/src/gui/configure.json
  23 index 1f08795c57..12c95742d2 100644
  24 --- a/src/gui/configure.json
  25 +++ b/src/gui/configure.json
  26 @@ -834,7 +834,8 @@
  27                      "// embedded devices, are not intended to be used together with X. EGL support",
  28                      "// has to be disabled in plugins like xcb in this case since the native display,",
  29                      "// window and pixmap types will be different than what an X-based platform",
  30 -                    "// plugin would expect."
  31 +                    "// plugin would expect.",
  32 +                    "#define USE_X11"
  33                  ],
  34                  "include": [ "EGL/egl.h", "X11/Xlib.h" ],
  35                  "main": [
  36 diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h
  37 index bf37d07fd8..dbd42fb799 100644
  38 --- a/src/platformsupport/eglconvenience/qt_egl_p.h
  39 +++ b/src/platformsupport/eglconvenience/qt_egl_p.h
  40 @@ -61,7 +61,11 @@
  41  # if !defined(Q_OS_INTEGRITY)
  42  #  define WIN_INTERFACE_CUSTOM   // NV
  43  # endif // Q_OS_INTEGRITY
  44 -#endif  // QT_EGL_NO_X11
  45 +#else // QT_EGL_NO_X11
  46 +// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130
  47 +// that needs USE_X11 to be defined.
  48 +# define USE_X11
  49 +#endif
  50
  51  #ifdef QT_EGL_WAYLAND
  52  # define WAYLAND // NV
  53 --
  54 GitLab
  55