[Pkg-voip-commits] r9859 - in /t38modem/trunk/debian: changelog patches/t38modem-opal3.10-patch

[mvanderkolff-guest at alioth.debian.org]

Author: mvanderkolff-guest
Date: Fri Jun 29 11:12:26 2012
New Revision: 9859

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9859
Log:
Apply patch attached to #671382, hopefully closing it.

Modified:
    t38modem/trunk/debian/changelog
    t38modem/trunk/debian/patches/t38modem-opal3.10-patch

Modified: t38modem/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/changelog?rev=9859&op=diff
==============================================================================
--- t38modem/trunk/debian/changelog (original)
+++ t38modem/trunk/debian/changelog Fri Jun 29 11:12:26 2012
@@ -1,3 +1,10 @@
+t38modem (2.0.0-3) UNRELEASED; urgency=low
+
+  * Apply patch attached to #671382 (Closes: #671382)
+   - Thanks, Matej! (vela at debian.org)
+
+ -- Michael van der Kolff <mvanderkolff at gmail.com>  Fri, 29 Jun 2012 21:09:42 +1000
+
 t38modem (2.0.0-2) unstable; urgency=low
 
   * Upload to unstable - coordinated through debian-release

Modified: t38modem/trunk/debian/patches/t38modem-opal3.10-patch
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/patches/t38modem-opal3.10-patch?rev=9859&op=diff
==============================================================================
--- t38modem/trunk/debian/patches/t38modem-opal3.10-patch (original)
+++ t38modem/trunk/debian/patches/t38modem-opal3.10-patch Fri Jun 29 11:12:26 2012
@@ -1,7 +1,21 @@
 Author: "Peter Katzmann" <pk1057 at users.sf.net>
 Origin: http://sourceforge.net/tracker/index.php?func=detail&aid=3462909&group_id=152230&atid=783658
 Description: With this patch, t38modem builds against the OPAL in debian
+ * Arguments to OpalConnection::AdjustMediaFormats() changed order from
+   (local, mediaFormats, otherConnection) in 3.8.x [1] to
+   (local, otherConnection, mediaFormats) in 3.10.x [2].
+ * OpalMediaStream::RemovePatch() has been removed; in 3.8.x it was
+   implemented as simply "SetPatch(NULL)" [3], so use that instead.
+ .
+ Slightly different patch from Henning Holtschneider:
+ <https://github.com/hehol/t38modem/commit/244124970667e19daceaf4c52372cca316e4bd8e>
+ .
+ [1] <http://www.opalvoip.org/docs/opal-v3_8/de/da0/classOpalConnection.html#2c09181a20a215fa4b9c210cf006ba74>
+ [2] <http://www.opalvoip.org/docs/opal-v3_10/de/da0/classOpalConnection.html#b5b91814e4df73825c949e65ab1cc79b>
+ [3] <http://opalvoip.svn.sourceforge.net/viewvc/opalvoip/opal/branches/v3_8/src/opal/mediastrm.cxx?revision=24861&view=markup#l498>
 Forwarded: Yes
+Last-Update: 2012-05-22
+
 diff -urwb t38modem/opal/fake_codecs.cxx ../t38modem-2.0.0/opal/fake_codecs.cxx
 --- t38modem/opal/fake_codecs.cxx	2010-03-24 11:48:29.000000000 +0100
 +++ ../t38modem-2.0.0/opal/fake_codecs.cxx	2011-11-07 20:30:25.772000161 +0100
@@ -84,7 +98,7 @@
      if (faxMode) {
        OpalMediaFormatList otherMediaFormats = other->GetMediaFormats();
 -      other->AdjustMediaFormats(false, otherMediaFormats, NULL);
-+      other->AdjustMediaFormats(false, other, otherMediaFormats);
++      other->AdjustMediaFormats(false, NULL, otherMediaFormats);
  
        PTRACE(4, "ModemConnection::RequestMode: other connection formats: \n" <<
                  setfill('\n') << otherMediaFormats << setfill(' '));
@@ -93,7 +107,7 @@
          if (other != NULL) {
            OpalMediaFormatList otherMediaFormats = other->GetMediaFormats();
 -          other->AdjustMediaFormats(false, otherMediaFormats, NULL);
-+          other->AdjustMediaFormats(false, other, otherMediaFormats);
++          other->AdjustMediaFormats(false, NULL, otherMediaFormats);
  
            PTRACE(4, "ModemConnection::RequestMode: other connection formats: \n" <<
                      setfill('\n') << otherMediaFormats << setfill(' '));