package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch

   1 From 87c9c18fad02744238336a6cf1ce70d3ec2c89c2 Mon Sep 17 00:00:00 2001
   2 From: Bernd Kuhls <bernd.kuhls@t-online.de>
   3 Date: Sat, 11 Jun 2016 17:03:07 +0200
   4 Subject: [PATCH 1/1] OpenGL/EGL: Avoid X11 header collision
   5
   6 Including X11 headers via EGL/egl.h leads to a collision of defines
   7 between Qt and X11. To fix this qt5 added
   8   DEFINES += MESA_EGL_NO_X11_HEADERS
   9 in various files:
  10
  11 https://github.com/qtproject/qtbase/blob/dev/src/platformsupport/eglconvenience/eglconvenience.pri#L19
  12 https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/minimalegl/minimalegl.pro#L10
  13 https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro#L6
  14 [...]
  15
  16 This patch fixes a similar compile error in qt4:
  17 http://autobuild.buildroot.net/results/9b0/9b0ed92984eead89d148eaa71aff6e2f1e117837/
  18 http://autobuild.buildroot.org/results/4fd/4fd57553336d36439fab32a7221fc8639758e887/
  19 http://autobuild.buildroot.org/results/5cb/5cb8072f8220f7203fa79936eedcc43eab53ec66/
  20
  21 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  22 (patch not sent upstream because qt4 branch is closed:
  23  http://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/)
  24 ---
  25
  26  src/gui/egl/egl.pri   | 3 +++
  27  src/opengl/opengl.pro | 3 +++
  28  2 files changed, 6 insertions(+)
  29
  30 diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
  31 index 8e8664c..715ffd7 100644
  32 --- a/src/gui/egl/egl.pri
  33 +++ b/src/gui/egl/egl.pri
  34 @@ -22,6 +22,9 @@ contains(QT_CONFIG, egl): {
  35              !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
  36          }
  37
  38 +       # Avoid X11 header collision
  39 +       DEFINES += MESA_EGL_NO_X11_HEADERS
  40 +
  41         wince*: SOURCES += egl/qegl_wince.cpp
  42
  43         unix {
  44 diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
  45 index ce1a5d2..65b1031 100644
  46 --- a/src/opengl/opengl.pro
  47 +++ b/src/opengl/opengl.pro
  48 @@ -149,6 +149,9 @@ embedded {
  49                 qglwindowsurface_qws_p.h \
  50                 qgl_egl_p.h
  51
  52 +    # Avoid X11 header collision
  53 +    DEFINES += MESA_EGL_NO_X11_HEADERS
  54 +
  55      contains(QT_CONFIG, fontconfig) {
  56          include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
  57      } else {
  58 --
  59 2.8.1
  60