summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2021-05-08 14:14:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-09 23:30:16 +0100
commitcaa8605d8de02c069738a92d03db05ebdd117128 (patch)
tree137b29c9e6a570c15078fd0a25d15648c723f008
parent4444786679ceb268d8d145d801dc56141fff7d9b (diff)
downloadpoky-caa8605d8de02c069738a92d03db05ebdd117128.tar.gz
gstreamer1.0-plugins-good: fix build with gcc11
This fixes issues when qt plugins are enabled (which is not by default without additional layers). (From OE-Core rev: 25f3ff9c4ca20962994c43b741c7839b713cbfe6) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch100
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb1
2 files changed, 101 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch
new file mode 100644
index 0000000000..87223826c6
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch
@@ -0,0 +1,100 @@
1From 07572920319ea86cebb6dd073ab65915ec207eed Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sat, 8 May 2021 14:08:41 +0200
4Subject: [PATCH] Remove volatile from static vars to fix build with gcc11
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Stolen from [1]
10
11[1] https://src.fedoraproject.org/rpms/gstreamer1-plugins-good/blob/rawhide/f/gstreamer1-plugins-good-gcc11.patch
12
13Upstream-Status: Pending
14
15Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
16---
17 ext/qt/gstqsgtexture.cc | 2 +-
18 ext/qt/gstqtglutility.cc | 2 +-
19 ext/qt/qtglrenderer.cc | 2 +-
20 ext/qt/qtitem.cc | 2 +-
21 ext/qt/qtwindow.cc | 4 ++--
22 5 files changed, 6 insertions(+), 6 deletions(-)
23
24diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
25index 4cc9fc6..50c8d7f 100644
26--- a/ext/qt/gstqsgtexture.cc
27+++ b/ext/qt/gstqsgtexture.cc
28@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
29
30 GstQSGTexture::GstQSGTexture ()
31 {
32- static volatile gsize _debug;
33+ static gsize _debug;
34
35 initializeOpenGLFunctions();
36
37diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
38index acb89b6..d2c0922 100644
39--- a/ext/qt/gstqtglutility.cc
40+++ b/ext/qt/gstqtglutility.cc
41@@ -66,7 +66,7 @@ gst_qt_get_gl_display ()
42 {
43 GstGLDisplay *display = NULL;
44 QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
45- static volatile gsize _debug;
46+ static gsize _debug;
47
48 g_assert (app != NULL);
49
50diff --git a/ext/qt/qtglrenderer.cc b/ext/qt/qtglrenderer.cc
51index 2ad5601..bffba8f 100644
52--- a/ext/qt/qtglrenderer.cc
53+++ b/ext/qt/qtglrenderer.cc
54@@ -22,7 +22,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
55 static void
56 init_debug (void)
57 {
58- static volatile gsize _debug;
59+ static gsize _debug;
60
61 if (g_once_init_enter (&_debug)) {
62 GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglrenderer", 0,
63diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc
64index 7659800..bc99639 100644
65--- a/ext/qt/qtitem.cc
66+++ b/ext/qt/qtitem.cc
67@@ -104,7 +104,7 @@ void InitializeSceneGraph::run()
68
69 QtGLVideoItem::QtGLVideoItem()
70 {
71- static volatile gsize _debug;
72+ static gsize _debug;
73
74 if (g_once_init_enter (&_debug)) {
75 GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
76diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
77index 0dfd3f1..f1bd4ae 100644
78--- a/ext/qt/qtwindow.cc
79+++ b/ext/qt/qtwindow.cc
80@@ -103,7 +103,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
81 QQuickWindow( parent ), source (src)
82 {
83 QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
84- static volatile gsize _debug;
85+ static gsize _debug;
86
87 g_assert (app != NULL);
88
89@@ -152,7 +152,7 @@ QtGLWindow::beforeRendering()
90
91 g_mutex_lock (&this->priv->lock);
92
93- static volatile gsize once = 0;
94+ static gsize once = 0;
95 if (g_once_init_enter(&once)) {
96 this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
97 g_once_init_leave(&once,1);
98--
992.30.2
100
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb
index 07cacdc68a..c7d31d206d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb
@@ -7,6 +7,7 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues
7SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ 7SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
8 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ 8 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
9 file://0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch \ 9 file://0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch \
10 file://0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch \
10 " 11 "
11 12
12SRC_URI[sha256sum] = "b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0" 13SRC_URI[sha256sum] = "b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0"