diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-12-18 15:08:53 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-31 16:24:22 +0100 |
| commit | bb6049fbe1808a1e33085740672e8fb7fc1bef20 (patch) | |
| tree | daba1dac685e090fcade80b7066e3ba1e6c40fae /recipes-qt/qt5/qtbase-git | |
| parent | 8b040e58b263741ea19e1826308e22ab3cae585b (diff) | |
qtbase: Make libraries build with cmake find gl(es) headers
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git')
| -rw-r--r-- | recipes-qt/qt5/qtbase-git/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase-git/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch new file mode 100644 index 00000000..6ea42bc5 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch @@ -0,0 +1,42 @@ +From f5df17e2a02cf67f3436b7fe640c6bf54ba93ad6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Thu, 18 Dec 2014 13:41:09 +0100 +Subject: [PATCH] Make Qt5GuiConfigExtras.cmake find gl(es) include dir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In configure QMAKE_INCDIR_OPENGL is set with pkg-config. Without +PKG_CONFIG_ALLOW_SYSTEM_CFLAGS set, pkg-config returns paths outside +/usr/include only (in my case /usr/include/libdrm). With NO_DEFAULT_PATH set +gl(es) include directories cannot be found. Cmake builds depending on +Qt5Gui error out with + +| Failed to find "GLES2/gl2.h" in "/usr/include/libdrm" + +Upstream-Status: submitted [1] + +[1] https://bugreports.qt-project.org/browse/QTBUG-43445 + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + src/gui/Qt5GuiConfigExtras.cmake.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 9a846d4..07869ef 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -57,9 +57,6 @@ set(Qt5Gui_OPENGL_LIBRARIES Qt5::Gui_GLESv2) + set(_GL_INCDIRS $$CMAKE_GL_INCDIRS) + find_path(_qt5gui_OPENGL_INCLUDE_DIR $$CMAKE_GL_HEADER_NAME + PATHS ${_GL_INCDIRS} +-!!IF !mac +- NO_DEFAULT_PATH +-!!ENDIF + ) + if (NOT _qt5gui_OPENGL_INCLUDE_DIR) + message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") +-- +1.8.3.1 + |