diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch new file mode 100644 index 00000000..f2eed114 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | From 16a55457ce31d467cb331ab8e94b672757ef42b9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 | ||
| 4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | In configure QMAKE_INCDIR_OPENGL is set with pkg-config. Without | ||
| 10 | PKG_CONFIG_ALLOW_SYSTEM_CFLAGS set, pkg-config returns paths outside | ||
| 11 | /usr/include only (in my case /usr/include/libdrm). With NO_DEFAULT_PATH set | ||
| 12 | gl(es) include directories cannot be found. Cmake builds depending on | ||
| 13 | Qt5Gui error out with | ||
| 14 | |||
| 15 | | Failed to find "GLES2/gl2.h" in "/usr/include/libdrm" | ||
| 16 | |||
| 17 | Upstream-Status: submitted [1] | ||
| 18 | |||
| 19 | [1] https://bugreports.qt-project.org/browse/QTBUG-43445 | ||
| 20 | |||
| 21 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 22 | --- | ||
| 23 | src/gui/Qt5GuiConfigExtras.cmake.in | 3 --- | ||
| 24 | 1 file changed, 3 deletions(-) | ||
| 25 | |||
| 26 | diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in | ||
| 27 | index 9a846d4..07869ef 100644 | ||
| 28 | --- a/src/gui/Qt5GuiConfigExtras.cmake.in | ||
| 29 | +++ b/src/gui/Qt5GuiConfigExtras.cmake.in | ||
| 30 | @@ -57,9 +57,6 @@ set(Qt5Gui_OPENGL_LIBRARIES Qt5::Gui_GLESv2) | ||
| 31 | set(_GL_INCDIRS $$CMAKE_GL_INCDIRS) | ||
| 32 | find_path(_qt5gui_OPENGL_INCLUDE_DIR $$CMAKE_GL_HEADER_NAME | ||
| 33 | PATHS ${_GL_INCDIRS} | ||
| 34 | -!!IF !mac | ||
| 35 | - NO_DEFAULT_PATH | ||
| 36 | -!!ENDIF | ||
| 37 | ) | ||
| 38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) | ||
| 39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") | ||
| 40 | -- | ||
| 41 | 2.3.5 | ||
| 42 | |||
