Patchwork [v3] qt5base: fix build when egl headers need a definition

login
register
mail settings
Submitter Fatih Aşıcı
Date Sept. 19, 2013, 7:01 a.m.
Message ID <1379574103-9992-1-git-send-email-fatih.asici@gmail.com>
Download mbox | patch
Permalink /patch/275885/
State Accepted
Commit 6f21eefbe98c8c1f367aebbe013ebe549a5a9fe2
Headers show

Comments

Fatih Aşıcı - Sept. 19, 2013, 7:01 a.m.
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ı <fatih.asici@gmail.com>
---
Changes v2 -> v3:
  - Give a number to the patch file (suggested by Arnout Vandecappelle and
    Thomas Petazzoni)

Changes v1 -> v2:
  - Add description and Signed-off-by line to the patch (suggested by
      Thomas Petazzoni)

 package/qt5/qt5base/qt5base-0004-egl-cflags.patch |   28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/qt5/qt5base/qt5base-0004-egl-cflags.patch
Peter Korsgaard - Oct. 2, 2013, 8:53 p.m.
>>>>> "Fatih" == Fatih Aşıcı <fatih.asici@gmail.com> writes:

 Fatih> The build with gpu-viv-bin-mx6q libraries was broken since it wasn't
 Fatih> using "-DEGL_API_FB=1" flag which is found in egl.pc.

Committed, thanks. Don't forget to send the patch upstream.

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 0000000..bff82a8
--- /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ı <fatih.asici@gmail.com>
+
+--- 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