* [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition
@ 2013-09-18 11:17 Fatih Aşıcı
2013-09-18 16:55 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Fatih Aşıcı @ 2013-09-18 11:17 UTC (permalink / raw)
To: buildroot
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>
---
package/qt5/qt5base/qt5base-egl-cflags.patch | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 package/qt5/qt5base/qt5base-egl-cflags.patch
diff --git a/package/qt5/qt5base/qt5base-egl-cflags.patch b/package/qt5/qt5base/qt5base-egl-cflags.patch
new file mode 100644
index 0000000..7f9d779
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-egl-cflags.patch
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition
2013-09-18 11:17 [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition Fatih Aşıcı
@ 2013-09-18 16:55 ` Thomas Petazzoni
2013-09-18 21:28 ` Arnout Vandecappelle
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2013-09-18 16:55 UTC (permalink / raw)
To: buildroot
Dear Fatih A??c?,
On Wed, 18 Sep 2013 14:17:51 +0300, Fatih A??c? wrote:
> 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>
> ---
> package/qt5/qt5base/qt5base-egl-cflags.patch | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
> create mode 100644 package/qt5/qt5base/qt5base-egl-cflags.patch
>
> diff --git a/package/qt5/qt5base/qt5base-egl-cflags.patch b/package/qt5/qt5base/qt5base-egl-cflags.patch
> new file mode 100644
> index 0000000..7f9d779
> --- /dev/null
> +++ b/package/qt5/qt5base/qt5base-egl-cflags.patch
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.
> @@ -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
Shouldn't we have separate QMAKE_CFLAGS_EGL and QMAKE_CXXFLAGS_EGL ? Or
are you following a pattern used in other places?
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition
2013-09-18 16:55 ` Thomas Petazzoni
@ 2013-09-18 21:28 ` Arnout Vandecappelle
2013-09-19 4:12 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2013-09-18 21:28 UTC (permalink / raw)
To: buildroot
On 18/09/13 18:55, Thomas Petazzoni wrote:
> Dear Fatih A??c?,
>
> On Wed, 18 Sep 2013 14:17:51 +0300, Fatih A??c? wrote:
>> >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>
>> >---
>> > package/qt5/qt5base/qt5base-egl-cflags.patch | 21 +++++++++++++++++++++
>> > 1 file changed, 21 insertions(+)
>> > create mode 100644 package/qt5/qt5base/qt5base-egl-cflags.patch
>> >
>> >diff --git a/package/qt5/qt5base/qt5base-egl-cflags.patch b/package/qt5/qt5base/qt5base-egl-cflags.patch
>> >new file mode 100644
>> >index 0000000..7f9d779
>> >--- /dev/null
>> >+++ b/package/qt5/qt5base/qt5base-egl-cflags.patch
> 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.
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
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition
2013-09-18 21:28 ` Arnout Vandecappelle
@ 2013-09-19 4:12 ` Thomas Petazzoni
2013-09-19 17:36 ` Arnout Vandecappelle
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2013-09-19 4:12 UTC (permalink / raw)
To: buildroot
Dear Arnout Vandecappelle,
On Wed, 18 Sep 2013 23:28:03 +0200, Arnout Vandecappelle wrote:
> >> >+++ b/package/qt5/qt5base/qt5base-egl-cflags.patch
> > 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.
>
> 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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition
2013-09-19 4:12 ` Thomas Petazzoni
@ 2013-09-19 17:36 ` Arnout Vandecappelle
0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2013-09-19 17:36 UTC (permalink / raw)
To: buildroot
On 19/09/13 06:12, Thomas Petazzoni wrote:
> Dear Arnout Vandecappelle,
>
> On Wed, 18 Sep 2013 23:28:03 +0200, Arnout Vandecappelle wrote:
>
>>>>> +++ b/package/qt5/qt5base/qt5base-egl-cflags.patch
>>> 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.
>>
>> 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.
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
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition
@ 2013-09-18 18:48 Fatih Aşıcı
0 siblings, 0 replies; 6+ messages in thread
From: Fatih Aşıcı @ 2013-09-18 18:48 UTC (permalink / raw)
To: buildroot
[This time, sent to the list]
On Wednesday 18 September 2013 19:55:39 you wrote:
> > @@ -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
>
> Shouldn't we have separate QMAKE_CFLAGS_EGL and QMAKE_CXXFLAGS_EGL ? Or
> are you following a pattern used in other places?
Setting only QMAKE_CFLAGS_EGL did not fix the build. Platform plugins are
written in C++ and the build system honors CXXFLAGS only. I saw the same
assignments in other .prf files, too.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-09-19 17:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-18 11:17 [Buildroot] [PATCH] qt5base: fix build when egl headers need a definition Fatih Aşıcı
2013-09-18 16:55 ` Thomas Petazzoni
2013-09-18 21:28 ` Arnout Vandecappelle
2013-09-19 4:12 ` Thomas Petazzoni
2013-09-19 17:36 ` Arnout Vandecappelle
-- strict thread matches above, loose matches on Subject: below --
2013-09-18 18:48 Fatih Aşıcı
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox