Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Dec 2019 12:22:31 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r521277 - in head/net-im/farstream: . files
Message-ID:  <201912291222.xBTCMVX2081995@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sun Dec 29 12:22:30 2019
New Revision: 521277
URL: https://svnweb.freebsd.org/changeset/ports/521277

Log:
  net-im/farstream: import patch to isolate from Git version updates
  
  ...on the download portal of the patch.
  
  PR:		242657
  Approved by:	gnome@ (kwm)

Added:
  head/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9   (contents, props changed)
Modified:
  head/net-im/farstream/Makefile
  head/net-im/farstream/distinfo

Modified: head/net-im/farstream/Makefile
==============================================================================
--- head/net-im/farstream/Makefile	Sun Dec 29 12:20:56 2019	(r521276)
+++ head/net-im/farstream/Makefile	Sun Dec 29 12:22:30 2019	(r521277)
@@ -7,11 +7,10 @@ PORTREVISION=	1
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://freedesktop.org/software/farstream/releases/farstream/
 
-PATCH_SITES=	https://gitlab.collabora.com/farstream/farstream/commit/
-PATCHFILES=	11dde55cbaf5179e8e1885cf1483e538a8d5a4a9.patch:-p1
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
+
+LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libnice.so:net-im/libnice
 RUN_DEPENDS=	libnice-gst1>=0:net-im/libnice-gst1

Modified: head/net-im/farstream/distinfo
==============================================================================
--- head/net-im/farstream/distinfo	Sun Dec 29 12:20:56 2019	(r521276)
+++ head/net-im/farstream/distinfo	Sun Dec 29 12:22:30 2019	(r521277)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1567675919
+TIMESTAMP = 1576460171
 SHA256 (farstream-0.2.8.tar.gz) = 2b3b9c6b4f64ace8c83e03d1da5c5a2884c1cae10b35471072b574201ab38908
 SIZE (farstream-0.2.8.tar.gz) = 1315548
-SHA256 (11dde55cbaf5179e8e1885cf1483e538a8d5a4a9.patch) = 18a5e7c97266373a87c4fc90ef764a744ebc888752897f9e9ff453ec8d450862
+SHA256 (11dde55cbaf5179e8e1885cf1483e538a8d5a4a9.patch) = 3f156b4baf70004d74b3489e414367800c24acdb94bcbd315afdd31104d0deb7
 SIZE (11dde55cbaf5179e8e1885cf1483e538a8d5a4a9.patch) = 2164

Added: head/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9	Sun Dec 29 12:22:30 2019	(r521277)
@@ -0,0 +1,56 @@
+From 11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 Mon Sep 17 00:00:00 2001
+From: Jakub Adam <jakub.adam@ktknet.cz>
+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
+--- ./gst/fsrtpconference/fs-rtp-bitrate-adapter.c~
++++ ./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.22.2
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912291222.xBTCMVX2081995>