From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] gst-plugins-good1: version bump 1.18.4 -> 1.18.5
Date: Wed, 20 Oct 2021 11:39:25 +0200 [thread overview]
Message-ID: <20211020093925.3915142-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210930151014.3897042-4-p.zabel@pengutronix.de>
Thanks, applied as 7c3cad3352f364b5e3c19132098030695efe5a1c.
Michael
[sent from post-receive hook]
On Wed, 20 Oct 2021 11:39:25 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210930151014.3897042-4-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/gst-plugins-good-1.18.4/0001-gst-don-t-use-volatile-to-mean-atomic.patch b/patches/gst-plugins-good-1.18.4/0001-gst-don-t-use-volatile-to-mean-atomic.patch
> deleted file mode 100644
> index 548f814e0da1..000000000000
> --- a/patches/gst-plugins-good-1.18.4/0001-gst-don-t-use-volatile-to-mean-atomic.patch
> +++ /dev/null
> @@ -1,311 +0,0 @@
> -From: Matthew Waters <matthew@centricular.com>
> -Date: Thu, 18 Mar 2021 19:52:53 +1100
> -Subject: [PATCH] gst: don't use volatile to mean atomic
> -
> -volatile is not sufficient to provide atomic guarantees and real atomics
> -should be used instead. GCC 11 has started warning about using volatile
> -with atomic operations.
> -
> -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
> -
> -Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868
> -
> -Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/911>
> ----
> - ext/jack/gstjack.c | 6 +++---
> - ext/jack/gstjackaudiosink.c | 2 +-
> - ext/jack/gstjackaudiosrc.c | 2 +-
> - ext/pulse/pulsesink.h | 2 +-
> - ext/qt/gstqsgtexture.cc | 2 +-
> - ext/qt/gstqtglutility.cc | 2 +-
> - ext/qt/qtglrenderer.cc | 6 +++---
> - ext/qt/qtitem.cc | 2 +-
> - ext/qt/qtwindow.cc | 4 ++--
> - ext/vpx/gstvpxdec.c | 2 +-
> - ext/vpx/gstvpxenc.c | 14 +++++++-------
> - gst/audioparsers/gstac3parse.h | 2 +-
> - sys/rpicamsrc/gstrpicamsrc.c | 2 +-
> - sys/ximage/ximageutil.c | 2 +-
> - 14 files changed, 25 insertions(+), 25 deletions(-)
> -
> -diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
> -index ca98dc40592b..fdd507d87207 100644
> ---- a/ext/jack/gstjack.c
> -+++ b/ext/jack/gstjack.c
> -@@ -28,7 +28,7 @@
> - GType
> - gst_jack_connect_get_type (void)
> - {
> -- static volatile gsize jack_connect_type = 0;
> -+ static gsize jack_connect_type = 0;
> -
> - if (g_once_init_enter (&jack_connect_type)) {
> - static const GEnumValue jack_connect_enums[] = {
> -@@ -50,7 +50,7 @@ gst_jack_connect_get_type (void)
> - GType
> - gst_jack_transport_get_type (void)
> - {
> -- static volatile gsize type = 0;
> -+ static gsize type = 0;
> -
> - if (g_once_init_enter (&type)) {
> - static const GFlagsValue flag_values[] = {
> -@@ -84,7 +84,7 @@ gst_jack_client_free (gpointer jclient)
> - GType
> - gst_jack_client_get_type (void)
> - {
> -- static volatile gsize jack_client_type = 0;
> -+ static gsize jack_client_type = 0;
> -
> - if (g_once_init_enter (&jack_client_type)) {
> - /* hackish, but makes it show up nicely in gst-inspect */
> -diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c
> -index ee7cea8c0623..6e8d04ae5b3b 100644
> ---- a/ext/jack/gstjackaudiosink.c
> -+++ b/ext/jack/gstjackaudiosink.c
> -@@ -131,7 +131,7 @@ gst_jack_audio_sink_free_channels (GstJackAudioSink * sink)
> - static GType
> - gst_jack_ring_buffer_get_type (void)
> - {
> -- static volatile gsize ringbuffer_type = 0;
> -+ static gsize ringbuffer_type = 0;
> -
> - if (g_once_init_enter (&ringbuffer_type)) {
> - static const GTypeInfo ringbuffer_info = {
> -diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c
> -index 1d2cf82ee6e8..d43a447a76aa 100644
> ---- a/ext/jack/gstjackaudiosrc.c
> -+++ b/ext/jack/gstjackaudiosrc.c
> -@@ -151,7 +151,7 @@ gst_jack_audio_src_free_channels (GstJackAudioSrc * src)
> - static GType
> - gst_jack_ring_buffer_get_type (void)
> - {
> -- static volatile gsize ringbuffer_type = 0;
> -+ static gsize ringbuffer_type = 0;
> -
> - if (g_once_init_enter (&ringbuffer_type)) {
> - static const GTypeInfo ringbuffer_info = { sizeof (GstJackRingBufferClass),
> -diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
> -index 86f3dcdbb751..51ec86a25ad6 100644
> ---- a/ext/pulse/pulsesink.h
> -+++ b/ext/pulse/pulsesink.h
> -@@ -72,7 +72,7 @@ struct _GstPulseSink
> - GstStructure *properties;
> - pa_proplist *proplist;
> -
> -- volatile gint format_lost;
> -+ gint format_lost;
> - GstClockTime format_lost_time;
> - };
> -
> -diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
> -index a05d26edd51d..bfa79cda0fe3 100644
> ---- a/ext/qt/gstqsgtexture.cc
> -+++ b/ext/qt/gstqsgtexture.cc
> -@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
> -
> - GstQSGTexture::GstQSGTexture ()
> - {
> -- static volatile gsize _debug;
> -+ static gsize _debug;
> -
> - initializeOpenGLFunctions();
> -
> -diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
> -index acb89b6e1e3b..d2c092202bd3 100644
> ---- a/ext/qt/gstqtglutility.cc
> -+++ b/ext/qt/gstqtglutility.cc
> -@@ -66,7 +66,7 @@ gst_qt_get_gl_display ()
> - {
> - GstGLDisplay *display = NULL;
> - QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
> -- static volatile gsize _debug;
> -+ static gsize _debug;
> -
> - g_assert (app != NULL);
> -
> -diff --git a/ext/qt/qtglrenderer.cc b/ext/qt/qtglrenderer.cc
> -index 2ad5601fc381..52965fd0bdb9 100644
> ---- a/ext/qt/qtglrenderer.cc
> -+++ b/ext/qt/qtglrenderer.cc
> -@@ -22,7 +22,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
> - static void
> - init_debug (void)
> - {
> -- static volatile gsize _debug;
> -+ static gsize _debug;
> -
> - if (g_once_init_enter (&_debug)) {
> - GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglrenderer", 0,
> -@@ -115,7 +115,7 @@ typedef enum
> -
> - struct SharedRenderData
> - {
> -- volatile int refcount;
> -+ int refcount;
> - SharedRenderDataState state;
> - GMutex lock;
> - GCond cond;
> -@@ -130,7 +130,7 @@ shared_render_data_new (void)
> - {
> - struct SharedRenderData *ret = g_new0 (struct SharedRenderData, 1);
> -
> -- ret->refcount = 1;
> -+ g_atomic_int_set (&ret->refcount, 1);
> - g_mutex_init (&ret->lock);
> -
> - return ret;
> -diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc
> -index 7659800b6bb8..bc99639b4129 100644
> ---- a/ext/qt/qtitem.cc
> -+++ b/ext/qt/qtitem.cc
> -@@ -104,7 +104,7 @@ void InitializeSceneGraph::run()
> -
> - QtGLVideoItem::QtGLVideoItem()
> - {
> -- static volatile gsize _debug;
> -+ static gsize _debug;
> -
> - if (g_once_init_enter (&_debug)) {
> - GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
> -diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
> -index 9360c3337f09..7c44ac54ebfd 100644
> ---- a/ext/qt/qtwindow.cc
> -+++ b/ext/qt/qtwindow.cc
> -@@ -103,7 +103,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
> - QQuickWindow( parent ), source (src)
> - {
> - QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
> -- static volatile gsize _debug;
> -+ static gsize _debug;
> -
> - g_assert (app != NULL);
> -
> -@@ -152,7 +152,7 @@ QtGLWindow::beforeRendering()
> -
> - g_mutex_lock (&this->priv->lock);
> -
> -- static volatile gsize once = 0;
> -+ static gsize once = 0;
> - if (g_once_init_enter(&once)) {
> - this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
> - g_once_init_leave(&once,1);
> -diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
> -index e92aa85c7e10..74cc3c9702a3 100644
> ---- a/ext/vpx/gstvpxdec.c
> -+++ b/ext/vpx/gstvpxdec.c
> -@@ -79,7 +79,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
> - {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -diff --git a/ext/vpx/gstvpxenc.c b/ext/vpx/gstvpxenc.c
> -index cd5b30d14dc2..4b3b4f77084f 100644
> ---- a/ext/vpx/gstvpxenc.c
> -+++ b/ext/vpx/gstvpxenc.c
> -@@ -165,7 +165,7 @@ gst_vpx_enc_end_usage_get_type (void)
> - {VPX_CQ, "Constant Quality Mode (CQ) mode", "cq"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -@@ -188,7 +188,7 @@ gst_vpx_enc_multipass_mode_get_type (void)
> - {VPX_RC_LAST_PASS, "Last pass of multipass encoding", "last-pass"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -@@ -210,7 +210,7 @@ gst_vpx_enc_kf_mode_get_type (void)
> - {VPX_KF_DISABLED, "Don't automatically place keyframes", "disabled"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -@@ -232,7 +232,7 @@ gst_vpx_enc_tuning_get_type (void)
> - {VP8_TUNE_SSIM, "Tune for SSIM", "ssim"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -@@ -256,7 +256,7 @@ gst_vpx_enc_scaling_mode_get_type (void)
> - {VP8E_ONETWO, "1:2", "1:2"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -@@ -280,7 +280,7 @@ gst_vpx_enc_token_partitions_get_type (void)
> - {VP8_EIGHT_TOKENPARTITION, "Eight token partitions", "8"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -@@ -303,7 +303,7 @@ gst_vpx_enc_er_flags_get_type (void)
> - "Allow partitions to be decoded independently", "partitions"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> -
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> -diff --git a/gst/audioparsers/gstac3parse.h b/gst/audioparsers/gstac3parse.h
> -index 0e7af5acd7e5..81e2104d5e06 100644
> ---- a/gst/audioparsers/gstac3parse.h
> -+++ b/gst/audioparsers/gstac3parse.h
> -@@ -62,7 +62,7 @@ struct _GstAc3Parse {
> - gint blocks;
> - gboolean eac;
> - gboolean sent_codec_tag;
> -- volatile gint align;
> -+ gint align;
> - GstPadChainFunction baseparse_chainfunc;
> - };
> -
> -diff --git a/sys/rpicamsrc/gstrpicamsrc.c b/sys/rpicamsrc/gstrpicamsrc.c
> -index a148d4106d52..f719acb4ce42 100644
> ---- a/sys/rpicamsrc/gstrpicamsrc.c
> -+++ b/sys/rpicamsrc/gstrpicamsrc.c
> -@@ -292,7 +292,7 @@ gst_rpi_cam_src_sensor_mode_get_type (void)
> - "640x480 4:3 60.1-90fps", "640x480-fast"},
> - {0, NULL, NULL}
> - };
> -- static volatile GType id = 0;
> -+ static GType id = 0;
> - if (g_once_init_enter ((gsize *) & id)) {
> - GType _id;
> - _id = g_enum_register_static ("GstRpiCamSrcSensorMode", values);
> -diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c
> -index 57c9392c79fa..018b60515601 100644
> ---- a/sys/ximage/ximageutil.c
> -+++ b/sys/ximage/ximageutil.c
> -@@ -26,7 +26,7 @@
> - GType
> - gst_meta_ximage_api_get_type (void)
> - {
> -- static volatile GType type;
> -+ static GType type;
> - static const gchar *tags[] = { "memory", NULL };
> -
> - if (g_once_init_enter (&type)) {
> diff --git a/patches/gst-plugins-good-1.18.4/series b/patches/gst-plugins-good-1.18.4/series
> deleted file mode 100644
> index 8ec8c07140fa..000000000000
> --- a/patches/gst-plugins-good-1.18.4/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-gst-don-t-use-volatile-to-mean-atomic.patch
> -# 4e886ca480d92593b4af01c1f83c6503 - git-ptx-patches magic
> diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make
> index c7beedfd04fe..07939c27ec54 100644
> --- a/rules/gst-plugins-good1.make
> +++ b/rules/gst-plugins-good1.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD1) += gst-plugins-good1
> #
> # Paths and names
> #
> -GST_PLUGINS_GOOD1_VERSION := 1.18.4
> -GST_PLUGINS_GOOD1_MD5 := 4ecf1ac5cd422d9c13fe05dbf5e3df26
> +GST_PLUGINS_GOOD1_VERSION := 1.18.5
> +GST_PLUGINS_GOOD1_MD5 := 1c8ec6b14d166d7affbb216e863c9e42
> GST_PLUGINS_GOOD1 := gst-plugins-good-$(GST_PLUGINS_GOOD1_VERSION)
> GST_PLUGINS_GOOD1_SUFFIX := tar.xz
> GST_PLUGINS_GOOD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-10-20 9:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 15:10 [ptxdist] [PATCH 01/10] gstreamer1: " Philipp Zabel
2021-09-30 15:10 ` [ptxdist] [PATCH 02/10] gst-devtools1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-30 15:10 ` [ptxdist] [PATCH 03/10] gst-plugins-base1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-30 15:10 ` [ptxdist] [PATCH 04/10] gst-plugins-good1: " Philipp Zabel
2021-10-20 9:39 ` Michael Olbrich [this message]
2021-09-30 15:10 ` [ptxdist] [PATCH 05/10] gst-plugins-bad1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-30 15:10 ` [ptxdist] [PATCH 06/10] gst-plugins-ugly1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-30 15:10 ` [ptxdist] [PATCH 07/10] gst-libav1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-30 15:10 ` [ptxdist] [PATCH 08/10] gst-python1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-30 15:10 ` [ptxdist] [PATCH 09/10] gst-rtsp-server1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-09-30 15:10 ` [ptxdist] [PATCH 10/10] gstreamer-vaapi1: " Philipp Zabel
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-10-20 9:39 ` [ptxdist] [APPLIED] gstreamer1: " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211020093925.3915142-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox