[arch-commits] Commit in farstream-0.1/trunk (PKGBUILD farstream-rtp-session.patch)

[Evangelos Foutras]

    Date: Wednesday, March 25, 2015 @ 12:40:03
  Author: foutrelis
Revision: 234724

upgpkg: farstream-0.1 0.1.2-5

Fix Pidgin crashing in SIPE calls (FS#44331).

Patch by: Michael Cronenworth <mike at cchtml.com>

Added:
  farstream-0.1/trunk/farstream-rtp-session.patch
Modified:
  farstream-0.1/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    5 ++++-
 farstream-rtp-session.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-25 11:33:54 UTC (rev 234723)
+++ PKGBUILD	2015-03-25 11:40:03 UTC (rev 234724)
@@ -5,7 +5,7 @@
 pkgname=farstream-0.1
 _pkgname=farstream
 pkgver=0.1.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Audio/Video Communications Framework (legacy version)"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/Farstream"
@@ -14,6 +14,7 @@
 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
+        farstream-rtp-session.patch
         codec-discovery-intersect.patch
         intersect-instead-of-merge.patch
         rtp-memleak.patch
@@ -20,6 +21,7 @@
         fix-crash.patch)
 sha256sums=('SKIP'
             '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
+            '30e95a24800a26ff84e0cffeccb525e704fab6024402cd1d3e7fd957909650bf'
             '385d7c72e269bf48bd41937442d819a1e6d0f2472b903670a8a5555f5cb96586'
             'c3988f90fc50ee557399b240de78f3fb4fe191f339143f6943b963c2e0fddaf2'
             'b966312ccad90dd30b78ee2df49e9637b3b573e498668bcc58ac208f254440db'
@@ -28,6 +30,7 @@
 prepare() {
   cd farstream
   patch -Np1 -i ../farstream-0.1.2-prefer-vp8.patch
+  patch -Np1 -i ../farstream-rtp-session.patch
   patch -Np1 -i ../intersect-instead-of-merge.patch
   patch -Np1 -i ../codec-discovery-intersect.patch
   patch -Np1 -i ../rtp-memleak.patch

Added: farstream-rtp-session.patch
===================================================================
--- farstream-rtp-session.patch	                        (rev 0)
+++ farstream-rtp-session.patch	2015-03-25 11:40:03 UTC (rev 234724)
@@ -0,0 +1,36 @@
+--- farstream-0.1.2/gst/fsrtpconference/fs-rtp-session.c.orig	2012-03-22 15:23:10.000000000 -0500
++++ farstream-0.1.2/gst/fsrtpconference/fs-rtp-session.c	2014-08-08 11:59:55.206979402 -0500
+@@ -3624,6 +3624,9 @@
+ 
+   if (!codecbin)
+   {
++    g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
++        "Could create codec bin for: " FS_CODEC_FORMAT,
++        FS_CODEC_ARGS (send_codec_copy));
+     fs_codec_destroy (send_codec_copy);
+     fs_codec_destroy (codec_copy);
+     fs_codec_list_destroy (codecs);
+@@ -3690,6 +3693,9 @@
+ 
+   if (!g_value_get_boolean (&link_rv))
+   {
++    g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
++        "Could not get boolean value for link"
++        " the main pad for: " FS_CODEC_FORMAT, FS_CODEC_ARGS (send_codec_copy));
+     gst_iterator_free (iter);
+     goto error;
+   }
+@@ -3709,8 +3715,12 @@
+ 
+   gst_iterator_free (iter);
+ 
+-  if (!g_value_get_boolean (&link_rv))
++  if (!g_value_get_boolean (&link_rv)) {
++    g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
++        "Could not get boolean value for link"
++        " the main pad for: " FS_CODEC_FORMAT, FS_CODEC_ARGS (send_codec_copy));
+     goto error;
++  }
+ 
+   gst_element_set_locked_state (codecbin, FALSE);
+