From f515127f286997e5f21e48508d33f38683849f93 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 1 Oct 2008 04:08:43 +0000 Subject: [PATCH] update to snapshot spandsp-20080928.tar.gz git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9772 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/spandsp/.update | 2 +- libs/spandsp/Makefile.am | 4 ++-- libs/spandsp/spandsp.spec | 12 +++++++----- libs/spandsp/spandsp.spec.in | 12 +++++++----- libs/spandsp/src/spandsp/version.h | 4 ++-- libs/spandsp/tests/g726_tests.c | 4 +++- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/libs/spandsp/.update b/libs/spandsp/.update index e6f44d4828..df0d5762bf 100644 --- a/libs/spandsp/.update +++ b/libs/spandsp/.update @@ -1 +1 @@ -Wed Oct 1 00:06:28 EDT 2008 +Wed Oct 1 00:08:32 EDT 2008 diff --git a/libs/spandsp/Makefile.am b/libs/spandsp/Makefile.am index 3db6684c0d..3e1d69c834 100644 --- a/libs/spandsp/Makefile.am +++ b/libs/spandsp/Makefile.am @@ -16,7 +16,7 @@ ## License along with this program; if not, write to the Free Software ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -## $Id: Makefile.am,v 1.43 2008/09/20 15:44:40 steveu Exp $ +## $Id: Makefile.am,v 1.44 2008/09/28 14:36:25 steveu Exp $ AM_CFLAGS = $(COMP_VENDOR_CFLAGS) AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) @@ -73,7 +73,7 @@ rpm-build: rm -f rpm/SOURCES/* rm -f rpm/SPECS/* rm -f rpm/SRPMS/* - rpm -ta --sign @PACKAGE@-@VERSION@.tar.gz + rpmbuild -ta --sign @PACKAGE@-@VERSION@.tar.gz bump.rpm.release: spandsp.spec VERSION="x"; \ diff --git a/libs/spandsp/spandsp.spec b/libs/spandsp/spandsp.spec index 751f5e6d5d..38a3dbac57 100644 --- a/libs/spandsp/spandsp.spec +++ b/libs/spandsp/spandsp.spec @@ -2,18 +2,18 @@ Summary: A DSP library for telephony. Name: spandsp Version: 0.0.5 Release: 1 -License: GPL +License: LGPL Group: System Environment/Libraries URL: http://www.soft-switch.org/spandsp BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.5.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Docdir: %{_prefix}/doc - BuildRequires: libtiff-devel BuildRequires: audiofile-devel BuildRequires: doxygen +# for xsltproc: +BuildRequires: libxslt %description SpanDSP is a library of DSP functions for telephony, in the 8000 @@ -56,8 +56,6 @@ rm -rf %{buildroot} %{_libdir}/libspandsp.so.* -%{_datadir}/spandsp - %files devel %defattr(-,root,root,-) %doc doc/api @@ -70,6 +68,10 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %changelog +* Wed Sep 24 2008 Tzafrir Cohen 0.0.5-1 +- Preparing for 0.0.5pre4 release +- License: LGPL + * Mon 23 Jun 2008 Steve Underwood 0.0.5-1 - Cleared out the dependency on libxml2 diff --git a/libs/spandsp/spandsp.spec.in b/libs/spandsp/spandsp.spec.in index 1410ace511..ea1f26fdb2 100644 --- a/libs/spandsp/spandsp.spec.in +++ b/libs/spandsp/spandsp.spec.in @@ -2,18 +2,18 @@ Summary: A DSP library for telephony. Name: @PACKAGE@ Version: @VERSION@ Release: 1 -License: GPL +License: LGPL Group: System Environment/Libraries URL: http://www.soft-switch.org/spandsp BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: http://www.soft-switch.org/downloads/spandsp/@PACKAGE@-@VERSION@.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Docdir: %{_prefix}/doc - BuildRequires: libtiff-devel BuildRequires: audiofile-devel BuildRequires: doxygen +# for xsltproc: +BuildRequires: libxslt %description SpanDSP is a library of DSP functions for telephony, in the 8000 @@ -56,8 +56,6 @@ rm -rf %{buildroot} %{_libdir}/libspandsp.so.* -%{_datadir}/spandsp - %files devel %defattr(-,root,root,-) %doc doc/api @@ -70,6 +68,10 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %changelog +* Wed Sep 24 2008 Tzafrir Cohen 0.0.5-1 +- Preparing for 0.0.5pre4 release +- License: LGPL + * Mon 23 Jun 2008 Steve Underwood 0.0.5-1 - Cleared out the dependency on libxml2 diff --git a/libs/spandsp/src/spandsp/version.h b/libs/spandsp/src/spandsp/version.h index 815245e21d..3385f4aaaa 100644 --- a/libs/spandsp/src/spandsp/version.h +++ b/libs/spandsp/src/spandsp/version.h @@ -30,8 +30,8 @@ /* The date and time of the version are in UTC form. */ -#define SPANDSP_RELEASE_DATE 20080920 -#define SPANDSP_RELEASE_TIME 154737 +#define SPANDSP_RELEASE_DATE 20080928 +#define SPANDSP_RELEASE_TIME 144338 #endif /*- End of file ------------------------------------------------------------*/ diff --git a/libs/spandsp/tests/g726_tests.c b/libs/spandsp/tests/g726_tests.c index a5edb42406..470c28b4ec 100644 --- a/libs/spandsp/tests/g726_tests.c +++ b/libs/spandsp/tests/g726_tests.c @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: g726_tests.c,v 1.27 2008/08/29 09:28:13 steveu Exp $ + * $Id: g726_tests.c,v 1.28 2008/09/28 14:36:25 steveu Exp $ */ /*! \file */ @@ -1279,6 +1279,8 @@ int main(int argc, char *argv[]) } printf("ADPCM packing is %d\n", packing); + //g726_init(&enc_state, bit_rate, G726_ENCODING_LINEAR, G726_PACKING_LEFT); + //g726_init(&dec_state, bit_rate, G726_ENCODING_LINEAR, G726_PACKING_RIGHT); g726_init(&enc_state, bit_rate, G726_ENCODING_LINEAR, packing); g726_init(&dec_state, bit_rate, G726_ENCODING_LINEAR, packing);