[Pkg-voip-commits] [t38modem] 03/03: Imported Debian patch 2.0.0-4

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Fri Aug 14 12:41:45 UTC 2015


This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository t38modem.

commit 1daad3c1367ac90c491f1954b5d992dfe0d18edc
Author: Mark Purcell <msp at debian.org>
Date:   Sat Jun 1 21:25:38 2013 +1000

    Imported Debian patch 2.0.0-4
---
 debian/changelog                 |  29 +++++++++++
 debian/compat                    |   2 +-
 debian/control                   |   4 +-
 debian/patches/opal-3.10.7.patch | 104 +++++++++++++++++++++++++++++++++++++++
 debian/patches/opal-3.10.9.patch |  84 +++++++++++++++++++++++++++++++
 debian/patches/series            |   2 +
 6 files changed, 222 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0fcc15f..d881b03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+t38modem (2.0.0-4) unstable; urgency=low
+
+  * Sync with Ubuntu - Thanks Adam for API fix (Closes: #695815)
+    - supports libpt2.10.10 transition
+  * debian/compat -> 9
+  * Update Standards Version 3.9.4 - no further changes
+
+ -- Mark Purcell <msp at debian.org>  Sat, 01 Jun 2013 21:25:38 +1000
+
+t38modem (2.0.0-3ubuntu3) raring; urgency=low
+
+  * No-change rebuild for the opal/libpt2.10.10 transition 
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Mon, 04 Mar 2013 11:39:59 -0500
+
+t38modem (2.0.0-3ubuntu2) raring; urgency=low
+
+  * debian/patches/opal-3.10.9.patch: Adjust again for new API changes
+    in the new opal version, and rebuild for the opal/ptlib transition.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Wed, 12 Dec 2012 14:38:32 -0700
+
+t38modem (2.0.0-3ubuntu1) raring; urgency=low
+
+  * debian/patches/opal-3.10.7.patch: Adjust slightly for API changes
+    in the new opal version, and rebuild for the opal/ptlib transition.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Wed, 31 Oct 2012 15:30:25 +0000
+
 t38modem (2.0.0-3) unstable; urgency=low
 
   [ Michael van der Kolff ] 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index d2961a7..df48412 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Uploaders:
  Santiago Garcia Mantinan <manty at debian.org>,
  Michael van der Kolff <mvanderkolff at gmail.com>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
  help2man,
  libexpat1-dev,
  libopal-dev (>= 3.10)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://t38modem.sf.net/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/t38modem/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/t38modem/trunk/
diff --git a/debian/patches/opal-3.10.7.patch b/debian/patches/opal-3.10.7.patch
new file mode 100644
index 0000000..725bffe
--- /dev/null
+++ b/debian/patches/opal-3.10.7.patch
@@ -0,0 +1,104 @@
+Description: Fix FTBS with the new opal 3.10.7 API
+Author: Adam Conrad <adconrad at ubuntu.com>
+Forwarded: no
+
+Index: t38modem-2.0.0/opal/modemstrm.h
+===================================================================
+--- t38modem-2.0.0.orig/opal/modemstrm.h	2012-11-07 14:04:57.000000000 -0700
++++ t38modem-2.0.0/opal/modemstrm.h	2012-11-07 14:25:13.652310704 -0700
+@@ -74,7 +74,6 @@
+   /**@name Overrides of OpalRawMediaStream class */
+   //@{
+     virtual PBoolean Open();
+-    virtual PBoolean Close();
+ 
+     virtual PBoolean ReadData(
+       BYTE * data,                         ///<  Data buffer to read to
+@@ -92,6 +91,8 @@
+   //@}
+ 
+   protected:
++    virtual void InternalClose();
++
+     AudioEngine *audioEngine;
+ };
+ /////////////////////////////////////////////////////////////////////////////
+@@ -118,7 +119,6 @@
+   /**@name Overrides of OpalMediaStream class */
+   //@{
+     virtual PBoolean Open();
+-    virtual PBoolean Close();
+     virtual void OnStartMediaPatch();
+ 
+     virtual PBoolean ReadPacket(
+@@ -133,6 +133,8 @@
+   //@}
+ 
+   protected:
++    virtual void InternalClose();
++
+     long currentSequenceNumber;
+ #if PTRACING
+     int totallost;
+Index: t38modem-2.0.0/opal/modemstrm.cxx
+===================================================================
+--- t38modem-2.0.0.orig/opal/modemstrm.cxx	2012-11-07 14:04:57.000000000 -0700
++++ t38modem-2.0.0/opal/modemstrm.cxx	2012-11-07 14:23:17.168310353 -0700
+@@ -110,18 +110,16 @@
+   return OpalMediaStream::Open();
+ }
+ 
+-PBoolean AudioModemMediaStream::Close()
++void AudioModemMediaStream::InternalClose()
+ {
+   if (isOpen) {
+-    PTRACE(3, "AudioModemMediaStream::Close " << *this);
++    PTRACE(3, "AudioModemMediaStream::InternalClose " << *this);
+ 
+     if (IsSink())
+       audioEngine->CloseIn(EngineBase::HOWNERIN(this));
+     else
+       audioEngine->CloseOut(EngineBase::HOWNEROUT(this));
+   }
+-
+-  return OpalMediaStream::Close();
+ }
+ 
+ PBoolean AudioModemMediaStream::ReadData(BYTE * data, PINDEX size, PINDEX & length)
+@@ -188,31 +186,30 @@
+   return OpalMediaStream::Open();
+ }
+ 
+-PBoolean T38ModemMediaStream::Close()
++void T38ModemMediaStream::InternalClose()
+ {
+   if (isOpen) {
+-    PTRACE(3, "T38ModemMediaStream::Close " << *this);
++    PTRACE(3, "T38ModemMediaStream::InternalClose " << *this);
+ 
+     if (IsSink()) {
+-      PTRACE(2, "T38ModemMediaStream::Close Send statistics:"
++      PTRACE(2, "T38ModemMediaStream::InternalClose Send statistics:"
+                 " sequence=" << currentSequenceNumber <<
+                 " lost=" << totallost);
+ 
+       t38engine->CloseIn(EngineBase::HOWNERIN(this));
+     } else {
+-      PTRACE(2, "T38ModemMediaStream::Close Receive statistics:"
++      PTRACE(2, "T38ModemMediaStream::InternalClose Receive statistics:"
+                 " sequence=" << currentSequenceNumber);
+ 
+       t38engine->CloseOut(EngineBase::HOWNEROUT(this));
+     }
+   }
+-
+-  return OpalMediaStream::Close();
+ }
+ 
+ void T38ModemMediaStream::OnStartMediaPatch()
+ {
+   if (isSource) {
++    PatchPtr mediaPatch = m_mediaPatch;
+     if (mediaPatch != NULL) {
+       OpalMediaStreamPtr sink = mediaPatch->GetSink();
+ 
diff --git a/debian/patches/opal-3.10.9.patch b/debian/patches/opal-3.10.9.patch
new file mode 100644
index 0000000..ca6f4bf
--- /dev/null
+++ b/debian/patches/opal-3.10.9.patch
@@ -0,0 +1,84 @@
+Description: Fix FTBS with the new opal 3.10.9 API
+Author: Adam Conrad <adconrad at ubuntu.com>
+Forwarded: no
+
+Index: t38modem-2.0.0/opal/sipep.cxx
+===================================================================
+--- t38modem-2.0.0.orig/opal/sipep.cxx	2012-12-12 14:59:13.000000000 -0700
++++ t38modem-2.0.0/opal/sipep.cxx	2012-12-12 15:06:56.819887272 -0700
+@@ -167,11 +167,12 @@
+     virtual void OnApplyStringOptions();
+ 
+     virtual bool SwitchFaxMediaStreams(
+-      bool enableFax                            ///< Enable FAX or return to audio mode
++      bool toT38                                ///< Enable FAX or return to audio mode
+     );
+ 
+     virtual void OnSwitchedFaxMediaStreams(
+-      bool enabledFax                           ///< Enabled FAX or audio mode
++      bool toT38,                               ///< Enabled FAX or audio mode
++      bool success                              ///< Switch succeeded or failed
+     );
+ 
+     virtual PBoolean OnOpenMediaStream(
+@@ -507,15 +508,15 @@
+   return res;
+ }
+ 
+-void MySIPConnection::OnSwitchedFaxMediaStreams(bool enabledFax)
++void MySIPConnection::OnSwitchedFaxMediaStreams(bool toT38, bool success)
+ {
+   PTRACE(3, "MySIPConnection::OnSwitchedFaxMediaStreams: "
+-         << (enabledFax == switchingToFaxMode ? "" : "NOT ") << "switched to "
+-         << (switchingToFaxMode ? "fax" : "audio"));
++         << (success ? "succeeded" : "NOT") << "switched to "
++         << (toT38 ? "T.38" : "audio"));
+ 
+-  SIPConnection::OnSwitchedFaxMediaStreams(enabledFax);
++  SIPConnection::OnSwitchedFaxMediaStreams(toT38, success);
+ 
+-  if (switchingToFaxMode && !enabledFax) {
++  if (toT38 && !success) {
+       PTRACE(3, "MySIPConnection::OnSwitchedFaxMediaStreams: fallback to audio");
+       mediaFormatList -= OpalT38;
+       SwitchFaxMediaStreams(false);
+Index: t38modem-2.0.0/opal/h323ep.cxx
+===================================================================
+--- t38modem-2.0.0.orig/opal/h323ep.cxx	2012-12-12 14:59:13.000000000 -0700
++++ t38modem-2.0.0/opal/h323ep.cxx	2012-12-12 15:07:09.307887150 -0700
+@@ -176,11 +176,12 @@
+     );
+ 
+     virtual bool SwitchFaxMediaStreams(
+-      bool enableFax                           ///< Enable FAX or return to audio mode
++      bool toT38                               ///< Enable FAX or return to audio mode
+     );
+ 
+     virtual void OnSwitchedFaxMediaStreams(
+-      bool enabledFax                          ///< Enabled FAX or audio mode
++      bool toT38,                              ///< Enabled FAX or audio mode
++      bool success                             ///< Switch succeeded or failed
+     );
+ 
+     virtual PBoolean OnOpenMediaStream(
+@@ -567,15 +568,15 @@
+   return false;
+ }
+ 
+-void MyH323Connection::OnSwitchedFaxMediaStreams(bool enabledFax)
++void MyH323Connection::OnSwitchedFaxMediaStreams(bool toT38, bool success)
+ {
+   PTRACE(3, "MyH323Connection::OnSwitchedFaxMediaStreams: "
+-         << (enabledFax == switchingToFaxMode ? "" : "NOT ") << "switched to "
+-         << (switchingToFaxMode ? "fax" : "audio"));
++         << (success ? "succeeded" : "NOT") << "switched to "
++         << (toT38 ? "T.38" : "audio"));
+ 
+-  H323Connection::OnSwitchedFaxMediaStreams(enabledFax);
++  H323Connection::OnSwitchedFaxMediaStreams(toT38, success);
+ 
+-  if (switchingToFaxMode && !enabledFax) {
++  if (toT38 && !success) {
+       PTRACE(3, "MyH323Connection::OnSwitchedFaxMediaStreams: fallback to audio");
+       mediaFormatList -= OpalT38;
+       SwitchFaxMediaStreams(false);
diff --git a/debian/patches/series b/debian/patches/series
index 0f0dc4a..2d5add2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 simplify-makefile-new
 t38modem-opal3.10-patch
 spelling-error-fix
+opal-3.10.7.patch
+opal-3.10.9.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/t38modem.git



More information about the Pkg-voip-commits mailing list