qtbase: Make libraries build with cmake find gl(es) headers

(From meta-qt5 rev: bb6049fbe1808a1e33085740672e8fb7fc1bef20)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/meta-qt5/recipes-qt/qt5/qtbase-git/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/meta-qt5/recipes-qt/qt5/qtbase-git/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
new file mode 100644 (file)
index 0000000..6ea42bc
--- /dev/null
+++ b/meta-qt5/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
+

diff --git a/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc
index c37134f..5b2c08c 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/meta-qt5/recipes-qt/qt5/qtbase.inc
@@ -12,6 +12,7 @@ SRC_URI += "\
     file://0008-configure-bump-path-length-from-256-to-512-character.patch \
     file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
     file://0010-QOpenGLPaintDevice-sub-area-support.patch \
+    file://0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch \
 "
 
 # specific for qtbase

diff --git a/meta-qt5/recipes-qt/qt5/qtbase/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/meta-qt5/recipes-qt/qt5/qtbase/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch
new file mode 100644 (file)
index 0000000..6ea42bc
--- /dev/null
+++ b/meta-qt5/recipes-qt/qt5/qtbase/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
+