[Pkg-voip-commits] r861 - in iaxclient/trunk/debian: . patches
Mikael Magnusson
mikma-guest at costa.debian.org
Thu Oct 20 20:41:07 UTC 2005
Author: mikma-guest
Date: 2005-10-20 20:41:03 +0000 (Thu, 20 Oct 2005)
New Revision: 861
Added:
iaxclient/trunk/debian/patches/170_deadlock.dpatch
iaxclient/trunk/debian/patches/180_filter.dpatch
iaxclient/trunk/debian/patches/200_version.dpatch
iaxclient/trunk/debian/patches/210_ringback.dpatch
iaxclient/trunk/debian/patches/220_audio_encode.dpatch
Modified:
iaxclient/trunk/debian/changelog
iaxclient/trunk/debian/patches/00list
iaxclient/trunk/debian/patches/10_autoconf.dpatch
iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch
iaxclient/trunk/debian/rules
iaxclient/trunk/debian/shlibs.local
Log:
Add patch to resolve deadlock during shutdown. (Closes: #321309:
iaxcomm: sometimes stalls or freezes on exit)
Enable the Analog AGC filter which was always disabled.
Announce iaxcomm version 1.0rc3 in the about dialog.
Return PACKAGE_VERSION in iaxc_version.
Add debug build option in rules, using wx debug libraries.
Force usage of wx version 2.4.
Stop ring back tone if voice data are received.
Use configurable VAD (needs libspeex >= 1.1.10-1). (Closes: #331313:
iaxclient: should use shared libspeex when possible)
Modified: iaxclient/trunk/debian/changelog
===================================================================
--- iaxclient/trunk/debian/changelog 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/changelog 2005-10-20 20:41:03 UTC (rev 861)
@@ -1,6 +1,18 @@
iaxclient (0.0+cvs20050725-5~1) UNRELEASED; urgency=low
+ [ Mikael Magnusson ]
* debian/copyright: add Speex copyright and license.
+ * Add patch to resolve deadlock during shutdown. (Closes: #321309:
+ iaxcomm: sometimes stalls or freezes on exit)
+ * Enable the Analog AGC filter which was always disabled.
+ * Announce iaxcomm version 1.0rc3 in the about dialog.
+ * Return PACKAGE_VERSION in iaxc_version.
+ * Add debug build option in rules, using wx debug libraries.
+ * Force usage of wx version 2.4.
+ * Stop ring back tone if voice data are received.
+ * Use configurable VAD (needs libspeex >= 1.1.10-1). (Closes: #331313:
+ iaxclient: should use shared libspeex when possible)
+
* add man pages for iaxcomm and testcall (Tzafrir)
-- Mikael Magnusson <mikma at users.sourceforge.net> Mon, 3 Oct 2005 13:44:39 +0200
Modified: iaxclient/trunk/debian/patches/00list
===================================================================
--- iaxclient/trunk/debian/patches/00list 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/00list 2005-10-20 20:41:03 UTC (rev 861)
@@ -10,3 +10,9 @@
#120_separate_streams
150_iax2_newjb
160_umask
+170_deadlock
+180_filter
+90_mixer
+200_version
+210_ringback
+220_audio_encode
Modified: iaxclient/trunk/debian/patches/10_autoconf.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/10_autoconf.dpatch 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/10_autoconf.dpatch 2005-10-20 20:41:03 UTC (rev 861)
@@ -7,9 +7,9 @@
## DP: ./debian/rules autoreconf
@DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/AUTHORS /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/AUTHORS
+diff -urNad iaxclient-0.0+cvs20050725/AUTHORS /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/AUTHORS
--- iaxclient-0.0+cvs20050725/AUTHORS 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/AUTHORS 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/AUTHORS 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,8 @@
+Steve Kann <stevek at stevek.com>
+Shawn Lawrence <shawn.lawrence at terracecomm.com>
@@ -19,9 +19,9 @@
+Steven Sokol <ssokol at sokol-associates.com> [ Debugging, Blind Transfer ]
+Stephan Kauss <Stephan at kauss.org> [ 32-bit alignment for IAX2 ]
+Stephen Uhler <suhler at sun.com> [Solaris build, tkiaxphone]
-diff -urNad iaxclient-0.0+cvs20050725/autogen.sh /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/autogen.sh
+diff -urNad iaxclient-0.0+cvs20050725/autogen.sh /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/autogen.sh
--- iaxclient-0.0+cvs20050725/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/autogen.sh 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/autogen.sh 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
@@ -35,15 +35,15 @@
+ ./config.status --recheck
+ ./config.status
+fi
-diff -urNad iaxclient-0.0+cvs20050725/ChangeLog /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/ChangeLog
+diff -urNad iaxclient-0.0+cvs20050725/ChangeLog /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/ChangeLog
--- iaxclient-0.0+cvs20050725/ChangeLog 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/ChangeLog 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/ChangeLog 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,2 @@
+
+
-diff -urNad iaxclient-0.0+cvs20050725/clean.sh /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/clean.sh
+diff -urNad iaxclient-0.0+cvs20050725/clean.sh /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/clean.sh
--- iaxclient-0.0+cvs20050725/clean.sh 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/clean.sh 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/clean.sh 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,6 @@
+#!/bin/sh
+
@@ -51,10 +51,10 @@
+
+rm -f {.,lib,simpleclient,simpleclient/iaxcomm,simpleclient/iaxphone,simpleclient/testcall,simpleclient/tkphone,simpleclient/WinIAX,simpleclient/wx}/Makefile.in
+rm -rf autom4te.cache
-diff -urNad iaxclient-0.0+cvs20050725/configure.ac /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/configure.ac
+diff -urNad iaxclient-0.0+cvs20050725/configure.ac /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/configure.ac
--- iaxclient-0.0+cvs20050725/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/configure.ac 2005-07-25 18:52:05.000000000 +0200
-@@ -0,0 +1,352 @@
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/configure.ac 2005-08-08 23:26:09.000000000 +0200
+@@ -0,0 +1,361 @@
+dnl Copyright (C) 2004-2005 Mikael Magnusson <mikma at users.sourceforge.net>
+
+AC_PREREQ(2.59)
@@ -67,8 +67,9 @@
+dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
+AM_CONFIG_HEADER([config.h])
+
-+dnl Default CFLAGS if unset
-+CFLAGS=${CFLAGS-"-O2 -g -Wall"}
++dnl Default CFLAGS and CXXFLAGS if unset
++CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"}
++CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"}
+
+ISODATE=`date +%Y-%m-%d`
+AC_SUBST(ISODATE)
@@ -79,8 +80,8 @@
+ [enable_local_gsm="auto"])
+
+AC_ARG_ENABLE(local-speex,
-+ [AS_HELP_STRING([--enable-local-speex],[Use local speex library [default=auto]])],,
-+ [enable_local_speex="auto"])
++ [AS_HELP_STRING([--disable-local-speex],[Use local speex library [default=auto]])],,
++ [enable_local_speex="yes"])
+
+AC_ARG_ENABLE(local-iax,
+ [AS_HELP_STRING([--disable-local-iax],[Don't use local iax library])],,
@@ -290,9 +291,17 @@
+fi
+
+if test x$has_wx_xrc = xyes; then
++
++dnl Check for debug libraries
++ wx_lib_prefix=
++
++ case $WX_CXXFLAGS in
++ *__WXDEBUG__*) wx_lib_prefix=d
++ esac
++
+ has_wx_xrc=xno
+ AC_MSG_CHECKING([for wx xrc library])
-+ for wx_xrc_lib in " " "-lwx_gtk_xrc-2.4" "-lwx_msw_xrc-2.4" "-lwxxrc"; do
++ for wx_xrc_lib in " " "-lwx_gtk${wx_lib_prefix}_xrc-2.4" "-lwx_msw${wx_lib_prefix}_xrc-2.4" "-lwxxrc"; do
+ LIBS="$wx_xrc_lib $WX_LIBS $save_LIBS"
+ AC_LINK_IFELSE([
+#include <wx/xrc/xmlres.h>
@@ -407,9 +416,9 @@
+AC_OUTPUT
+
+AC_MSG_NOTICE([Configured clients: $clients])
-diff -urNad iaxclient-0.0+cvs20050725/COPYING /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/COPYING
+diff -urNad iaxclient-0.0+cvs20050725/COPYING /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/COPYING
--- iaxclient-0.0+cvs20050725/COPYING 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/COPYING 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/COPYING 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
@@ -751,9 +760,9 @@
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
-diff -urNad iaxclient-0.0+cvs20050725/INSTALL /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/INSTALL
+diff -urNad iaxclient-0.0+cvs20050725/INSTALL /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/INSTALL
--- iaxclient-0.0+cvs20050725/INSTALL 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/INSTALL 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/INSTALL 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
@@ -984,10 +993,10 @@
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
-diff -urNad iaxclient-0.0+cvs20050725/lib/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/lib/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/lib/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/lib/Makefile.am
--- iaxclient-0.0+cvs20050725/lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/lib/Makefile.am 2005-07-25 18:51:52.000000000 +0200
-@@ -0,0 +1,315 @@
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/lib/Makefile.am 2005-08-10 15:14:49.000000000 +0200
+@@ -0,0 +1,322 @@
+# Autoconf etc. macros
+AUTOMAKE_OPTIONS = subdir-objects
+
@@ -1002,7 +1011,7 @@
+ $(PORTAUDIO_CFLAGS)
+
+AM_CFLAGS += -Wpointer-arith -DPA_COMPAT18
-+AM_CFLAGS += -DLIBVER='"CVS-$(shell date +%Y/%m/%d-%H:%M)"'
++AM_CFLAGS += -DLIBVER='"$(PACKAGE_VERSION)"'
+
+libiaxclient_la_LIBADD = $(GSM_LIBS) $(SPEEX_LIBS) $(IAX_LIBS) \
+ $(IAX2_LIBS) $(PORTAUDIO_LIBS)
@@ -1169,6 +1178,7 @@
+ libspeex/cb_search.h \
+ libspeex/vq.h \
+ libspeex/math_approx.h \
++ libspeex/cb_search_arm4.h \
+ libspeex/cb_search_sse.h \
+ libspeex/lpc.h \
+ libspeex/lsp.h \
@@ -1176,7 +1186,9 @@
+ libspeex/fixed_debug.h \
+ libspeex/vbr.h \
+ libspeex/filters.h \
++ libspeex/filters_arm4.h \
+ libspeex/fixed_generic.h \
++ libspeex/fixed_arm5e.h \
+ libspeex/stack_alloc.h \
+ libspeex/quant_lsp.h \
+ libspeex/smallft.h \
@@ -1186,8 +1198,10 @@
+ libspeex/modes.h \
+ libspeex/filters_sse.h \
+ libspeex/misc.h \
++ libspeex/ltp_arm4.h \
+ libspeex/ltp_sse.h \
-+ libspeex/fixed_arm.h \
++ libspeex/fixed_arm4.h \
++ libspeex/vq_arm4.h \
+ libspeex/include/speex/speex_echo.h \
+ libspeex/include/speex/speex_noglobals.h \
+ libspeex/include/speex/speex.h \
@@ -1196,7 +1210,9 @@
+ libspeex/include/speex/speex_header.h \
+ libspeex/include/speex/speex_jitter.h \
+ libspeex/include/speex/speex_preprocess.h \
-+ libspeex/include/speex/speex_bits.h
++ libspeex/include/speex/speex_bits.h \
++ libspeex/include/speex/speex_config_types.h \
++ libspeex/include/speex/speex_types.h
+
+SRCS_ILBC= \
+ iLBC/anaFilter.c \
@@ -1303,9 +1319,9 @@
+portmixer/px_tests portmixer/px_unix_oss/Makefile \
+portmixer/px_win_wmme/Makefile portmixer/winproj libiax sox
+endif
-diff -urNad iaxclient-0.0+cvs20050725/macros/gsm.m4 /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/gsm.m4
+diff -urNad iaxclient-0.0+cvs20050725/macros/gsm.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/gsm.m4
--- iaxclient-0.0+cvs20050725/macros/gsm.m4 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/gsm.m4 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/gsm.m4 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,63 @@
+dnl 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/gsm.m4?rev=1.2
+dnl This is a little s script written by Rob Flynn of Linux Support Services, Inc.
@@ -1370,9 +1386,9 @@
+fi
+
+])
-diff -urNad iaxclient-0.0+cvs20050725/macros/iax2.m4 /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/iax2.m4
+diff -urNad iaxclient-0.0+cvs20050725/macros/iax2.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax2.m4
--- iaxclient-0.0+cvs20050725/macros/iax2.m4 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/iax2.m4 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax2.m4 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,166 @@
+# 20041024 Mikael Magnusson
+# 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/iax.m4?rev=1.2
@@ -1540,9 +1556,9 @@
+ AC_SUBST(IAX2_LIBS)
+ rm -f conf.iaxtest
+])
-diff -urNad iaxclient-0.0+cvs20050725/macros/iax.m4 /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/iax.m4
+diff -urNad iaxclient-0.0+cvs20050725/macros/iax.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax.m4
--- iaxclient-0.0+cvs20050725/macros/iax.m4 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/iax.m4 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax.m4 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,166 @@
+# 20041025 Mikael Magnusson modifications
+# 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/iax.m4?rev=1.2
@@ -1710,9 +1726,9 @@
+ AC_SUBST(IAX_LIBS)
+ rm -f conf.iaxtest
+])
-diff -urNad iaxclient-0.0+cvs20050725/macros/portaudio.m4 /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/portaudio.m4
+diff -urNad iaxclient-0.0+cvs20050725/macros/portaudio.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/portaudio.m4
--- iaxclient-0.0+cvs20050725/macros/portaudio.m4 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/portaudio.m4 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/portaudio.m4 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,132 @@
+# 2004-10-25 Mikael Magnusson stolen from speex.m4
+# Configure paths for libspeex
@@ -1846,9 +1862,9 @@
+ AC_SUBST(PORTAUDIO_CFLAGS)
+ AC_SUBST(PORTAUDIO_LIBS)
+])
-diff -urNad iaxclient-0.0+cvs20050725/macros/speex.m4 /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/speex.m4
+diff -urNad iaxclient-0.0+cvs20050725/macros/speex.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/speex.m4
--- iaxclient-0.0+cvs20050725/macros/speex.m4 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/macros/speex.m4 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/speex.m4 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,148 @@
+# 2004-10-25 Modified by Mikael Magnusson
+# Configure paths for libspeex
@@ -1998,27 +2014,27 @@
+ AC_SUBST(SPEEX_LIBS)
+ rm -f conf.speextest
+])
-diff -urNad iaxclient-0.0+cvs20050725/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/Makefile.am
--- iaxclient-0.0+cvs20050725/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,5 @@
+ACLOCAL_AMFLAGS = -I macros
+
+SUBDIRS = lib simpleclient
+
+#EXTRA_DIST += iaxclient conf
-diff -urNad iaxclient-0.0+cvs20050725/NEWS /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/NEWS
+diff -urNad iaxclient-0.0+cvs20050725/NEWS /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/NEWS
--- iaxclient-0.0+cvs20050725/NEWS 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/NEWS 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/NEWS 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,2 @@
+
+
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am
--- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,88 @@
+PROG=iaxcomm
-+VERSION=1.0rc3
++IAXCOMM_VERSION=1.0rc3
+
+iaxcommdatadir = ${datadir}/iaxcomm
+
@@ -2049,7 +2065,7 @@
+
+CLEANFILES = $(BUILT_SOURCES)
+
-+AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DISODATE=\"$(ISODATE)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\"
++AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\"
+AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY)
+
+LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS) \
@@ -2105,9 +2121,9 @@
+endif MACOSX
+
+EXTRA_DIST = QUICKSTART ring.raw
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am
--- iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,51 @@
+PROG=iaxphone
+
@@ -2160,16 +2176,16 @@
+ $(INSTALL_PROGRAM) $(PROG) "`pwd`/$@/Contents/MacOS/$(PROG)"
+
+endif MACOSX
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/Makefile.am
--- iaxclient-0.0+cvs20050725/simpleclient/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = $(CLIENTS)
+
+EXTRA_DIST = win32
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am
--- iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,12 @@
+bin_PROGRAMS=testcall
+testcall_SOURCES=testcall.c
@@ -2183,9 +2199,9 @@
+
+EXTRA_DIST = .cvsignore
+
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am
--- iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,29 @@
+# Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
+bin_SCRIPTS = tkphone
@@ -2216,9 +2232,9 @@
+CLEANFILES = tkphone tkiaxphone
+
+EXTRA_DIST = License tkphone.in tkiaxphone.in
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am
--- iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,15 @@
+bin_PROGRAMS = WinIAX
+
@@ -2235,9 +2251,9 @@
+ $(RCCOMPILE) -o $@ -i $<
+
+EXTRA_DIST = ReadMe.txt WinIAX.dsp WinIAX.dsw
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am
--- iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.crFg5W/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am 2005-07-25 18:51:52.000000000 +0200
++++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am 2005-08-10 15:14:49.000000000 +0200
@@ -0,0 +1,38 @@
+# Should support LINUX MACOSX WIN32
+bin_PROGRAMS = wxiax
Modified: iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch 2005-10-20 20:41:03 UTC (rev 861)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/aclocal.m4 /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/aclocal.m4
+diff -urNad iaxclient-0.0+cvs20050725/aclocal.m4 /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/aclocal.m4
--- iaxclient-0.0+cvs20050725/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/aclocal.m4 2005-07-25 18:52:28.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/aclocal.m4 2005-08-10 15:15:32.000000000 +0200
@@ -0,0 +1,7328 @@
+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
+
@@ -7337,9 +7337,9 @@
+m4_include([macros/iax2.m4])
+m4_include([macros/portaudio.m4])
+m4_include([macros/speex.m4])
-diff -urNad iaxclient-0.0+cvs20050725/autogen.sh /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/autogen.sh
---- iaxclient-0.0+cvs20050725/autogen.sh 2005-07-25 18:52:27.000000000 +0200
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/autogen.sh 2005-07-25 18:52:28.000000000 +0200
+diff -urNad iaxclient-0.0+cvs20050725/autogen.sh /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/autogen.sh
+--- iaxclient-0.0+cvs20050725/autogen.sh 2005-08-10 15:15:31.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/autogen.sh 2005-08-10 15:15:32.000000000 +0200
@@ -3,7 +3,7 @@
aclocal -I macros
autoheader
@@ -7349,9 +7349,9 @@
automake -a -c
if test -x ./config.status; then
-diff -urNad iaxclient-0.0+cvs20050725/compile /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/compile
+diff -urNad iaxclient-0.0+cvs20050725/compile /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/compile
--- iaxclient-0.0+cvs20050725/compile 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/compile 2005-07-25 18:52:28.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/compile 2005-08-10 15:15:32.000000000 +0200
@@ -0,0 +1,136 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
@@ -7489,9 +7489,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient-0.0+cvs20050725/config.guess /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/config.guess
+diff -urNad iaxclient-0.0+cvs20050725/config.guess /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.guess
--- iaxclient-0.0+cvs20050725/config.guess 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/config.guess 2005-07-25 18:52:51.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.guess 2005-08-10 15:15:50.000000000 +0200
@@ -0,0 +1,1465 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
@@ -8958,9 +8958,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad iaxclient-0.0+cvs20050725/config.h.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/config.h.in
+diff -urNad iaxclient-0.0+cvs20050725/config.h.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.h.in
--- iaxclient-0.0+cvs20050725/config.h.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/config.h.in 2005-07-25 18:52:28.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.h.in 2005-08-10 15:15:32.000000000 +0200
@@ -0,0 +1,128 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
@@ -9090,9 +9090,9 @@
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+ code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
-diff -urNad iaxclient-0.0+cvs20050725/config.sub /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/config.sub
+diff -urNad iaxclient-0.0+cvs20050725/config.sub /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.sub
--- iaxclient-0.0+cvs20050725/config.sub 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/config.sub 2005-07-25 18:52:51.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.sub 2005-08-10 15:15:50.000000000 +0200
@@ -0,0 +1,1569 @@
+#! /bin/sh
+# Configuration validation subroutine script.
@@ -10663,10 +10663,10 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad iaxclient-0.0+cvs20050725/configure /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/configure
+diff -urNad iaxclient-0.0+cvs20050725/configure /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/configure
--- iaxclient-0.0+cvs20050725/configure 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/configure 2005-07-25 18:52:50.000000000 +0200
-@@ -0,0 +1,24570 @@
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/configure 2005-08-10 15:15:49.000000000 +0200
+@@ -0,0 +1,24578 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.59 for iaxclient 0.0+cvs20050725.
@@ -11699,7 +11699,7 @@
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
+ --enable-local-gsm Use local gsm library [default=auto]
-+ --enable-local-speex Use local speex library [default=auto]
++ --disable-local-speex Use local speex library [default=auto]
+ --disable-local-iax Don't use local iax library
+ --disable-local-portaudio
+ Don't use local portaudio library
@@ -12689,7 +12689,8 @@
+ ac_config_headers="$ac_config_headers config.h"
+
+
-+CFLAGS=${CFLAGS-"-O2 -g -Wall"}
++CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"}
++CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"}
+
+ISODATE=`date +%Y-%m-%d`
+
@@ -12708,7 +12709,7 @@
+ enableval="$enable_local_speex"
+
+else
-+ enable_local_speex="auto"
++ enable_local_speex="yes"
+fi;
+
+# Check whether --enable-local-iax or --disable-local-iax was given.
@@ -15189,7 +15190,7 @@
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
-+ echo '#line 4523 "configure"' > conftest.$ac_ext
++ echo '#line 4524 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
@@ -16535,7 +16536,7 @@
+
+
+# Provide some information about the compiler.
-+echo "$as_me:5869:" \
++echo "$as_me:5870:" \
+ "checking for Fortran 77 compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -17567,11 +17568,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:6901: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6902: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:6905: \$? = $ac_status" >&5
++ echo "$as_me:6906: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
@@ -17800,11 +17801,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:7134: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7135: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:7138: \$? = $ac_status" >&5
++ echo "$as_me:7139: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
@@ -17860,11 +17861,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:7194: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7195: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:7198: \$? = $ac_status" >&5
++ echo "$as_me:7199: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -20048,7 +20049,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 9382 "configure"
++#line 9383 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -20146,7 +20147,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 9480 "configure"
++#line 9481 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -22323,11 +22324,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:11657: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11658: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:11661: \$? = $ac_status" >&5
++ echo "$as_me:11662: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
@@ -22383,11 +22384,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:11717: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11718: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:11721: \$? = $ac_status" >&5
++ echo "$as_me:11722: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -23752,7 +23753,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 13086 "configure"
++#line 13087 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -23850,7 +23851,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 13184 "configure"
++#line 13185 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -24677,11 +24678,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:14011: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14012: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:14015: \$? = $ac_status" >&5
++ echo "$as_me:14016: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
@@ -24737,11 +24738,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:14071: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14072: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:14075: \$? = $ac_status" >&5
++ echo "$as_me:14076: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -26782,11 +26783,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:16116: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16117: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:16120: \$? = $ac_status" >&5
++ echo "$as_me:16121: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
@@ -27015,11 +27016,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:16349: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16350: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:16353: \$? = $ac_status" >&5
++ echo "$as_me:16354: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
@@ -27075,11 +27076,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:16409: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16410: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:16413: \$? = $ac_status" >&5
++ echo "$as_me:16414: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
@@ -29263,7 +29264,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 18597 "configure"
++#line 18598 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -29361,7 +29362,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 18695 "configure"
++#line 18696 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -33369,10 +33370,17 @@
+fi
+
+if test x$has_wx_xrc = xyes; then
++
++ wx_lib_prefix=
++
++ case $WX_CXXFLAGS in
++ *__WXDEBUG__*) wx_lib_prefix=d
++ esac
++
+ has_wx_xrc=xno
+ echo "$as_me:$LINENO: checking for wx xrc library" >&5
+echo $ECHO_N "checking for wx xrc library... $ECHO_C" >&6
-+ for wx_xrc_lib in " " "-lwx_gtk_xrc-2.4" "-lwx_msw_xrc-2.4" "-lwxxrc"; do
++ for wx_xrc_lib in " " "-lwx_gtk${wx_lib_prefix}_xrc-2.4" "-lwx_msw${wx_lib_prefix}_xrc-2.4" "-lwxxrc"; do
+ LIBS="$wx_xrc_lib $WX_LIBS $save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+
@@ -35237,9 +35245,9 @@
+
+{ echo "$as_me:$LINENO: Configured clients: $clients" >&5
+echo "$as_me: Configured clients: $clients" >&6;}
-diff -urNad iaxclient-0.0+cvs20050725/depcomp /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/depcomp
+diff -urNad iaxclient-0.0+cvs20050725/depcomp /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/depcomp
--- iaxclient-0.0+cvs20050725/depcomp 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/depcomp 2005-07-25 18:52:29.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/depcomp 2005-08-10 15:15:32.000000000 +0200
@@ -0,0 +1,526 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
@@ -35767,9 +35775,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient-0.0+cvs20050725/install-sh /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/install-sh
+diff -urNad iaxclient-0.0+cvs20050725/install-sh /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/install-sh
--- iaxclient-0.0+cvs20050725/install-sh 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/install-sh 2005-07-25 18:52:29.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/install-sh 2005-08-10 15:15:32.000000000 +0200
@@ -0,0 +1,325 @@
+#!/bin/sh
+# install - install a program, script, or datafile
@@ -36096,10 +36104,10 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient-0.0+cvs20050725/lib/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/lib/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/lib/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/lib/Makefile.in
--- iaxclient-0.0+cvs20050725/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/lib/Makefile.in 2005-07-25 18:52:57.000000000 +0200
-@@ -0,0 +1,3855 @@
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/lib/Makefile.in 2005-08-10 15:15:56.000000000 +0200
+@@ -0,0 +1,3866 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
@@ -36219,13 +36227,15 @@
+ libspeex/stereo.c libspeex/preprocess.c libspeex/smallft.c \
+ libspeex/lbr_48k_tables.c libspeex/jitter.c libspeex/mdf.c \
+ libspeex/cb_search.h libspeex/vq.h libspeex/math_approx.h \
-+ libspeex/cb_search_sse.h libspeex/lpc.h libspeex/lsp.h \
-+ libspeex/ltp.h libspeex/fixed_debug.h libspeex/vbr.h \
-+ libspeex/filters.h libspeex/fixed_generic.h \
-+ libspeex/stack_alloc.h libspeex/quant_lsp.h libspeex/smallft.h \
-+ libspeex/sb_celp.h libspeex/arch.h libspeex/nb_celp.h \
-+ libspeex/modes.h libspeex/filters_sse.h libspeex/misc.h \
-+ libspeex/ltp_sse.h libspeex/fixed_arm.h \
++ libspeex/cb_search_arm4.h libspeex/cb_search_sse.h \
++ libspeex/lpc.h libspeex/lsp.h libspeex/ltp.h \
++ libspeex/fixed_debug.h libspeex/vbr.h libspeex/filters.h \
++ libspeex/filters_arm4.h libspeex/fixed_generic.h \
++ libspeex/fixed_arm5e.h libspeex/stack_alloc.h \
++ libspeex/quant_lsp.h libspeex/smallft.h libspeex/sb_celp.h \
++ libspeex/arch.h libspeex/nb_celp.h libspeex/modes.h \
++ libspeex/filters_sse.h libspeex/misc.h libspeex/ltp_arm4.h \
++ libspeex/ltp_sse.h libspeex/fixed_arm4.h libspeex/vq_arm4.h \
+ libspeex/include/speex/speex_echo.h \
+ libspeex/include/speex/speex_noglobals.h \
+ libspeex/include/speex/speex.h \
@@ -36235,6 +36245,8 @@
+ libspeex/include/speex/speex_jitter.h \
+ libspeex/include/speex/speex_preprocess.h \
+ libspeex/include/speex/speex_bits.h \
++ libspeex/include/speex/speex_config_types.h \
++ libspeex/include/speex/speex_types.h \
+ portaudio/pa_win_wmme/pa_win_wmme.c \
+ portaudio/pa_unix_oss/pa_unix_oss.c \
+ portaudio/pa_unix_oss/pa_unix.c \
@@ -36614,7 +36626,7 @@
+ -I$(srcdir)/portmixer/px_common \
+ $(GSM_CFLAGS) $(SPEEX_CFLAGS) $(IAX_CFLAGS) $(IAX2_CFLAGS) \
+ $(PORTAUDIO_CFLAGS)\
-+-Wpointer-arith -DPA_COMPAT18 -DLIBVER='"CVS-$(shell date +%Y/%m/%d-%H:%M)"' $(am__append_7) $(am__append_12)
++-Wpointer-arith -DPA_COMPAT18 -DLIBVER='"$(PACKAGE_VERSION)"' $(am__append_7) $(am__append_12)
+libiaxclient_la_LIBADD = $(GSM_LIBS) $(SPEEX_LIBS) $(IAX_LIBS) \
+ $(IAX2_LIBS) $(PORTAUDIO_LIBS)\
+$(am__append_3) $(am__append_6) $(am__append_11)
@@ -36720,6 +36732,7 @@
+ libspeex/cb_search.h \
+ libspeex/vq.h \
+ libspeex/math_approx.h \
++ libspeex/cb_search_arm4.h \
+ libspeex/cb_search_sse.h \
+ libspeex/lpc.h \
+ libspeex/lsp.h \
@@ -36727,7 +36740,9 @@
+ libspeex/fixed_debug.h \
+ libspeex/vbr.h \
+ libspeex/filters.h \
++ libspeex/filters_arm4.h \
+ libspeex/fixed_generic.h \
++ libspeex/fixed_arm5e.h \
+ libspeex/stack_alloc.h \
+ libspeex/quant_lsp.h \
+ libspeex/smallft.h \
@@ -36737,8 +36752,10 @@
+ libspeex/modes.h \
+ libspeex/filters_sse.h \
+ libspeex/misc.h \
++ libspeex/ltp_arm4.h \
+ libspeex/ltp_sse.h \
-+ libspeex/fixed_arm.h \
++ libspeex/fixed_arm4.h \
++ libspeex/vq_arm4.h \
+ libspeex/include/speex/speex_echo.h \
+ libspeex/include/speex/speex_noglobals.h \
+ libspeex/include/speex/speex.h \
@@ -36747,7 +36764,9 @@
+ libspeex/include/speex/speex_header.h \
+ libspeex/include/speex/speex_jitter.h \
+ libspeex/include/speex/speex_preprocess.h \
-+ libspeex/include/speex/speex_bits.h
++ libspeex/include/speex/speex_bits.h \
++ libspeex/include/speex/speex_config_types.h \
++ libspeex/include/speex/speex_types.h
+
+SRCS_ILBC = \
+ iLBC/anaFilter.c \
@@ -39955,9 +39974,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/ltmain.sh /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/ltmain.sh
+diff -urNad iaxclient-0.0+cvs20050725/ltmain.sh /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/ltmain.sh
--- iaxclient-0.0+cvs20050725/ltmain.sh 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/ltmain.sh 2005-07-25 18:52:51.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/ltmain.sh 2005-08-10 15:15:50.000000000 +0200
@@ -0,0 +1,6426 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -46385,9 +46404,9 @@
+# mode:shell-script
+# sh-indentation:2
+# End:
-diff -urNad iaxclient-0.0+cvs20050725/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/Makefile.in
--- iaxclient-0.0+cvs20050725/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/Makefile.in 2005-07-25 18:52:55.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/Makefile.in 2005-08-10 15:15:54.000000000 +0200
@@ -0,0 +1,659 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
@@ -47048,9 +47067,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/missing /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/missing
+diff -urNad iaxclient-0.0+cvs20050725/missing /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/missing
--- iaxclient-0.0+cvs20050725/missing 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/missing 2005-07-25 18:52:29.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/missing 2005-08-10 15:15:32.000000000 +0200
@@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
@@ -47412,10 +47431,10 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in
--- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in 2005-07-25 18:52:58.000000000 +0200
-@@ -0,0 +1,659 @@
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in 2005-08-10 15:15:57.000000000 +0200
+@@ -0,0 +1,660 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
@@ -47623,7 +47642,7 @@
+USE_LOCAL_PORTAUDIO_TRUE = @USE_LOCAL_PORTAUDIO_TRUE@
+USE_LOCAL_SPEEX_FALSE = @USE_LOCAL_SPEEX_FALSE@
+USE_LOCAL_SPEEX_TRUE = @USE_LOCAL_SPEEX_TRUE@
-+VERSION = 1.0rc3
++VERSION = @VERSION@
+WIN32_FALSE = @WIN32_FALSE@
+WIN32_TRUE = @WIN32_TRUE@
+WISH = @WISH@
@@ -47684,6 +47703,7 @@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+PROG = iaxcomm
++IAXCOMM_VERSION = 1.0rc3
+iaxcommdatadir = ${datadir}/iaxcomm
+XRCS = rc/accounts.xrc rc/devices.xrc rc/directory.xrc rc/frame.xrc \
+rc/menubar.xrc rc/panel.xrc rc/prefs.xrc
@@ -47705,7 +47725,7 @@
+# BUILT_SOURCES = xrc_res.cc
+# nodist_iaxcomm_SOURCES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
-+AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DISODATE=\"$(ISODATE)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\" $(am__append_1)
++AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\" $(am__append_1)
+AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY) $(am__append_2)
+LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS) \
+$(WX_XRC_LIBS)
@@ -48075,9 +48095,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in
--- iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in 2005-07-25 18:52:58.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in 2005-08-10 15:15:57.000000000 +0200
@@ -0,0 +1,567 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
@@ -48646,9 +48666,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/Makefile.in
--- iaxclient-0.0+cvs20050725/simpleclient/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/Makefile.in 2005-07-25 18:52:57.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/Makefile.in 2005-08-10 15:15:56.000000000 +0200
@@ -0,0 +1,514 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
@@ -49164,9 +49184,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in
--- iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in 2005-07-25 18:52:58.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in 2005-08-10 15:15:57.000000000 +0200
@@ -0,0 +1,514 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
@@ -49682,9 +49702,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in
--- iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in 2005-07-25 18:52:59.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in 2005-08-10 15:15:58.000000000 +0200
@@ -0,0 +1,603 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
@@ -50289,9 +50309,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in
--- iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in 2005-07-25 18:52:57.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in 2005-08-10 15:15:56.000000000 +0200
@@ -0,0 +1,531 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
@@ -50824,9 +50844,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in
--- iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.mnlDo5/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in 2005-07-25 18:52:59.000000000 +0200
++++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in 2005-08-10 15:15:58.000000000 +0200
@@ -0,0 +1,538 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
Added: iaxclient/trunk/debian/patches/170_deadlock.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/170_deadlock.dpatch 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/170_deadlock.dpatch 2005-10-20 20:41:03 UTC (rev 861)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 170_deadlock.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Resolve deadlock in iaxc_stop_processing_thread by unlocking gui mutex.
+
+ at DPATCH@
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.DKi6Ff/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc 2005-08-08 17:27:07.000000000 +0200
++++ /tmp/dpep.DKi6Ff/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc 2005-08-08 17:27:19.000000000 +0200
+@@ -381,7 +381,10 @@
+ for(int i=0;i<10;i++) {
+ iaxc_millisleep(100);
+ }
++
++ wxMutexGuiLeave();
+ iaxc_stop_processing_thread();
++ wxMutexGuiEnter();
+
+ if(help != NULL)
+ help->Quit();
Property changes on: iaxclient/trunk/debian/patches/170_deadlock.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: iaxclient/trunk/debian/patches/180_filter.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/180_filter.dpatch 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/180_filter.dpatch 2005-10-20 20:41:03 UTC (rev 861)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 180_filter.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The AGC and AAGC filter were always disabled
+
+ at DPATCH@
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.2hLDj6/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc 2005-08-08 17:27:55.000000000 +0200
++++ /tmp/dpep.2hLDj6/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc 2005-08-08 17:28:06.000000000 +0200
+@@ -322,17 +322,16 @@
+ // Clear these filters
+ int flag = ~(IAXC_FILTER_AGC | IAXC_FILTER_AAGC | IAXC_FILTER_CN |
+ IAXC_FILTER_DENOISE | IAXC_FILTER_ECHO);
+- iaxc_set_filters(iaxc_get_filters() & flag);
++ flag = flag & iaxc_get_filters();
+
+- flag = 0;
+ if(AGC)
+- flag = IAXC_FILTER_AGC;
++ flag |= IAXC_FILTER_AGC;
+
+ if(AAGC)
+- flag = IAXC_FILTER_AAGC;
++ flag |= IAXC_FILTER_AAGC;
+
+ if(CN)
+- flag = IAXC_FILTER_CN;
++ flag |= IAXC_FILTER_CN;
+
+ if(NoiseReduce)
+ flag |= IAXC_FILTER_DENOISE;
+@@ -340,7 +339,7 @@
+ if(EchoCancel)
+ flag |= IAXC_FILTER_ECHO;
+
+- iaxc_set_filters(iaxc_get_filters() | flag);
++ iaxc_set_filters(flag);
+ }
+
+ void MyFrame::ApplyCodecs()
Property changes on: iaxclient/trunk/debian/patches/180_filter.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: iaxclient/trunk/debian/patches/200_version.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/200_version.dpatch 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/200_version.dpatch 2005-10-20 20:41:03 UTC (rev 861)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 200_version.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Announcing iaxcomm version 1.0rc3 in the about dialog
+
+ at DPATCH@
+diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.jflKHr/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc 2005-08-08 17:28:59.000000000 +0200
++++ /tmp/dpep.jflKHr/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc 2005-08-08 17:29:07.000000000 +0200
+@@ -690,7 +690,8 @@
+ char* libver = (char *)malloc(256);
+
+ libver = iaxc_version(libver);
+- msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), VERSION, libver);
++ msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"),
++ IAXCOMM_VERSION, libver);
+ wxMessageBox(msg, _("iaxComm"), wxOK | wxICON_INFORMATION, this);
+ }
+
Property changes on: iaxclient/trunk/debian/patches/200_version.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: iaxclient/trunk/debian/patches/210_ringback.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/210_ringback.dpatch 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/210_ringback.dpatch 2005-10-20 20:41:03 UTC (rev 861)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 210_ringback.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Stop ring back tone if voice data are received.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./lib/iaxclient_lib.c /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c
+--- ./lib/iaxclient_lib.c 2005-10-20 21:25:22.000000000 +0200
++++ /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c 2005-10-20 21:25:25.000000000 +0200
+@@ -830,6 +830,12 @@
+ break;
+ case IAX_EVENT_VOICE:
+ handle_audio_event(e, callNo);
++ if (calls[callNo].state & IAXC_CALL_STATE_RINGING) {
++ calls[callNo].state &= ~IAXC_CALL_STATE_RINGING;
++ iaxc_do_state_callback(callNo);
++ iaxc_usermsg(IAXC_STATUS,"Call %d progress",
++ callNo);
++ }
+ break;
+ case IAX_EVENT_TEXT:
+ handle_text_event(e, callNo);
+diff -urNad --exclude=CVS --exclude=.svn ./simpleclient/iaxcomm/calls.cc /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc
+--- ./simpleclient/iaxcomm/calls.cc 2005-10-20 21:25:22.000000000 +0200
++++ /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc 2005-10-20 21:26:19.000000000 +0200
+@@ -250,6 +250,7 @@
+ SetItem(c.callNo, 1, _T("ring out"));
+ wxGetApp().RingbackTone.Start(0);
+ } else {
++ wxGetApp().RingbackTone.Stop();
+ if(complete) {
+ // I really need to clean up this spaghetti code
+ if(selected)
Property changes on: iaxclient/trunk/debian/patches/210_ringback.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: iaxclient/trunk/debian/patches/220_audio_encode.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/220_audio_encode.dpatch 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/patches/220_audio_encode.dpatch 2005-10-20 20:41:03 UTC (rev 861)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 220_audio_encode.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Configurable VAD in Debian libspeex uses integer percentage instead
+## DP: of float.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./lib/audio_encode.c /tmp/dpep-work.5TuN91/iaxclient-0.0+cvs20050725/lib/audio_encode.c
+--- ./lib/audio_encode.c 2005-05-14 12:33:44.000000000 +0200
++++ /tmp/dpep-work.5TuN91/iaxclient-0.0+cvs20050725/lib/audio_encode.c 2005-10-20 21:34:45.000000000 +0200
+@@ -86,7 +86,6 @@
+ void iaxc_set_speex_filters()
+ {
+ int i;
+- float f;
+
+ if(!st) return;
+
+@@ -98,10 +97,10 @@
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
+
+ /* make vad more sensitive */
+- f=0.30f;
+- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &f);
+- f=0.07f;
+- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &f);
++ i=30;
++ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &i);
++ i=7;
++ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &i);
+ }
+
+ static void calculate_level(short *audio, int len, double *level) {
Property changes on: iaxclient/trunk/debian/patches/220_audio_encode.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: iaxclient/trunk/debian/rules
===================================================================
--- iaxclient/trunk/debian/rules 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/rules 2005-10-20 20:41:03 UTC (rev 861)
@@ -27,6 +27,11 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ WX_CONFIG_NAME = wxgtk-2.4-config
+else
+ WX_CONFIG_NAME = wxgtkd-2.4-config
+endif
autoreconf:
dh_testdir
@@ -39,7 +44,7 @@
dh_testdir
test -z objs || mkdir objs
- (cd objs && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-local-portaudio --disable-local-gsm --enable-local-speex --disable-shared --enable-clients="testcall iaxcomm")
+ (cd objs && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" WX_CONFIG_NAME="$(WX_CONFIG_NAME)" ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-local-portaudio --disable-local-gsm --disable-local-speex --disable-shared --enable-clients="testcall iaxcomm")
touch configure-stamp
#Architecture
Modified: iaxclient/trunk/debian/shlibs.local
===================================================================
--- iaxclient/trunk/debian/shlibs.local 2005-10-20 18:44:34 UTC (rev 860)
+++ iaxclient/trunk/debian/shlibs.local 2005-10-20 20:41:03 UTC (rev 861)
@@ -1 +1 @@
-libspeex 1 libspeex1 (>= 1.1.3-1)
+libspeex 1 libspeex1 (>= 1.1.10-1)
More information about the Pkg-voip-commits
mailing list