From owner-svn-ports-all@freebsd.org Sun Dec 29 12:22:31 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DCA411DDBDA; Sun, 29 Dec 2019 12:22:31 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47m07W5Tgnz4Rjc; Sun, 29 Dec 2019 12:22:31 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B7167196DA; Sun, 29 Dec 2019 12:22:31 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBTCMVUk082001; Sun, 29 Dec 2019 12:22:31 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBTCMVX2081995; Sun, 29 Dec 2019 12:22:31 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201912291222.xBTCMVX2081995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 29 Dec 2019 12:22:31 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/net-im/farstream: . files X-SVN-Commit-Revision: 521277 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Dec 2019 12:22:31 -0000 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 +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 +