diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch | |
parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) |
gentoo resync : 28.09.2019
Diffstat (limited to 'dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch')
-rw-r--r-- | dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch | 42 |
1 files changed, 0 insertions, 42 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 deleted file mode 100644 index 1e5d7551d30c..000000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 |