diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:28:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:30:53 +0200 |
| commit | 625f40151b0767cb421999cf988f4eb7bcf8b63d (patch) | |
| tree | 629565f6f9efb26ad36b2a6d8e7e266290feb94b /pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch | |
| parent | d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 (diff) | |
| parent | 4fb87e91ffcbf6f6785e32b7e608198401a7155d (diff) | |
| download | nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.gz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.bz2 nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.lz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.xz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.zst nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.zip | |
Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch')
| -rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch new file mode 100644 index 000000000000..ec003732344f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch @@ -0,0 +1,22 @@ +diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +index 88fdbd1..57c6c05 100644 +--- a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc ++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) + LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate; + pt_ = i->id; + audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */ +- port2 = rtp_session_get_local_port(audio_stream_->session); ++ port2 = rtp_session_get_local_port(audio_stream_->ms.session); + first = false; + } + } +@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) + // working with a buggy client; let's try PCMU. + LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000"; + audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */ +- port2 = rtp_session_get_local_port(audio_stream_->session); ++ port2 = rtp_session_get_local_port(audio_stream_->ms.session); + } + + return true; |