diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2021-10-04 00:41:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-29 11:17:25 +0100 |
commit | 73ebd1f04d4e9663dd138c7e962587cedfb62ca5 (patch) | |
tree | 689b28e99f6c45d6c0a89a2d36179f5b9a29d251 | |
parent | dc851c427b445fc8a62f745ae30df1e32bf76d12 (diff) | |
download | poky-73ebd1f04d4e9663dd138c7e962587cedfb62ca5.tar.gz |
gstreamer1.0-plugins-good: 1.18.4 -> 1.18.5
Drop backport patches:
* 0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch
* 0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/a1bf3d8d540a25268d612a489e1e836d6ea737b0
(From OE-Core rev: 790cb8acafc89969a6d1468f7df0493b737f946a)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit b51d46790e582556a7230a1fe8f67375e785cc43)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch | 33 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch | 100 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb) | 4 |
3 files changed, 1 insertions, 136 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch deleted file mode 100644 index 14a9fe23aa..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From ec1949dffd931d0ec7e4f67108a08ab1e2af0cfe Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> | ||
3 | Date: Tue, 16 Mar 2021 19:25:36 +0200 | ||
4 | Subject: [PATCH] rtpjitterbuffer: Fix parsing of the mediaclk:direct= field | ||
5 | |||
6 | Due to an off-by-one when parsing the string, the most significant digit | ||
7 | or the clock offset was skipped when parsing the offset. | ||
8 | |||
9 | Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/910> | ||
10 | |||
11 | Upstream-Status: Backport [b5bb4ede3a42273fafc1054f9cf106ca527e3c26] | ||
12 | |||
13 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
14 | --- | ||
15 | gst/rtpmanager/gstrtpjitterbuffer.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c | ||
19 | index 60d8ad875..02fe15adc 100644 | ||
20 | --- a/gst/rtpmanager/gstrtpjitterbuffer.c | ||
21 | +++ b/gst/rtpmanager/gstrtpjitterbuffer.c | ||
22 | @@ -1534,7 +1534,7 @@ gst_jitter_buffer_sink_parse_caps (GstRtpJitterBuffer * jitterbuffer, | ||
23 | GST_DEBUG_OBJECT (jitterbuffer, "Got media clock %s", mediaclk); | ||
24 | |||
25 | if (!g_str_has_prefix (mediaclk, "direct=") || | ||
26 | - !g_ascii_string_to_unsigned (&mediaclk[8], 10, 0, G_MAXUINT64, | ||
27 | + !g_ascii_string_to_unsigned (&mediaclk[7], 10, 0, G_MAXUINT64, | ||
28 | &clock_offset, NULL)) | ||
29 | GST_FIXME_OBJECT (jitterbuffer, "Unsupported media clock"); | ||
30 | if (strstr (mediaclk, "rate=") != NULL) { | ||
31 | -- | ||
32 | 2.31.0 | ||
33 | |||
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 deleted file mode 100644 index 87223826c6..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch +++ /dev/null | |||
@@ -1,100 +0,0 @@ | |||
1 | From 07572920319ea86cebb6dd073ab65915ec207eed Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Sat, 8 May 2021 14:08:41 +0200 | ||
4 | Subject: [PATCH] Remove volatile from static vars to fix build with gcc11 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Stolen from [1] | ||
10 | |||
11 | [1] https://src.fedoraproject.org/rpms/gstreamer1-plugins-good/blob/rawhide/f/gstreamer1-plugins-good-gcc11.patch | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-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 | |||
24 | diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc | ||
25 | index 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 | |||
37 | diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc | ||
38 | index 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 | |||
50 | diff --git a/ext/qt/qtglrenderer.cc b/ext/qt/qtglrenderer.cc | ||
51 | index 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, | ||
63 | diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc | ||
64 | index 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"); | ||
76 | diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc | ||
77 | index 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 | -- | ||
99 | 2.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.5.bb index a90594ade5..ade935df9e 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.5.bb | |||
@@ -6,11 +6,9 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues | |||
6 | 6 | ||
7 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ | 7 | SRC_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 \ | ||
10 | file://0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch \ | ||
11 | " | 9 | " |
12 | 10 | ||
13 | SRC_URI[sha256sum] = "b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0" | 11 | SRC_URI[sha256sum] = "3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b" |
14 | 12 | ||
15 | S = "${WORKDIR}/gst-plugins-good-${PV}" | 13 | S = "${WORKDIR}/gst-plugins-good-${PV}" |
16 | 14 | ||