[gajim/f17] Apply upstream patch to use farstream for audio/video.
Michal Schmidt
michich at fedoraproject.org
Mon Aug 6 11:55:22 UTC 2012
commit e902858762a65ffb861833238a1abb7718e33b92
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Mon Aug 6 13:29:38 2012 +0200
Apply upstream patch to use farstream for audio/video.
gajim-0.15-farstream.patch | 412 ++++++++++++++++++++++++++++++++++++++++++++
gajim.spec | 12 +-
2 files changed, 421 insertions(+), 3 deletions(-)
---
diff --git a/gajim-0.15-farstream.patch b/gajim-0.15-farstream.patch
new file mode 100644
index 0000000..d310af7
--- /dev/null
+++ b/gajim-0.15-farstream.patch
@@ -0,0 +1,412 @@
+# Hand-edited to remove non-applicable debian/ hunks -- michich
+#
+# HG changeset patch
+# User Yann Leboulanger <asterix at lagaule.org>
+# Date 1333302592 -7200
+# Node ID dfd58bb1ad06041878bf9f47db5271c1d5d8d8b8
+# Parent 0f94fd42abbaa3aea4630f59d54ec970e72d73f4
+[Olivier Crete] port Gajim to use Farstream instead of Farsight2. Fixes #7113
+
+diff -r 0f94fd42abba -r dfd58bb1ad06 src/chat_control.py
+--- a/src/chat_control.py Sun Apr 01 19:47:11 2012 +0200
++++ b/src/chat_control.py Sun Apr 01 19:49:52 2012 +0200
+@@ -1649,15 +1649,15 @@
+ self.restore_conversation()
+ self.msg_textview.grab_focus()
+
+- # change tooltip text for audio and video buttons if python-farsight is
++ # change tooltip text for audio and video buttons if python-farstream is
+ # not installed
+- if not gajim.HAVE_FARSIGHT:
++ if not gajim.HAVE_FARSTREAM:
+ tooltip_text = self._audio_button.get_tooltip_text()
+ self._audio_button.set_tooltip_text(
+- '%s\n%s' % (tooltip_text, _('Requires python-farsight.')))
++ '%s\n%s' % (tooltip_text, _('Requires python-farstream.')))
+ tooltip_text = self._video_button.get_tooltip_text()
+ self._video_button.set_tooltip_text(
+- '%s\n%s' % (tooltip_text, _('Requires python-farsight.')))
++ '%s\n%s' % (tooltip_text, _('Requires python-farstream.')))
+
+ gajim.ged.register_event_handler('pep-received', ged.GUI1,
+ self._nec_pep_received)
+@@ -1705,7 +1705,7 @@
+
+ # Jingle detection
+ if self.contact.supports(NS_JINGLE_ICE_UDP) and \
+- gajim.HAVE_FARSIGHT and self.contact.resource:
++ gajim.HAVE_FARSTREAM and self.contact.resource:
+ self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO)
+ self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO)
+ else:
+diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/gajim.py
+--- a/src/common/gajim.py Sun Apr 01 19:47:11 2012 +0200
++++ b/src/common/gajim.py Sun Apr 01 19:49:52 2012 +0200
+@@ -169,21 +169,21 @@
+ # read.
+ HAVE_LATEX = False
+
+-HAVE_FARSIGHT = True
++HAVE_FARSTREAM = True
+ try:
+- farsight = __import__('farsight')
++ farstream = __import__('farstream')
+ import gst
+ import glib
+ try:
+ conference = gst.element_factory_make('fsrtpconference')
+- session = conference.new_session(farsight.MEDIA_TYPE_AUDIO)
++ session = conference.new_session(farstream.MEDIA_TYPE_AUDIO)
+ del session
+ del conference
+ except glib.GError:
+- HAVE_FARSIGHT = False
++ HAVE_FARSTREAM = False
+
+ except ImportError:
+- HAVE_FARSIGHT = False
++ HAVE_FARSTREAM = False
+
+ HAVE_UPNP_IGD = True
+ try:
+diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/helpers.py
+--- a/src/common/helpers.py Sun Apr 01 19:47:11 2012 +0200
++++ b/src/common/helpers.py Sun Apr 01 19:49:52 2012 +0200
+@@ -1330,7 +1330,7 @@
+ gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION)
+ if gajim.config.get_per('accounts', a, 'answer_receipts'):
+ gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS)
+- if gajim.HAVE_FARSIGHT:
++ if gajim.HAVE_FARSTREAM:
+ gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE)
+ gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP)
+ gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO)
+diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/jingle.py
+--- a/src/common/jingle.py Sun Apr 01 19:47:11 2012 +0200
++++ b/src/common/jingle.py Sun Apr 01 19:49:52 2012 +0200
+@@ -35,7 +35,7 @@
+ import gajim
+
+ from jingle_session import JingleSession, JingleStates
+-if gajim.HAVE_FARSIGHT:
++if gajim.HAVE_FARSTREAM:
+ from jingle_rtp import JingleAudio, JingleVideo
+
+
+diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/jingle_rtp.py
+--- a/src/common/jingle_rtp.py Sun Apr 01 19:47:11 2012 +0200
++++ b/src/common/jingle_rtp.py Sun Apr 01 19:49:52 2012 +0200
+@@ -21,7 +21,7 @@
+ import socket
+
+ import xmpp
+-import farsight, gst
++import farstream, gst
+ from glib import GError
+
+ import gajim
+@@ -42,8 +42,8 @@
+ JingleContent.__init__(self, session, transport)
+ self.media = media
+ self._dtmf_running = False
+- self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO,
+- 'video': farsight.MEDIA_TYPE_VIDEO}[media]
++ self.farstream_media = {'audio': farstream.MEDIA_TYPE_AUDIO,
++ 'video': farstream.MEDIA_TYPE_VIDEO}[media]
+
+ self.pipeline = None
+ self.src_bin = None
+@@ -59,7 +59,7 @@
+ self.callbacks['session-terminate'] += [self.__stop]
+ self.callbacks['session-terminate-sent'] += [self.__stop]
+
+- def setup_stream(self):
++ def setup_stream(self, on_src_pad_added):
+ # pipeline and bus
+ self.pipeline = gst.Pipeline()
+ bus = self.pipeline.get_bus()
+@@ -68,13 +68,12 @@
+
+ # conference
+ self.conference = gst.element_factory_make('fsrtpconference')
+- self.conference.set_property('sdes-cname', self.session.ourjid)
+ self.pipeline.add(self.conference)
+ self.funnel = None
+
+- self.p2psession = self.conference.new_session(self.farsight_media)
++ self.p2psession = self.conference.new_session(self.farstream_media)
+
+- participant = self.conference.new_participant(self.session.peerjid)
++ participant = self.conference.new_participant()
+ # FIXME: Consider a workaround, here...
+ # pidgin and telepathy-gabble don't follow the XEP, and it won't work
+ # due to bad controlling-mode
+@@ -93,7 +92,9 @@
+ params['stun-ip'] = ip
+
+ self.p2pstream = self.p2psession.new_stream(participant,
+- farsight.DIRECTION_RECV, 'nice', params)
++ farstream.DIRECTION_RECV)
++ self.p2pstream.connect('src-pad-added', on_src_pad_added)
++ self.p2pstream.set_transmitter('nice', params)
+
+ def is_ready(self):
+ return (JingleContent.is_ready(self) and self.candidates_ready)
+@@ -117,7 +118,7 @@
+ # FIXME: connectivity should not be etablished yet
+ # Instead, it should be etablished after session-accept!
+ if self.sent:
+- self.p2pstream.set_remote_candidates(candidates)
++ self.p2pstream.add_remote_candidates(candidates)
+
+ def batch_dtmf(self, events):
+ """
+@@ -140,15 +141,14 @@
+
+ def _start_dtmf(self, event):
+ if event in ('*', '#'):
+- event = {'*': farsight.DTMF_EVENT_STAR,
+- '#': farsight.DTMF_EVENT_POUND}[event]
++ event = {'*': farstream.DTMF_EVENT_STAR,
++ '#': farstream.DTMF_EVENT_POUND}[event]
+ else:
+ event = int(event)
+- self.p2psession.start_telephony_event(event, 2,
+- farsight.DTMF_METHOD_RTP_RFC4733)
++ self.p2psession.start_telephony_event(event, 2)
+
+ def _stop_dtmf(self):
+- self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733)
++ self.p2psession.stop_telephony_event()
+
+ def _fill_content(self, content):
+ content.addChild(xmpp.NS_JINGLE_RTP + ' description',
+@@ -170,34 +170,33 @@
+ if message.type == gst.MESSAGE_ELEMENT:
+ name = message.structure.get_name()
+ log.debug('gst element message: %s: %s' % (name, message))
+- if name == 'farsight-new-active-candidate-pair':
++ if name == 'farstream-new-active-candidate-pair':
+ pass
+- elif name == 'farsight-recv-codecs-changed':
++ elif name == 'farstream-recv-codecs-changed':
+ pass
+- elif name == 'farsight-codecs-changed':
+- if self.sent and self.p2psession.get_property('codecs-ready'):
++ elif name == 'farstream-codecs-changed':
++ if self.sent and self.p2psession.get_property('codecs'):
+ self.send_description_info()
+- elif name == 'farsight-local-candidates-prepared':
++ elif name == 'farstream-local-candidates-prepared':
+ self.candidates_ready = True
+ if self.is_ready():
+ self.session.on_session_state_changed(self)
+- elif name == 'farsight-new-local-candidate':
++ elif name == 'farstream-new-local-candidate':
+ candidate = message.structure['candidate']
+ self.transport.candidates.append(candidate)
+ if self.sent:
+ # FIXME: Is this case even possible?
+ self.send_candidate(candidate)
+- elif name == 'farsight-component-state-changed':
++ elif name == 'farstream-component-state-changed':
+ state = message.structure['state']
+- if state == farsight.STREAM_STATE_FAILED:
++ if state == farstream.STREAM_STATE_FAILED:
+ reason = xmpp.Node('reason')
+ reason.setTag('failed-transport')
+ self.session.remove_content(self.creator, self.name, reason)
+- elif name == 'farsight-error':
+- log.error('Farsight error #%d!\nMessage: %s\nDebug: %s' % (
++ elif name == 'farstream-error':
++ log.error('Farstream error #%d!\nMessage: %s' % (
+ message.structure['error-no'],
+- message.structure['error-msg'],
+- message.structure['debug-msg']))
++ message.structure['error-msg']))
+ elif message.type == gst.MESSAGE_ERROR:
+ # TODO: Fix it to fallback to videotestsrc anytime an error occur,
+ # or raise an error, Jingle way
+@@ -236,10 +235,10 @@
+ def on_negotiated(self):
+ if self.accepted:
+ if self.transport.remote_candidates:
+- self.p2pstream.set_remote_candidates(self.transport.remote_candidates)
++ self.p2pstream.add_remote_candidates(self.transport.remote_candidates)
+ self.transport.remote_candidates = []
+- # TODO: farsight.DIRECTION_BOTH only if senders='both'
+- self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH)
++ # TODO: farstream.DIRECTION_BOTH only if senders='both'
++ self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH)
+ JingleContent.on_negotiated(self)
+
+ def __on_remote_codecs(self, stanza, content, error, action):
+@@ -252,8 +251,8 @@
+ if not codec['id'] or not codec['name'] or not codec['clockrate']:
+ # ignore invalid payload-types
+ continue
+- c = farsight.Codec(int(codec['id']), codec['name'],
+- self.farsight_media, int(codec['clockrate']))
++ c = farstream.Codec(int(codec['id']), codec['name'],
++ self.farstream_media, int(codec['clockrate']))
+ if 'channels' in codec:
+ c.channels = int(codec['channels'])
+ else:
+@@ -318,7 +317,7 @@
+ self.out_volume.set_property('volume', vol)
+
+ def setup_stream(self):
+- JingleRTPContent.setup_stream(self)
++ JingleRTPContent.setup_stream(self, self._on_src_pad_added)
+
+ # Configure SPEEX
+ # Workaround for psi (not needed since rev
+@@ -326,10 +325,10 @@
+ # place 16kHz before 8kHz, as buggy psi versions will take in
+ # account only the first codec
+
+- codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
+- farsight.MEDIA_TYPE_AUDIO, 16000),
+- farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
+- farsight.MEDIA_TYPE_AUDIO, 8000)]
++ codecs = [farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX',
++ farstream.MEDIA_TYPE_AUDIO, 16000),
++ farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX',
++ farstream.MEDIA_TYPE_AUDIO, 8000)]
+ self.p2psession.set_codec_preferences(codecs)
+
+ # the local parts
+@@ -348,9 +347,8 @@
+
+ self.src_bin.get_pad('src').link(self.p2psession.get_property(
+ 'sink-pad'))
+- self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
+
+- # The following is needed for farsight to process ICE requests:
++ # The following is needed for farstream to process ICE requests:
+ self.pipeline.set_state(gst.STATE_PLAYING)
+
+
+@@ -363,7 +361,7 @@
+ # TODO: Everything is not working properly:
+ # sometimes, one window won't show up,
+ # sometimes it'll freeze...
+- JingleRTPContent.setup_stream(self)
++ JingleRTPContent.setup_stream(self, self._on_src_pad_added)
+
+ # the local parts
+ if gajim.config.get('video_framerate'):
+@@ -395,9 +393,8 @@
+
+ self.src_bin.get_pad('src').link(self.p2psession.get_property(
+ 'sink-pad'))
+- self.p2pstream.connect('src-pad-added', self._on_src_pad_added)
+
+- # The following is needed for farsight to process ICE requests:
++ # The following is needed for farstream to process ICE requests:
+ self.pipeline.set_state(gst.STATE_PLAYING)
+
+ def get_fallback_src(self):
+diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/jingle_transport.py
+--- a/src/common/jingle_transport.py Sun Apr 01 19:47:11 2012 +0200
++++ b/src/common/jingle_transport.py Sun Apr 01 19:49:52 2012 +0200
+@@ -73,7 +73,7 @@
+
+
+ try:
+- import farsight
++ import farstream
+ except Exception:
+ pass
+
+@@ -82,11 +82,11 @@
+ JingleTransport.__init__(self, TransportType.datagram)
+
+ def make_candidate(self, candidate):
+- types = {farsight.CANDIDATE_TYPE_HOST: 'host',
+- farsight.CANDIDATE_TYPE_SRFLX: 'srflx',
+- farsight.CANDIDATE_TYPE_PRFLX: 'prflx',
+- farsight.CANDIDATE_TYPE_RELAY: 'relay',
+- farsight.CANDIDATE_TYPE_MULTICAST: 'multicast'}
++ types = {farstream.CANDIDATE_TYPE_HOST: 'host',
++ farstream.CANDIDATE_TYPE_SRFLX: 'srflx',
++ farstream.CANDIDATE_TYPE_PRFLX: 'prflx',
++ farstream.CANDIDATE_TYPE_RELAY: 'relay',
++ farstream.CANDIDATE_TYPE_MULTICAST: 'multicast'}
+ attrs = {
+ 'component': candidate.component_id,
+ 'foundation': '1', # hack
+@@ -98,7 +98,7 @@
+ }
+ if candidate.type in types:
+ attrs['type'] = types[candidate.type]
+- if candidate.proto == farsight.NETWORK_PROTOCOL_UDP:
++ if candidate.proto == farstream.NETWORK_PROTOCOL_UDP:
+ attrs['protocol'] = 'udp'
+ else:
+ # we actually don't handle properly different tcp options in jingle
+@@ -117,29 +117,29 @@
+ def parse_transport_stanza(self, transport):
+ candidates = []
+ for candidate in transport.iterTags('candidate'):
+- cand = farsight.Candidate()
++ cand = farstream.Candidate()
+ cand.component_id = int(candidate['component'])
+ cand.ip = str(candidate['ip'])
+ cand.port = int(candidate['port'])
+ cand.foundation = str(candidate['foundation'])
+- #cand.type = farsight.CANDIDATE_TYPE_LOCAL
++ #cand.type = farstream.CANDIDATE_TYPE_LOCAL
+ cand.priority = int(candidate['priority'])
+
+ if candidate['protocol'] == 'udp':
+- cand.proto = farsight.NETWORK_PROTOCOL_UDP
++ cand.proto = farstream.NETWORK_PROTOCOL_UDP
+ else:
+ # we actually don't handle properly different tcp options in jingle
+- cand.proto = farsight.NETWORK_PROTOCOL_TCP
++ cand.proto = farstream.NETWORK_PROTOCOL_TCP
+
+ cand.username = str(transport['ufrag'])
+ cand.password = str(transport['pwd'])
+
+ #FIXME: huh?
+- types = {'host': farsight.CANDIDATE_TYPE_HOST,
+- 'srflx': farsight.CANDIDATE_TYPE_SRFLX,
+- 'prflx': farsight.CANDIDATE_TYPE_PRFLX,
+- 'relay': farsight.CANDIDATE_TYPE_RELAY,
+- 'multicast': farsight.CANDIDATE_TYPE_MULTICAST}
++ types = {'host': farstream.CANDIDATE_TYPE_HOST,
++ 'srflx': farstream.CANDIDATE_TYPE_SRFLX,
++ 'prflx': farstream.CANDIDATE_TYPE_PRFLX,
++ 'relay': farstream.CANDIDATE_TYPE_RELAY,
++ 'multicast': farstream.CANDIDATE_TYPE_MULTICAST}
+ if 'type' in candidate and candidate['type'] in types:
+ cand.type = types[candidate['type']]
+ else:
+diff -r 0f94fd42abba -r dfd58bb1ad06 src/features_window.py
+--- a/src/features_window.py Sun Apr 01 19:47:11 2012 +0200
++++ b/src/features_window.py Sun Apr 01 19:49:52 2012 +0200
+@@ -103,9 +103,9 @@
+ _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'),
+ _('Requires python-docutils.'),
+ _('Requires python-docutils.')),
+- _('Audio / Video'): (self.farsight_available,
++ _('Audio / Video'): (self.farstream_available,
+ _('Ability to start audio and video chat.'),
+- _('Requires python-farsight and gstreamer-plugins-bad.'),
++ _('Requires python-farstream and gstreamer-plugins-bad.'),
+ _('Feature not available under Windows.')),
+ _('UPnP-IGD'): (self.gupnp_igd_available,
+ _('Ability to request your router to forward port for file transfer.'),
+@@ -258,8 +258,8 @@
+ return False
+ return True
+
+- def farsight_available(self):
+- return gajim.HAVE_FARSIGHT
++ def farstream_available(self):
++ return gajim.HAVE_FARSTREAM
+
+ def gupnp_igd_available(self):
+ return gajim.HAVE_UPNP_IGD
diff --git a/gajim.spec b/gajim.spec
index a05b478..b3db534 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -2,7 +2,7 @@ Summary: Jabber client written in PyGTK
Name: gajim
%global majorver 0.15
Version: 0.15
-Release: 3%{?dist}
+Release: 5%{?dist}
License: GPLv3
Group: Applications/Internet
URL: http://gajim.org/
@@ -14,8 +14,7 @@ Requires: avahi-ui-tools
Requires: bind-utils
Requires: dbus-python
# Audio/Video calls:
-# farstream port: https://trac.gajim.org/ticket/7113
-#Requires: farsight2-python
+Requires: farstream-python
Requires: gstreamer-python
# XXX: Gajim does not import bonobo directly, but some module does and
# prints an error if it's not available.
@@ -55,6 +54,9 @@ BuildRequires: hardlink
Patch1: gajim-0.15-13759-bac8e353d25c.patch
Patch2: gajim-0.15-13761-f6f78f3802c0.patch
Patch3: gajim-0.15-13766-f046e4aaf7d4.patch
+# use farstream instead of farsight, which is no longer in Fedora
+# https://trac.gajim.org/ticket/7113
+Patch4: gajim-0.15-farstream.patch
%description
Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
@@ -66,6 +68,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%configure --docdir=%{_docdir}/%{name}-%{version}
@@ -120,6 +123,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/%{name}/src
%changelog
+* Mon Aug 06 2012 Michal Schmidt <mschmidt at redhat.com> - 0.15-5
+- Apply upstream patch to use farstream for audio/video (#845825)
+
* Fri May 25 2012 Michal Schmidt <mschmidt at redhat.com> - 0.15-3
- Require gupnp-igd-python (#825035)
More information about the scm-commits
mailing list