diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2021-10-04 00:41:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-02 00:22:12 +0000 |
commit | f6206ff8517a8e8a088d041bbf5ab4367700f183 (patch) | |
tree | 3fd7bd7505a554f8b03fb81807b6ee1fab6e847a /meta | |
parent | 27309ad07832a5592da609de44478e1d9387a8ce (diff) | |
download | poky-f6206ff8517a8e8a088d041bbf5ab4367700f183.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: 27c6230ddcd2723c60846a7cc2a9388a92b67ab9)
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>
Diffstat (limited to 'meta')
-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_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb) | 3 |
2 files changed, 1 insertions, 35 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_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb index 07cacdc68a..6f642d01ef 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,10 +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 | " | 9 | " |
11 | 10 | ||
12 | SRC_URI[sha256sum] = "b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0" | 11 | SRC_URI[sha256sum] = "3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b" |
13 | 12 | ||
14 | S = "${WORKDIR}/gst-plugins-good-${PV}" | 13 | S = "${WORKDIR}/gst-plugins-good-${PV}" |
15 | 14 | ||