summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 11:12:46 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 18:28:08 +0100
commit4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (patch)
tree8df0894830a43956bbf1c629dc3938f3f41ca10a /recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
parentfa521467249da68e89c762a178550c8109bccae3 (diff)
downloadmeta-qt5-4d4a34c5d29ef7b730eb9da87b39f91352ef66fa.tar.gz
recipes: Refresh patches to match git recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch42
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..188ae157
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
@@ -0,0 +1,42 @@
1From d6158c2cb6ce64af531246636c3b2adb35afeb72 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Thu, 18 Dec 2014 13:41:09 +0100
4Subject: [PATCH 10/13] Make Qt5GuiConfigExtras.cmake find gl(es) include dir
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9In configure QMAKE_INCDIR_OPENGL is set with pkg-config. Without
10PKG_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
12gl(es) include directories cannot be found. Cmake builds depending on
13Qt5Gui error out with
14
15| Failed to find "GLES2/gl2.h" in "/usr/include/libdrm"
16
17Upstream-Status: submitted [1]
18
19[1] https://bugreports.qt-project.org/browse/QTBUG-43445
20
21Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
22---
23 src/gui/Qt5GuiConfigExtras.cmake.in | 3 ---
24 1 file changed, 3 deletions(-)
25
26diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
27index 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--
412.3.1
42