[Pkg-voip-commits] r922 - asterisk/trunk/debian/patches

[Mark Purcell]

Author: msp
Date: 2005-11-01 21:10:57 +0000 (Tue, 01 Nov 2005)
New Revision: 922

Removed:
   asterisk/trunk/debian/patches/system_libgsm.dpatch
Modified:
   asterisk/trunk/debian/patches/00list
Log:
system_libgsm does not apply

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2005-11-01 21:10:51 UTC (rev 921)
+++ asterisk/trunk/debian/patches/00list	2005-11-01 21:10:57 UTC (rev 922)
@@ -3,14 +3,13 @@
 # Depends on defaults_debian:
 #Makefile_datafiles
 #bristuff-0.2.0-RC8j.dpatch
-option_detach_12
+#option_detach_12
 #10_DPIC.dpatch
 #20_Makefile.dpatch
 #25_subdirs_Makefiles.dpatch
 30_ast-data-dir.dpatch
 40_initgroups.dpatch
-system_libgsm
-#50_debian-libgsm.dpatch
+50_debian-libgsm.dpatch
 # needs to be resorected:
 #60_debian-libopenh323.dpatch
 # app_sql_postgres seems "obsolete" and not used by default:

Deleted: asterisk/trunk/debian/patches/system_libgsm.dpatch
===================================================================
--- asterisk/trunk/debian/patches/system_libgsm.dpatch	2005-11-01 21:10:51 UTC (rev 921)
+++ asterisk/trunk/debian/patches/system_libgsm.dpatch	2005-11-01 21:10:57 UTC (rev 922)
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## system_libgsm.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use the system copy of libgsm, if availble.
-
- at DPATCH@
-diff -urNad asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c
---- asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c	2005-10-12 22:13:37.563900650 +0200
-+++ /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c	2005-10-12 22:13:50.495196931 +0200
-@@ -33,7 +33,7 @@
- #include "asterisk/logger.h"
- #include "asterisk/channel.h"
- 
--#include "gsm/inc/gsm.h"
-+#include <gsm/gsm.h>
- #include "../formats/msgsm.h"
- 
- /* Sample frame data */
-diff -urNad asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile
---- asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile	2005-10-12 22:13:37.578898674 +0200
-+++ /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile	2005-10-12 22:18:53.182433117 +0200
-@@ -26,10 +26,19 @@
- CFLAGS+=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h ] && echo "-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex")
- CFLAGS+=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h ] && echo "-I$(CROSS_COMPILE_TARGET)/usr/include/speex")
- 
-+LIBGSM_PATH:=/usr/local/include /usr/include
-+LIBGSM_SYSTEM_HEADERS:=$(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h))
-+ifneq (,$(LIBGSM_SYSTEM_HEADERS))
-+LIBGSM=-lgsm
-+LIBGSMT=
-+else
-+LIBGSM=gsm/lib/libgsm.a
-+LIBGSMT=$(LIBGSM)
-+CFLAGS+=-I.
-+endif
-+
- LIBG723=g723.1/libg723.a
- LIBG723B=g723.1b/libg723b.a
--LIBGSM=gsm/lib/libgsm.a
--LIBGSMT=gsm/lib/libgsm.a
- LIBLPC10=lpc10/liblpc10.a
- LIBSPEEX=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/local/lib/libspeex.a ] && echo "-L$(CROSS_COMPILE_TARGET)/usr/local/lib")
- LIBSPEEX+=-lspeex -lm