[asterisk-commits] russell: branch 1.6.0 r132391 - in /branches/1.6.0: ./ apps/ build_tools/ cod...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jul 21 09:48:46 CDT 2008
Author: russell
Date: Mon Jul 21 09:48:45 2008
New Revision: 132391
URL: http://svn.digium.com/view/asterisk?view=rev&rev=132391
Log:
Merged revisions 132390 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r132390 | russell | 2008-07-21 09:47:41 -0500 (Mon, 21 Jul 2008) | 16 lines
Remove libresample from the Asterisk source tree. It is now available in its
own repository, and must be installed like any other library for Asterisk to
use. The two modules that require it are codec_resample and app_jack.
To install libresample:
$ svn co http://svn.digium.com/svn/libresample/trunk libresample
$ cd libresample
$ ./configure
$ make
$ sudo make install
This code is currently in our own repository because the build system did not
include the appropriate targets for building a dynamic library or for installing
the library.
........
Removed:
branches/1.6.0/include/asterisk/libresample.h
branches/1.6.0/main/libresample/
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/apps/app_jack.c
branches/1.6.0/build_tools/menuselect-deps.in
branches/1.6.0/codecs/codec_resample.c
branches/1.6.0/configure
branches/1.6.0/configure.ac
branches/1.6.0/include/asterisk/autoconfig.h.in
branches/1.6.0/main/Makefile
branches/1.6.0/makeopts.in
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/apps/app_jack.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_jack.c?view=diff&rev=132391&r1=132390&r2=132391
==============================================================================
--- branches/1.6.0/apps/app_jack.c (original)
+++ branches/1.6.0/apps/app_jack.c Mon Jul 21 09:48:45 2008
@@ -27,12 +27,14 @@
* another application, or to play audio from another application.
*
* \arg http://www.jackaudio.org/
+ * \arg http://svn.digium.com/svn/libresample/trunk
*
* \ingroup applications
*/
/*** MODULEINFO
<depend>jack</depend>
+ <depend>resample</depend>
***/
#include "asterisk.h"
@@ -43,12 +45,13 @@
#include <jack/jack.h>
#include <jack/ringbuffer.h>
+
+#include <libresample.h>
#include "asterisk/module.h"
#include "asterisk/channel.h"
#include "asterisk/strings.h"
#include "asterisk/lock.h"
-#include "asterisk/libresample.h"
#include "asterisk/app.h"
#include "asterisk/pbx.h"
#include "asterisk/audiohook.h"
Modified: branches/1.6.0/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/build_tools/menuselect-deps.in?view=diff&rev=132391&r1=132390&r2=132391
==============================================================================
--- branches/1.6.0/build_tools/menuselect-deps.in (original)
+++ branches/1.6.0/build_tools/menuselect-deps.in Mon Jul 21 09:48:45 2008
@@ -30,6 +30,7 @@
POPT=@PBX_POPT@
PORTAUDIO=@PBX_PORTAUDIO@
PRI=@PBX_PRI@
+RESAMPLE=@PBX_RESAMPLE@
RADIUS=@PBX_RADIUS@
SPANDSP=@PBX_SPANDSP@
SPEEX=@PBX_SPEEX@
Modified: branches/1.6.0/codecs/codec_resample.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/codecs/codec_resample.c?view=diff&rev=132391&r1=132390&r2=132391
==============================================================================
--- branches/1.6.0/codecs/codec_resample.c (original)
+++ branches/1.6.0/codecs/codec_resample.c Mon Jul 21 09:48:45 2008
@@ -20,9 +20,15 @@
* \file
*
* \brief Resample slinear audio
+ *
+ * \arg http://svn.digium.com/svn/libresample/trunk
*
* \ingroup codecs
*/
+
+/*** MODULEINFO
+ <depend>resample</depend>
+ ***/
#include "asterisk.h"
@@ -37,9 +43,10 @@
#include <limits.h>
/* } */
+#include <libresample.h>
+
#include "asterisk/module.h"
#include "asterisk/translate.h"
-#include "asterisk/libresample.h"
#include "slin_resample_ex.h"
Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=132391&r1=132390&r2=132391
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Jul 21 09:48:45 2008
@@ -234,6 +234,7 @@
AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
+AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
@@ -1294,6 +1295,8 @@
AST_EXT_LIB_CHECK([PRI_INBANDRELEASE], [pri], [pri_set_inbandrelease], [libpri.h])
+AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])
+
AST_C_COMPILE_CHECK([SPANDSP], [
#if SPANDSP_RELEASE_DATE < 20080516
#error "spandsp 0.0.5 or greater is required"
Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=132391&r1=132390&r2=132391
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Mon Jul 21 09:48:45 2008
@@ -651,6 +651,12 @@
/* Define to indicate the ${REMAINDER_DESCRIP} library version */
#undef HAVE_REMAINDER_VERSION
+
+/* Define this to indicate the ${RESAMPLE_DESCRIP} library */
+#undef HAVE_RESAMPLE
+
+/* Define to indicate the ${RESAMPLE_DESCRIP} library version */
+#undef HAVE_RESAMPLE_VERSION
/* Define to 1 if your system has the ndestroy resolver function. */
#undef HAVE_RES_NDESTROY
Modified: branches/1.6.0/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=132391&r1=132390&r2=132391
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Mon Jul 21 09:48:45 2008
@@ -17,8 +17,6 @@
include $(ASTTOPDIR)/Makefile.moddir_rules
-RESAMPLE_OBJS:=libresample/src/resample.o libresample/src/resamplesubs.o libresample/src/filterkit.o
-
OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o pbx.o cli.o md5.o term.o \
ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
@@ -29,7 +27,7 @@
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \
strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
- astobj2.o hashtab.o global_datastores.o $(RESAMPLE_OBJS) version.o \
+ astobj2.o hashtab.o global_datastores.o version.o \
features.o
# we need to link in the objects statically, not as a library, because
Modified: branches/1.6.0/makeopts.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/makeopts.in?view=diff&rev=132391&r1=132390&r2=132391
==============================================================================
--- branches/1.6.0/makeopts.in (original)
+++ branches/1.6.0/makeopts.in Mon Jul 21 09:48:45 2008
@@ -148,6 +148,9 @@
PRI_INCLUDE=@PRI_INCLUDE@
PRI_LIB=@PRI_LIB@
+RESAMPLE_INCLUDE=@RESAMPLE_INCLUDE@
+RESAMPLE_LIB=@RESAMPLE_LIB@
+
SS7_INCLUDE=@SS7_INCLUDE@
SS7_LIB=@SS7_LIB@
More information about the asterisk-commits
mailing list