SOURCES: twinkle-gsm.patch - updated for 0.8

Tue Jul 4 01:27:13 CEST 2006

Author: charles                      Date: Mon Jul  3 23:27:13 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.8

---- Files affected:
SOURCES:
   twinkle-gsm.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/twinkle-gsm.patch
diff -u SOURCES/twinkle-gsm.patch:1.2 SOURCES/twinkle-gsm.patch:1.3

--- SOURCES/twinkle-gsm.patch:1.2	Sun Apr 30 17:07:05 2006
+++ SOURCES/twinkle-gsm.patch	Tue Jul  4 01:27:08 2006
@@ -1,6 +1,6 @@
---- twinkle-0.7/configure.in.orig	2006-04-30 10:10:08.000000000 +0200
-+++ twinkle-0.7/configure.in	2006-04-30 16:47:23.000000000 +0200
-@@ -143,6 +143,12 @@
+--- twinkle-0.8/configure.in.orig	2006-06-30 22:11:07.000000000 +0200
++++ twinkle-0.8/configure.in	2006-07-02 07:58:37.053748000 +0200
+@@ -147,6 +147,12 @@
  	have_speex="yes"
  	], [have_speex="no"])
  
@@ -10,18 +10,30 @@
 +AC_CHECK_HEADER(gsm.h, [],
 +	[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
 +
- $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
- echo "distdir:" >> src/gui/Makefile
- 
-@@ -152,7 +158,7 @@
+ # iLBC
+ if test "x$ac_cv_ilbc" = "xyes"
+ then
+@@ -172,8 +178,7 @@
  PARSER_CXXFLAGS=`echo $CXXFLAGS | sed -e "s/\-O2//;s/\-Os//"`
  AC_SUBST(PARSER_CXXFLAGS)
  
 -AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile \
-+AC_OUTPUT(Makefile src/Makefile src/audio/Makefile \
+-	src/audio/ilbc/Makefile \
++AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/ilbc/Makefile \
  	src/audits/Makefile src/sdp/Makefile src/parser/Makefile \
  	src/sockets/Makefile src/stun/Makefile src/threads/Makefile \
  	twinkle.spec)
+--- twinkle-0.8/src/audio/audio_decoder.h.orig	2006-05-13 10:24:32.000000000 +0200
++++ twinkle-0.8/src/audio/audio_decoder.h	2006-07-02 08:20:45.948399750 +0200
+@@ -25,7 +25,7 @@
+ #include "twinkle_config.h"
+ #include "audio_codecs.h"
+ #include "user.h"
+-#include "gsm/inc/gsm.h"
++#include <gsm.h>
+ 
+ #ifdef HAVE_SPEEX
+ #include <speex/speex.h>
 --- twinkle-0.7/src/audio/audio_encoder.h.orig	2006-04-16 20:51:14.000000000 +0200
 +++ twinkle-0.7/src/audio/audio_encoder.h	2006-04-30 15:40:37.000000000 +0200
 @@ -25,7 +25,7 @@
@@ -33,54 +45,52 @@
  
  #ifdef HAVE_SPEEX
  #include <speex/speex.h>
-diff -ur orig/twinkle-0.6.1/src/audio/audio_tx.h twinkle-0.6.1/src/audio/audio_tx.h
---- orig/twinkle-0.6.1/src/audio/audio_tx.h	2006-01-01 15:38:04.000000000 +0000
-+++ twinkle-0.6.1/src/audio/audio_tx.h	2006-02-21 10:35:16.000000000 +0000
-@@ -27,7 +27,7 @@
- #include "media_buffer.h"
+--- twinkle-0.8/src/audio/audio_tx.h.orig	2006-05-13 09:50:14.000000000 +0200
++++ twinkle-0.8/src/audio/audio_tx.h	2006-07-02 08:22:38.423429000 +0200
+@@ -30,7 +30,7 @@
  #include "rtp_telephone_event.h"
+ #include "user.h"
  #include "threads/mutex.h"
 -#include "gsm/inc/gsm.h"
 +#include <gsm.h>
  #include "audio_device.h"
  #include "twinkle_rtp_session.h"
- 
-diff -ur orig/twinkle-0.6.1/src/audio/Makefile.am twinkle-0.6.1/src/audio/Makefile.am
---- orig/twinkle-0.6.1/src/audio/Makefile.am	2005-10-09 20:11:36.000000000 +0100
-+++ twinkle-0.6.1/src/audio/Makefile.am	2006-02-21 10:35:37.000000000 +0000
-@@ -29,6 +29,4 @@
+ #include "twinkle_config.h"
+--- twinkle-0.8/src/audio/Makefile.am.orig	2006-05-13 09:57:01.000000000 +0200
++++ twinkle-0.8/src/audio/Makefile.am	2006-07-02 07:45:43.445400500 +0200
+@@ -37,6 +37,6 @@
          tone_gen.h\
          twinkle_rtp_session.h
  
--SUBDIRS = gsm
--
+-SUBDIRS = gsm ilbc
++SUBDIRS = ilbc
+ 
  EXTRA_DIST = README_G711
-diff -ur orig/twinkle-0.6.1/src/gui/twinkle.pro twinkle-0.6.1/src/gui/twinkle.pro
---- orig/twinkle-0.6.1/src/gui/twinkle.pro	2006-02-11 08:34:27.000000000 +0000
-+++ twinkle-0.6.1/src/gui/twinkle.pro	2006-02-21 11:05:20.000000000 +0000
+--- twinkle-0.8/src/gui/twinkle.pro.orig	2006-07-01 09:19:17.000000000 +0200
++++ twinkle-0.8/src/gui/twinkle.pro	2006-07-02 07:49:12.354456500 +0200
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
  
--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
-+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
+-LIBS	+= ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audio/ilbc/libilbc.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex
++LIBS	+= ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/ilbc/libilbc.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -lgsm
  
  DEFINES	+= QT_NO_STL
  
-Only in twinkle-0.6.1/src/gui: .ui
-diff -ur orig/twinkle-0.6.1/src/Makefile.am twinkle-0.6.1/src/Makefile.am
---- orig/twinkle-0.6.1/src/Makefile.am	2006-02-03 22:28:58.000000000 +0000
-+++ twinkle-0.6.1/src/Makefile.am	2006-02-21 10:40:53.000000000 +0000
-@@ -16,11 +16,11 @@
+--- twinkle-0.8/src/Makefile.am.orig	2006-06-22 22:32:19.000000000 +0200
++++ twinkle-0.8/src/Makefile.am	2006-07-02 07:50:05.601784250 +0200
+@@ -16,13 +16,13 @@
          $(top_builddir)/src/sockets/libsocket.a\
          $(top_builddir)/src/threads/libthread.a\
          $(top_builddir)/src/audio/libaudio.a\
 -        $(top_builddir)/src/audio/gsm/libgsm.a\
+         $(top_builddir)/src/audio/ilbc/libilbc.a\
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
  	$(CCRTP_LIBS)\
  	-lresolv\
-+	-lgsm\
- 	-lsndfile
+ 	-lsndfile\
++	-lgsm \
+ 	-lboost_regex
  
  libtwinkle_a_SOURCES =\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/twinkle-gsm.patch?r1=1.2&r2=1.3&f=u

