qt5base: fix build when egl headers need a definition
PATCH 1/1 qt5base: fix build when egl headers need a definition
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.
--- package/qt5/qt5base/qt5base-egl-cflags.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/qt5/qt5base/qt5base-egl-cflags.patch
package/qt5/qt5base/qt5base-egl-cflags.patch new file +21 -0
@@ -0,0 +1,21 @@ +--- a/configure ++++ b/configure +@@ -5391,6 +5391,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
Signature · 1 line
1.7.10.4
PATCH 1/1 qt5base: fix build when egl headers need a definition
Dear Fatih A??c?,
package/qt5/qt5base/qt5base-egl-cflags.patch
Quoted 14 lines · Fatih A??c?
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? <[email protected]>--- package/qt5/qt5base/qt5base-egl-cflags.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/qt5/qt5base/qt5base-egl-cflags.patchpackage/qt5/qt5base/qt5base-egl-cflags.patch new file +0
-0
All patches should have a description, and a Signed-off-by line. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches.
Quoted 9 lines
package/qt5/qt5base/qt5base-egl-cflags.patch new file +8
-0@@ -0,0 +1,21 @@ +--- a/configure ++++ b/configure +@@ -5391,6 +5391,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
package/qt5/qt5base/qt5base-egl-cflags.patch line 18
Quoted 10 lines
package/qt5/qt5base/qt5base-egl-cflags.patch new file +10
-0+ 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
Shouldn't we have separate QMAKE_CFLAGS_EGL and QMAKE_CXXFLAGS_EGL ? Or are you following a pattern used in other places?
Thanks!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 qt5base: fix build when egl headers need a definition
Quoted 12 lines · Thomas Petazzoni
Dear Fatih A??c?,
Quoted 9 lines · Fatih A??c?
Quoted 9 lines
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?<[email protected]>--- package/qt5/qt5base/qt5base-egl-cflags.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/qt5/qt5base/qt5base-egl-cflags.patch
Quoted 7 lines
Quoted 5 lines
package/qt5/qt5base/qt5base-egl-cflags.patch
Quoted 5 lines
package/qt5/qt5base/qt5base-egl-cflags.patch new file +0
-0All patches should have a description, and a Signed-off-by line. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches.
Also, please give your patch a number so that the order in which
they're applied is predictable. At the moment this probably doesn't matter much, but it makes it easier later on to make sure a new patch will be applied after this one.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/1 qt5base: fix build when egl headers need a definition
Dear Arnout Vandecappelle,
Quoted 8 lines · Arnout Vandecappelle
Quoted 3 lines
Quoted 1 line
Quoted 1 line
+++
b/package/qt5/qt5base/qt5base-egl-cflags.patchAll patches should have a description, and a Signed-off-by line. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches.Also, please give your patch a number so that the order in which
they're applied is predictable. At the moment this probably doesn't matter much, but it makes it easier later on to make sure a new patch will be applied after this one.
Yeah, I also wanted to ask that, but there are existing patches for qt5base that doesn't comply with this, so I felt that it was maybe not appropriate to ask a contributor to fix our (my ?) mess :-)
But indeed, Fatih, as a preparation patch, you could add number to the existing patches, and then add your own.
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 qt5base: fix build when egl headers need a definition
Quoted 13 lines · Thomas Petazzoni
Dear Arnout Vandecappelle,
Quoted 8 lines · Arnout Vandecappelle
Quoted 3 lines
Quoted 1 line
Quoted 1 line
+++
b/package/qt5/qt5base/qt5base-egl-cflags.patchAll patches should have a description, and a Signed-off-by line. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches.Also, please give your patch a number so that the order in which
they're applied is predictable. At the moment this probably doesn't matter much, but it makes it easier later on to make sure a new patch will be applied after this one.
Quoted 6 lines
Yeah, I also wanted to ask that, but there are existing patches for qt5base that doesn't comply with this, so I felt that it was maybe not appropriate to ask a contributor to fix our (my ?) mess :-)
But indeed, Fatih, as a preparation patch, you could add number to the existing patches, and then add your own.
I didn't say to add a number to the existing patches. Since the order
doesn't matter for this patch, you can just give this patch a number and leave the other ones alone. This is particularly relevant since your qt5 version bumping patch removes some of the patches, so renaming would give a conflict...
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F