Attachment 166671 Details for Bug 206985 – net-im_farstream010.shar

net-im_farstream010.shar

net-im_farstream010.shar (text/plain), 14.59 KB, created by rainbow on 2016-02-06 21:05:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rainbow

Created: 2016-02-06 21:05:59 UTC

Size: 14.59 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	net-im/farstream010
>#	net-im/farstream010/files
>#	net-im/farstream010/files/patch-transmitters_rawudp_fs-rawudp-transmitter.c
>#	net-im/farstream010/files/patch-transmitters_multicast_fs-multicast-transmitter.c
>#	net-im/farstream010/files/patch-transmitters_rawudp_fs-rawudp-transmitter.h
>#	net-im/farstream010/files/patch-farstream-rtp-session
>#	net-im/farstream010/files/patch-fix-crash
>#	net-im/farstream010/files/patch-intersect-instead-of-merge
>#	net-im/farstream010/files/patch-rtp-memleak
>#	net-im/farstream010/files/patch-codec-discovery-intersect
>#	net-im/farstream010/Makefile
>#	net-im/farstream010/distinfo
>#	net-im/farstream010/pkg-descr
>#	net-im/farstream010/pkg-plist
>#
>echo c - net-im/farstream010
>mkdir -p net-im/farstream010 > /dev/null 2>&1
>echo c - net-im/farstream010/files
>mkdir -p net-im/farstream010/files > /dev/null 2>&1
>echo x - net-im/farstream010/files/patch-transmitters_rawudp_fs-rawudp-transmitter.c
>sed 's/^X//' >net-im/farstream010/files/patch-transmitters_rawudp_fs-rawudp-transmitter.c << '6d6e43476b740fea16feb144edcc0767'
>X--- transmitters/rawudp/fs-rawudp-transmitter.c.orig	2009-08-03 16:20:07.000000000 -0400
>X+++ transmitters/rawudp/fs-rawudp-transmitter.c	2009-08-09 19:19:33.000000000 -0400
>X@@ -53,6 +53,8 @@
>X #else /*G_OS_WIN32*/
>X # include <netdb.h>
>X # include <sys/socket.h>
>X+# include <netinet/in.h>
>X+# include <netinet/in_systm.h>
>X # include <netinet/ip.h>
>X # include <arpa/inet.h>
>X #endif /*G_OS_WIN32*/
>6d6e43476b740fea16feb144edcc0767
>echo x - net-im/farstream010/files/patch-transmitters_multicast_fs-multicast-transmitter.c
>sed 's/^X//' >net-im/farstream010/files/patch-transmitters_multicast_fs-multicast-transmitter.c << '3efc2d7fda38477400889905fd88d3bc'
>X--- transmitters/multicast/fs-multicast-transmitter.c.orig	2009-08-03 16:20:07.000000000 -0400
>X+++ transmitters/multicast/fs-multicast-transmitter.c	2009-08-09 19:20:18.000000000 -0400
>X@@ -53,6 +53,8 @@
>X #else /*G_OS_WIN32*/
>X # include <netdb.h>
>X # include <sys/socket.h>
>X+# include <netinet/in.h>
>X+# include <netinet/in_systm.h>
>X # include <netinet/ip.h>
>X # include <arpa/inet.h>
>X #endif /*G_OS_WIN32*/
>3efc2d7fda38477400889905fd88d3bc
>echo x - net-im/farstream010/files/patch-transmitters_rawudp_fs-rawudp-transmitter.h
>sed 's/^X//' >net-im/farstream010/files/patch-transmitters_rawudp_fs-rawudp-transmitter.h << 'e482d1521ccf2b4d36044238b1bbd490'
>X--- transmitters/rawudp/fs-rawudp-transmitter.h.orig	2009-02-27 23:30:18.000000000 -0500
>X+++ transmitters/rawudp/fs-rawudp-transmitter.h	2009-02-27 23:30:37.000000000 -0500
>X@@ -34,6 +34,9 @@
>X #ifdef G_OS_WIN32
>X # include <ws2tcpip.h>
>X #else /*G_OS_WIN32*/
>X+# include <sys/types.h>
>X+# include <sys/socket.h>
>X+# include <netinet/in.h>
>X # include <arpa/inet.h>
>X #endif /*G_OS_WIN32*/
>X 
>e482d1521ccf2b4d36044238b1bbd490
>echo x - net-im/farstream010/files/patch-farstream-rtp-session
>sed 's/^X//' >net-im/farstream010/files/patch-farstream-rtp-session << 'b7781eebc0223a028c402767cf3586be'
>X--- gst/fsrtpconference/fs-rtp-session.c.orig	2012-03-22 15:23:10.000000000 -0500
>X+++ gst/fsrtpconference/fs-rtp-session.c	2014-08-08 11:59:55.206979402 -0500
>X@@ -3624,6 +3624,9 @@
>X 
>X   if (!codecbin)
>X   {
>X+    g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
>X+        "Could create codec bin for: " FS_CODEC_FORMAT,
>X+        FS_CODEC_ARGS (send_codec_copy));
>X     fs_codec_destroy (send_codec_copy);
>X     fs_codec_destroy (codec_copy);
>X     fs_codec_list_destroy (codecs);
>X@@ -3690,6 +3693,9 @@
>X 
>X   if (!g_value_get_boolean (&link_rv))
>X   {
>X+    g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
>X+        "Could not get boolean value for link"
>X+        " the main pad for: " FS_CODEC_FORMAT, FS_CODEC_ARGS (send_codec_copy));
>X     gst_iterator_free (iter);
>X     goto error;
>X   }
>X@@ -3709,8 +3715,12 @@
>X 
>X   gst_iterator_free (iter);
>X 
>X-  if (!g_value_get_boolean (&link_rv))
>X+  if (!g_value_get_boolean (&link_rv)) {
>X+    g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
>X+        "Could not get boolean value for link"
>X+        " the main pad for: " FS_CODEC_FORMAT, FS_CODEC_ARGS (send_codec_copy));
>X     goto error;
>X+  }
>X 
>X   gst_element_set_locked_state (codecbin, FALSE);
>X 
>b7781eebc0223a028c402767cf3586be
>echo x - net-im/farstream010/files/patch-fix-crash
>sed 's/^X//' >net-im/farstream010/files/patch-fix-crash << '92c55ac8636c5d56550f642e6cb27c92'
>XFrom e349a7db681b643beaf8174a32b071292abd980e Mon Sep 17 00:00:00 2001
>XFrom: Olivier CrÃªte <olivier.crete@collabora.com>
>XDate: Thu, 27 Feb 2014 23:00:13 +0000
>XSubject: raw: Fix crash where the stream would try to contact its session before its been set
>X
>X---
>X(limited to 'gst/fsrawconference')
>X
>Xdiff --git gst/fsrawconference/fs-raw-stream.c gst/fsrawconference/fs-raw-stream.c
>Xindex fe5326b..eb8db74 100644
>X--- gst/fsrawconference/fs-raw-stream.c
>X+++ gst/fsrawconference/fs-raw-stream.c
>X@@ -436,7 +436,8 @@ fs_raw_stream_set_property (GObject *object,
>X               (direction & FS_DIRECTION_SEND) ? TRUE : FALSE, NULL);
>X           g_object_unref (st);
>X         }
>X-        fs_raw_session_update_direction (self->priv->session, direction);
>X+        if (self->priv->session)
>X+          fs_raw_session_update_direction (self->priv->session, direction);
>X         if (conference)
>X           GST_OBJECT_LOCK (conference);
>X       }
>X--
>Xcgit v0.9.0.3
>92c55ac8636c5d56550f642e6cb27c92
>echo x - net-im/farstream010/files/patch-intersect-instead-of-merge
>sed 's/^X//' >net-im/farstream010/files/patch-intersect-instead-of-merge << '6d7b80421142b013d1cdd4fa22c7114f'
>Xdiff --git gst/fsrtpconference/fs-rtp-discover-codecs.c gst/fsrtpconference/fs-rtp-discover-codecs.c
>Xindex d128e84..3521580 100644
>X--- gst/fsrtpconference/fs-rtp-discover-codecs.c
>X+++ gst/fsrtpconference/fs-rtp-discover-codecs.c
>X@@ -1110,11 +1110,8 @@ compare_media_caps (gconstpointer a, gconstpointer b)
>X }
>X 
>X static gint
>X-compare_rtp_caps (gconstpointer a, gconstpointer b)
>X+compare_rtp_caps (CodecCap *element, GstCaps *c_caps)
>X {
>X-  CodecCap *element = (CodecCap *)a;
>X-  GstCaps *c_caps = (GstCaps *)b;
>X-
>X   return !gst_caps_can_intersect (element->rtp_caps, c_caps);
>X }
>X 
>X@@ -1226,7 +1223,7 @@ create_codec_cap_list (GstElementFactory *factory,
>X         if (rtp_caps) {
>X           if (entry->rtp_caps) {
>X             GstCaps *new_rtp_caps;
>X-            new_rtp_caps = gst_caps_union (rtp_caps, entry->rtp_caps);
>X+            new_rtp_caps = gst_caps_intersect (rtp_caps, entry->rtp_caps);
>X             gst_caps_unref (entry->rtp_caps);
>X             entry->rtp_caps = new_rtp_caps;
>X           } else {
>6d7b80421142b013d1cdd4fa22c7114f
>echo x - net-im/farstream010/files/patch-rtp-memleak
>sed 's/^X//' >net-im/farstream010/files/patch-rtp-memleak << '19c3d5e1db4d9d8cc98b822d114c014a'
>XFrom 10b3d38560ec53d980d13240559e6758c1113e21 Mon Sep 17 00:00:00 2001
>XFrom: Havard Graff <havard.graff@gmail.com>
>XDate: Thu, 21 Mar 2013 12:46:11 +0000
>XSubject: fs-rtp-discover-codecs: plug memoryleak
>X
>Xuse g_list_delete_link to free the list as well
>X---
>X(limited to 'gst/fsrtpconference')
>X
>Xdiff --git gst/fsrtpconference/fs-rtp-discover-codecs.c gst/fsrtpconference/fs-rtp-discover-codecs.c
>Xindex df316a4..c663225 100644
>X--- gst/fsrtpconference/fs-rtp-discover-codecs.c
>X+++ gst/fsrtpconference/fs-rtp-discover-codecs.c
>X@@ -536,7 +536,7 @@ remove_duplicates (GList *list)
>X       if (gst_caps_is_equal (codec_cap1->rtp_caps, codec_cap2->rtp_caps))
>X       {
>X         codec_cap_free (codec_cap2);
>X-        walk1 = g_list_remove_link (walk1, walk2);
>X+        walk1 = g_list_delete_link (walk1, walk2);
>X         goto again;
>X       }
>X     }
>X--
>Xcgit v0.9.0.3
>19c3d5e1db4d9d8cc98b822d114c014a
>echo x - net-im/farstream010/files/patch-codec-discovery-intersect
>sed 's/^X//' >net-im/farstream010/files/patch-codec-discovery-intersect << 'b9668c5fed971a39616dccc890d9c73c'
>XFrom 50fffb08d941dce58ae48bf531faead8a4e22ed7 Mon Sep 17 00:00:00 2001
>XFrom: Olivier CrÃªte <olivier.crete@collabora.com>
>XDate: Tue, 02 Apr 2013 23:13:06 +0000
>XSubject: codec-discovery: Intersect different parts of the same caps to reduce them
>X
>XWe do this because a caps may have the static payload in a separate structure from the encoding-name
>XWe just want both in the same structure
>X---
>Xdiff --git gst/fsrtpconference/fs-rtp-discover-codecs.c gst/fsrtpconference/fs-rtp-discover-codecs.c
>Xindex 5530cc8..df316a4 100644
>X--- gst/fsrtpconference/fs-rtp-discover-codecs.c
>X+++ gst/fsrtpconference/fs-rtp-discover-codecs.c
>X@@ -384,7 +384,6 @@ validate_h263_codecs (CodecCap *codec_cap)
>X   if (!rtp_struct)
>X     return FALSE;
>X 
>X-  /* If there no h263version, we accept everything */
>X   encoding_name = gst_structure_get_string (rtp_struct, "encoding-name");
>X 
>X   /* If there is no encoding name, we have a problem, lets refuse it */
>X@@ -1300,15 +1299,44 @@ get_plugins_filtered_from_caps (FilterFunc filter,
>X     else
>X     {
>X       gint i;
>X-      for (i = 0; i < gst_caps_get_size (matched_caps); i++)
>X+      GPtrArray *capslist = g_ptr_array_new_with_free_func (
>X+        (GDestroyNotify) gst_caps_unref);
>X+
>X+      while (gst_caps_get_size (matched_caps) > 0)
>X       {
>X-        GstCaps *cur_caps =
>X-            gst_caps_copy_nth (matched_caps, i);
>X+        GstCaps *stolencaps = gst_caps_new_full (
>X+          gst_caps_steal_structure (matched_caps, 0), NULL);
>X+        gboolean got_match = FALSE;
>X+
>X+        for (i = 0; i < capslist->len; i++)
>X+        {
>X+          GstCaps *intersect = gst_caps_intersect (stolencaps,
>X+              g_ptr_array_index (capslist, i));
>X+
>X+          if (gst_caps_is_empty (intersect))
>X+          {
>X+            gst_caps_unref (intersect);
>X+          }
>X+          else
>X+          {
>X+            got_match = TRUE;
>X+            gst_caps_unref (g_ptr_array_index (capslist, i));
>X+            g_ptr_array_index (capslist, i) = intersect;
>X+          }
>X+        }
>X+
>X+        if (got_match)
>X+          gst_caps_unref (stolencaps);
>X+        else
>X+          g_ptr_array_add (capslist, stolencaps);
>X 
>X-        list = create_codec_cap_list (factory, direction, list, cur_caps);
>X-        gst_caps_unref (cur_caps);
>X       }
>X       gst_caps_unref (matched_caps);
>X+
>X+      for (i = 0; i < capslist->len; i++)
>X+        list = create_codec_cap_list (factory, direction, list,
>X+            g_ptr_array_index (capslist, i));
>X+      g_ptr_array_unref (capslist);
>X     }
>X   }
>X 
>X--
>Xcgit v0.9.0.3
>b9668c5fed971a39616dccc890d9c73c
>echo x - net-im/farstream010/Makefile
>sed 's/^X//' >net-im/farstream010/Makefile << 'd66a960da0348fd0fc9df70accc4545c'
>X# Created by: Davide Gerhard <rainbow@irh.it>
>X# $FreeBSD$
>X
>XPORTNAME=	farstream010
>XPORTVERSION=	0.1.2r2013032901
>XPORTREVISION=	1
>XCATEGORIES=	net-im devel
>XMASTER_SITES=	LOCAL/rainbow
>X
>XMAINTAINER=	portsi@FreeBSD.org
>XCOMMENT=	Collection of GStreamer modules and libraries for videoconferencing
>X
>XLIB_DEPENDS=	libnice.so:${PORTSDIR}/net-im/libnice
>XRUN_DEPENDS=	libnice-gst010>=0:${PORTSDIR}/net-im/libnice-gst010 \
>X		gstreamer-plugins-v4l2>=0:${PORTSDIR}/multimedia/gstreamer-plugins-v4l2
>X
>XUSES=		gettext libtool gmake pathfix pkgconfig python
>XUSE_LDCONFIG=	yes
>XUSE_GNOME=	glib20
>XUSE_GSTREAMER=	core good bad python
>XGNU_CONFIGURE=	yes
>X
>XCPPFLAGS+=	-I${LOCALBASE}/include
>XLDFLAGS+=	-L${LOCALBASE}/lib
>XINSTALL_TARGET=	install-strip
>X
>XFETCH_DEPENDS+= git:${PORTSDIR}/devel/git
>XGIT_COMMIT=	54e28e95bed4f04bc95dae509c3724399c79fa29
>XGIT_URI=	git://git.collabora.co.uk/git/farstream.git
>X
>X.if defined(BOOTSTRAP)   ## make BOOTSTRAP=defined fetch
>Xdo-fetch:
>X	@${MKDIR} ${WRKDIR}
>X	git clone ${GIT_URI} ${WRKSRC}
>X	@cd ${WRKSRC} && git reset --hard ${GIT_COMMIT}
>X	@cd ${WRKDIR}; tar czf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
>X.endif
>X	
>Xpre-configure:
>X	@${REINPLACE_CMD} -e 's/AC_INIT(Farstream, 0.1.2.1/AC_INIT(Farstream, 0.1.2/' ${WRKSRC}/configure.ac
>X	@cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} autogen.sh
>X
>X.include <bsd.port.mk>
>d66a960da0348fd0fc9df70accc4545c
>echo x - net-im/farstream010/distinfo
>sed 's/^X//' >net-im/farstream010/distinfo << '28f9185a2e000bf2732ae4bb3c7ee52b'
>XSHA256 (farstream010-0.1.2r2013032901.tar.gz) = b21ccb1741002047841fe0b19ca1d8771862d4230bfdbdf9da2a46f30008a292
>XSIZE (farstream010-0.1.2r2013032901.tar.gz) = 4116339
>28f9185a2e000bf2732ae4bb3c7ee52b
>echo x - net-im/farstream010/pkg-descr
>sed 's/^X//' >net-im/farstream010/pkg-descr << '991bc397b275378edc6feb9aa9f6fbfb'
>XFarsight 2 is a collection of GStreamer modules and libraries for
>Xvideoconferencing.
>X
>XWWW: http://farsight.freedesktop.org/
>991bc397b275378edc6feb9aa9f6fbfb
>echo x - net-im/farstream010/pkg-plist
>sed 's/^X//' >net-im/farstream010/pkg-plist << 'b557b36a1d4273431a4065c838dced68'
>Xinclude/farstream-0.1/farstream/fs-candidate.h
>Xinclude/farstream-0.1/farstream/fs-codec.h
>Xinclude/farstream-0.1/farstream/fs-conference.h
>Xinclude/farstream-0.1/farstream/fs-element-added-notifier.h
>Xinclude/farstream-0.1/farstream/fs-enumtypes.h
>Xinclude/farstream-0.1/farstream/fs-participant.h
>Xinclude/farstream-0.1/farstream/fs-plugin.h
>Xinclude/farstream-0.1/farstream/fs-rtp.h
>Xinclude/farstream-0.1/farstream/fs-session.h
>Xinclude/farstream-0.1/farstream/fs-stream-transmitter.h
>Xinclude/farstream-0.1/farstream/fs-stream.h
>Xinclude/farstream-0.1/farstream/fs-transmitter.h
>Xinclude/farstream-0.1/farstream/fs-utils.h
>Xlib/farstream-0.1/libmulticast-transmitter.a
>Xlib/farstream-0.1/libmulticast-transmitter.so
>Xlib/farstream-0.1/libnice-transmitter.a
>Xlib/farstream-0.1/libnice-transmitter.so
>Xlib/farstream-0.1/librawudp-transmitter.a
>Xlib/farstream-0.1/librawudp-transmitter.so
>Xlib/farstream-0.1/libshm-transmitter.a
>Xlib/farstream-0.1/libshm-transmitter.so
>Xlib/girepository-1.0/Farstream-0.1.typelib
>Xlib/gstreamer-0.10/libfsfunnel.a
>Xlib/gstreamer-0.10/libfsfunnel.so
>Xlib/gstreamer-0.10/libfsmsnconference.a
>Xlib/gstreamer-0.10/libfsmsnconference.so
>Xlib/gstreamer-0.10/libfsrawconference.a
>Xlib/gstreamer-0.10/libfsrawconference.so
>Xlib/gstreamer-0.10/libfsrtcpfilter.a
>Xlib/gstreamer-0.10/libfsrtcpfilter.so
>Xlib/gstreamer-0.10/libfsrtpconference.a
>Xlib/gstreamer-0.10/libfsrtpconference.so
>Xlib/gstreamer-0.10/libfsvideoanyrate.a
>Xlib/gstreamer-0.10/libfsvideoanyrate.so
>Xlib/libfarstream-0.1.a
>Xlib/libfarstream-0.1.so
>Xlib/libfarstream-0.1.so.0
>Xlib/libfarstream-0.1.so.0.0.1
>Xlib/pkgconfig/farstream-0.1.pc
>X%%PYTHON_SITELIBDIR%%/farstream.a
>X%%PYTHON_SITELIBDIR%%/farstream.so
>Xshare/farstream/0.1/fsrawconference/default-element-properties
>Xshare/farstream/0.1/fsrtpconference/default-codec-preferences
>Xshare/farstream/0.1/fsrtpconference/default-element-properties
>Xshare/gir-1.0/Farstream-0.1.gir
>b557b36a1d4273431a4065c838dced68
>exit
>

Actions: View

Attachments on bug 206985: 166671