Hello community,

here is the log from the commit of package farstream for openSUSE:Leap:15.2 
checked in at 2020-03-06 12:36:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/farstream (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.farstream.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "farstream"

Fri Mar  6 12:36:29 2020 rev:10 rq:779564 version:0.2.8

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/farstream/farstream.changes    2020-01-15 
14:54:36.297561564 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.farstream.new.26092/farstream.changes 
2020-03-06 12:36:30.410583211 +0100
@@ -1,0 +2,11 @@
+Fri Dec  7 16:51:41 UTC 2018 - [email protected]
+
+- Add farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch:
+  rtpbitrateadapter should make no adaption by default (bgo#99183).
+
+-------------------------------------------------------------------
+Wed Feb 28 16:25:19 UTC 2018 - [email protected]
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------

New:
----
  farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch

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

Other differences:
------------------
++++++ farstream.spec ++++++
--- /var/tmp/diff_new_pack.UEeIqu/_old  2020-03-06 12:36:31.010583576 +0100
+++ /var/tmp/diff_new_pack.UEeIqu/_new  2020-03-06 12:36:31.014583578 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package farstream
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
 #
 
 
+%define gst_pluginsdir %(pkg-config --variable pluginsdir gstreamer-1.0)
 Name:           farstream
 Version:        0.2.8
 Release:        0
@@ -23,13 +24,15 @@
 # and common/gstdoc-scangobj; those are just used during the build and do not
 # affect the license of the binary packages
 Summary:        GStreamer modules and libraries for videoconferencing
-License:        GPL-2.0+ and LGPL-2.1+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Multimedia/Other
-Url:            http://farsight.freedesktop.org/
+URL:            http://farsight.freedesktop.org/
 Source:         
http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
 # PATCH-FEATURE-OPENSUSE farstream-plugin-path.patch [email protected] -- Use 
library policy compliant path for plugin
 Patch0:         farstream-plugin-path.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch
 #needed by patch0
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -37,13 +40,12 @@
 BuildRequires:  glib2-devel >= 2.32
 BuildRequires:  gobject-introspection-devel >= 0.10.1
 BuildRequires:  gstreamer-devel >= 1.4
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.16
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.4
 BuildRequires:  pkgconfig(gupnp-igd-1.0) >= 0.2
 BuildRequires:  pkgconfig(nice) >= 0.1.8
 BuildRequires:  pkgconfig(pygobject-2.0) >= 2.16.0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define gst_pluginsdir %(pkg-config --variable pluginsdir gstreamer-1.0)
 
 %description
 Farstream is a collection of GStreamer modules and libraries for
@@ -51,7 +53,7 @@
 
 %package -n libfarstream-0_2-5
 Summary:        GStreamer modules and libraries for videoconferencing
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Libraries
 Requires:       %{name}-data
 # While not strictly needed, apps using farstream will need the gstreamer
@@ -64,7 +66,7 @@
 
 %package -n typelib-1_0-Farstream-0_2
 Summary:        GStreamer modules and libraries for videoconferencing -- 
Introspection bindings
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Libraries
 
 %description -n typelib-1_0-Farstream-0_2
@@ -75,7 +77,7 @@
 
 %package -n gstreamer-plugins-farstream
 Summary:        GStreamer Plug-Ins for videoconferencing
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Productivity/Multimedia/Other
 Requires:       gstreamer-plugins-bad >= 0.11
 Requires:       gstreamer-plugins-good >= 0.11
@@ -89,7 +91,7 @@
 
 %package data
 Summary:        GStreamer modules and libraries for videoconferencing -- Codec 
preferences
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Libraries
 BuildArch:      noarch
 
@@ -102,7 +104,7 @@
 
 %package devel
 Summary:        GStreamer modules and libraries for videoconferencing -- 
Development files
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libfarstream-0_2-5 = %{version}
 Requires:       typelib-1_0-Farstream-0_2 = %{version}
@@ -114,6 +116,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 #needed by patch0
@@ -125,16 +128,15 @@
 
 %install
 %make_install
-find %{buildroot} -name '*.la' -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 %fdupes %{buildroot}%{_datadir}/gtk-doc/html/
 
 %post -n libfarstream-0_2-5 -p /sbin/ldconfig
-
 %postun -n libfarstream-0_2-5 -p /sbin/ldconfig
 
 %files -n libfarstream-0_2-5
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 %{_libdir}/libfarstream-0.2.so.*
 %dir %{_libdir}/farstream-0.2-5/
 %{_libdir}/farstream-0.2-5/libmulticast-transmitter.so
@@ -143,11 +145,9 @@
 %{_libdir}/farstream-0.2-5/libshm-transmitter.so
 
 %files -n typelib-1_0-Farstream-0_2
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/Farstream-0.2.typelib
 
 %files -n gstreamer-plugins-farstream
-%defattr(-,root,root)
 %{gst_pluginsdir}/libfsmsnconference.so
 %{gst_pluginsdir}/libfsrawconference.so
 %{gst_pluginsdir}/libfsrtpconference.so
@@ -155,7 +155,6 @@
 %{gst_pluginsdir}/libfsvideoanyrate.so
 
 %files data
-%defattr(-, root, root)
 %dir %{_datadir}/farstream/
 %dir %{_datadir}/farstream/0.2/
 %dir %{_datadir}/farstream/0.2/fsrawconference/
@@ -165,7 +164,6 @@
 %{_datadir}/farstream/0.2/fsrtpconference/default-element-properties
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/farstream-0.2/
 %{_libdir}/libfarstream-0.2.so
 %{_libdir}/pkgconfig/farstream-0.2.pc

++++++ farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch ++++++
>From 11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 Mon Sep 17 00:00:00 2001
From: Jakub Adam <[email protected]>
Date: Thu, 14 Apr 2016 15:17:50 +0200
Subject: [PATCH] rtpbitrateadapter: should make no adaption by default

Description of "bitrate" property says 0 (the default value) means
the element performs no adaption, and so one would assume it would
remain passive until "bitrate" is set to some nonzero value. However,
when "bitrate" is left unset, the adapter instead requests video in tiny
128x96 resolution on its sink pad.

In order for fs_rtp_bitrate_adapter_getcaps() to return peer_caps by
default, the value of FsRtpBitrateAdapter::bitrate has to be initialized
to G_MAXUINT.

Also fix the comments to say that MAXUINT is no adaptation.

https://bugs.freedesktop.org/show_bug.cgi?id=99183
---
 gst/fsrtpconference/fs-rtp-bitrate-adapter.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c 
b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
index e8684fd5..99ea03a0 100644
--- a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
+++ b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
@@ -55,6 +55,7 @@ enum
 };
 
 #define PROP_INTERVAL_DEFAULT (10 * GST_SECOND)
+#define PROP_BITRATE_DEFAULT (G_MAXUINT)
 
 static void fs_rtp_bitrate_adapter_finalize (GObject *object);
 static void fs_rtp_bitrate_adapter_set_property (GObject *object,
@@ -105,8 +106,8 @@ fs_rtp_bitrate_adapter_class_init (FsRtpBitrateAdapterClass 
*klass)
       PROP_BITRATE,
       g_param_spec_uint ("bitrate",
           "Bitrate to adapt for",
-          "The bitrate to adapt for (0 means no adaption)",
-          0, G_MAXUINT, 0,
+          "The bitrate to adapt for (MAXUINT means no adaption)",
+          0, G_MAXUINT, PROP_BITRATE_DEFAULT,
           G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
 
  g_object_class_install_property (gobject_class,
@@ -161,6 +162,7 @@ fs_rtp_bitrate_adapter_init (FsRtpBitrateAdapter *self)
   self->system_clock = gst_system_clock_obtain ();
   self->interval = PROP_INTERVAL_DEFAULT;
 
+  self->bitrate = PROP_BITRATE_DEFAULT;
   self->last_bitrate = G_MAXUINT;
 }
 
-- 
2.18.1


Reply via email to