commit: c0f69728fe2538b50a9daf12ea241a76c4b5d131 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jun 18 10:39:05 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jun 18 12:22:47 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c0f69728
dev-qt/qtmultimedia: Fix build with -no-opengl See also: https://bugreports.qt.io/browse/QTBUG-76405 Thanks-to: Rolf Eike Beer <eike <AT> sf-mail.de> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 .../files/qtmultimedia-5.12.4-fix-no-opengl.patch | 42 ++++++++++++++++++++++ dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild | 2 ++ 2 files changed, 44 insertions(+) diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch new file mode 100644 index 00000000..1e5d7551 --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch @@ -0,0 +1,42 @@ +From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001 +From: Val Doroshchuk <valentyn.doroshc...@qt.io> +Date: Mon, 17 Jun 2019 15:20:22 +0200 +Subject: [PATCH] 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.s...@qt.io> +--- + 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() + { +-- +2.16.3 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild index e56a2019..8a896cd1 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild @@ -38,6 +38,8 @@ DEPEND="${RDEPEND} gstreamer? ( x11-base/xorg-proto ) " +PATCHES=( "${FILESDIR}/${P}-fix-no-opengl.patch" ) + src_prepare() { sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ src/multimedia/multimedia.pro || die
