From: Peter Seiderer <ps.report@gmx.net>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/qt5multimedia: fix build without opengl
Date: Fri, 16 Aug 2019 00:42:51 +0200 [thread overview]
Message-ID: <20190816004251.3f74d5ea@gmx.net> (raw)
In-Reply-To: <20190815223403.9249-1-fontaine.fabrice@gmail.com>
Hello Fabrice,
On Fri, 16 Aug 2019 00:34:03 +0200, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Fixes:
> - http://autobuild.buildroot.org/results/fc7bcc6b3ccf1e075dce43296b36e7e1cac417db
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...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
>
> diff --git a/package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch b/package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch
> new file mode 100644
> index 0000000000..1dc7701c08
> --- /dev/null
> +++ b/package/qt5/qt5multimedia/5.12.4/0001-Fix-compile-issue-when-no-opengl-in-QVideoSurfacePainter.patch
> @@ -0,0 +1,47 @@
> +From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001
> +From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
> +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 <andy.shaw@qt.io>
> +
> +[Retrieved from:
> +https://code.qt.io/cgit/qt/qtmultimedia.git/commit/?id=9bbf9f0d862b8d458e59690d36641618fb101b4e]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + 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
> +
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Regards,
Peter
next prev parent reply other threads:[~2019-08-15 22:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 22:34 [Buildroot] [PATCH 1/1] package/qt5multimedia: fix build without opengl Fabrice Fontaine
2019-08-15 22:42 ` Peter Seiderer [this message]
2019-08-17 14:32 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190816004251.3f74d5ea@gmx.net \
--to=ps.report@gmx.net \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox