From 6f21eefbe98c8c1f367aebbe013ebe549a5a9fe2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Thu, 19 Sep 2013 10:01:43 +0300 Subject: [PATCH] qt5base: fix build when egl headers need a definition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The build with gpu-viv-bin-mx6q libraries was broken since it wasn't using "-DEGL_API_FB=1" flag which is found in egl.pc. Signed-off-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- .../qt5/qt5base/qt5base-0004-egl-cflags.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/qt5/qt5base/qt5base-0004-egl-cflags.patch diff --git a/package/qt5/qt5base/qt5base-0004-egl-cflags.patch b/package/qt5/qt5base/qt5base-0004-egl-cflags.patch new file mode 100644 index 0000000000..bff82a8080 --- /dev/null +++ b/package/qt5/qt5base/qt5base-0004-egl-cflags.patch @@ -0,0 +1,28 @@ +egl.prf: Append egl CFLAGS to QMAKE_C[XX]FLAGS + +Projects including egl in their config (e.g. with CONFIG += egl) cannot get +egl CFLAGS without this. + +Signed-off-by: Fatih Aşıcı + +--- a/configure ++++ b/configure +@@ -4934,6 +4934,7 @@ + QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` + QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" + QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" ++ QMakeVar set QMAKE_CFLAGS_EGL "$QMAKE_CFLAGS_EGL" + fi # detect EGL support + if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then + CFG_EGL=yes +--- a/mkspecs/features/egl.prf ++++ b/mkspecs/features/egl.prf +@@ -14,6 +14,8 @@ + } else { + INCLUDEPATH += $$QMAKE_INCDIR_EGL + LIBS_PRIVATE += $$QMAKE_LIBS_EGL ++ QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL ++ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL + LIBS += $$QMAKE_LFLAGS_EGL + for(p, QMAKE_LIBDIR_EGL) { + exists($$p):LIBS_PRIVATE += -L$$p -- 2.30.2