commit farstream for openSUSE:Factory

25 May 2021

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package farstream for openSUSE:Factory checked in at 2021-05-25 21:07:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/farstream (Old)
 and      /work/SRC/openSUSE:Factory/.farstream.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "farstream"

Tue May 25 21:07:41 2021 rev:21 rq:892520 version:0.2.9+4

Changes:
--------

--- /work/SRC/openSUSE:Factory/farstream/farstream.changes	2020-04-23 18:26:06.767591076 +0200
+++ /work/SRC/openSUSE:Factory/.farstream.new.2988/farstream.changes	2021-05-25 21:07:47.259119683 +0200
@@ -1,0 +2,6 @@
+Wed May 12 14:17:06 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add farstream-glib-non-volatile.patch: Fix build againat GCC11
+  with glib no longer misusing 'volatile' (boo#1185220).
+
+-------------------------------------------------------------------

New:
----
  farstream-glib-non-volatile.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ farstream.spec ++++++
--- /var/tmp/diff_new_pack.Bm2BTB/_old	2021-05-25 21:07:47.843117121 +0200
+++ /var/tmp/diff_new_pack.Bm2BTB/_new	2021-05-25 21:07:47.843117121 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package farstream
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,8 @@
 
 # PATCH-FEATURE-OPENSUSE farstream-plugin-path.patch fcrozat@suse.com -- Use library policy compliant path for plugin
 Patch0:         farstream-plugin-path.patch
+# PATCH-FIX-UPSTREAM farstream-glib-non-volatile.patch boo#1185220 dimstar@opensuse.org -- Fix build against GCC11/glib2 without misusing 'volatile'
+Patch1:         farstream-glib-non-volatile.patch
 
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.32

++++++ farstream-glib-non-volatile.patch ++++++
diff -ur farstream/common/glib-gen.mak farstream.patched/common/glib-gen.mak
--- farstream/common/glib-gen.mak	2021-05-12 16:13:24.779979698 +0200
+++ farstream.patched/common/glib-gen.mak	2021-05-12 16:12:47.923729843 +0200
@@ -30,7 +30,7 @@
 	$(AM_V_GEN)glib-mkenums \
 	--fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
-	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static volatile gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {"     \
+	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {"     \
 	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 	--vtail "      { 0, NULL, NULL }\n    };\n    GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n  }\n  return g_define_type_id__volatile;\n}\n" \
 	$^ > $@
diff -ur farstream/common/gst-glib-gen.mak farstream.patched/common/gst-glib-gen.mak
--- farstream/common/gst-glib-gen.mak	2021-05-12 16:13:24.779979698 +0200
+++ farstream.patched/common/gst-glib-gen.mak	2021-05-12 16:12:55.283779724 +0200
@@ -33,7 +33,7 @@
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 	--fhead "#ifdef HAVE_CONFIG_H\n#include \"config.h\"\n#endif\n\n#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
-	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static volatile gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {"     \
+	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {"     \
 	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 	--vtail "      { 0, NULL, NULL }\n    };\n    GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n  }\n  return g_define_type_id__volatile;\n}\n" \
 	$^ > $@
diff -ur farstream/common-modified/gst-glib-gen.mak farstream.patched/common-modified/gst-glib-gen.mak
--- farstream/common-modified/gst-glib-gen.mak	2021-05-12 16:13:22.471964046 +0200
+++ farstream.patched/common-modified/gst-glib-gen.mak	2021-05-12 16:10:16.058702161 +0200
@@ -23,7 +23,7 @@
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 	--fhead "#ifdef HAVE_CONFIG_H\n#include \"config.h\"\n#endif\n\n#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
-	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static volatile gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {"     \
+	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {"     \
 	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 	--vtail "      { 0, NULL, NULL }\n    };\n    GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n  }\n  return g_define_type_id__volatile;\n}\n" \
 	$^ > $@
diff -ur farstream/tests/check/transmitter/nice.c farstream.patched/tests/check/transmitter/nice.c
--- farstream/tests/check/transmitter/nice.c	2021-05-12 16:13:22.491964183 +0200
+++ farstream.patched/tests/check/transmitter/nice.c	2021-05-12 16:10:37.914849857 +0200
@@ -44,7 +44,7 @@
 gint buffer_count[2][2] = {{0,0}, {0,0}};
 guint received_known[2][2] = {{0,0}, {0,0}};
 GMainLoop *loop = NULL;
-volatile gint running = TRUE;
+gint running = TRUE;
 gboolean associate_on_source = TRUE;
 gboolean is_address_local = FALSE;
 gboolean force_candidates = FALSE;
diff -ur farstream/tests/check/transmitter/rawudp.c farstream.patched/tests/check/transmitter/rawudp.c
--- farstream/tests/check/transmitter/rawudp.c	2021-05-12 16:13:22.515964345 +0200
+++ farstream.patched/tests/check/transmitter/rawudp.c	2021-05-12 16:10:43.882890201 +0200
@@ -44,7 +44,7 @@
 gint candidates[2] = {0, 0};
 GstElement *pipeline = NULL;
 gboolean src_setup[2] = {FALSE, FALSE};
-volatile gint running = TRUE;
+gint running = TRUE;
 guint received_known[2] = {0, 0};
 gboolean has_stun = FALSE;
 gboolean associate_on_source = TRUE;
diff -ur farstream/transmitters/multicast/fs-multicast-transmitter.c farstream.patched/transmitters/multicast/fs-multicast-transmitter.c
--- farstream/transmitters/multicast/fs-multicast-transmitter.c	2021-05-12 16:13:22.491964183 +0200
+++ farstream.patched/transmitters/multicast/fs-multicast-transmitter.c	2021-05-12 16:10:48.874923951 +0200
@@ -541,7 +541,7 @@
 
   guint component_id;
 
-  volatile gint sendcount;
+  gint sendcount;
 };
 
 static gboolean
diff -ur farstream/transmitters/nice/fs-nice-stream-transmitter.c farstream.patched/transmitters/nice/fs-nice-stream-transmitter.c
--- farstream/transmitters/nice/fs-nice-stream-transmitter.c	2021-05-12 16:13:22.491964183 +0200
+++ farstream.patched/transmitters/nice/fs-nice-stream-transmitter.c	2021-05-12 16:10:54.438961572 +0200
@@ -110,7 +110,7 @@
 
   GPtrArray *relay_info;
 
-  volatile gint associate_on_source;
+  gint associate_on_source;
 
   gboolean *component_has_been_ready; /* only from NiceAgent main thread */

    

Source-Sync

tags

participants (1)