From ecdc76a39c89d37a90c2b87ecf62db09de710beb Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 4 Feb 2022 16:46:21 +0100 Subject: [PATCH] package/gst1-plugins-base: bump version to 1.18.6 - removed 0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch (upstream accepted [1], [2]) [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d86cf6314f8f178c59600f55321ce73d4ca95d97.patch Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...eo-gstvideoaggregator.c-fix-build-wi.patch | 45 ------------------- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch diff --git a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch deleted file mode 100644 index 87cd6493f5..0000000000 --- a/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 07:42:55 +0100 -Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc - 4.8 - -Fix the following build failure with gcc 4.8 which has been added with -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: - -../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': -../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (gint i = 0; i < gst_caps_get_size (src_template); i++) { - ^ - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] ---- - gst-libs/gst/video/gstvideoaggregator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c -index 2e3d813be..04dad6563 100644 ---- a/gst-libs/gst/video/gstvideoaggregator.c -+++ b/gst-libs/gst/video/gstvideoaggregator.c -@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - { - GstCaps *src_template; - GstPadTemplate *pad_template; -+ gint i; - - vagg->priv = gst_video_aggregator_get_instance_private (vagg); - vagg->priv->current_caps = NULL; -@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, - pad_template = - gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); - src_template = gst_pad_template_get_caps (pad_template); -- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { -+ for (i = 0; i < gst_caps_get_size (src_template); i++) { - const GValue *v = - gst_structure_get_value (gst_caps_get_structure (src_template, i), - "format"); --- -2.29.2 - diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 200ba0fe5d..081dc6f213 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum -sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum +sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76757fd6a8..c99eeb6c59 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.5 +GST1_PLUGINS_BASE_VERSION = 1.18.6 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES