[Pkg-voip-commits] r2020 - twinkle/trunk/debian/patches

Mark Purcell msp at costa.debian.org
Thu Jul 6 22:06:40 UTC 2006 

Author: msp
Date: 2006-07-06 22:06:39 +0000 (Thu, 06 Jul 2006)
New Revision: 2020

Modified:
   twinkle/trunk/debian/patches/libgsm.diff
Log:
Rebuild debian/patches/libgsm.diff

Modified: twinkle/trunk/debian/patches/libgsm.diff
===================================================================
--- twinkle/trunk/debian/patches/libgsm.diff	2006-07-06 19:17:30 UTC (rev 2019)
+++ twinkle/trunk/debian/patches/libgsm.diff	2006-07-06 22:06:39 UTC (rev 2020)
@@ -1,9 +1,9 @@
-diff -ur orig/twinkle-0.6.1/configure.in twinkle-0.6.1/configure.in
---- orig/twinkle-0.6.1/configure.in	2006-02-11 14:40:40.000000000 +0000
-+++ twinkle-0.6.1/configure.in	2006-02-21 10:49:26.000000000 +0000
-@@ -133,6 +133,12 @@
- 	echo "LIBS += -lasound" >> $QT_INCL_PRO
- 	])
+diff -ur /tmp/twinkle-0.8/configure.in twinkle-0.8.dfsg/configure.in
+--- /tmp/twinkle-0.8/configure.in	2006-06-30 21:11:07.000000000 +0100
++++ twinkle-0.8.dfsg/configure.in	2006-07-06 22:59:01.000000000 +0100
+@@ -127,6 +127,12 @@
+ AC_CHECK_LIB(sndfile, sf_open, [], 
+ 	[AC_MSG_ERROR([libsndfile library is missing.])])
  
 +# Check if libgsm is available
 +AC_CHECK_LIB(gsm, sf_open, [],
@@ -11,25 +11,73 @@
 +AC_CHECK_HEADER(gsm.h, [],
 +	[AC_MSG_ERROR([gsm header files msiing (gsm.h)])])
 +
- $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
- echo "distdir:" >> src/gui/Makefile
+ # Check if ALSA is available
+ AC_CHECK_LIB(asound, main, [
+ 	AC_CHECK_HEADER(alsa/asoundlib.h, [],
+@@ -173,7 +179,6 @@
+ AC_SUBST(PARSER_CXXFLAGS)
  
-diff -Nur twinkle-0.7/src/audio/audio_encoder.h twinkle-0.7.new/src/audio/audio_encoder.h
---- twinkle-0.7/src/audio/audio_encoder.h       2006-04-16 19:51:14.000000000 +0100
-+++ twinkle-0.7.new/src/audio/audio_encoder.h   2006-05-01 22:25:49.000000000 +0100
+ AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/gsm/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)
+Only in twinkle-0.8.dfsg: debian
+diff -ur /tmp/twinkle-0.8/src/Makefile.am twinkle-0.8.dfsg/src/Makefile.am
+--- /tmp/twinkle-0.8/src/Makefile.am	2006-06-22 21:32:19.000000000 +0100
++++ twinkle-0.8.dfsg/src/Makefile.am	2006-07-06 22:58:32.000000000 +0100
+@@ -16,13 +16,12 @@
+         $(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\
+ 	-lsndfile\
++	-lgsm\
+ 	-lboost_regex
+ 
+ libtwinkle_a_SOURCES =\
+diff -ur /tmp/twinkle-0.8/src/audio/Makefile.am twinkle-0.8.dfsg/src/audio/Makefile.am
+--- /tmp/twinkle-0.8/src/audio/Makefile.am	2006-05-13 08:57:01.000000000 +0100
++++ twinkle-0.8.dfsg/src/audio/Makefile.am	2006-07-06 22:58:32.000000000 +0100
+@@ -37,6 +37,4 @@
+         tone_gen.h\
+         twinkle_rtp_session.h
+ 
+-SUBDIRS = gsm ilbc
+-
+ EXTRA_DIST = README_G711
+diff -ur /tmp/twinkle-0.8/src/audio/audio_decoder.h twinkle-0.8.dfsg/src/audio/audio_decoder.h
+--- /tmp/twinkle-0.8/src/audio/audio_decoder.h	2006-05-13 09:24:32.000000000 +0100
++++ twinkle-0.8.dfsg/src/audio/audio_decoder.h	2006-07-06 22:58:32.000000000 +0100
 @@ -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>
-
-diff -Nur twinkle-0.7/src/audio/audio_rx.h twinkle-0.7.new/src/audio/audio_rx.h
---- twinkle-0.7/src/audio/audio_rx.h    2006-04-16 20:57:15.000000000 +0100
-+++ twinkle-0.7.new/src/audio/audio_rx.h        2006-05-01 22:19:25.000000000 +0100
+diff -ur /tmp/twinkle-0.8/src/audio/audio_encoder.h twinkle-0.8.dfsg/src/audio/audio_encoder.h
+--- /tmp/twinkle-0.8/src/audio/audio_encoder.h	2006-05-13 09:25:02.000000000 +0100
++++ twinkle-0.8.dfsg/src/audio/audio_encoder.h	2006-07-06 22:58:32.000000000 +0100
+@@ -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>
+diff -ur /tmp/twinkle-0.8/src/audio/audio_rx.h twinkle-0.8.dfsg/src/audio/audio_rx.h
+--- /tmp/twinkle-0.8/src/audio/audio_rx.h	2006-05-13 08:50:14.000000000 +0100
++++ twinkle-0.8.dfsg/src/audio/audio_rx.h	2006-07-06 22:58:32.000000000 +0100
 @@ -24,6 +24,7 @@
  #include <assert.h>
  #include <queue>
@@ -38,43 +86,16 @@
  #include "audio_codecs.h"
  #include "audio_device.h"
  #include "audio_encoder.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 @@
-         tone_gen.h\
-         twinkle_rtp_session.h
- 
--SUBDIRS = gsm
--
- 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
+Only in /tmp/twinkle-0.8/src/audio: ilbc
+diff -ur /tmp/twinkle-0.8/src/gui/twinkle.pro twinkle-0.8.dfsg/src/gui/twinkle.pro
+--- /tmp/twinkle-0.8/src/gui/twinkle.pro	2006-07-01 08:19:17.000000000 +0100
++++ twinkle-0.8.dfsg/src/gui/twinkle.pro	2006-07-06 22:58:32.000000000 +0100
 @@ -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 ../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 @@
-         $(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/audits/libaudits.a\
-         $(top_builddir)/src/stun/libstun.a\
- 	$(CCRTP_LIBS)\
- 	-lresolv\
-+	-lgsm\
- 	-lsndfile
- 
- libtwinkle_a_SOURCES =\

More information about the Pkg-voip-commits mailing list