[arch-commits] Commit in farstream-0.1/repos (20 files)
Jan de Groot
jgc at nymeria.archlinux.org
Wed Apr 2 21:38:08 UTC 2014
Date: Wednesday, April 2, 2014 @ 23:38:07
Author: jgc
Revision: 209757
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
farstream-0.1/repos/extra-i686/PKGBUILD
(from rev 209756, farstream-0.1/trunk/PKGBUILD)
farstream-0.1/repos/extra-i686/codec-discovery-intersect.patch
(from rev 209756, farstream-0.1/trunk/codec-discovery-intersect.patch)
farstream-0.1/repos/extra-i686/farstream-0.1.2-prefer-vp8.patch
(from rev 209756, farstream-0.1/trunk/farstream-0.1.2-prefer-vp8.patch)
farstream-0.1/repos/extra-i686/fix-crash.patch
(from rev 209756, farstream-0.1/trunk/fix-crash.patch)
farstream-0.1/repos/extra-i686/intersect-instead-of-merge.patch
(from rev 209756, farstream-0.1/trunk/intersect-instead-of-merge.patch)
farstream-0.1/repos/extra-i686/rtp-memleak.patch
(from rev 209756, farstream-0.1/trunk/rtp-memleak.patch)
farstream-0.1/repos/extra-x86_64/PKGBUILD
(from rev 209756, farstream-0.1/trunk/PKGBUILD)
farstream-0.1/repos/extra-x86_64/codec-discovery-intersect.patch
(from rev 209756, farstream-0.1/trunk/codec-discovery-intersect.patch)
farstream-0.1/repos/extra-x86_64/farstream-0.1.2-prefer-vp8.patch
(from rev 209756, farstream-0.1/trunk/farstream-0.1.2-prefer-vp8.patch)
farstream-0.1/repos/extra-x86_64/fix-crash.patch
(from rev 209756, farstream-0.1/trunk/fix-crash.patch)
farstream-0.1/repos/extra-x86_64/intersect-instead-of-merge.patch
(from rev 209756, farstream-0.1/trunk/intersect-instead-of-merge.patch)
farstream-0.1/repos/extra-x86_64/rtp-memleak.patch
(from rev 209756, farstream-0.1/trunk/rtp-memleak.patch)
Deleted:
farstream-0.1/repos/extra-i686/PKGBUILD
farstream-0.1/repos/extra-i686/codec-discovery-intersect.patch
farstream-0.1/repos/extra-i686/farstream-0.1.2-prefer-vp8.patch
farstream-0.1/repos/extra-i686/rtp-memleak.patch
farstream-0.1/repos/extra-x86_64/PKGBUILD
farstream-0.1/repos/extra-x86_64/codec-discovery-intersect.patch
farstream-0.1/repos/extra-x86_64/farstream-0.1.2-prefer-vp8.patch
farstream-0.1/repos/extra-x86_64/rtp-memleak.patch
-----------------------------------------------+
/PKGBUILD | 118 +++++++++++++++++++
/codec-discovery-intersect.patch | 144 ++++++++++++++++++++++++
/farstream-0.1.2-prefer-vp8.patch | 24 ++++
/rtp-memleak.patch | 48 ++++++++
extra-i686/PKGBUILD | 49 --------
extra-i686/codec-discovery-intersect.patch | 72 ------------
extra-i686/farstream-0.1.2-prefer-vp8.patch | 12 --
extra-i686/fix-crash.patch | 24 ++++
extra-i686/intersect-instead-of-merge.patch | 26 ++++
extra-i686/rtp-memleak.patch | 24 ----
extra-x86_64/PKGBUILD | 49 --------
extra-x86_64/codec-discovery-intersect.patch | 72 ------------
extra-x86_64/farstream-0.1.2-prefer-vp8.patch | 12 --
extra-x86_64/fix-crash.patch | 24 ++++
extra-x86_64/intersect-instead-of-merge.patch | 26 ++++
extra-x86_64/rtp-memleak.patch | 24 ----
16 files changed, 434 insertions(+), 314 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-i686/PKGBUILD 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=farstream-0.1
-_pkgname=farstream
-pkgver=0.1.2
-pkgrel=3
-pkgdesc="Audio/Video Communications Framework (legacy version)"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
-depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins'
- 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
-makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2' 'git' 'gtk-doc')
-source=(git://git.collabora.co.uk/git/farstream.git#commit=54e28e95bed4f04bc95dae509c3724399c79fa29
- farstream-0.1.2-prefer-vp8.patch
- codec-discovery-intersect.patch
- rtp-memleak.patch)
-sha256sums=('SKIP')
-
-prepare() {
- cd farstream
- patch -Np1 -i ../farstream-0.1.2-prefer-vp8.patch
- patch -Np1 -i ../codec-discovery-intersect.patch
- patch -Np1 -i ../rtp-memleak.patch
-}
-
-build() {
- cd farstream
- NOCONFIGURE=1 ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-package-name='Arch Linux Farstream 0.1 Package' \
- --with-package-origin='httpw://www.archlinux.org/' \
- --enable-gtk-doc --disable-static
- make -j1
-}
-
-package() {
- cd farstream
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-sha256sums=('SKIP'
- '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
- '385d7c72e269bf48bd41937442d819a1e6d0f2472b903670a8a5555f5cb96586'
- 'b966312ccad90dd30b78ee2df49e9637b3b573e498668bcc58ac208f254440db')
Copied: farstream-0.1/repos/extra-i686/PKGBUILD (from rev 209756, farstream-0.1/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=farstream-0.1
+_pkgname=farstream
+pkgver=0.1.2
+pkgrel=4
+pkgdesc="Audio/Video Communications Framework (legacy version)"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/Farstream"
+license=('LGPL2.1')
+depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-ffmpeg')
+makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2' 'git' 'gtk-doc')
+source=(git://git.collabora.co.uk/git/farstream.git#commit=54e28e95bed4f04bc95dae509c3724399c79fa29
+ farstream-0.1.2-prefer-vp8.patch
+ codec-discovery-intersect.patch
+ intersect-instead-of-merge.patch
+ rtp-memleak.patch
+ fix-crash.patch)
+sha256sums=('SKIP'
+ '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
+ '385d7c72e269bf48bd41937442d819a1e6d0f2472b903670a8a5555f5cb96586'
+ 'c3988f90fc50ee557399b240de78f3fb4fe191f339143f6943b963c2e0fddaf2'
+ 'b966312ccad90dd30b78ee2df49e9637b3b573e498668bcc58ac208f254440db'
+ '8fde8f5fb16475aabeda2d6e48c86b105341fd72cde02cd6655ca7f41b4a98ed')
+
+prepare() {
+ cd farstream
+ patch -Np1 -i ../farstream-0.1.2-prefer-vp8.patch
+ patch -Np1 -i ../intersect-instead-of-merge.patch
+ patch -Np1 -i ../codec-discovery-intersect.patch
+ patch -Np1 -i ../rtp-memleak.patch
+ patch -Np1 -i ../fix-crash.patch
+ sed -i -e 's/AC_INIT(Farstream, 0.1.2.1/AC_INIT(Farstream, 0.1.2/' configure.ac
+}
+
+check() {
+ cd farstream
+ # MSN test fails because of missing libmimic + mimenc element
+ make check || return 0
+}
+build() {
+ cd farstream
+ NOCONFIGURE=1 ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-package-name='Arch Linux Farstream 0.1 Package' \
+ --with-package-origin='httpw://www.archlinux.org/' \
+ --disable-gtk-doc --disable-static
+ make -j1
+}
+
+package() {
+ cd farstream
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/codec-discovery-intersect.patch
===================================================================
--- extra-i686/codec-discovery-intersect.patch 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-i686/codec-discovery-intersect.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,72 +0,0 @@
-From 50fffb08d941dce58ae48bf531faead8a4e22ed7 Mon Sep 17 00:00:00 2001
-From: Olivier Crête <olivier.crete at collabora.com>
-Date: Tue, 02 Apr 2013 23:13:06 +0000
-Subject: codec-discovery: Intersect different parts of the same caps to reduce them
-
-We do this because a caps may have the static payload in a separate structure from the encoding-name
-We just want both in the same structure
----
-diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-index 5530cc8..df316a4 100644
---- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
-+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-@@ -384,7 +384,6 @@ validate_h263_codecs (CodecCap *codec_cap)
- if (!rtp_struct)
- return FALSE;
-
-- /* If there no h263version, we accept everything */
- encoding_name = gst_structure_get_string (rtp_struct, "encoding-name");
-
- /* If there is no encoding name, we have a problem, lets refuse it */
-@@ -1300,15 +1299,44 @@ get_plugins_filtered_from_caps (FilterFunc filter,
- else
- {
- gint i;
-- for (i = 0; i < gst_caps_get_size (matched_caps); i++)
-+ GPtrArray *capslist = g_ptr_array_new_with_free_func (
-+ (GDestroyNotify) gst_caps_unref);
-+
-+ while (gst_caps_get_size (matched_caps) > 0)
- {
-- GstCaps *cur_caps =
-- gst_caps_copy_nth (matched_caps, i);
-+ GstCaps *stolencaps = gst_caps_new_full (
-+ gst_caps_steal_structure (matched_caps, 0), NULL);
-+ gboolean got_match = FALSE;
-+
-+ for (i = 0; i < capslist->len; i++)
-+ {
-+ GstCaps *intersect = gst_caps_intersect (stolencaps,
-+ g_ptr_array_index (capslist, i));
-+
-+ if (gst_caps_is_empty (intersect))
-+ {
-+ gst_caps_unref (intersect);
-+ }
-+ else
-+ {
-+ got_match = TRUE;
-+ gst_caps_unref (g_ptr_array_index (capslist, i));
-+ g_ptr_array_index (capslist, i) = intersect;
-+ }
-+ }
-+
-+ if (got_match)
-+ gst_caps_unref (stolencaps);
-+ else
-+ g_ptr_array_add (capslist, stolencaps);
-
-- list = create_codec_cap_list (factory, direction, list, cur_caps);
-- gst_caps_unref (cur_caps);
- }
- gst_caps_unref (matched_caps);
-+
-+ for (i = 0; i < capslist->len; i++)
-+ list = create_codec_cap_list (factory, direction, list,
-+ g_ptr_array_index (capslist, i));
-+ g_ptr_array_unref (capslist);
- }
- }
-
---
-cgit v0.9.0.3
Copied: farstream-0.1/repos/extra-i686/codec-discovery-intersect.patch (from rev 209756, farstream-0.1/trunk/codec-discovery-intersect.patch)
===================================================================
--- extra-i686/codec-discovery-intersect.patch (rev 0)
+++ extra-i686/codec-discovery-intersect.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,72 @@
+From 50fffb08d941dce58ae48bf531faead8a4e22ed7 Mon Sep 17 00:00:00 2001
+From: Olivier Crête <olivier.crete at collabora.com>
+Date: Tue, 02 Apr 2013 23:13:06 +0000
+Subject: codec-discovery: Intersect different parts of the same caps to reduce them
+
+We do this because a caps may have the static payload in a separate structure from the encoding-name
+We just want both in the same structure
+---
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index 5530cc8..df316a4 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -384,7 +384,6 @@ validate_h263_codecs (CodecCap *codec_cap)
+ if (!rtp_struct)
+ return FALSE;
+
+- /* If there no h263version, we accept everything */
+ encoding_name = gst_structure_get_string (rtp_struct, "encoding-name");
+
+ /* If there is no encoding name, we have a problem, lets refuse it */
+@@ -1300,15 +1299,44 @@ get_plugins_filtered_from_caps (FilterFunc filter,
+ else
+ {
+ gint i;
+- for (i = 0; i < gst_caps_get_size (matched_caps); i++)
++ GPtrArray *capslist = g_ptr_array_new_with_free_func (
++ (GDestroyNotify) gst_caps_unref);
++
++ while (gst_caps_get_size (matched_caps) > 0)
+ {
+- GstCaps *cur_caps =
+- gst_caps_copy_nth (matched_caps, i);
++ GstCaps *stolencaps = gst_caps_new_full (
++ gst_caps_steal_structure (matched_caps, 0), NULL);
++ gboolean got_match = FALSE;
++
++ for (i = 0; i < capslist->len; i++)
++ {
++ GstCaps *intersect = gst_caps_intersect (stolencaps,
++ g_ptr_array_index (capslist, i));
++
++ if (gst_caps_is_empty (intersect))
++ {
++ gst_caps_unref (intersect);
++ }
++ else
++ {
++ got_match = TRUE;
++ gst_caps_unref (g_ptr_array_index (capslist, i));
++ g_ptr_array_index (capslist, i) = intersect;
++ }
++ }
++
++ if (got_match)
++ gst_caps_unref (stolencaps);
++ else
++ g_ptr_array_add (capslist, stolencaps);
+
+- list = create_codec_cap_list (factory, direction, list, cur_caps);
+- gst_caps_unref (cur_caps);
+ }
+ gst_caps_unref (matched_caps);
++
++ for (i = 0; i < capslist->len; i++)
++ list = create_codec_cap_list (factory, direction, list,
++ g_ptr_array_index (capslist, i));
++ g_ptr_array_unref (capslist);
+ }
+ }
+
+--
+cgit v0.9.0.3
Deleted: extra-i686/farstream-0.1.2-prefer-vp8.patch
===================================================================
--- extra-i686/farstream-0.1.2-prefer-vp8.patch 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-i686/farstream-0.1.2-prefer-vp8.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,12 +0,0 @@
-diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
---- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100
-+++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100
-@@ -41,6 +41,8 @@ feedback:nack/pli=
- [video/H263]
- feedback:nack/pli=
-
-+[video/VP8-DRAFT-IETF-01]
-+
- [video/THEORA]
- #feedback:tfrc=
- feedback:nack/pli=
Copied: farstream-0.1/repos/extra-i686/farstream-0.1.2-prefer-vp8.patch (from rev 209756, farstream-0.1/trunk/farstream-0.1.2-prefer-vp8.patch)
===================================================================
--- extra-i686/farstream-0.1.2-prefer-vp8.patch (rev 0)
+++ extra-i686/farstream-0.1.2-prefer-vp8.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,12 @@
+diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
+--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100
++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100
+@@ -41,6 +41,8 @@ feedback:nack/pli=
+ [video/H263]
+ feedback:nack/pli=
+
++[video/VP8-DRAFT-IETF-01]
++
+ [video/THEORA]
+ #feedback:tfrc=
+ feedback:nack/pli=
Copied: farstream-0.1/repos/extra-i686/fix-crash.patch (from rev 209756, farstream-0.1/trunk/fix-crash.patch)
===================================================================
--- extra-i686/fix-crash.patch (rev 0)
+++ extra-i686/fix-crash.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,24 @@
+From e349a7db681b643beaf8174a32b071292abd980e Mon Sep 17 00:00:00 2001
+From: Olivier Crête <olivier.crete at collabora.com>
+Date: Thu, 27 Feb 2014 23:00:13 +0000
+Subject: raw: Fix crash where the stream would try to contact its session before its been set
+
+---
+(limited to 'gst/fsrawconference')
+
+diff --git a/gst/fsrawconference/fs-raw-stream.c b/gst/fsrawconference/fs-raw-stream.c
+index fe5326b..eb8db74 100644
+--- a/gst/fsrawconference/fs-raw-stream.c
++++ b/gst/fsrawconference/fs-raw-stream.c
+@@ -436,7 +436,8 @@ fs_raw_stream_set_property (GObject *object,
+ (direction & FS_DIRECTION_SEND) ? TRUE : FALSE, NULL);
+ g_object_unref (st);
+ }
+- fs_raw_session_update_direction (self->priv->session, direction);
++ if (self->priv->session)
++ fs_raw_session_update_direction (self->priv->session, direction);
+ if (conference)
+ GST_OBJECT_LOCK (conference);
+ }
+--
+cgit v0.9.0.3
Copied: farstream-0.1/repos/extra-i686/intersect-instead-of-merge.patch (from rev 209756, farstream-0.1/trunk/intersect-instead-of-merge.patch)
===================================================================
--- extra-i686/intersect-instead-of-merge.patch (rev 0)
+++ extra-i686/intersect-instead-of-merge.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,26 @@
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index d128e84..3521580 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -1110,11 +1110,8 @@ compare_media_caps (gconstpointer a, gconstpointer b)
+ }
+
+ static gint
+-compare_rtp_caps (gconstpointer a, gconstpointer b)
++compare_rtp_caps (CodecCap *element, GstCaps *c_caps)
+ {
+- CodecCap *element = (CodecCap *)a;
+- GstCaps *c_caps = (GstCaps *)b;
+-
+ return !gst_caps_can_intersect (element->rtp_caps, c_caps);
+ }
+
+@@ -1226,7 +1223,7 @@ create_codec_cap_list (GstElementFactory *factory,
+ if (rtp_caps) {
+ if (entry->rtp_caps) {
+ GstCaps *new_rtp_caps;
+- new_rtp_caps = gst_caps_union (rtp_caps, entry->rtp_caps);
++ new_rtp_caps = gst_caps_intersect (rtp_caps, entry->rtp_caps);
+ gst_caps_unref (entry->rtp_caps);
+ entry->rtp_caps = new_rtp_caps;
+ } else {
Deleted: extra-i686/rtp-memleak.patch
===================================================================
--- extra-i686/rtp-memleak.patch 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-i686/rtp-memleak.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,24 +0,0 @@
-From 10b3d38560ec53d980d13240559e6758c1113e21 Mon Sep 17 00:00:00 2001
-From: Havard Graff <havard.graff at gmail.com>
-Date: Thu, 21 Mar 2013 12:46:11 +0000
-Subject: fs-rtp-discover-codecs: plug memoryleak
-
-use g_list_delete_link to free the list as well
----
-(limited to 'gst/fsrtpconference')
-
-diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-index df316a4..c663225 100644
---- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
-+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-@@ -536,7 +536,7 @@ remove_duplicates (GList *list)
- if (gst_caps_is_equal (codec_cap1->rtp_caps, codec_cap2->rtp_caps))
- {
- codec_cap_free (codec_cap2);
-- walk1 = g_list_remove_link (walk1, walk2);
-+ walk1 = g_list_delete_link (walk1, walk2);
- goto again;
- }
- }
---
-cgit v0.9.0.3
Copied: farstream-0.1/repos/extra-i686/rtp-memleak.patch (from rev 209756, farstream-0.1/trunk/rtp-memleak.patch)
===================================================================
--- extra-i686/rtp-memleak.patch (rev 0)
+++ extra-i686/rtp-memleak.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,24 @@
+From 10b3d38560ec53d980d13240559e6758c1113e21 Mon Sep 17 00:00:00 2001
+From: Havard Graff <havard.graff at gmail.com>
+Date: Thu, 21 Mar 2013 12:46:11 +0000
+Subject: fs-rtp-discover-codecs: plug memoryleak
+
+use g_list_delete_link to free the list as well
+---
+(limited to 'gst/fsrtpconference')
+
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index df316a4..c663225 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -536,7 +536,7 @@ remove_duplicates (GList *list)
+ if (gst_caps_is_equal (codec_cap1->rtp_caps, codec_cap2->rtp_caps))
+ {
+ codec_cap_free (codec_cap2);
+- walk1 = g_list_remove_link (walk1, walk2);
++ walk1 = g_list_delete_link (walk1, walk2);
+ goto again;
+ }
+ }
+--
+cgit v0.9.0.3
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-x86_64/PKGBUILD 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=farstream-0.1
-_pkgname=farstream
-pkgver=0.1.2
-pkgrel=3
-pkgdesc="Audio/Video Communications Framework (legacy version)"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
-depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins'
- 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
-makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2' 'git' 'gtk-doc')
-source=(git://git.collabora.co.uk/git/farstream.git#commit=54e28e95bed4f04bc95dae509c3724399c79fa29
- farstream-0.1.2-prefer-vp8.patch
- codec-discovery-intersect.patch
- rtp-memleak.patch)
-sha256sums=('SKIP')
-
-prepare() {
- cd farstream
- patch -Np1 -i ../farstream-0.1.2-prefer-vp8.patch
- patch -Np1 -i ../codec-discovery-intersect.patch
- patch -Np1 -i ../rtp-memleak.patch
-}
-
-build() {
- cd farstream
- NOCONFIGURE=1 ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-package-name='Arch Linux Farstream 0.1 Package' \
- --with-package-origin='httpw://www.archlinux.org/' \
- --enable-gtk-doc --disable-static
- make -j1
-}
-
-package() {
- cd farstream
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-sha256sums=('SKIP'
- '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
- '385d7c72e269bf48bd41937442d819a1e6d0f2472b903670a8a5555f5cb96586'
- 'b966312ccad90dd30b78ee2df49e9637b3b573e498668bcc58ac208f254440db')
Copied: farstream-0.1/repos/extra-x86_64/PKGBUILD (from rev 209756, farstream-0.1/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=farstream-0.1
+_pkgname=farstream
+pkgver=0.1.2
+pkgrel=4
+pkgdesc="Audio/Video Communications Framework (legacy version)"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/Farstream"
+license=('LGPL2.1')
+depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-ffmpeg')
+makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2' 'git' 'gtk-doc')
+source=(git://git.collabora.co.uk/git/farstream.git#commit=54e28e95bed4f04bc95dae509c3724399c79fa29
+ farstream-0.1.2-prefer-vp8.patch
+ codec-discovery-intersect.patch
+ intersect-instead-of-merge.patch
+ rtp-memleak.patch
+ fix-crash.patch)
+sha256sums=('SKIP'
+ '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
+ '385d7c72e269bf48bd41937442d819a1e6d0f2472b903670a8a5555f5cb96586'
+ 'c3988f90fc50ee557399b240de78f3fb4fe191f339143f6943b963c2e0fddaf2'
+ 'b966312ccad90dd30b78ee2df49e9637b3b573e498668bcc58ac208f254440db'
+ '8fde8f5fb16475aabeda2d6e48c86b105341fd72cde02cd6655ca7f41b4a98ed')
+
+prepare() {
+ cd farstream
+ patch -Np1 -i ../farstream-0.1.2-prefer-vp8.patch
+ patch -Np1 -i ../intersect-instead-of-merge.patch
+ patch -Np1 -i ../codec-discovery-intersect.patch
+ patch -Np1 -i ../rtp-memleak.patch
+ patch -Np1 -i ../fix-crash.patch
+ sed -i -e 's/AC_INIT(Farstream, 0.1.2.1/AC_INIT(Farstream, 0.1.2/' configure.ac
+}
+
+check() {
+ cd farstream
+ # MSN test fails because of missing libmimic + mimenc element
+ make check || return 0
+}
+build() {
+ cd farstream
+ NOCONFIGURE=1 ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-package-name='Arch Linux Farstream 0.1 Package' \
+ --with-package-origin='httpw://www.archlinux.org/' \
+ --disable-gtk-doc --disable-static
+ make -j1
+}
+
+package() {
+ cd farstream
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/codec-discovery-intersect.patch
===================================================================
--- extra-x86_64/codec-discovery-intersect.patch 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-x86_64/codec-discovery-intersect.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,72 +0,0 @@
-From 50fffb08d941dce58ae48bf531faead8a4e22ed7 Mon Sep 17 00:00:00 2001
-From: Olivier Crête <olivier.crete at collabora.com>
-Date: Tue, 02 Apr 2013 23:13:06 +0000
-Subject: codec-discovery: Intersect different parts of the same caps to reduce them
-
-We do this because a caps may have the static payload in a separate structure from the encoding-name
-We just want both in the same structure
----
-diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-index 5530cc8..df316a4 100644
---- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
-+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-@@ -384,7 +384,6 @@ validate_h263_codecs (CodecCap *codec_cap)
- if (!rtp_struct)
- return FALSE;
-
-- /* If there no h263version, we accept everything */
- encoding_name = gst_structure_get_string (rtp_struct, "encoding-name");
-
- /* If there is no encoding name, we have a problem, lets refuse it */
-@@ -1300,15 +1299,44 @@ get_plugins_filtered_from_caps (FilterFunc filter,
- else
- {
- gint i;
-- for (i = 0; i < gst_caps_get_size (matched_caps); i++)
-+ GPtrArray *capslist = g_ptr_array_new_with_free_func (
-+ (GDestroyNotify) gst_caps_unref);
-+
-+ while (gst_caps_get_size (matched_caps) > 0)
- {
-- GstCaps *cur_caps =
-- gst_caps_copy_nth (matched_caps, i);
-+ GstCaps *stolencaps = gst_caps_new_full (
-+ gst_caps_steal_structure (matched_caps, 0), NULL);
-+ gboolean got_match = FALSE;
-+
-+ for (i = 0; i < capslist->len; i++)
-+ {
-+ GstCaps *intersect = gst_caps_intersect (stolencaps,
-+ g_ptr_array_index (capslist, i));
-+
-+ if (gst_caps_is_empty (intersect))
-+ {
-+ gst_caps_unref (intersect);
-+ }
-+ else
-+ {
-+ got_match = TRUE;
-+ gst_caps_unref (g_ptr_array_index (capslist, i));
-+ g_ptr_array_index (capslist, i) = intersect;
-+ }
-+ }
-+
-+ if (got_match)
-+ gst_caps_unref (stolencaps);
-+ else
-+ g_ptr_array_add (capslist, stolencaps);
-
-- list = create_codec_cap_list (factory, direction, list, cur_caps);
-- gst_caps_unref (cur_caps);
- }
- gst_caps_unref (matched_caps);
-+
-+ for (i = 0; i < capslist->len; i++)
-+ list = create_codec_cap_list (factory, direction, list,
-+ g_ptr_array_index (capslist, i));
-+ g_ptr_array_unref (capslist);
- }
- }
-
---
-cgit v0.9.0.3
Copied: farstream-0.1/repos/extra-x86_64/codec-discovery-intersect.patch (from rev 209756, farstream-0.1/trunk/codec-discovery-intersect.patch)
===================================================================
--- extra-x86_64/codec-discovery-intersect.patch (rev 0)
+++ extra-x86_64/codec-discovery-intersect.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,72 @@
+From 50fffb08d941dce58ae48bf531faead8a4e22ed7 Mon Sep 17 00:00:00 2001
+From: Olivier Crête <olivier.crete at collabora.com>
+Date: Tue, 02 Apr 2013 23:13:06 +0000
+Subject: codec-discovery: Intersect different parts of the same caps to reduce them
+
+We do this because a caps may have the static payload in a separate structure from the encoding-name
+We just want both in the same structure
+---
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index 5530cc8..df316a4 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -384,7 +384,6 @@ validate_h263_codecs (CodecCap *codec_cap)
+ if (!rtp_struct)
+ return FALSE;
+
+- /* If there no h263version, we accept everything */
+ encoding_name = gst_structure_get_string (rtp_struct, "encoding-name");
+
+ /* If there is no encoding name, we have a problem, lets refuse it */
+@@ -1300,15 +1299,44 @@ get_plugins_filtered_from_caps (FilterFunc filter,
+ else
+ {
+ gint i;
+- for (i = 0; i < gst_caps_get_size (matched_caps); i++)
++ GPtrArray *capslist = g_ptr_array_new_with_free_func (
++ (GDestroyNotify) gst_caps_unref);
++
++ while (gst_caps_get_size (matched_caps) > 0)
+ {
+- GstCaps *cur_caps =
+- gst_caps_copy_nth (matched_caps, i);
++ GstCaps *stolencaps = gst_caps_new_full (
++ gst_caps_steal_structure (matched_caps, 0), NULL);
++ gboolean got_match = FALSE;
++
++ for (i = 0; i < capslist->len; i++)
++ {
++ GstCaps *intersect = gst_caps_intersect (stolencaps,
++ g_ptr_array_index (capslist, i));
++
++ if (gst_caps_is_empty (intersect))
++ {
++ gst_caps_unref (intersect);
++ }
++ else
++ {
++ got_match = TRUE;
++ gst_caps_unref (g_ptr_array_index (capslist, i));
++ g_ptr_array_index (capslist, i) = intersect;
++ }
++ }
++
++ if (got_match)
++ gst_caps_unref (stolencaps);
++ else
++ g_ptr_array_add (capslist, stolencaps);
+
+- list = create_codec_cap_list (factory, direction, list, cur_caps);
+- gst_caps_unref (cur_caps);
+ }
+ gst_caps_unref (matched_caps);
++
++ for (i = 0; i < capslist->len; i++)
++ list = create_codec_cap_list (factory, direction, list,
++ g_ptr_array_index (capslist, i));
++ g_ptr_array_unref (capslist);
+ }
+ }
+
+--
+cgit v0.9.0.3
Deleted: extra-x86_64/farstream-0.1.2-prefer-vp8.patch
===================================================================
--- extra-x86_64/farstream-0.1.2-prefer-vp8.patch 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-x86_64/farstream-0.1.2-prefer-vp8.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,12 +0,0 @@
-diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
---- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100
-+++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100
-@@ -41,6 +41,8 @@ feedback:nack/pli=
- [video/H263]
- feedback:nack/pli=
-
-+[video/VP8-DRAFT-IETF-01]
-+
- [video/THEORA]
- #feedback:tfrc=
- feedback:nack/pli=
Copied: farstream-0.1/repos/extra-x86_64/farstream-0.1.2-prefer-vp8.patch (from rev 209756, farstream-0.1/trunk/farstream-0.1.2-prefer-vp8.patch)
===================================================================
--- extra-x86_64/farstream-0.1.2-prefer-vp8.patch (rev 0)
+++ extra-x86_64/farstream-0.1.2-prefer-vp8.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,12 @@
+diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
+--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100
++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100
+@@ -41,6 +41,8 @@ feedback:nack/pli=
+ [video/H263]
+ feedback:nack/pli=
+
++[video/VP8-DRAFT-IETF-01]
++
+ [video/THEORA]
+ #feedback:tfrc=
+ feedback:nack/pli=
Copied: farstream-0.1/repos/extra-x86_64/fix-crash.patch (from rev 209756, farstream-0.1/trunk/fix-crash.patch)
===================================================================
--- extra-x86_64/fix-crash.patch (rev 0)
+++ extra-x86_64/fix-crash.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,24 @@
+From e349a7db681b643beaf8174a32b071292abd980e Mon Sep 17 00:00:00 2001
+From: Olivier Crête <olivier.crete at collabora.com>
+Date: Thu, 27 Feb 2014 23:00:13 +0000
+Subject: raw: Fix crash where the stream would try to contact its session before its been set
+
+---
+(limited to 'gst/fsrawconference')
+
+diff --git a/gst/fsrawconference/fs-raw-stream.c b/gst/fsrawconference/fs-raw-stream.c
+index fe5326b..eb8db74 100644
+--- a/gst/fsrawconference/fs-raw-stream.c
++++ b/gst/fsrawconference/fs-raw-stream.c
+@@ -436,7 +436,8 @@ fs_raw_stream_set_property (GObject *object,
+ (direction & FS_DIRECTION_SEND) ? TRUE : FALSE, NULL);
+ g_object_unref (st);
+ }
+- fs_raw_session_update_direction (self->priv->session, direction);
++ if (self->priv->session)
++ fs_raw_session_update_direction (self->priv->session, direction);
+ if (conference)
+ GST_OBJECT_LOCK (conference);
+ }
+--
+cgit v0.9.0.3
Copied: farstream-0.1/repos/extra-x86_64/intersect-instead-of-merge.patch (from rev 209756, farstream-0.1/trunk/intersect-instead-of-merge.patch)
===================================================================
--- extra-x86_64/intersect-instead-of-merge.patch (rev 0)
+++ extra-x86_64/intersect-instead-of-merge.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,26 @@
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index d128e84..3521580 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -1110,11 +1110,8 @@ compare_media_caps (gconstpointer a, gconstpointer b)
+ }
+
+ static gint
+-compare_rtp_caps (gconstpointer a, gconstpointer b)
++compare_rtp_caps (CodecCap *element, GstCaps *c_caps)
+ {
+- CodecCap *element = (CodecCap *)a;
+- GstCaps *c_caps = (GstCaps *)b;
+-
+ return !gst_caps_can_intersect (element->rtp_caps, c_caps);
+ }
+
+@@ -1226,7 +1223,7 @@ create_codec_cap_list (GstElementFactory *factory,
+ if (rtp_caps) {
+ if (entry->rtp_caps) {
+ GstCaps *new_rtp_caps;
+- new_rtp_caps = gst_caps_union (rtp_caps, entry->rtp_caps);
++ new_rtp_caps = gst_caps_intersect (rtp_caps, entry->rtp_caps);
+ gst_caps_unref (entry->rtp_caps);
+ entry->rtp_caps = new_rtp_caps;
+ } else {
Deleted: extra-x86_64/rtp-memleak.patch
===================================================================
--- extra-x86_64/rtp-memleak.patch 2014-04-02 21:37:30 UTC (rev 209756)
+++ extra-x86_64/rtp-memleak.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -1,24 +0,0 @@
-From 10b3d38560ec53d980d13240559e6758c1113e21 Mon Sep 17 00:00:00 2001
-From: Havard Graff <havard.graff at gmail.com>
-Date: Thu, 21 Mar 2013 12:46:11 +0000
-Subject: fs-rtp-discover-codecs: plug memoryleak
-
-use g_list_delete_link to free the list as well
----
-(limited to 'gst/fsrtpconference')
-
-diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-index df316a4..c663225 100644
---- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
-+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
-@@ -536,7 +536,7 @@ remove_duplicates (GList *list)
- if (gst_caps_is_equal (codec_cap1->rtp_caps, codec_cap2->rtp_caps))
- {
- codec_cap_free (codec_cap2);
-- walk1 = g_list_remove_link (walk1, walk2);
-+ walk1 = g_list_delete_link (walk1, walk2);
- goto again;
- }
- }
---
-cgit v0.9.0.3
Copied: farstream-0.1/repos/extra-x86_64/rtp-memleak.patch (from rev 209756, farstream-0.1/trunk/rtp-memleak.patch)
===================================================================
--- extra-x86_64/rtp-memleak.patch (rev 0)
+++ extra-x86_64/rtp-memleak.patch 2014-04-02 21:38:07 UTC (rev 209757)
@@ -0,0 +1,24 @@
+From 10b3d38560ec53d980d13240559e6758c1113e21 Mon Sep 17 00:00:00 2001
+From: Havard Graff <havard.graff at gmail.com>
+Date: Thu, 21 Mar 2013 12:46:11 +0000
+Subject: fs-rtp-discover-codecs: plug memoryleak
+
+use g_list_delete_link to free the list as well
+---
+(limited to 'gst/fsrtpconference')
+
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index df316a4..c663225 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -536,7 +536,7 @@ remove_duplicates (GList *list)
+ if (gst_caps_is_equal (codec_cap1->rtp_caps, codec_cap2->rtp_caps))
+ {
+ codec_cap_free (codec_cap2);
+- walk1 = g_list_remove_link (walk1, walk2);
++ walk1 = g_list_delete_link (walk1, walk2);
+ goto again;
+ }
+ }
+--
+cgit v0.9.0.3
More information about the arch-commits
mailing list