1 |
commit: 4ff48cd9e5fea109f8c01e231dba5b7a4c06b655 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 23 18:29:14 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 23 18:29:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4ff48cd9 |
7 |
|
8 |
dev-qt/qtmultimedia: Drop unused patch |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../files/qtmultimedia-5.12.4-fix-no-opengl.patch | 42 ---------------------- |
14 |
1 file changed, 42 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index 1e5d7551..00000000 |
19 |
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch |
20 |
+++ /dev/null |
21 |
@@ -1,42 +0,0 @@ |
22 |
-From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001 |
23 |
-From: Val Doroshchuk <valentyn.doroshchuk@××.io> |
24 |
-Date: Mon, 17 Jun 2019 15:20:22 +0200 |
25 |
-Subject: [PATCH] Fix compile issue when no opengl in QVideoSurfacePainter |
26 |
- |
27 |
-error: invalid use of incomplete type 'class QGLContext' |
28 |
- |
29 |
-Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9 |
30 |
-Fixes: QTBUG-76405 |
31 |
-Reviewed-by: Andy Shaw <andy.shaw@××.io> |
32 |
---- |
33 |
- src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++---- |
34 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
35 |
- |
36 |
-diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp |
37 |
-index 440d5c858..6af0c7588 100644 |
38 |
---- a/src/multimediawidgets/qpaintervideosurface.cpp |
39 |
-+++ b/src/multimediawidgets/qpaintervideosurface.cpp |
40 |
-@@ -57,10 +57,6 @@ |
41 |
- #ifndef GL_RGB8 |
42 |
- #define GL_RGB8 0x8051 |
43 |
- #endif |
44 |
--#endif |
45 |
-- |
46 |
--#include <QtDebug> |
47 |
--QT_BEGIN_NAMESPACE |
48 |
- |
49 |
- static void makeCurrent(QGLContext *context) |
50 |
- { |
51 |
-@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context) |
52 |
- if (handle && QOpenGLContext::currentContext() != handle) |
53 |
- handle->makeCurrent(handle->surface()); |
54 |
- } |
55 |
-+#endif |
56 |
-+ |
57 |
-+#include <QtDebug> |
58 |
-+QT_BEGIN_NAMESPACE |
59 |
- |
60 |
- QVideoSurfacePainter::~QVideoSurfacePainter() |
61 |
- { |
62 |
--- |
63 |
-2.16.3 |