/[pkg-voip]/kiax/ec-enable.patch
ViewVC logotype

Contents of /kiax/ec-enable.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1949 - (show annotations) (download)
Sun Jun 25 21:48:10 2006 UTC (6 years, 11 months ago) by danchev-guest
File size: 8011 byte(s) 
add testing patch to enable Echo Cancellation
1 Index: debian/patches/01_debian-patch.dpatch
2 ===================================================================
3 --- debian/patches/01_debian-patch.dpatch (revision 1948)
4 +++ debian/patches/01_debian-patch.dpatch (working copy)
5 @@ -5,55 +5,30 @@
6 ## DP: New patch generated from kiax 0.8.4-4 diff.gz
7
8 @DPATCH@
9 -diff -urNad kiax-0.8.5~/bin/Makefile kiax-0.8.5/bin/Makefile
10 ---- kiax-0.8.5~/bin/Makefile 2006-02-06 16:02:48.000000000 +0000
11 -+++ kiax-0.8.5/bin/Makefile 2006-03-29 21:21:49.000000000 +0100
12 +diff -urNad kiax-0.8.51.dfsg~/bin/Makefile kiax-0.8.51.dfsg/bin/Makefile
13 +--- kiax-0.8.51.dfsg~/bin/Makefile 2006-06-26 00:26:18.000000000 +0300
14 ++++ kiax-0.8.51.dfsg/bin/Makefile 2006-06-26 00:26:19.000000000 +0300
15 @@ -1,4 +1,4 @@
16 -DEST_PATH=/usr/local/bin/
17 +DEST_PATH=/usr/bin/
18 all:
19 echo 'none'
20 install:
21 -diff -urNad kiax-0.8.5~/qkiax.pro kiax-0.8.5/qkiax.pro
22 ---- kiax-0.8.5~/qkiax.pro 2005-04-08 15:29:52.000000000 +0100
23 -+++ kiax-0.8.5/qkiax.pro 2006-03-29 21:23:45.000000000 +0100
24 -@@ -3,15 +3,13 @@
25 - # Subdir relative project main directory: .
26 - # Target is a subdirs project
27 +diff -urNad kiax-0.8.51.dfsg~/lib/Makefile kiax-0.8.51.dfsg/lib/Makefile
28 +--- kiax-0.8.51.dfsg~/lib/Makefile 2006-02-05 02:34:34.000000000 +0200
29 ++++ kiax-0.8.51.dfsg/lib/Makefile 2006-06-26 00:26:31.000000000 +0300
30 +@@ -16,7 +16,7 @@
31
32 --TARGETDEPS += lib/libiaxclient.a \
33 -- src/../bin/kiax
34 -+TARGETDEPS += src/../bin/kiax
35 - CONFIG += release \
36 - warn_on \
37 - qt \
38 - thread \
39 - x11
40 - TEMPLATE = subdirs
41 --SUBDIRS += lib \
42 -- i18n \
43 -+SUBDIRS += i18n \
44 - src \
45 - bin
46 -diff -urNad kiax-0.8.5~/src/src.pro.or kiax-0.8.5/src/src.pro.or
47 ---- kiax-0.8.5~/src/src.pro.or 2006-03-25 23:21:46.000000000 +0000
48 -+++ kiax-0.8.5/src/src.pro.or 2006-03-29 21:23:58.000000000 +0100
49 -@@ -86,10 +86,8 @@
50 - kiaxcontactlistitem.cpp \
51 - kiaxiconfactory.cpp \
52 - kiaxkeyfilter.cpp
53 --TARGETDEPS += ../lib/libiaxclient.a
54 --LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
55 --INCLUDEPATH = ../src \
56 --../lib
57 -+LIBS += -lportaudio -lgsm -lspeex -liaxclient ${LIBOSSAUDIO}
58 -+INCLUDEPATH = ../src /usr/include
59 - DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
60 - I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
61 - TARGET = ../bin/kiax
62 -diff -urNad kiax-0.8.5~/repath.pl kiax-0.8.5/repath.pl
63 ---- kiax-0.8.5~/repath.pl 2005-04-08 16:47:06.000000000 +0200
64 -+++ kiax-0.8.5/repath.pl 2006-05-05 23:50:40.000000000 +0200
65 +
66 +
67 +-CODEC_ILBC=1
68 ++CODEC_ILBC=0
69 +
70 + SPEEX_PREPROCESS=1
71 + SPAN_EC=0
72 +diff -urNad kiax-0.8.51.dfsg~/repath.pl kiax-0.8.51.dfsg/repath.pl
73 +--- kiax-0.8.51.dfsg~/repath.pl 2006-06-26 00:26:18.000000000 +0300
74 ++++ kiax-0.8.51.dfsg/repath.pl 2006-06-26 00:26:19.000000000 +0300
75 @@ -88,8 +88,8 @@
76 $proFile =~ s|icons\.path = .*?\n|icons.path = $params{'prefix'}/share/kiax/icons/\n|;
77 $proFile =~ s|translations\.path = .*?\n|translations.path = $params{'prefix'}/share/kiax/i18n/\n|;
78 @@ -65,9 +40,9 @@
79 }
80
81 open FH, ">$fnSrcpro" or die "Can't open file $fnSrcpro: $!\n";
82 -diff -urNad kiax-0.8.5~/src/iaxwrapper.cpp kiax-0.8.5/src/iaxwrapper.cpp
83 ---- kiax-0.8.5~/src/iaxwrapper.cpp 2006-03-25 22:57:11.000000000 +0100
84 -+++ kiax-0.8.5/src/iaxwrapper.cpp 2006-05-06 22:54:29.000000000 +0200
85 +diff -urNad kiax-0.8.51.dfsg~/src/iaxwrapper.cpp kiax-0.8.51.dfsg/src/iaxwrapper.cpp
86 +--- kiax-0.8.51.dfsg~/src/iaxwrapper.cpp 2006-06-26 00:26:18.000000000 +0300
87 ++++ kiax-0.8.51.dfsg/src/iaxwrapper.cpp 2006-06-26 00:26:19.000000000 +0300
88 @@ -564,8 +564,6 @@
89 uint IaxWrapper::getCodecMaskFromName(QString codecName)
90 {
91 @@ -77,9 +52,9 @@
92 if (codecName=="gsm")
93 return IAXC_FORMAT_GSM;
94 if (codecName=="ulaw")
95 -diff -urNad kiax-0.8.5~/src/kiaxaccountwizard.cpp kiax-0.8.5/src/kiaxaccountwizard.cpp
96 ---- kiax-0.8.5~/src/kiaxaccountwizard.cpp 2006-02-05 02:10:11.000000000 +0100
97 -+++ kiax-0.8.5/src/kiaxaccountwizard.cpp 2006-05-06 22:58:41.000000000 +0200
98 +diff -urNad kiax-0.8.51.dfsg~/src/kiaxaccountwizard.cpp kiax-0.8.51.dfsg/src/kiaxaccountwizard.cpp
99 +--- kiax-0.8.51.dfsg~/src/kiaxaccountwizard.cpp 2006-06-26 00:26:18.000000000 +0300
100 ++++ kiax-0.8.51.dfsg/src/kiaxaccountwizard.cpp 2006-06-26 00:26:19.000000000 +0300
101 @@ -135,7 +135,7 @@
102 voipgatePreset->operatorHomePage = "http://www.voipgate.com";
103 voipgatePreset->operatorName = "VoipGATE";
104 @@ -89,9 +64,9 @@
105 voipgatePreset->userLoginPage = "https://www.voipgate.com/login.php";
106 voipgatePreset->instructions = "<font color=\"#00007f\">VoipGATE is a VoIP service provider based in Luxemburg. It provides quality communication services for end-users and business customers on reasonable and low prices. PC-to-PC VoIP communication is free! </font>";
107
108 -diff -urNad kiax-0.8.5~/src/kiaxprefswindow.cpp kiax-0.8.5/src/kiaxprefswindow.cpp
109 ---- kiax-0.8.5~/src/kiaxprefswindow.cpp 2006-02-04 19:47:12.000000000 +0100
110 -+++ kiax-0.8.5/src/kiaxprefswindow.cpp 2006-05-06 23:00:14.000000000 +0200
111 +diff -urNad kiax-0.8.51.dfsg~/src/kiaxprefswindow.cpp kiax-0.8.51.dfsg/src/kiaxprefswindow.cpp
112 +--- kiax-0.8.51.dfsg~/src/kiaxprefswindow.cpp 2006-06-26 00:26:18.000000000 +0300
113 ++++ kiax-0.8.51.dfsg/src/kiaxprefswindow.cpp 2006-06-26 00:26:19.000000000 +0300
114 @@ -228,8 +228,6 @@
115 QString KiaxPrefsWindow::getSelectedCodecName()
116 {
117 @@ -109,9 +84,9 @@
118 gsmRadioButton->setChecked(codecName == "gsm");
119 speexRadioButton->setChecked(codecName == "speex");
120 ulawRadioButton->setChecked(codecName == "ulaw");
121 -diff -urNad kiax-0.8.5~/src/prefswindow.ui kiax-0.8.5/src/prefswindow.ui
122 ---- kiax-0.8.5~/src/prefswindow.ui 2006-02-06 17:31:54.000000000 +0100
123 -+++ kiax-0.8.5/src/prefswindow.ui 2006-05-06 21:58:43.000000000 +0200
124 +diff -urNad kiax-0.8.51.dfsg~/src/prefswindow.ui kiax-0.8.51.dfsg/src/prefswindow.ui
125 +--- kiax-0.8.51.dfsg~/src/prefswindow.ui 2006-06-26 00:26:18.000000000 +0300
126 ++++ kiax-0.8.51.dfsg/src/prefswindow.ui 2006-06-26 00:26:19.000000000 +0300
127 @@ -167,7 +167,7 @@
128 <property name="name">
129 <cstring>unnamed</cstring>
130 @@ -165,3 +140,18 @@
131 <tabstop>makeDefaultCheckBox</tabstop>
132 <tabstop>newAccountButton</tabstop>
133 <tabstop>deleteAccountButton</tabstop>
134 +diff -urNad kiax-0.8.51.dfsg~/src/src.pro.or kiax-0.8.51.dfsg/src/src.pro.or
135 +--- kiax-0.8.51.dfsg~/src/src.pro.or 2006-06-26 00:26:18.000000000 +0300
136 ++++ kiax-0.8.51.dfsg/src/src.pro.or 2006-06-26 00:26:19.000000000 +0300
137 +@@ -87,10 +87,8 @@
138 + kiaxcontactlistitem.cpp \
139 + kiaxiconfactory.cpp \
140 + kiaxkeyfilter.cpp
141 +-TARGETDEPS += ../lib/libiaxclient.a
142 + LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
143 +-INCLUDEPATH = ../src \
144 +-../lib
145 ++INCLUDEPATH = ../src ../lib /usr/include
146 + DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
147 + I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
148 + TARGET = ../bin/kiax
149 Index: debian/patches/00list
150 ===================================================================
151 --- debian/patches/00list (revision 1948)
152 +++ debian/patches/00list (working copy)
153 @@ -1,2 +1,2 @@
154 01_debian-patch
155 -02_disable_echo_cancellation
156 +#02_disable_echo_cancellation
157 Index: debian/rules
158 ===================================================================
159 --- debian/rules (revision 1948)
160 +++ debian/rules (working copy)
161 @@ -114,7 +114,12 @@
162 @@echo Removing non dfsg compliant parts out of it
163 @@[ -d ../tarballs/dfsg/. ]||mkdir -p ../tarballs/dfsg
164 @@tar -xzf ../tarballs/$(FILENAME) -C ../tarballs/dfsg
165 - @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib
166 +# @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib
167 + @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/CVS
168 + @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/iLBC
169 + @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/aec_nlms
170 +# @@for f in `ls ../tarballs/dfsg/$(SRCDIR)/lib | grep -v [libiax2][gsm][Makefile]` ; \
171 +# do rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/$$f; done
172 @@echo Fixing the tar warning
173 @@touch ../tarballs/dfsg/$(SRCDIR)/templates
174 @@ echo Building the dfsg tarball
  ViewVC Help
Powered by ViewVC 1.1.5