diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile index d7f5a8947164..048a1361af2c 100644 --- a/net-im/farstream/Makefile +++ b/net-im/farstream/Makefile @@ -7,12 +7,11 @@ 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 diff --git a/net-im/farstream/distinfo b/net-im/farstream/distinfo index 7d0f3774d7f8..b25bb84f8236 100644 --- a/net-im/farstream/distinfo +++ b/net-im/farstream/distinfo @@ -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 diff --git a/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 b/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 new file mode 100644 index 000000000000..75483f15cb29 --- /dev/null +++ b/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 @@ -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 +