1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From 39233709c321a572ec071c97e417347ea67824f7 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 22 Jan 2023 10:39:59 -0500
Subject: [PATCH 1/2] Pass explicit GL api when initializing GStreamer backend
Recent GStreamer versions now require an explicit API instead of
GST_GL_API_ANY, so now we pass GL or GLES depending on what is used.
Cherrypicked from 20153c34a4a46a755f8a48502f0ad36d01de2e98
---
src/gsttools/qgstvideorenderersink.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp
index 4000f2178..a446d93fe 100644
--- a/src/gsttools/qgstvideorenderersink.cpp
+++ b/src/gsttools/qgstvideorenderersink.cpp
@@ -368,7 +368,8 @@ static GstGLContext *gstGLDisplayContext(QAbstractVideoSurface *surface)
if (!nativeContext)
qWarning() << "Could not find resource for" << contextName;
- GstGLContext *appContext = gst_gl_context_new_wrapped(display, (guintptr)nativeContext, glPlatform, GST_GL_API_ANY);
+ GstGLAPI glApi = QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL ? GST_GL_API_OPENGL : GST_GL_API_GLES2;
+ GstGLContext *appContext = gst_gl_context_new_wrapped(display, (guintptr)nativeContext, glPlatform, glApi);
if (!appContext)
qWarning() << "Could not create wrappped context for platform:" << glPlatform;
--
2.49.0
From d342547886448dacf38d2933cd40322c7435ee86 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 17 Sep 2021 10:14:42 +0200
Subject: [PATCH 2/2] Drop obsolete QtOpengl dependency
Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency
remained (commit 30034a140ca8aefa1986c9964ae1f30dcfef886e).
See also: https://bugreports.qt.io/browse/QTBUG-81902
qmake backport of upstream dev branch commit a7621a6db7bdbe514be825cbc2952d50e328bab4
Thanks-to: Davide Pesavento <pesa@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
src/multimediawidgets/multimediawidgets.pro | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 1919e8107..4c30d8fbf 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -2,8 +2,6 @@
TARGET = QtMultimediaWidgets
QT = core gui multimedia widgets-private
QT_PRIVATE += multimedia-private
-qtHaveModule(opengl): \
- QT_PRIVATE += opengl
PRIVATE_HEADERS += \
qvideowidget_p.h \
--
2.49.0
|
