Author: dzzinstant
Date: Sun Jun 1 00:47:47 2014
New Revision: 6
URL: http://svn.gna.org/viewcvs/pidgin-zrtp?rev=6&view=rev
Log:
Moved to from Farsight-0.0.31 to Farstream-0.1.2
Added:
trunk/patches/farstream-0.1.2.diff
Modified:
trunk/Changelog
trunk/install.sh
trunk/patches/pidgin.diff
Modified: trunk/Changelog
URL:
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/Changelog?rev=6&r1=5&r2=6&view=diff
==============================================================================
--- trunk/Changelog (original)
+++ trunk/Changelog Sun Jun 1 00:47:47 2014
@@ -1,14 +1,22 @@
pidgin-simplezrtp: The SimpleZRTP plugin for Pidgin IM
-version 0.0.4 (2014-05-28):
- First published version
- EXPERIMENTAL --
- Please read the README file before using this software
+== version 0.0.4 (2014-05-28) ==
+First published version
+EXPERIMENTAL --
+Please read the README file before using this software
- * versions of software used:
- Pidgin 2.10.9
- Farsight2 0.0.31
- ZRTPCPP 4.2.2
- * Basic setup and display of ZRTP in media sessions
- * Shell script for download and installation
+* versions of software used:
+** Pidgin 2.10.9
+** Farsight2 0.0.31
+** gstzrtp
+** ZRTPCPP 4.2.2
+* Basic setup and display of ZRTP in media sessions
+
+* Shell script for download and installation
+
+
+== next version ==
+
+* Moving from farsight2-0.0.31 to farstream-0.1.2
+
Modified: trunk/install.sh
URL:
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/install.sh?rev=6&r1=5&r2=6&view=diff
==============================================================================
--- trunk/install.sh (original)
+++ trunk/install.sh Sun Jun 1 00:47:47 2014
@@ -59,10 +59,11 @@
##
## Farsight2/Farstream
##
-FARSTREAM_PACKED="farsight2-0.0.31.tar.gz"
-FARSTREAM_DIR="${SOURCEDIR}/farsight2-0.0.31"
-FARSTREAM_PATCH="patches/farsight2.diff"
-FARSTREAM_PATH="${INSTALLDIR}/farsight2"
+
+FARSTREAM_PACKED="farstream-0.1.2.tar.gz"
+FARSTREAM_DIR="${SOURCEDIR}/farstream-0.1.2"
+FARSTREAM_PATCH="patches/farstream-0.1.2.diff"
+FARSTREAM_PATH="${INSTALLDIR}/farstream"
ZRTPCONF_SRC="${PWD}/src/zrtp-conf"
zrtpconf_unpack() {
@@ -73,13 +74,13 @@
farstream_unpack() {
if [ ! -e ${FARSTREAM_PACKED} ]; then
- wget
http://freedesktop.org/software/farstream/releases/farsight2/${FARSTREAM_PACKED}
+ wget
http://freedesktop.org/software/farstream/releases/farstream/${FARSTREAM_PACKED}
fi
if [ ! -e ${FARSTREAM_DIR} ]; then
tar xzf ${FARSTREAM_PACKED}
( cd ${FARSTREAM_DIR}; patch -p1 < ../${FARSTREAM_PATCH} )
- zrtpconf_unpack
+ zrtpconf_unpack
fi
return 0
}
Added: trunk/patches/farstream-0.1.2.diff
URL:
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/patches/farstream-0.1.2.diff?rev=6&view=auto
==============================================================================
--- trunk/patches/farstream-0.1.2.diff (added)
+++ trunk/patches/farstream-0.1.2.diff Sun Jun 1 00:47:47 2014
@@ -0,0 +1,154 @@
+diff -r bb8bb4f75f07 -r 34e1e7a0c72e configure.ac
+--- a/configure.ac Sun Jun 01 00:17:00 2014 +0200
++++ b/configure.ac Sun Jun 01 00:18:29 2014 +0200
+@@ -386,6 +386,8 @@
+ AC_ERROR([Requested GUPnP IGD, but it is not available])
+ fi
+
++AC_DEFINE([USE_ZRTP], [1], [Use ZRTP encryption (with gstzrtpfilter)])
++
+ dnl *** output files ***
+
+ AC_CONFIG_FILES(
+diff -r bb8bb4f75f07 -r 34e1e7a0c72e gst/fsrtpconference/fs-rtp-conference.c
+--- a/gst/fsrtpconference/fs-rtp-conference.c Sun Jun 01 00:17:00 2014 +0200
++++ b/gst/fsrtpconference/fs-rtp-conference.c Sun Jun 01 00:18:29 2014 +0200
+@@ -49,6 +49,10 @@
+ #include "fs-rtp-stream.h"
+ #include "fs-rtp-participant.h"
+
++#ifdef USE_ZRTP
++#include "fs-rtp-marshal.h"
++#include "zrtp-conference.h"
++#endif /* USE_ZRTP */
+
+ GST_DEBUG_CATEGORY (fsrtpconference_debug);
+ GST_DEBUG_CATEGORY (fsrtpconference_disco);
+@@ -66,6 +70,7 @@
+ {
+ PROP_0,
+ PROP_SDES,
++ PROP_ZRTP_CONFERENCE,
+ };
+
+
+@@ -259,6 +264,30 @@
+ g_param_spec_boxed ("sdes", "SDES Items for this conference",
+ "SDES items to use for sessions in this conference",
+ GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
++
++#ifdef USE_ZRTP
++ g_object_class_install_property(gobject_class, PROP_ZRTP_CONFERENCE,
++ g_param_spec_object("zrtp-conference",
++ "ZRTP Conference",
++ "The ZRTP Conference object watching over the"
++ " FSConference's ZrtpFilters.",
++ G_TYPE_OBJECT,
++ G_PARAM_READABLE));
++#endif /* USE_ZRTP */
++
++#ifdef USE_ZRTP
++ g_signal_new("new-transmitter",
++ G_TYPE_FROM_CLASS(klass),
++ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
++ _fs_rtp_marshal_VOID__UINT_STRING_POINTER,
++ G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_POINTER);
++ g_signal_new("new-stream",
++ G_TYPE_FROM_CLASS(klass),
++ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
++ g_cclosure_marshal_VOID__POINTER,
++ G_TYPE_NONE, 1, G_TYPE_POINTER);
++#endif /* USE_ZRTP */
++
+ }
+
+ static void
+@@ -312,6 +341,13 @@
+ g_signal_connect (conf->gstrtpbin, "on-ssrc-validated",
+ G_CALLBACK (_rtpbin_on_ssrc_validated), conf);
+
++#ifdef USE_ZRTP
++ g_object_new(ZRTP_TYPE_CONFERENCE,
++ "fsconference", conf,
++ "automode", TRUE,
++ NULL);
++#endif /* USE_ZRTP */
++
+ /* We have to ref the class here because the class initialization
+ * in GLib is not thread safe
+ * http://bugzilla.gnome.org/show_bug.cgi?id=349410
+@@ -336,6 +372,11 @@
+ case PROP_SDES:
+ g_object_get_property (G_OBJECT (self->gstrtpbin), "sdes", value);
+ break;
++#ifdef USE_ZRTP
++ case PROP_ZRTP_CONFERENCE:
++ g_value_set_object(value, zrtp_conference_find(G_OBJECT(self)));
++ break;
++#endif /* USE_ZRTP */
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+diff -r bb8bb4f75f07 -r 34e1e7a0c72e gst/fsrtpconference/fs-rtp-session.c
+--- a/gst/fsrtpconference/fs-rtp-session.c Sun Jun 01 00:17:00 2014 +0200
++++ b/gst/fsrtpconference/fs-rtp-session.c Sun Jun 01 00:18:29 2014 +0200
+@@ -79,6 +79,11 @@
+ #include "fs-rtp-codec-specific.h"
+ #include "fs-rtp-tfrc.h"
+
++#ifdef USE_ZRTP
++#include "zrtp-conference.h"
++#include "zrtp-call.h"
++#endif /* USE_ZRTP */
++
+ #define GST_CAT_DEFAULT fsrtpconference_debug
+
+ /* Signals */
+@@ -1228,6 +1233,10 @@
+
+ funnel_src_pad = gst_element_get_static_pad (funnel, "src");
+
++#ifdef USE_ZRTP
++ gst_debug_set_threshold_for_name ("zrtpfilter", GST_LEVEL_LOG);
++#endif /* USE_ZRTP */
++
+ ret = gst_pad_link (funnel_src_pad, self->priv->rtpbin_recv_rtp_sink);
+
+ if (GST_PAD_LINK_FAILED (ret))
+@@ -1755,6 +1764,11 @@
+
+ g_object_weak_ref (G_OBJECT (new_stream), _remove_stream, self);
+
++#ifdef USE_ZRTP
++ g_signal_emit_by_name(self->priv->conference, "new-stream",
++ new_stream);
++#endif /* USE_ZRTP */
++
+ fs_rtp_session_has_disposed_exit (self);
+
+ return new_stream;
+@@ -2347,12 +2361,24 @@
+ FsTransmitter *transmitter;
+ FsStreamTransmitter *st = NULL;
+ FsRtpSession *self = user_data;
++ gchar *cname;
+
+ if (fs_rtp_session_has_disposed_enter (self, error))
+ return NULL;
+
+ transmitter = fs_rtp_session_get_transmitter (self, transmitter_name,
error);
+
++#ifdef USE_ZRTP
++ g_object_get(G_OBJECT(participant),
++ "cname", &cname, NULL);
++ g_debug("fs_rtp_session_get_new_stream_transmitter(session=%p sid=%u
cname=%s transmitter=%s)",
++ self, self->id, cname, transmitter_name);
++
++ g_signal_emit_by_name(self->priv->conference, "new-transmitter",
++ self->id, cname, transmitter);
++ g_free(cname);
++#endif /* USE_ZRTP */
++
+ if (!transmitter)
+ {
+ fs_rtp_session_has_disposed_exit (self);
Modified: trunk/patches/pidgin.diff
URL:
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/patches/pidgin.diff?rev=6&r1=5&r2=6&view=diff
==============================================================================
--- trunk/patches/pidgin.diff (original)
+++ trunk/patches/pidgin.diff Sun Jun 1 00:47:47 2014
@@ -1,6 +1,6 @@
diff -r dc6636e98d86 pidgin/plugins/Makefile.am
---- a/pidgin/plugins/Makefile.am Fri Aug 28 08:39:09 2009 +0000
-+++ b/pidgin/plugins/Makefile.am Mon May 26 15:42:30 2014 +0200
+--- a/pidgin/plugins/Makefile.am
++++ b/pidgin/plugins/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker
+DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker
simplezrtp
@@ -24,17 +24,8 @@
ticker
diff -r c607f1383671 configure.ac
---- a/configure.ac Mon Feb 11 00:23:47 2013 -0800
-+++ b/configure.ac Mon May 26 16:21:34 2014 +0200
-@@ -806,6 +806,8 @@
- ])
- ])
- fi
-+dnl # force Farsight2
-+AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream])
-
- dnl #######################################################################
- dnl # Check for Voice and Video support
+--- a/configure.ac
++++ b/configure.ac
@@ -2559,6 +2561,7 @@
pidgin/plugins/perl/Makefile
pidgin/plugins/perl/common/Makefile.PL
_______________________________________________
Pidgin-zrtp-commits mailing list
Pidgin-zrtp-commits@gna.org
https://mail.gna.org/listinfo/pidgin-zrtp-commits
