qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
PATCH 1/1 qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
Update the already existing fix for EGL/X11 header issue to fix an additional problem encountered on my system where I had compile errors in qeglplatformscreen.cpp. The problem was related to the wrong order of includes. The X11 headers must always be included last, as indicated in
http://lists.qt-project.org/pipermail/development/2013-March/010511.html
I decided instead of adding a new patch to update the existing patch, because it is an additional fix for the same problem. If you don't agree I am happy to submit a seperate patch.
This version is updated as suggested by Arnout.
--- package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
package/qt5/qt5base/0003-xcb-egl-fixes.patch +23 -2
@@ -1,11 +1,17 @@ -The vivante headers pull in X11 defines which break eglconvenience +Some EGL headers pull in X11 defines which break eglconvenience * Adds a missing include to qeglplatformcontext.cpp * Fix namespace collision on CursorShape, pulled in from X11/X.h * Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use +* Reorder includes to have the X11-header the last include + +Based on patch from Yocto project and buildroot patch from +Jerome Pouiller <[email protected]> +Updated to fix issue in qeglplatformscreen (reorder includes, see also +http://lists.qt-project.org/pipermail/development/2013-March/010511.html) -[based on patch from Yocto project] Signed-off-by: J?r?me Pouiller <[email protected]> +Signed-off-by: Marc Andre <[email protected]> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
@@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200 ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200 +@@ -31,11 +31,11 @@ + ** + ****************************************************************************/ + +-#include "qeglplatformscreen_p.h" +-#include "qeglplatformwindow_p.h" + #include <QtGui/qwindow.h> + #include <qpa/qwindowsysteminterface.h> + #include <QtPlatformSupport/private/qopenglcompositor_p.h> ++#include "qeglplatformscreen_p.h" ++#include "qeglplatformwindow_p.h" + + QT_BEGIN_NAMESPACE
Signature · 1 line
1.9.1
PATCH 1/1 qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
Dear Marc Andre,
Quoted 6 lines · Marc Andre
Update the already existing fix for EGL/X11 header issue to fix an additional problem encountered on my system where I had compile errors in qeglplatformscreen.cpp. The problem was related to the wrong order of includes. The X11 headers must always be included last, as indicated in
http://lists.qt-project.org/pipermail/development/2013-March/010511.html
I have seen that message in the mailing list and Thiago says:
"Please reorder the includes in that file. The X11 includes must *always* be the last include in the .cpp. If you can, submit that fix to codereview.qt-project.org."
Have you submitted that fix to codereview.qt-project.org? It would be good to fix it upstream.
Quoted 20 lines
I decided instead of adding a new patch to update the existing patch, because it is an additional fix for the same problem. If you don't agree I am happy to submit a seperate patch.
This version is updated as suggested by Arnout.
Signed-off-by Marc Andre <[email protected]>--- package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)package/qt5/qt5base/0003-xcb-egl-fixes.patch +1
-1@@ -1,11 +1,17 @@ -The vivante headers pull in X11 defines which break eglconvenience +Some EGL headers pull in X11 defines which break eglconvenience * Adds a missing include to qeglplatformcontext.cpp
package/qt5/qt5base/0003-xcb-egl-fixes.patch line 7
Quoted 10 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch +6
-1* Fix namespace collision on CursorShape, pulled in from X11/X.h * Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use +* Reorder includes to have the X11-header the last include + +Based on patch from Yocto project and buildroot patch from +Jerome Pouiller <[email protected]> +Updated to fix issue in qeglplatformscreen (reorder includes, see also +http://lists.qt-project.org/pipermail/development/2013-March/010511.html) -[based on patch from Yocto project]
I'm not sure if this is correct. Yes, you are modifying the patch and adding new stuff, but the rest is still based on Yocto Project's patch. I think it should stay, or at least say something like:
[part of it based on patch from Yocto project]
Quoted 16 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch +7
-0Signed-off-by: J?r?me Pouiller <[email protected]> +Signed-off-by: Marc Andre <[email protected]> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri@@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200 ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200 +@@ -31,11 +31,11 @@ + ** + ****************************************************************************/ +
package/qt5/qt5base/0003-xcb-egl-fixes.patch diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl · line 85
Quoted 10 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch +9
-0+-#include "qeglplatformscreen_p.h" +-#include "qeglplatformwindow_p.h" + #include <QtGui/qwindow.h> + #include <qpa/qwindowsysteminterface.h> + #include <QtPlatformSupport/private/qopenglcompositor_p.h> ++#include "qeglplatformscreen_p.h" ++#include "qeglplatformwindow_p.h" + + QT_BEGIN_NAMESPACE
Regards,
Vincent.
PATCH 1/1 qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
Hi Vincente
Quoted 9 lines · Vicente Olivert Riera
Dear Marc Andre,
Quoted 6 lines · Marc Andre
Update the already existing fix for EGL/X11 header issue to fix an additional problem encountered on my system where I had compile errors in qeglplatformscreen.cpp. The problem was related to the wrong order of includes. The X11 headers must always be included last, as indicated in
http://lists.qt-project.org/pipermail/development/2013-March/010511.html
Quoted 8 lines
I have seen that message in the mailing list and Thiago says:
"Please reorder the includes in that file. The X11 includes must *always* be the last include in the .cpp. If you can, submit that fix to codereview.qt-project.org."
Have you submitted that fix to codereview.qt-project.org? It would be good to fix it upstream.
I did consider it, but as long as the the other part of the 0003-xcb-egl-fixes.patch isn't fixed in the upstream project fixing this doesn't make too much sense. I will certainly submit, but I would appreciate to fix it in buildroot until qt5 is fixed.
I will submit the full 0003-xcb-egl-fixes.patch to qt.
Quoted 29 lines
Quoted 29 lines
I decided instead of adding a new patch to update the existing patch, because it is an additional fix for the same problem. If you don't agree I am happy to submit a seperate patch.
This version is updated as suggested by Arnout.
Signed-off-by Marc Andre <[email protected]>--- package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)package/qt5/qt5base/0003-xcb-egl-fixes.patch +7
-1@@ -1,11 +1,17 @@ -The vivante headers pull in X11 defines which break eglconvenience +Some EGL headers pull in X11 defines which break eglconvenience * Adds a missing include to qeglplatformcontext.cpp * Fix namespace collision on CursorShape, pulled in from X11/X.h * Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use +* Reorder includes to have the X11-header the last include + +Based on patch from Yocto project and buildroot patch from +Jerome Pouiller <[email protected]> +Updated to fix issue in qeglplatformscreen (reorder includes, see also +http://lists.qt-project.org/pipermail/development/2013-March/010511.html)
Quoted 6 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch line 7
Quoted 1 line
package/qt5/qt5base/0003-xcb-egl-fixes.patch +0
-1-[based on patch from Yocto project]I'm not sure if this is correct. Yes, you are modifying the patch and adding new stuff, but the rest is still based on Yocto Project's patch. I think it should stay, or at least say something like:
[part of it based on patch from Yocto project]
It is in, see 3 lines higher: "Based on patch from Yocto project and builroot patch from Jerome"
Quoted 29 lines
Quoted 17 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch +7
-0Signed-off-by: J?r?me Pouiller <[email protected]> +Signed-off-by: Marc Andre <[email protected]> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri@@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200 ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200 +@@ -31,11 +31,11 @@ + ** + ****************************************************************************/ +package/qt5/qt5base/0003-xcb-egl-fixes.patch diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl · line 85
Quoted 10 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch +9
-0+-#include "qeglplatformscreen_p.h" +-#include "qeglplatformwindow_p.h" + #include <QtGui/qwindow.h> + #include <qpa/qwindowsysteminterface.h> + #include <QtPlatformSupport/private/qopenglcompositor_p.h> ++#include "qeglplatformscreen_p.h" ++#include "qeglplatformwindow_p.h" + + QT_BEGIN_NAMESPACERegards,
Quoted 1 line
Vincent.
Regards,
Marc
Signature · 11 lines
Marc Andr?, Andr?-Netline eBusiness-Solutions Andr?-Netline K?nizstr. 161 CH-3097 Liebefeld Tel. 031 974 16 66 Fax: 031 974 16 65 marc.andre at netline.ch http://www.netline.ch
PATCH 1/1 qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
In reply to Vicente Olivert RieraQuoted 3 lines · Vicente Olivert Riera
Dear Marc Andre,
On 09/03/2015 02:22 PM, Marc Andre wrote:
[snip]
Quoted 10 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch line 7
Quoted 6 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch +4
-1+Based on patch from Yocto project and buildroot patch from +Jerome Pouiller <[email protected]> +Updated to fix issue in qeglplatformscreen (reorder includes, see also +http://lists.qt-project.org/pipermail/development/2013-March/010511.html) -[based on patch from Yocto project]I'm not sure if this is correct. Yes, you are modifying the patch and adding new stuff, but the rest is still based on Yocto Project's patch. I think it should stay, or at least say something like:
It is still there, a few lines up:
Based on patch from Yocto project and buildroot patch from Jerome Pouiller <[email protected]>
That said, I don't really like the way it's formulated either, I'd prefer to
keep the original and add something:
+Updated to fix issue in qeglplatformscreen (reorder includes, see also +http://lists.qt-project.org/pipermail/development/2013-March/010511.html) +Signed-off-by: Marc Andre <[email protected]>
But really, it's not that important, so:
Regards,
Arnout
Quoted 34 lines
[part of it based on patch from Yocto project]
Quoted 16 lines
Signed-off-by J?r?me Pouiller <[email protected]>package/qt5/qt5base/0003-xcb-egl-fixes.patch +7
-0+Signed-off-by: Marc Andre <[email protected]> diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri@@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE +--- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200 ++++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200 +@@ -31,11 +31,11 @@ + ** + ****************************************************************************/ +package/qt5/qt5base/0003-xcb-egl-fixes.patch diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl · line 85
Quoted 10 lines
package/qt5/qt5base/0003-xcb-egl-fixes.patch +9
-0+-#include "qeglplatformscreen_p.h" +-#include "qeglplatformwindow_p.h" + #include <QtGui/qwindow.h> + #include <qpa/qwindowsysteminterface.h> + #include <QtPlatformSupport/private/qopenglcompositor_p.h> ++#include "qeglplatformscreen_p.h" ++#include "qeglplatformwindow_p.h" + + QT_BEGIN_NAMESPACERegards,
Vincent.
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: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Thomas Petazzoni
AppliedPATCH 1/1 qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp
In reply to Marc AndreDear Marc Andre,
Quoted 11 lines · Marc Andre
Update the already existing fix for EGL/X11 header issue to fix an additional problem encountered on my system where I had compile errors in qeglplatformscreen.cpp. The problem was related to the wrong order of includes. The X11 headers must always be included last, as indicated in
http://lists.qt-project.org/pipermail/development/2013-March/010511.htmlI decided instead of adding a new patch to update the existing patch, because it is an additional fix for the same problem. If you don't agree I am happy to submit a seperate patch.
Quoted 6 lines
This version is updated as suggested by Arnout.
Signed-off-by Marc Andre <[email protected]>--- package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
Applied, after slightly tweaking the commit log (to avoid sentence at the first person) and rework the SoB as suggested by Arnout.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com