]>
Commit | Line | Data |
---|---|---|
1 | --- twinkle-0.8.1/configure.in.orig 2006-07-09 16:09:11.000000000 +0200 | |
2 | +++ twinkle-0.8.1/configure.in 2006-07-10 17:24:58.371947250 +0200 | |
3 | @@ -160,6 +160,12 @@ | |
4 | have_speex="no" | |
5 | fi | |
6 | ||
7 | +# Check if libgsm is available | |
8 | +AC_CHECK_LIB(gsm, sf_open, [], | |
9 | + [AC_MSG_ERROR([libgsm library is missing.])]) | |
10 | +AC_CHECK_HEADER(gsm.h, [], | |
11 | + [AC_MSG_ERROR([gsm header files missing (gsm.h)])]) | |
12 | + | |
13 | # iLBC | |
14 | if test "x$ac_cv_ilbc" = "xyes" | |
15 | then | |
16 | @@ -196,7 +202,7 @@ | |
17 | PARSER_CXXFLAGS=`echo $CXXFLAGS | sed -e "s/\-O2//;s/\-Os//"` | |
18 | AC_SUBST(PARSER_CXXFLAGS) | |
19 | ||
20 | -AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile \ | |
21 | +AC_OUTPUT(Makefile src/Makefile src/audio/Makefile \ | |
22 | src/audits/Makefile src/sdp/Makefile src/parser/Makefile \ | |
23 | src/sockets/Makefile src/stun/Makefile src/threads/Makefile \ | |
24 | twinkle.spec) | |
25 | --- twinkle-0.8/src/audio/audio_decoder.h.orig 2006-05-13 10:24:32.000000000 +0200 | |
26 | +++ twinkle-0.8/src/audio/audio_decoder.h 2006-07-02 08:20:45.948399750 +0200 | |
27 | @@ -25,7 +25,7 @@ | |
28 | #include "twinkle_config.h" | |
29 | #include "audio_codecs.h" | |
30 | #include "user.h" | |
31 | -#include "gsm/inc/gsm.h" | |
32 | +#include <gsm.h> | |
33 | ||
34 | #ifdef HAVE_SPEEX | |
35 | #include <speex/speex.h> | |
36 | --- twinkle-0.7/src/audio/audio_encoder.h.orig 2006-04-16 20:51:14.000000000 +0200 | |
37 | +++ twinkle-0.7/src/audio/audio_encoder.h 2006-04-30 15:40:37.000000000 +0200 | |
38 | @@ -25,7 +25,7 @@ | |
39 | #include "twinkle_config.h" | |
40 | #include "audio_codecs.h" | |
41 | #include "user.h" | |
42 | -#include "gsm/inc/gsm.h" | |
43 | +#include <gsm.h> | |
44 | ||
45 | #ifdef HAVE_SPEEX | |
46 | #include <speex/speex.h> | |
47 | --- twinkle-0.8/src/audio/audio_tx.h.orig 2006-05-13 09:50:14.000000000 +0200 | |
48 | +++ twinkle-0.8/src/audio/audio_tx.h 2006-07-02 08:22:38.423429000 +0200 | |
49 | @@ -30,7 +30,7 @@ | |
50 | #include "rtp_telephone_event.h" | |
51 | #include "user.h" | |
52 | #include "threads/mutex.h" | |
53 | -#include "gsm/inc/gsm.h" | |
54 | +#include <gsm.h> | |
55 | #include "audio_device.h" | |
56 | #include "twinkle_rtp_session.h" | |
57 | #include "twinkle_config.h" | |
58 | --- twinkle-0.8.1/src/audio/Makefile.am.orig 2006-07-07 20:39:35.000000000 +0200 | |
59 | +++ twinkle-0.8.1/src/audio/Makefile.am 2006-07-10 17:28:47.042238250 +0200 | |
60 | @@ -37,6 +37,6 @@ | |
61 | tone_gen.h\ | |
62 | twinkle_rtp_session.h | |
63 | ||
64 | -SUBDIRS = gsm | |
65 | +SUBDIRS = | |
66 | ||
67 | EXTRA_DIST = README_G711 | |
68 | ||
69 | --- twinkle/src/gui/twinkle.pro.org 2007-02-28 01:27:31.194623000 +0100 | |
70 | +++ twinkle/src/gui/twinkle.pro 2007-02-28 01:28:02.870623000 +0100 | |
71 | @@ -3,7 +3,7 @@ | |
72 | ||
73 | CONFIG += qt warn_off release thread | |
74 | ||
75 | -LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a -lsndfile | |
76 | +LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a -lsndfile -lgsm | |
77 | ||
78 | DEFINES += QT_NO_STL | |
79 | ||
80 | --- twinkle/src/Makefile.am.org 2007-02-28 01:28:25.106623000 +0100 | |
81 | +++ twinkle/src/Makefile.am 2007-02-28 01:28:41.186623000 +0100 | |
82 | @@ -16,7 +16,6 @@ | |
83 | $(top_builddir)/src/sockets/libsocket.a\ | |
84 | $(top_builddir)/src/threads/libthread.a\ | |
85 | $(top_builddir)/src/audio/libaudio.a\ | |
86 | - $(top_builddir)/src/audio/gsm/libgsm.a\ | |
87 | $(top_builddir)/src/audits/libaudits.a\ | |
88 | $(top_builddir)/src/stun/libstun.a\ | |
89 | $(top_builddir)/src/mwi/libmwi.a\ | |
90 | @@ -25,6 +24,7 @@ | |
91 | $(top_builddir)/src/patterns/libpatterns.a\ | |
92 | $(CCRTP_LIBS)\ | |
93 | $(XML2_LIBS)\ | |
94 | + -lgsm \ | |
95 | -lsndfile | |
96 | ||
97 | libtwinkle_a_SOURCES =\ |