Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package farstream for openSUSE:Factory
checked in at 2022-02-17 00:30:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/farstream (Old)
and /work/SRC/openSUSE:Factory/.farstream.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "farstream"
Thu Feb 17 00:30:02 2022 rev:22 rq:954709 version:0.2.9+5
Changes:
--------
--- /work/SRC/openSUSE:Factory/farstream/farstream.changes 2021-05-25
21:07:47.259119683 +0200
+++ /work/SRC/openSUSE:Factory/.farstream.new.1956/farstream.changes
2022-02-17 00:30:15.561436105 +0100
@@ -1,0 +2,12 @@
+Fri Feb 11 18:57:00 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Update to version 0.2.9+5:
+ + rawudp-upnp test: Also build against new GUPnP 1.2 library if
+ present
+- Add explicit pkgconfig(gupnp-1.2) BuildRequires and pass
+ enable-gupnp to configure, now that upstream supports the version
+ we have.
+- Add farstream-drop-examples.patch: No longer build the examples.
+ Fixes building with gcc 12.
+
+-------------------------------------------------------------------
@@ -10 +22 @@
-- Update to 2.4.9+4:
+- Update to version 0.2.9+4:
Old:
----
farstream-0.2.9+4.obscpio
New:
----
farstream-0.2.9+5.obscpio
farstream-drop-examples.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ farstream.spec ++++++
--- /var/tmp/diff_new_pack.cSn7Y1/_old 2022-02-17 00:30:17.025435852 +0100
+++ /var/tmp/diff_new_pack.cSn7Y1/_new 2022-02-17 00:30:17.029435851 +0100
@@ -1,7 +1,7 @@
#
# spec file for package farstream
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define gst_pluginsdir %(pkg-config --variable pluginsdir gstreamer-1.0)
Name: farstream
-Version: 0.2.9+4
+Version: 0.2.9+5
Release: 0
# License note: the only GPL-2.0+ files are farstream-0.1.1/common/coverage/*
# and common/gstdoc-scangobj; those are just used during the build and do not
@@ -34,6 +34,8 @@
Patch0: farstream-plugin-path.patch
# PATCH-FIX-UPSTREAM farstream-glib-non-volatile.patch boo#1185220
dims...@opensuse.org -- Fix build against GCC11/glib2 without misusing
'volatile'
Patch1: farstream-glib-non-volatile.patch
+# PATCH-FIX-OPENSUSE farstream-drop-examples.patch -- Drop building examples
+Patch2: farstream-drop-examples.patch
BuildRequires: fdupes
BuildRequires: glib2-devel >= 2.32
@@ -45,6 +47,7 @@
BuildRequires: pkgconfig
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.40
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.4
+BuildRequires: pkgconfig(gupnp-1.2)
BuildRequires: pkgconfig(gupnp-igd-1.0) >= 0.2
BuildRequires: pkgconfig(nice) >= 0.1.8
@@ -126,6 +129,7 @@
--disable-static \
--enable-gtk-doc \
--enable-introspection \
+ --enable-gupnp \
%{nil}
%make_build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.cSn7Y1/_old 2022-02-17 00:30:17.065435845 +0100
+++ /var/tmp/diff_new_pack.cSn7Y1/_new 2022-02-17 00:30:17.069435844 +0100
@@ -3,7 +3,7 @@
<service name="obs_scm" mode="disabled">
<param name="scm">git</param>
<param
name="url">https://gitlab.freedesktop.org/farstream/farstream.git</param>
- <param name="revision">46d7b108</param>
+ <param name="revision">e70dcd0a</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
++++++ farstream-0.2.9+4.obscpio -> farstream-0.2.9+5.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/farstream-0.2.9+4/.gitignore
new/farstream-0.2.9+5/.gitignore
--- old/farstream-0.2.9+4/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/farstream-0.2.9+5/.gitignore 2020-10-21 01:51:22.000000000 +0200
@@ -0,0 +1,115 @@
+*.lo
+*.loT
+*.o
+*.la
+Makefile
+Makefile.in
+.deps
+.libs
+*~
+*#
+.#*
+*.stamp
+*.gcno
+*.gcda
+*.typelib
+*.gir
+
+gst/*/*.doc.c
+
+farstream/fs-enumtypes.[ch]
+
+docs/libs/farstream-libs-decl-list.txt
+docs/libs/farstream-libs-decl-list.txt.bak
+docs/libs/farstream-libs-decl.txt
+docs/libs/farstream-libs-decl.txt.bak
+docs/libs/farstream-libs-undocumented.txt
+docs/libs/farstream-libs-unused.txt
+docs/libs/farstream-libs.args
+docs/libs/farstream-libs.hierarchy
+docs/libs/farstream-libs.interfaces
+docs/libs/farstream-libs.prerequisites
+docs/libs/farstream-libs.signals
+docs/libs/farstream-libs-undeclared.txt
+docs/libs/html
+docs/libs/tmpl
+docs/libs/xml
+docs/libs/doc-registry.xml
+docs/plugins/farstream-plugins-decl-list.txt
+docs/plugins/farstream-plugins-decl.txt
+docs/plugins/farstream-plugins-undeclared.txt
+docs/plugins/farstream-plugins-undocumented.txt
+docs/plugins/farstream-plugins-unused.txt
+docs/plugins/farstream-plugins.args
+docs/plugins/farstream-plugins.args.new
+docs/plugins/farstream-plugins.hierarchy
+docs/plugins/farstream-plugins.interfaces
+docs/plugins/farstream-plugins.prerequisites
+docs/plugins/farstream-plugins.signals
+docs/plugins/farstream-plugins.signals.new
+docs/plugins/farstream-transmitters.types
+docs/plugins/html/
+docs/plugins/inspect-registry.xml
+docs/plugins/inspect/
+docs/plugins/script
+docs/plugins/tmpl/
+docs/plugins/xml/
+docs/diagrams/*.png
+docs/version.entities
+
+python/pyfarstream.c
+python/*.pyo
+python/*.pyc
+
+tests/check/test-registry.xml
+tests/check/cache
+tests/check/*/.dirstamp
+tests/check/base/fscodec
+tests/check/base/fstransmitter
+tests/check/transmitter/rawudp
+tests/check/transmitter/multicast
+tests/check/transmitter/nice
+tests/check/transmitter/shm
+tests/check/raw/conference
+tests/check/rtp/conference
+tests/check/rtp/codecs
+tests/check/rtp/sendcodecs
+tests/check/rtp/recvcodecs
+tests/check/utils/binadded
+tests/check/elements/rtcpfilter
+tests/check/elements/funnel
+tests/rtp/codec-discovery
+examples/commandline/simple-call
+examples/commandline/simple-call-shm
+examples/gui/*.pyo
+examples/gui/*.pyc
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
+aclocal.m4
+autom4te.cache
+autoregen.sh
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+compile
+depcomp
+diff
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h.in
+stamp-h1
+test-driver
+
+farstream*.pc
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/farstream-0.2.9+4/common/.gitignore
new/farstream-0.2.9+5/common/.gitignore
--- old/farstream-0.2.9+4/common/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/farstream-0.2.9+5/common/.gitignore 2020-10-21 01:51:22.000000000
+0200
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+*~
+/common-update-*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/farstream-0.2.9+4/common/m4/.gitignore
new/farstream-0.2.9+5/common/m4/.gitignore
--- old/farstream-0.2.9+4/common/m4/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/farstream-0.2.9+5/common/m4/.gitignore 2020-10-21 01:51:22.000000000
+0200
@@ -0,0 +1,23 @@
+codeset.m4
+gettext.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+inttypes-pri.m4
+inttypes.m4
+inttypes_h.m4
+isc-posix.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+progtest.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/farstream-0.2.9+4/configure.ac
new/farstream-0.2.9+5/configure.ac
--- old/farstream-0.2.9+4/configure.ac 2020-03-12 15:37:24.000000000 +0100
+++ new/farstream-0.2.9+5/configure.ac 2020-10-21 01:51:22.000000000 +0200
@@ -370,8 +370,25 @@
if test "x$HAVE_GUPNP" = "xyes"; then
AC_DEFINE(HAVE_GUPNP,,[Have the GUPnP IGD library])
+
+ PKG_CHECK_MODULES(GUPNP_CORE, [ gupnp-1.2 ],
+ [ HAVE_GUPNP_CORE_12=yes ],
+ [ HAVE_GUPNP_CORE_12=no
+ PKG_CHECK_MODULES(GUPNP_CORE, [ gupnp-1.0 ],
+ [ HAVE_GUPNP_CORE_10=yes ],
+ [ HAVE_GUPNP_CORE_10=no ])
+ ])
+
+ if test "x$HAVE_GUPNP_CORE_10" = "xyes"; then
+ AC_DEFINE(HAVE_GUPNP_CORE_10,,[Have the GUPnP 1.0 library])
+ fi
+
+ if test "x$HAVE_GUPNP_CORE_12" = "xyes"; then
+ AC_DEFINE(HAVE_GUPNP_CORE_12,,[Have the GUPnP 1.2 library])
+ fi
fi
+
dnl build static plugins or not
AC_MSG_CHECKING([whether to build static plugins or not])
AC_ARG_ENABLE(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/farstream-0.2.9+4/tests/check/Makefile.am
new/farstream-0.2.9+5/tests/check/Makefile.am
--- old/farstream-0.2.9+4/tests/check/Makefile.am 2020-03-12
15:37:24.000000000 +0100
+++ new/farstream-0.2.9+5/tests/check/Makefile.am 2020-10-21
01:51:22.000000000 +0200
@@ -76,9 +76,9 @@
transmitter_rawudp_CFLAGS = $(AM_CFLAGS) \
- $(GUPNP_CFLAGS) $(GIO_CFLAGS) $(NICE_CFLAGS)
+ $(GUPNP_CORE_CFLAGS) $(GIO_CFLAGS) $(NICE_CFLAGS)
transmitter_rawudp_LDADD = $(LDADD) \
- $(GUPNP_LIBS) \
+ $(GUPNP_CORE_LIBS) \
$(GIO_LIBS) \
$(NICE_LIBS)
transmitter_rawudp_SOURCES = \
@@ -113,9 +113,8 @@
transmitter_nice_LDADD = $(LDADD) $(GST_BASE_LIBS)
-transmitter_shm_CFLAGS = $(AM_CFLAGS) $(GUPNP_CFLAGS) $(NICE_CFLAGS)
+transmitter_shm_CFLAGS = $(AM_CFLAGS) $(NICE_CFLAGS)
transmitter_shm_LDADD = $(LDADD) \
- $(GUPNP_LIBS) \
$(NICE_LIBS)
transmitter_shm_SOURCES = \
check-threadsafe.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/farstream-0.2.9+4/tests/check/transmitter/rawudp-upnp.c
new/farstream-0.2.9+5/tests/check/transmitter/rawudp-upnp.c
--- old/farstream-0.2.9+4/tests/check/transmitter/rawudp-upnp.c 2020-03-12
15:37:24.000000000 +0100
+++ new/farstream-0.2.9+5/tests/check/transmitter/rawudp-upnp.c 2020-10-21
01:51:22.000000000 +0200
@@ -37,7 +37,7 @@
}
-#ifdef HAVE_GUPNP
+#if defined(HAVE_GUPNP_CORE_10) || defined(HAVE_GUPNP_CORE_12)
#include <libgupnp/gupnp.h>
@@ -126,8 +126,14 @@
GUPnPDeviceInfo *subdev1;
GUPnPDeviceInfo *subdev2;
const gchar *upnp_xml_path;
+ GError *gerr = NULL;
- context = gupnp_context_new (NULL, NULL, 0, NULL);
+#ifdef HAVE_GUPNP_CORE_12
+ context = gupnp_context_new (NULL, 0, &gerr);
+#else
+ context = gupnp_context_new (NULL, NULL, 0, &gerr);
+#endif
+ g_assert_no_error (gerr);
ts_fail_if (context == NULL, "Can't get gupnp context");
if (g_getenv ("UPNP_XML_PATH"))
@@ -137,8 +143,14 @@
gupnp_context_host_path (context, upnp_xml_path, "");
+#ifdef HAVE_GUPNP_CORE_12
+ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
+ upnp_xml_path, &gerr);
+ g_assert_no_error (gerr);
+#else
dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
upnp_xml_path);
+#endif
ts_fail_if (dev == NULL, "could not get root dev");
subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/farstream-0.2.9+4/tests/check/transmitter/rawudp.c
new/farstream-0.2.9+5/tests/check/transmitter/rawudp.c
--- old/farstream-0.2.9+4/tests/check/transmitter/rawudp.c 2020-03-12
15:37:24.000000000 +0100
+++ new/farstream-0.2.9+5/tests/check/transmitter/rawudp.c 2020-10-21
01:51:22.000000000 +0200
@@ -637,7 +637,7 @@
}
GST_END_TEST;
-#ifdef HAVE_GUPNP
+#if defined(HAVE_GUPNP_CORE_10) || defined (HAVE_GUPNP_CORE_12)
GST_START_TEST (test_rawudptransmitter_run_upnp_discovery)
{
@@ -967,7 +967,7 @@
tcase_add_test (tc_chain, test_rawudptransmitter_stop_stream);
suite_add_tcase (s, tc_chain);
-#ifdef HAVE_GUPNP
+#if defined(HAVE_GUPNP_CORE_10) || defined (HAVE_GUPNP_CORE_12)
if (g_getenv ("UPNP")) {
gchar *multicast_addr;
++++++ farstream-drop-examples.patch ++++++
diff -Nur farstream/configure.ac patched-farstream/configure.ac
--- farstream/configure.ac 2022-02-11 19:56:42.021680596 +0100
+++ patched-farstream/configure.ac 2022-02-11 20:26:22.846155822 +0100
@@ -438,9 +438,6 @@
tests/Makefile
tests/check/Makefile
tests/rtp/Makefile
-examples/Makefile
-examples/gui/Makefile
-examples/commandline/Makefile
docs/Makefile
docs/libs/Makefile
docs/plugins/Makefile
diff -Nur farstream/Makefile.am patched-farstream/Makefile.am
--- farstream/Makefile.am 2022-02-11 19:56:42.021680596 +0100
+++ patched-farstream/Makefile.am 2022-02-11 20:33:20.555044431 +0100
@@ -9,8 +9,7 @@
tests \
docs \
common \
- common-modified \
- examples
+ common-modified
# pkgconfig
DIST_SUBDIRS = \
@@ -20,8 +19,7 @@
tests \
docs \
common \
- common-modified \
- examples
+ common-modified
# pkgconfig
EXTRA_DIST = \
++++++ farstream.obsinfo ++++++
--- /var/tmp/diff_new_pack.cSn7Y1/_old 2022-02-17 00:30:17.369435793 +0100
+++ /var/tmp/diff_new_pack.cSn7Y1/_new 2022-02-17 00:30:17.373435792 +0100
@@ -1,6 +1,5 @@
name: farstream
-version: 0.2.9+4
-mtime: 1584023844
-commit: 46d7b108179b477a00464fc47dc8aa1c6389ee03
-
+version: 0.2.9+5
+mtime: 1603237882
+commit: e70dcd0a9f89efbdaa011c20737ad550635ea580
