summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-07-06 11:52:17 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-07-06 12:24:41 +0200
commit3b11b1c8844f17fd7f46fa10256b355317dc3a46 (patch)
tree3485743d2ab92535f66734aae79382c94e83149f /dev-qt/qtmultimedia/files
parentmedia-libs/avidemux-plugins: Drop 2.6.20 (diff)
downloadgentoo-3b11b1c8844f17fd7f46fa10256b355317dc3a46.tar.gz
gentoo-3b11b1c8844f17fd7f46fa10256b355317dc3a46.tar.bz2
gentoo-3b11b1c8844f17fd7f46fa10256b355317dc3a46.zip
dev-qt: Add Qt 5.12.4
Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtmultimedia/files')
-rw-r--r--dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch42
1 files changed, 42 insertions, 0 deletions
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 00000000000..1e5d7551d30
--- /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.doroshchuk@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.shaw@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