package/qt5multimedia: fix build without opengl
PATCH 1/1 package/qt5multimedia: fix build without opengl
Fixes:
- http://autobuild.buildroot.org/results/fc7bcc6b3ccf1e075dce43296b36e7e1cac417db
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...en-no-opengl-in-QVideoSurfacePainter.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch
package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch new file +47 -0
@@ -0,0 +1,47 @@ +From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001 +From: Val Doroshchuk <[email protected]> +Date: Mon, 17 Jun 2019 15:20:22 +0200 +Subject: Fix compile issue when no opengl in QVideoSurfacePainter + +error: invalid use of incomplete type 'class QGLContext' + +Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9 +Fixes: QTBUG-76405 +Reviewed-by: Andy Shaw <[email protected]> + +[Retrieved from: +https://code.qt.io/cgit/qt/qtmultimedia.git/commit/?id=9bbf9f0d862b8d458e59690d36641618fb101b4e] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp +index 440d5c858..6af0c7588 100644 +--- a/src/multimediawidgets/qpaintervideosurface.cpp ++++ b/src/multimediawidgets/qpaintervideosurface.cpp +@@ -57,10 +57,6 @@ + #ifndef GL_RGB8 + #define GL_RGB8 0x8051 + #endif +-#endif +- +-#include <QtDebug> +-QT_BEGIN_NAMESPACE + + static void makeCurrent(QGLContext *context) + { +@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context) + if (handle && QOpenGLContext::currentContext() != handle) + handle->makeCurrent(handle->surface()); + } ++#endif ++ ++#include <QtDebug> ++QT_BEGIN_NAMESPACE + + QVideoSurfacePainter::~QVideoSurfacePainter() + { +-- +cgit v1.2.1 +
Signature · 1 line
2.20.1
PATCH 1/1 package/qt5multimedia: fix build without opengl
Hello Fabrice,
Quoted 52 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.org/results/fc7bcc6b3ccf1e075dce43296b36e7e1cac417dbSigned-off-by Fabrice Fontaine <[email protected]>--- ...en-no-opengl-in-QVideoSurfacePainter.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patchpackage/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch new file +37
-0@@ -0,0 +1,47 @@ +From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001 +From: Val Doroshchuk <[email protected]> +Date: Mon, 17 Jun 2019 15:20:22 +0200 +Subject: Fix compile issue when no opengl in QVideoSurfacePainter + +error: invalid use of incomplete type 'class QGLContext' + +Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9 +Fixes: QTBUG-76405 +Reviewed-by: Andy Shaw <[email protected]> + +[Retrieved from: +https://code.qt.io/cgit/qt/qtmultimedia.git/commit/?id=9bbf9f0d862b8d458e59690d36641618fb101b4e] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp +index 440d5c858..6af0c7588 100644 +--- a/src/multimediawidgets/qpaintervideosurface.cpp ++++ b/src/multimediawidgets/qpaintervideosurface.cpp +@@ -57,10 +57,6 @@ + #ifndef GL_RGB8 + #define GL_RGB8 0x8051 + #endif +-#endif +- +-#include <QtDebug> +-QT_BEGIN_NAMESPACE + + static void makeCurrent(QGLContext *context) + { +@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context) + if (handle && QOpenGLContext::currentContext() != handle) + handle->makeCurrent(handle->surface()); + }
package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch line 47
Quoted 10 lines
package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch new file +10
-0++#endif ++ ++#include <QtDebug> ++QT_BEGIN_NAMESPACE + + QVideoSurfacePainter::~QVideoSurfacePainter() + { +-- +cgit v1.2.1 +
Reviewed-by Peter Seiderer <[email protected]>
Regards,
Peter
Thomas Petazzoni
AppliedPATCH 1/1 package/qt5multimedia: fix build without opengl
In reply to Fabrice FontaineQuoted 8 lines · On Fri, 16 Aug 2019 00:34:03 +0200 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/fc7bcc6b3ccf1e075dce43296b36e7e1cac417dbSigned-off-by Fabrice Fontaine <[email protected]>--- ...en-no-opengl-in-QVideoSurfacePainter.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com