diff options
22 files changed, 84 insertions, 262 deletions
diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile index 2ac4a651ad28..8bf0f6f21f10 100644 --- a/comms/spandsp-devel/Makefile +++ b/comms/spandsp-devel/Makefile @@ -1,24 +1,25 @@ -# New ports collection makefile for: spandsp -# Date created: 23 June 2005 -# Whom: wlloyd@slap.net +# New ports collection makefile for: spandsp-devel +# Date created: 2007-01-13 +# Whom: Joe Holden <joe@joeholden.co.uk> # # $FreeBSD$ # PORTNAME= spandsp -DISTVERSION= 0.0.2pre26 +DISTVERSION= 0.0.3pre27 CATEGORIES= comms -MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/${PORTNAME}-${DISTVERSION}/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= pav +MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/ \ + ftp://ftp.rewt.org.uk/pub/distfiles/ +PKGNAMESUFFIX= -devel +DISTNAME= spandsp-${DISTVERSION} +EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org -COMMENT= Fax DSP library for Asterisk +MAINTAINER= joe@joeholden.co.uk +COMMENT= Fax DSP library LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//} - +WRKSRC= ${WRKDIR}/spandsp-0.0.3/ USE_GMAKE= yes GNU_CONFIGURE= yes @@ -27,12 +28,12 @@ CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ USE_LDCONFIG= yes +CONFLICTS= spandsp-[0-9]* + .include <bsd.port.pre.mk> -post-patch: - @${FIND} ${WRKSRC} -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' -.if ${OSVERSION} < 503000 - ${ECHO} '#define lrintf(x) ((int16_t)rintf(x))' > ${WRKSRC}/src/tgmath.h +.if ${OSVERSION} < 500000 +BROKEN= Does not compile on 4.x .endif .include <bsd.port.post.mk> diff --git a/comms/spandsp-devel/distinfo b/comms/spandsp-devel/distinfo index 6d367c0f090d..9d1c1c260ca9 100644 --- a/comms/spandsp-devel/distinfo +++ b/comms/spandsp-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (spandsp-0.0.2pre26.tar.gz) = 2b28a75b1d7c49616534bd7264317241 -SHA256 (spandsp-0.0.2pre26.tar.gz) = 57ac136a61974eb6c8cfd81bab14a514a04a3be8c513cc1682524ec4082d0fc8 -SIZE (spandsp-0.0.2pre26.tar.gz) = 1417752 +MD5 (spandsp-0.0.3pre27.tgz) = 2ed944d0c15d4ac0c70de9624ce98cd4 +SHA256 (spandsp-0.0.3pre27.tgz) = a2c9b07c2f3c35d7d207b5e8bced8e1795381b38bb37aafa1fa6b38bdcadef06 +SIZE (spandsp-0.0.3pre27.tgz) = 1591379 diff --git a/comms/spandsp-devel/files/patch-src-Makefile.in b/comms/spandsp-devel/files/patch-src-Makefile.in deleted file mode 100644 index de339f157d18..000000000000 --- a/comms/spandsp-devel/files/patch-src-Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- src/Makefile.in.orig -+++ src/Makefile.in -@@ -195,9 +195,9 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --AM_CFLAGS = -std=c99 -+#AM_CFLAGS = -std=c99 - MAINTAINERCLEANFILES = Makefile.in --INCLUDES = -I$(top_builddir) -+#INCLUDES = -I$(top_builddir) - lib_LTLIBRARIES = libspandsp.la - libspandsp_la_SOURCES = adsi.c \ - async.c \ diff --git a/comms/spandsp-devel/files/patch-src-playout.c b/comms/spandsp-devel/files/patch-src-playout.c deleted file mode 100644 index 2674f62f0de3..000000000000 --- a/comms/spandsp-devel/files/patch-src-playout.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/playout.c~ Fri Feb 4 14:19:30 2005 -+++ src/playout.c Thu Jun 23 15:35:06 2005 -@@ -37,6 +37,7 @@ - #include <stdlib.h> - #include <string.h> - #include <limits.h> -+#include <sys/types.h> - - #include "spandsp/telephony.h" - #include "spandsp/playout.h" diff --git a/comms/spandsp-devel/files/patch-src-spandsp-dc_restore.h b/comms/spandsp-devel/files/patch-src-spandsp-dc_restore.h deleted file mode 100644 index dec6fcf8e048..000000000000 --- a/comms/spandsp-devel/files/patch-src-spandsp-dc_restore.h +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- src/spandsp/dc_restore.h.orig -+++ src/spandsp/dc_restore.h -@@ -53,6 +53,11 @@ - clean_sample = sample - (dc_bias >> 15); - */ - -+#ifndef INT16_MAX -+#define INT16_MAX 0x7fff -+#define INT16_MIN (-0x7fff-1) -+#endif -+ - /*! - Zero DC restoration descriptor. This defines the working state for a single - instance of DC content filter. diff --git a/comms/spandsp-devel/files/patch-src::awgn.c b/comms/spandsp-devel/files/patch-src::awgn.c deleted file mode 100644 index b4a45a08bb4e..000000000000 --- a/comms/spandsp-devel/files/patch-src::awgn.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/awgn.c -+++ src/awgn.c -@@ -51,6 +51,7 @@ - #include <stdio.h> - #include <inttypes.h> - #include <math.h> -+#include <tgmath.h> - - #include "spandsp/dc_restore.h" - #include "spandsp/awgn.h" diff --git a/comms/spandsp-devel/files/patch-src::t31.c b/comms/spandsp-devel/files/patch-src::t31.c deleted file mode 100644 index ba190efb6216..000000000000 --- a/comms/spandsp-devel/files/patch-src::t31.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- src/t31.c -+++ src/t31.c -@@ -81,14 +81,7 @@ - .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 -+ .s_regs = { 0, 0, 0, '\r', '\n', '\b', 1, 60, 5, 0, 0 } - } - }; - diff --git a/comms/spandsp-devel/files/patch-src::tone_generate.c b/comms/spandsp-devel/files/patch-src::tone_generate.c deleted file mode 100644 index e0a5f895152b..000000000000 --- a/comms/spandsp-devel/files/patch-src::tone_generate.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/tone_generate.c -+++ src/tone_generate.c -@@ -39,6 +39,7 @@ - #include <stdio.h> - #include <time.h> - #include <fcntl.h> -+#include <tgmath.h> - - #include "spandsp/telephony.h" - #include "spandsp/dc_restore.h" diff --git a/comms/spandsp-devel/files/patch-src::v17tx.c b/comms/spandsp-devel/files/patch-src::v17tx.c deleted file mode 100644 index 00d8803ec315..000000000000 --- a/comms/spandsp-devel/files/patch-src::v17tx.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/v17tx.c -+++ src/v17tx.c -@@ -39,6 +39,7 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> -+#include <tgmath.h> - - #include "spandsp/telephony.h" - #include "spandsp/logging.h" diff --git a/comms/spandsp-devel/pkg-descr b/comms/spandsp-devel/pkg-descr index a19fea158bbc..81d95f93eaad 100644 --- a/comms/spandsp-devel/pkg-descr +++ b/comms/spandsp-devel/pkg-descr @@ -1,4 +1,4 @@ -Spandsp is a DSP library to support fax functions in the Asterisk PBX. +Spandsp is a DSP library to support fax functions. Basically it implements a software fax machine to fax out or in. WWW: http://www.soft-switch.org/ diff --git a/comms/spandsp-devel/pkg-plist b/comms/spandsp-devel/pkg-plist index e46d42c9ce21..41307c274be0 100644 --- a/comms/spandsp-devel/pkg-plist +++ b/comms/spandsp-devel/pkg-plist @@ -1,42 +1,53 @@ include/spandsp.h include/spandsp/adsi.h -include/spandsp/alaw_ulaw.h include/spandsp/arctan2.h include/spandsp/async.h +include/spandsp/at_interpreter.h include/spandsp/awgn.h +include/spandsp/bell_r2_mf.h include/spandsp/bert.h include/spandsp/biquad.h +include/spandsp/bit_operations.h +include/spandsp/bitstream.h include/spandsp/complex.h include/spandsp/complex_filters.h +include/spandsp/complex_vector_float.h include/spandsp/dc_restore.h include/spandsp/dds.h -include/spandsp/ec_disable_tone.h +include/spandsp/dtmf.h include/spandsp/echo.h +include/spandsp/fax.h include/spandsp/fir.h include/spandsp/fsk.h include/spandsp/g168models.h +include/spandsp/g711.h include/spandsp/g722.h include/spandsp/g726.h +include/spandsp/gsm0610.h include/spandsp/hdlc.h include/spandsp/ima_adpcm.h include/spandsp/logging.h -include/spandsp/mmx.h +include/spandsp/lpc10.h +include/spandsp/modem_connect_tones.h include/spandsp/modem_echo.h include/spandsp/noise.h include/spandsp/oki_adpcm.h -include/spandsp/oss.h include/spandsp/playout.h include/spandsp/plc.h include/spandsp/power_meter.h include/spandsp/queue.h include/spandsp/schedule.h include/spandsp/sig_tone.h +include/spandsp/silence_gen.h include/spandsp/super_tone_rx.h include/spandsp/super_tone_tx.h include/spandsp/t30.h include/spandsp/t30_fcf.h include/spandsp/t31.h include/spandsp/t35.h +include/spandsp/t38_core.h +include/spandsp/t38_gateway.h +include/spandsp/t38_terminal.h include/spandsp/t4.h include/spandsp/telephony.h include/spandsp/time_scale.h @@ -53,12 +64,15 @@ include/spandsp/v29tx.h include/spandsp/v42.h include/spandsp/v42bis.h include/spandsp/v8.h -include/spandsp/vector.h +include/spandsp/vector_float.h +include/spandsp/vector_int.h lib/libspandsp.a lib/libspandsp.la lib/libspandsp.so lib/libspandsp.so.0 -%%DATADIR%%/global-tones.xml -%%DATADIR%%/tones.dtd -@dirrm %%DATADIR%% +share/spandsp/global-tones.xml +share/spandsp/tones.dtd +@dirrm share/spandsp +@dirrm share/nls/en_US.US-ASCII +@dirrm share/nls/POSIX @dirrm include/spandsp diff --git a/comms/spandsp-devel5/Makefile b/comms/spandsp-devel5/Makefile index 2ac4a651ad28..8bf0f6f21f10 100644 --- a/comms/spandsp-devel5/Makefile +++ b/comms/spandsp-devel5/Makefile @@ -1,24 +1,25 @@ -# New ports collection makefile for: spandsp -# Date created: 23 June 2005 -# Whom: wlloyd@slap.net +# New ports collection makefile for: spandsp-devel +# Date created: 2007-01-13 +# Whom: Joe Holden <joe@joeholden.co.uk> # # $FreeBSD$ # PORTNAME= spandsp -DISTVERSION= 0.0.2pre26 +DISTVERSION= 0.0.3pre27 CATEGORIES= comms -MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/${PORTNAME}-${DISTVERSION}/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= pav +MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/ \ + ftp://ftp.rewt.org.uk/pub/distfiles/ +PKGNAMESUFFIX= -devel +DISTNAME= spandsp-${DISTVERSION} +EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org -COMMENT= Fax DSP library for Asterisk +MAINTAINER= joe@joeholden.co.uk +COMMENT= Fax DSP library LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//} - +WRKSRC= ${WRKDIR}/spandsp-0.0.3/ USE_GMAKE= yes GNU_CONFIGURE= yes @@ -27,12 +28,12 @@ CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ USE_LDCONFIG= yes +CONFLICTS= spandsp-[0-9]* + .include <bsd.port.pre.mk> -post-patch: - @${FIND} ${WRKSRC} -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' -.if ${OSVERSION} < 503000 - ${ECHO} '#define lrintf(x) ((int16_t)rintf(x))' > ${WRKSRC}/src/tgmath.h +.if ${OSVERSION} < 500000 +BROKEN= Does not compile on 4.x .endif .include <bsd.port.post.mk> diff --git a/comms/spandsp-devel5/distinfo b/comms/spandsp-devel5/distinfo index 6d367c0f090d..9d1c1c260ca9 100644 --- a/comms/spandsp-devel5/distinfo +++ b/comms/spandsp-devel5/distinfo @@ -1,3 +1,3 @@ -MD5 (spandsp-0.0.2pre26.tar.gz) = 2b28a75b1d7c49616534bd7264317241 -SHA256 (spandsp-0.0.2pre26.tar.gz) = 57ac136a61974eb6c8cfd81bab14a514a04a3be8c513cc1682524ec4082d0fc8 -SIZE (spandsp-0.0.2pre26.tar.gz) = 1417752 +MD5 (spandsp-0.0.3pre27.tgz) = 2ed944d0c15d4ac0c70de9624ce98cd4 +SHA256 (spandsp-0.0.3pre27.tgz) = a2c9b07c2f3c35d7d207b5e8bced8e1795381b38bb37aafa1fa6b38bdcadef06 +SIZE (spandsp-0.0.3pre27.tgz) = 1591379 diff --git a/comms/spandsp-devel5/files/patch-src-Makefile.in b/comms/spandsp-devel5/files/patch-src-Makefile.in deleted file mode 100644 index de339f157d18..000000000000 --- a/comms/spandsp-devel5/files/patch-src-Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- src/Makefile.in.orig -+++ src/Makefile.in -@@ -195,9 +195,9 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --AM_CFLAGS = -std=c99 -+#AM_CFLAGS = -std=c99 - MAINTAINERCLEANFILES = Makefile.in --INCLUDES = -I$(top_builddir) -+#INCLUDES = -I$(top_builddir) - lib_LTLIBRARIES = libspandsp.la - libspandsp_la_SOURCES = adsi.c \ - async.c \ diff --git a/comms/spandsp-devel5/files/patch-src-playout.c b/comms/spandsp-devel5/files/patch-src-playout.c deleted file mode 100644 index 2674f62f0de3..000000000000 --- a/comms/spandsp-devel5/files/patch-src-playout.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/playout.c~ Fri Feb 4 14:19:30 2005 -+++ src/playout.c Thu Jun 23 15:35:06 2005 -@@ -37,6 +37,7 @@ - #include <stdlib.h> - #include <string.h> - #include <limits.h> -+#include <sys/types.h> - - #include "spandsp/telephony.h" - #include "spandsp/playout.h" diff --git a/comms/spandsp-devel5/files/patch-src-spandsp-dc_restore.h b/comms/spandsp-devel5/files/patch-src-spandsp-dc_restore.h deleted file mode 100644 index dec6fcf8e048..000000000000 --- a/comms/spandsp-devel5/files/patch-src-spandsp-dc_restore.h +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- src/spandsp/dc_restore.h.orig -+++ src/spandsp/dc_restore.h -@@ -53,6 +53,11 @@ - clean_sample = sample - (dc_bias >> 15); - */ - -+#ifndef INT16_MAX -+#define INT16_MAX 0x7fff -+#define INT16_MIN (-0x7fff-1) -+#endif -+ - /*! - Zero DC restoration descriptor. This defines the working state for a single - instance of DC content filter. diff --git a/comms/spandsp-devel5/files/patch-src::awgn.c b/comms/spandsp-devel5/files/patch-src::awgn.c deleted file mode 100644 index b4a45a08bb4e..000000000000 --- a/comms/spandsp-devel5/files/patch-src::awgn.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/awgn.c -+++ src/awgn.c -@@ -51,6 +51,7 @@ - #include <stdio.h> - #include <inttypes.h> - #include <math.h> -+#include <tgmath.h> - - #include "spandsp/dc_restore.h" - #include "spandsp/awgn.h" diff --git a/comms/spandsp-devel5/files/patch-src::t31.c b/comms/spandsp-devel5/files/patch-src::t31.c deleted file mode 100644 index ba190efb6216..000000000000 --- a/comms/spandsp-devel5/files/patch-src::t31.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- src/t31.c -+++ src/t31.c -@@ -81,14 +81,7 @@ - .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 -+ .s_regs = { 0, 0, 0, '\r', '\n', '\b', 1, 60, 5, 0, 0 } - } - }; - diff --git a/comms/spandsp-devel5/files/patch-src::tone_generate.c b/comms/spandsp-devel5/files/patch-src::tone_generate.c deleted file mode 100644 index e0a5f895152b..000000000000 --- a/comms/spandsp-devel5/files/patch-src::tone_generate.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/tone_generate.c -+++ src/tone_generate.c -@@ -39,6 +39,7 @@ - #include <stdio.h> - #include <time.h> - #include <fcntl.h> -+#include <tgmath.h> - - #include "spandsp/telephony.h" - #include "spandsp/dc_restore.h" diff --git a/comms/spandsp-devel5/files/patch-src::v17tx.c b/comms/spandsp-devel5/files/patch-src::v17tx.c deleted file mode 100644 index 00d8803ec315..000000000000 --- a/comms/spandsp-devel5/files/patch-src::v17tx.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/v17tx.c -+++ src/v17tx.c -@@ -39,6 +39,7 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> -+#include <tgmath.h> - - #include "spandsp/telephony.h" - #include "spandsp/logging.h" diff --git a/comms/spandsp-devel5/pkg-descr b/comms/spandsp-devel5/pkg-descr index a19fea158bbc..81d95f93eaad 100644 --- a/comms/spandsp-devel5/pkg-descr +++ b/comms/spandsp-devel5/pkg-descr @@ -1,4 +1,4 @@ -Spandsp is a DSP library to support fax functions in the Asterisk PBX. +Spandsp is a DSP library to support fax functions. Basically it implements a software fax machine to fax out or in. WWW: http://www.soft-switch.org/ diff --git a/comms/spandsp-devel5/pkg-plist b/comms/spandsp-devel5/pkg-plist index e46d42c9ce21..41307c274be0 100644 --- a/comms/spandsp-devel5/pkg-plist +++ b/comms/spandsp-devel5/pkg-plist @@ -1,42 +1,53 @@ include/spandsp.h include/spandsp/adsi.h -include/spandsp/alaw_ulaw.h include/spandsp/arctan2.h include/spandsp/async.h +include/spandsp/at_interpreter.h include/spandsp/awgn.h +include/spandsp/bell_r2_mf.h include/spandsp/bert.h include/spandsp/biquad.h +include/spandsp/bit_operations.h +include/spandsp/bitstream.h include/spandsp/complex.h include/spandsp/complex_filters.h +include/spandsp/complex_vector_float.h include/spandsp/dc_restore.h include/spandsp/dds.h -include/spandsp/ec_disable_tone.h +include/spandsp/dtmf.h include/spandsp/echo.h +include/spandsp/fax.h include/spandsp/fir.h include/spandsp/fsk.h include/spandsp/g168models.h +include/spandsp/g711.h include/spandsp/g722.h include/spandsp/g726.h +include/spandsp/gsm0610.h include/spandsp/hdlc.h include/spandsp/ima_adpcm.h include/spandsp/logging.h -include/spandsp/mmx.h +include/spandsp/lpc10.h +include/spandsp/modem_connect_tones.h include/spandsp/modem_echo.h include/spandsp/noise.h include/spandsp/oki_adpcm.h -include/spandsp/oss.h include/spandsp/playout.h include/spandsp/plc.h include/spandsp/power_meter.h include/spandsp/queue.h include/spandsp/schedule.h include/spandsp/sig_tone.h +include/spandsp/silence_gen.h include/spandsp/super_tone_rx.h include/spandsp/super_tone_tx.h include/spandsp/t30.h include/spandsp/t30_fcf.h include/spandsp/t31.h include/spandsp/t35.h +include/spandsp/t38_core.h +include/spandsp/t38_gateway.h +include/spandsp/t38_terminal.h include/spandsp/t4.h include/spandsp/telephony.h include/spandsp/time_scale.h @@ -53,12 +64,15 @@ include/spandsp/v29tx.h include/spandsp/v42.h include/spandsp/v42bis.h include/spandsp/v8.h -include/spandsp/vector.h +include/spandsp/vector_float.h +include/spandsp/vector_int.h lib/libspandsp.a lib/libspandsp.la lib/libspandsp.so lib/libspandsp.so.0 -%%DATADIR%%/global-tones.xml -%%DATADIR%%/tones.dtd -@dirrm %%DATADIR%% +share/spandsp/global-tones.xml +share/spandsp/tones.dtd +@dirrm share/spandsp +@dirrm share/nls/en_US.US-ASCII +@dirrm share/nls/POSIX @dirrm include/spandsp |