]>
Commit | Line | Data |
---|---|---|
c24d9d71 KK |
1 | --- twinkle-0.7/configure.in.orig 2006-04-30 10:10:08.000000000 +0200 |
2 | +++ twinkle-0.7/configure.in 2006-04-30 16:47:23.000000000 +0200 | |
3 | @@ -143,6 +143,12 @@ | |
4 | have_speex="yes" | |
5 | ], [have_speex="no"]) | |
604c6d70 AM |
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, [], | |
c24d9d71 | 11 | + [AC_MSG_ERROR([gsm header files missing (gsm.h)])]) |
604c6d70 AM |
12 | + |
13 | $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro | |
14 | echo "distdir:" >> src/gui/Makefile | |
15 | ||
c24d9d71 KK |
16 | @@ -152,7 +158,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.7/src/audio/audio_encoder.h.orig 2006-04-16 20:51:14.000000000 +0200 | |
26 | +++ twinkle-0.7/src/audio/audio_encoder.h 2006-04-30 15:40:37.000000000 +0200 | |
27 | @@ -25,7 +25,7 @@ | |
28 | #include "twinkle_config.h" | |
29 | #include "audio_codecs.h" | |
604c6d70 | 30 | #include "user.h" |
604c6d70 AM |
31 | -#include "gsm/inc/gsm.h" |
32 | +#include <gsm.h> | |
604c6d70 | 33 | |
c24d9d71 KK |
34 | #ifdef HAVE_SPEEX |
35 | #include <speex/speex.h> | |
604c6d70 AM |
36 | diff -ur orig/twinkle-0.6.1/src/audio/audio_tx.h twinkle-0.6.1/src/audio/audio_tx.h |
37 | --- orig/twinkle-0.6.1/src/audio/audio_tx.h 2006-01-01 15:38:04.000000000 +0000 | |
38 | +++ twinkle-0.6.1/src/audio/audio_tx.h 2006-02-21 10:35:16.000000000 +0000 | |
39 | @@ -27,7 +27,7 @@ | |
40 | #include "media_buffer.h" | |
41 | #include "rtp_telephone_event.h" | |
42 | #include "threads/mutex.h" | |
43 | -#include "gsm/inc/gsm.h" | |
44 | +#include <gsm.h> | |
45 | #include "audio_device.h" | |
46 | #include "twinkle_rtp_session.h" | |
47 | ||
48 | diff -ur orig/twinkle-0.6.1/src/audio/Makefile.am twinkle-0.6.1/src/audio/Makefile.am | |
49 | --- orig/twinkle-0.6.1/src/audio/Makefile.am 2005-10-09 20:11:36.000000000 +0100 | |
50 | +++ twinkle-0.6.1/src/audio/Makefile.am 2006-02-21 10:35:37.000000000 +0000 | |
51 | @@ -29,6 +29,4 @@ | |
52 | tone_gen.h\ | |
53 | twinkle_rtp_session.h | |
54 | ||
55 | -SUBDIRS = gsm | |
56 | - | |
57 | EXTRA_DIST = README_G711 | |
58 | diff -ur orig/twinkle-0.6.1/src/gui/twinkle.pro twinkle-0.6.1/src/gui/twinkle.pro | |
59 | --- orig/twinkle-0.6.1/src/gui/twinkle.pro 2006-02-11 08:34:27.000000000 +0000 | |
60 | +++ twinkle-0.6.1/src/gui/twinkle.pro 2006-02-21 11:05:20.000000000 +0000 | |
61 | @@ -3,7 +3,7 @@ | |
62 | ||
63 | CONFIG += qt warn_off release thread | |
64 | ||
65 | -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 -lresolv -lsndfile | |
66 | +LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lgsm | |
67 | ||
68 | DEFINES += QT_NO_STL | |
69 | ||
70 | Only in twinkle-0.6.1/src/gui: .ui | |
71 | diff -ur orig/twinkle-0.6.1/src/Makefile.am twinkle-0.6.1/src/Makefile.am | |
72 | --- orig/twinkle-0.6.1/src/Makefile.am 2006-02-03 22:28:58.000000000 +0000 | |
73 | +++ twinkle-0.6.1/src/Makefile.am 2006-02-21 10:40:53.000000000 +0000 | |
74 | @@ -16,11 +16,11 @@ | |
75 | $(top_builddir)/src/sockets/libsocket.a\ | |
76 | $(top_builddir)/src/threads/libthread.a\ | |
77 | $(top_builddir)/src/audio/libaudio.a\ | |
78 | - $(top_builddir)/src/audio/gsm/libgsm.a\ | |
79 | $(top_builddir)/src/audits/libaudits.a\ | |
80 | $(top_builddir)/src/stun/libstun.a\ | |
81 | $(CCRTP_LIBS)\ | |
82 | -lresolv\ | |
83 | + -lgsm\ | |
84 | -lsndfile | |
85 | ||
86 | libtwinkle_a_SOURCES =\ |