diff options
Diffstat (limited to '')
| -rw-r--r-- | net/asterisk16/Makefile | 24 | ||||
| -rw-r--r-- | net/asterisk16/files/patch-channels-chan_dahdi.c | 32 | ||||
| -rw-r--r-- | net/asterisk16/pkg-plist | 15 |
3 files changed, 52 insertions, 19 deletions
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index f986a03350d9..72b5c1bb0f85 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -60,12 +60,12 @@ OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ .include <bsd.port.pre.mk> -#.if ${ARCH} == "i386" || ${ARCH} == "amd64" -#OPTIONS+= ZAPTEL "Enable Zaptel support" off +.if ${ARCH} == "i386" || ${ARCH} == "amd64" +OPTIONS+= DAHDI "Enable DAHDI support" on # Include this since we have altered OPTIONS. -#.include "$(PORTSDIR)/Mk/bsd.port.options.mk" -#.endif +.include "$(PORTSDIR)/Mk/bsd.port.options.mk" +.endif .if !defined(WITH_H323) PLIST_SUB+= WITH_H323="@comment " @@ -77,16 +77,16 @@ LIB_DEPENDS+= pt_r.1:${PORTSDIR}/devel/pwlib \ h323_r.1:${PORTSDIR}/net/openh323 .endif -.if !defined(WITH_ZAPTEL) -PLIST_SUB+= WITH_ZAPTEL="@comment " -CONFIGURE_ARGS+= --without-zaptel +.if !defined(WITH_DAHDI) +PLIST_SUB+= WITH_DAHDI="@comment " +CONFIGURE_ARGS+= --without-dahdi .else -PLIST_SUB+= WITH_ZAPTEL="" -CONFIGURE_ARGS+= --with-zaptel -BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel +PLIST_SUB+= WITH_DAHDI="" +CONFIGURE_ARGS+= --with-dahdi +BUILD_DEPENDS+= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ + ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel +RUN_DEPENDS+= ${LOCALBASE}/lib/dahdi/dahdi.ko:${PORTSDIR}/misc/dahdi .endif # diff --git a/net/asterisk16/files/patch-channels-chan_dahdi.c b/net/asterisk16/files/patch-channels-chan_dahdi.c new file mode 100644 index 000000000000..b856d3266c2a --- /dev/null +++ b/net/asterisk16/files/patch-channels-chan_dahdi.c @@ -0,0 +1,32 @@ +--- channels/chan_dahdi.c.orig 2009-10-22 17:19:21.568250985 +0000 ++++ channels/chan_dahdi.c 2009-10-22 17:26:26.261584076 +0000 +@@ -1997,13 +1997,17 @@ + return; + } + if (p->echocancel.head.tap_length) { ++ struct dahdi_echocanparams *pecp; ++ + if ((p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP) || (p->sig == SIG_PRI) || (p->sig == SIG_SS7)) { + x = 1; + res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &x); + if (res) + ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno)); + } +- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel); ++ ++ pecp = &p->echocancel.head; ++ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); + if (res) { + ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); + } else { +@@ -2037,8 +2041,9 @@ + + if (p->echocanon) { + struct dahdi_echocanparams ecp = { .tap_length = 0 }; ++ struct dahdi_echocanparams *pecp = &ecp; + +- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp); ++ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); + + if (res) + ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno)); diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist index e4d415450203..c0652c26acf5 100644 --- a/net/asterisk16/pkg-plist +++ b/net/asterisk16/pkg-plist @@ -963,16 +963,17 @@ share/asterisk/static-http/ajamdemo.html share/asterisk/static-http/astman.css share/asterisk/static-http/astman.js share/asterisk/static-http/prototype.js -%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdibarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdiras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdiscan.so +%%WITH_DAHDI%%lib/asterisk/modules/app_flash.so +%%WITH_DAHDI%%lib/asterisk/modules/app_meetme.so +%%WITH_DAHDI%%lib/asterisk/modules/app_page.so +%%WITH_DAHDI%%lib/asterisk/modules/app_dahdibarge.so +%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiras.so +%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiscan.so %%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so %%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so %%WITH_H323%%lib/asterisk/modules/chan_h323.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_dahdi.so +%%WITH_DAHDI%%lib/asterisk/modules/chan_dahdi.so +%%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so %%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so %%WITH_ODBC%%lib/asterisk/modules/res_odbc.so %%DOCSDIR%%/WARNINGS |