Date: Sun, 22 Jan 2006 01:00:09 -0500 (EST) From: "Jeffrey H. Johnson" <trn@offworld.cqasys.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sobomax@FreeBSD.org, CPE1704TKS@bellsouth.net Subject: ports/92133: [PATCH] comms/spandsp: 0.0.2p22 fixes various bugs. Message-ID: <20060122060009.1A56839833@offworld.cqasys.com> Resent-Message-ID: <200601220640.k0M6e45t006106@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92133 >Category: ports >Synopsis: [PATCH] comms/spandsp: 0.0.2p22 fixes various bugs. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jan 22 06:40:03 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jeffrey H. Johnson >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD offworld.cqasys.com 6.0-STABLE FreeBSD 6.0-STABLE #21: Wed Jan 18 22:35:45 EST 2006 >Description: I was having a whole slew of assorted problems using spandsp with asterisk for faxing. Updating to the latest spandsp does the trick. Please note that asterisk will have to be updated with the files from: http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.2pre22/asterisk-1.2.x/ before this patch can be committed, or else asterisk won't build correctly. The API has changed with this version. The initial timeout excahnge support added in p22 was instrumental in fixing my configuration. This release has much better T.31 support as well... Does spandsp really have no FreeBSD maintainer? Cc'ing this to the Asterisk maintainer - sobomax@FreeBSD.org. I'm sure he want to do some major adjusting. Thanks for supporting Asterisk in FreeBSD. Removed file(s): - files/patch-src-Makefile.in Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- spandsp-0.0.2.p22.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/spandsp/Makefile /usr/home/trn/port-work/spandsp/Makefile --- /usr/ports/comms/spandsp/Makefile Sun Dec 4 23:05:36 2005 +++ /usr/home/trn/port-work/spandsp/Makefile Sun Jan 22 00:24:43 2006 @@ -6,7 +6,7 @@ # PORTNAME= spandsp -DISTVERSION= 0.0.2pre20 +DISTVERSION= 0.0.2pre22 CATEGORIES= comms MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/${PORTNAME}-${DISTVERSION}/ \ ${MASTER_SITE_LOCAL} @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//} USE_GMAKE= yes -USE_REINPLACE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -32,8 +31,8 @@ post-patch: @${FIND} ${WRKSRC} -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' -.if ${OSVERSION} < 503000 - ${TOUCH} ${WRKSRC}/src/tgmath.h -.endif +.if ${OSVERSION} < 503000 + ${TOUCH} ${WRKSRC}/src/tgmath.h +.endif .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/comms/spandsp/distinfo /usr/home/trn/port-work/spandsp/distinfo --- /usr/ports/comms/spandsp/distinfo Sun Dec 4 01:34:57 2005 +++ /usr/home/trn/port-work/spandsp/distinfo Sun Jan 22 00:13:41 2006 @@ -1,3 +1,3 @@ -MD5 (spandsp-0.0.2pre20.tar.gz) = 8d6e94a30fb4698b5f25eb93e26444e1 -SHA256 (spandsp-0.0.2pre20.tar.gz) = 8523c1a4da13e11c5096213e434bc69d96ea65cddde27b5b7fc83bf52787b7ef -SIZE (spandsp-0.0.2pre20.tar.gz) = 1312403 +SIZE (spandsp-0.0.2pre22.tar.gz) = 1370810 +MD5 (spandsp-0.0.2pre22.tar.gz) = f2830a2d30ec5a563d24a67c3b006207 +SHA256 (spandsp-0.0.2pre22.tar.gz) = e468086afa72d6d881c2722f3717861f0392173a0785c6d752df1872ba179045 diff -ruN --exclude=CVS /usr/ports/comms/spandsp/files/patch-src-Makefile.in /usr/home/trn/port-work/spandsp/files/patch-src-Makefile.in --- /usr/ports/comms/spandsp/files/patch-src-Makefile.in Thu Jun 30 18:22:38 2005 +++ /usr/home/trn/port-work/spandsp/files/patch-src-Makefile.in Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- src/Makefile.in~ Thu Apr 28 09:03:02 2005 -+++ src/Makefile.in Thu Jun 23 15:27:14 2005 -@@ -211,7 +211,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - MAINTAINERCLEANFILES = Makefile.in --INCLUDES = -I$(top_buildir) -+#INCLUDES = -I$(top_buildir) - lib_LTLIBRARIES = libspandsp.la - libspandsp_la_SOURCES = adsi.c \ - awgn.c \ diff -ruN --exclude=CVS /usr/ports/comms/spandsp/files/patch-src-power_meter.c /usr/home/trn/port-work/spandsp/files/patch-src-power_meter.c --- /usr/ports/comms/spandsp/files/patch-src-power_meter.c Thu Jun 30 18:22:38 2005 +++ /usr/home/trn/port-work/spandsp/files/patch-src-power_meter.c Sun Jan 22 00:18:57 2006 @@ -1,13 +1,19 @@ ---- src/power_meter.c.orig Thu Jun 30 22:40:33 2005 -+++ src/power_meter.c Thu Jun 30 22:41:05 2005 -@@ -72,6 +72,10 @@ - } - /*- End of function --------------------------------------------------------*/ - -+#ifndef INFINITY -+#define INFINITY (float)HUGE_VAL -+#endif -+ - float power_meter_dbm0(power_meter_t *meter) - { - float val; +*** src/power_meter.c.orig Sun Nov 27 07:36:22 2005 +--- src/power_meter.c Sun Jan 22 00:17:40 2006 +*************** +*** 85,94 **** +--- 85,98 ---- + l = pow(10.0, (level + 3.14)/20.0)*(32768.0*0.70711); + return l*l; + } + /*- End of function --------------------------------------------------------*/ + ++ #ifndef INFINITY ++ #define INFINITY (float)HUGE_VAL ++ #endif ++ + float power_meter_dbm0(power_meter_t *s) + { + float val; + + if ((val = sqrt((float) s->reading)) <= 0.0) diff -ruN --exclude=CVS /usr/ports/comms/spandsp/files/patch-src-spandsp-dc_restore.h /usr/home/trn/port-work/spandsp/files/patch-src-spandsp-dc_restore.h --- /usr/ports/comms/spandsp/files/patch-src-spandsp-dc_restore.h Thu Jun 30 18:22:38 2005 +++ /usr/home/trn/port-work/spandsp/files/patch-src-spandsp-dc_restore.h Sun Jan 22 00:20:31 2006 @@ -1,14 +1,20 @@ ---- src/spandsp/dc_restore.h.orig Tue Jan 18 15:05:48 2005 -+++ src/spandsp/dc_restore.h Thu Jun 30 22:35:33 2005 -@@ -85,6 +85,11 @@ - } - /*- End of function --------------------------------------------------------*/ - -+#ifndef INT16_MAX -+#define INT16_MAX 0x7fff -+#define INT16_MIN (-0x7fff-1) -+#endif -+ - static inline int16_t saturate(int32_t amp) - { - if (amp > INT16_MAX) +*** src/spandsp/dc_restore.h.orig Wed Nov 23 12:09:47 2005 +--- src/spandsp/dc_restore.h Sun Jan 22 00:19:53 2006 +*************** +*** 83,92 **** +--- 83,97 ---- + { + return (dc->state >> 15); + } + /*- End of function --------------------------------------------------------*/ + ++ #ifndef INT16_MAX ++ #define INT16_MAX 0x7fff ++ #define INT16_MIN (-0x7fff-1) ++ #endif ++ + static __inline__ int16_t saturate(int32_t amp) + { + if (amp > INT16_MAX) + return INT16_MAX; + if (amp < INT16_MIN) diff -ruN --exclude=CVS /usr/ports/comms/spandsp/files/patch-src-t31.c /usr/home/trn/port-work/spandsp/files/patch-src-t31.c --- /usr/ports/comms/spandsp/files/patch-src-t31.c Thu Jun 30 18:22:38 2005 +++ /usr/home/trn/port-work/spandsp/files/patch-src-t31.c Sun Jan 22 00:23:14 2006 @@ -1,28 +1,45 @@ ---- src/t31.c.orig Thu Jun 30 23:07:14 2005 -+++ src/t31.c Thu Jun 30 23:10:28 2005 -@@ -51,19 +51,12 @@ - t31_profile_t profiles[3] = - { - { -- .echo = TRUE, -- .verbose = TRUE, -- .result_code_format = ASCII_RESULT_CODES, -- .pulse_dial = FALSE, -- .double_escape = FALSE, -- .s_regs[0] = 0, -- .s_regs[3] = '\r', -- .s_regs[4] = '\n', -- .s_regs[5] = '\b', -- .s_regs[6] = 1, -- .s_regs[7] = 60, -- .s_regs[8] = 5, -- .s_regs[10] = 0 -+ TRUE, -+ TRUE, -+ ASCII_RESULT_CODES, -+ FALSE, -+ FALSE, -+ { 0, 0, 0, '\r', '\n', '\b', 1, 60, 5, 0 } - } - }; - +*** src/t31.c.orig Wed Dec 28 00:33:45 2005 +--- src/t31.c Sun Jan 22 00:22:47 2006 +*************** +*** 73,96 **** + }; + + t31_profile_t profiles[3] = + { + { +! .echo = TRUE, +! .verbose = TRUE, +! .result_code_format = ASCII_RESULT_CODES, +! .pulse_dial = FALSE, +! .double_escape = FALSE, +! .adaptive_receive = FALSE, +! .s_regs[0] = 0, +! .s_regs[3] = '\r', +! .s_regs[4] = '\n', +! .s_regs[5] = '\b', +! .s_regs[6] = 1, +! .s_regs[7] = 60, +! .s_regs[8] = 5, +! .s_regs[10] = 0 + } + }; + + typedef const char *(*at_cmd_service_t)(t31_state_t *s, const char *cmd); + +--- 73,88 ---- + }; + + t31_profile_t profiles[3] = + { + { +! TRUE, +! TRUE, +! ASCII_RESULT_CODES, +! FALSE, +! FALSE, +! { 0, 0, 0, '\r', '\n', '\b', 1, 60, 5, 0 } + } + }; + + typedef const char *(*at_cmd_service_t)(t31_state_t *s, const char *cmd); + diff -ruN --exclude=CVS /usr/ports/comms/spandsp/pkg-plist /usr/home/trn/port-work/spandsp/pkg-plist --- /usr/ports/comms/spandsp/pkg-plist Sun Dec 4 01:34:57 2005 +++ /usr/home/trn/port-work/spandsp/pkg-plist Sun Jan 22 00:27:23 2006 @@ -1,7 +1,7 @@ -include/spandsp.h -include/spandsp/adsi.h include/spandsp/alaw_ulaw.h +include/spandsp/adsi.h include/spandsp/arctan2.h +include/spandsp/async.h include/spandsp/awgn.h include/spandsp/bert.h include/spandsp/biquad.h @@ -9,18 +9,21 @@ include/spandsp/complex_filters.h include/spandsp/dc_restore.h include/spandsp/dds.h -include/spandsp/ec_disable_detector.h +include/spandsp/ec_disable_tone.h include/spandsp/echo.h include/spandsp/fir.h include/spandsp/fsk.h include/spandsp/g168models.h +include/spandsp/g722.h +include/spandsp/g726.h include/spandsp/hdlc.h include/spandsp/ima_adpcm.h include/spandsp/logging.h include/spandsp/mmx.h include/spandsp/modem_echo.h -include/spandsp/oki_adpcm.h +include/spandsp/noise.h include/spandsp/oss.h +include/spandsp/oki_adpcm.h include/spandsp/playout.h include/spandsp/plc.h include/spandsp/power_meter.h @@ -29,11 +32,11 @@ include/spandsp/sig_tone.h include/spandsp/super_tone_rx.h include/spandsp/super_tone_tx.h +include/spandsp/t4.h include/spandsp/t30.h include/spandsp/t30_fcf.h include/spandsp/t31.h include/spandsp/t35.h -include/spandsp/t4.h include/spandsp/telephony.h include/spandsp/time_scale.h include/spandsp/timing.h @@ -50,9 +53,10 @@ include/spandsp/v42bis.h include/spandsp/v8.h include/spandsp/vector.h -lib/libspandsp.a -lib/libspandsp.so +include/spandsp.h lib/libspandsp.so.0 +lib/libspandsp.so +lib/libspandsp.a %%DATADIR%%/global-tones.xml %%DATADIR%%/tones.dtd @dirrm %%DATADIR%% --- spandsp-0.0.2.p22.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060122060009.1A56839833>