|
0 |
From: Dominique Leuenberger <dimstar@opensuse.org>
|
|
1 |
Date: Tue, 13 Jul 2021 10:32:30 +0000
|
|
2 |
Subject: Fix build against glib 2.68
|
|
3 |
|
|
4 |
volatile has been misused in the past
|
|
5 |
|
|
6 |
Bug: https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/11
|
|
7 |
Bug-Debian: https://bugs.debian.org/997238
|
|
8 |
Reference: https://gitlab.gnome.org/GNOME/glib/-/issues/600
|
|
9 |
Reference: http://c.isvolatileusefulwiththreads.com/
|
|
10 |
---
|
|
11 |
gstreamer/gstreamermm/register.h | 2 +-
|
|
12 |
tests/integration/test-integration-seekonstartup.cc | 2 +-
|
|
13 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
14 |
|
|
15 |
diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h
|
|
16 |
index db66d17..a7ab3a6 100644
|
|
17 |
--- a/gstreamer/gstreamermm/register.h
|
|
18 |
+++ b/gstreamer/gstreamermm/register.h
|
|
19 |
@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name)
|
|
20 |
/* The typedef for GType may be gulong or gsize, depending on the
|
|
21 |
* system and whether the compiler is c++ or not. The g_once_init_*
|
|
22 |
* functions always take a gsize * though ... */
|
|
23 |
- static volatile gsize gonce_data = 0;
|
|
24 |
+ static gsize gonce_data = 0;
|
|
25 |
if (g_once_init_enter (&gonce_data)) {
|
|
26 |
GTypeInfo info;
|
|
27 |
|
|
28 |
diff --git a/tests/integration/test-integration-seekonstartup.cc b/tests/integration/test-integration-seekonstartup.cc
|
|
29 |
index 247ac49..cd43a12 100644
|
|
30 |
--- a/tests/integration/test-integration-seekonstartup.cc
|
|
31 |
+++ b/tests/integration/test-integration-seekonstartup.cc
|
|
32 |
@@ -18,7 +18,7 @@ RefPtr<Glib::MainLoop> mainloop;
|
|
33 |
RefPtr<Bus> bus;
|
|
34 |
RefPtr<Pipeline> pipeline;
|
|
35 |
RefPtr<Pad> sink_pad;
|
|
36 |
-static volatile gint counter;
|
|
37 |
+static gint counter;
|
|
38 |
bool prerolled = false;
|
|
39 |
gboolean was_check = 0;
|
|
40 |
|