diff options
Diffstat (limited to '')
252 files changed, 0 insertions, 29157 deletions
diff --git a/net-im/chattahoochie/Makefile b/net-im/chattahoochie/Makefile deleted file mode 100644 index 0e38fd692f24..000000000000 --- a/net-im/chattahoochie/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# New ports collection makefile for: pickwick -# Date created: Fri, 30 Apr 2010 19:50:00 EDT -# Whom: James Bailie <jimmy@mammothcheese.ca> -# -# $FreeBSD$ -# - -PORTNAME= pickwick -PORTVERSION= 1.14 -CATEGORIES= net-im -MASTER_SITES= http://www.mammothcheese.ca/ - -MAINTAINER= jimmy@mammothcheese.ca -COMMENT= Small group plain-text chat server and client - -MAN8= pickwick.8 -MAN1= weller.1 -MANCOMPRESSED= yes - -.include <bsd.port.mk> diff --git a/net-im/chattahoochie/distinfo b/net-im/chattahoochie/distinfo deleted file mode 100644 index 3f7e4c31376e..000000000000 --- a/net-im/chattahoochie/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (pickwick-1.14.tar.gz) = c58869a57b45536fd7ac49396981c2c9 -SHA256 (pickwick-1.14.tar.gz) = 256e09abda905d07a62444036949beb8e0a999557940db97996cdc250a507dd2 -SIZE (pickwick-1.14.tar.gz) = 11960 diff --git a/net-im/chattahoochie/pkg-descr b/net-im/chattahoochie/pkg-descr deleted file mode 100644 index 8688ea0a3280..000000000000 --- a/net-im/chattahoochie/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Pickwick is a plain text small group chat server. It uses a simple -obfuscation scheme to keep traffic to and from the server unintelligible to -casual perusal. A client program, named weller(1) is also provided. - -WWW: http://www.mammothcheese.ca/ diff --git a/net-im/chattahoochie/pkg-plist b/net-im/chattahoochie/pkg-plist deleted file mode 100644 index 05dd9e755844..000000000000 --- a/net-im/chattahoochie/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/pickwick -bin/weller -etc/rc.d/pickwick diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile deleted file mode 100644 index 10c22bb83ac2..000000000000 --- a/net-im/skype-devel/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# New ports collection makefile for: skype-devel -# Date created: Jun 21. 2004 -# Whom: netchild@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= skype -PORTVERSION= 2.0.0.68 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://download.skype.com/linux/ -PKGNAMESUFFIX= -devel -DISTNAME= skype_static-${DISTVERSION}-oss - -MAINTAINER= itetcu@FreeBSD.org -COMMENT= P2P VoIP software - -RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ - ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \ - ${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20 \ - ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib - -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else -USE_LINUX_APPS+=dri -.endif - -USE_BZIP2= yes -USE_LINUX= yes -RESTRICTED= Redistribution prohibited. - -IGNORE= has moved, use net/skype instead - -WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss -SKYPEDIR= share/skype -PORTDOCS= LICENSE README -SUB_FILES= pkg-message -SUB_LIST= SKYPEDIR=${SKYPEDIR} -PLIST_SUB= SKYPEDIR=${SKYPEDIR} - -.include <bsd.port.pre.mk> - -post-patch: - @${MV} ${WRKSRC}/skype.desktop ${WRKSRC}/skype-devel.desktop - @${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype_devel --resources=${PREFIX}/${SKYPEDIR}|' \ - ${WRKSRC}/skype-devel.desktop - -do-build: - @${BRANDELF} -t Linux ${WRKSRC}/skype - -do-install: - @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL} ${WRKSRC}/skype-devel.desktop ${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png - @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_devel - @${CHMOD} a+rx ${PREFIX}/bin/skype_devel - @cd ${WRKSRC}/&&${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/ - -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net-im/skype-devel/distinfo b/net-im/skype-devel/distinfo deleted file mode 100644 index afbe78eeb483..000000000000 --- a/net-im/skype-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (skype_static-2.0.0.68-oss.tar.bz2) = a0f3d5fe5587d737fe96ae63354de005 -SHA256 (skype_static-2.0.0.68-oss.tar.bz2) = c90106e8b85af3af620ecb27e542016d1459751025a94c32466b0be73b0989f4 -SIZE (skype_static-2.0.0.68-oss.tar.bz2) = 21568297 diff --git a/net-im/skype-devel/files/pkg-message.in b/net-im/skype-devel/files/pkg-message.in deleted file mode 100644 index 320c5fd18814..000000000000 --- a/net-im/skype-devel/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ - -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -skype_devel has been installed in: - -%%PREFIX%%/bin/skype_devel - -If you are starting from a terminal, please use the following command: - skype_devel --resources=%%DATADIR%% - -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/net-im/skype-devel/pkg-descr b/net-im/skype-devel/pkg-descr deleted file mode 100644 index 06e936789071..000000000000 --- a/net-im/skype-devel/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Skype is a free program that uses the latest P2P technology to bring -affordable and high-quality voice communications to people all over -the world. - -WWW: http://www.skype.com/ diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist deleted file mode 100644 index 9f1be48485d7..000000000000 --- a/net-im/skype-devel/pkg-plist +++ /dev/null @@ -1,134 +0,0 @@ -bin/skype_devel -share/pixmaps/skype.png -share/applications/skype-devel.desktop -%%SKYPEDIR%%/avatars/Angel Skype.png -%%SKYPEDIR%%/avatars/Architect Skype.png -%%SKYPEDIR%%/avatars/Beach Skype.png -%%SKYPEDIR%%/avatars/Behind Skype.png -%%SKYPEDIR%%/avatars/Business Skype.png -%%SKYPEDIR%%/avatars/Call Me Sweetheart.png -%%SKYPEDIR%%/avatars/Call Me.png -%%SKYPEDIR%%/avatars/Carnaval Skype.png -%%SKYPEDIR%%/avatars/Chic Skype.png -%%SKYPEDIR%%/avatars/Christmas Skype.png -%%SKYPEDIR%%/avatars/College Skype.png -%%SKYPEDIR%%/avatars/DIY Skype.png -%%SKYPEDIR%%/avatars/DJ Skype.png -%%SKYPEDIR%%/avatars/Desert Skype.png -%%SKYPEDIR%%/avatars/Designer Skype.png -%%SKYPEDIR%%/avatars/Devil Skype.png -%%SKYPEDIR%%/avatars/Earbud Skype.png -%%SKYPEDIR%%/avatars/Empire Skype.png -%%SKYPEDIR%%/avatars/Fax Skype.png -%%SKYPEDIR%%/avatars/Geisha Skype.png -%%SKYPEDIR%%/avatars/Hula Skype.png -%%SKYPEDIR%%/avatars/Make Skype Not War.png -%%SKYPEDIR%%/avatars/Metal Skype.png -%%SKYPEDIR%%/avatars/Ninja Skype.png -%%SKYPEDIR%%/avatars/Party Skype.png -%%SKYPEDIR%%/avatars/Pop Skype.png -%%SKYPEDIR%%/avatars/Rice Skype.png -%%SKYPEDIR%%/avatars/Skypahontas.png -%%SKYPEDIR%%/avatars/Skype 502.png -%%SKYPEDIR%%/avatars/Skype Aid.png -%%SKYPEDIR%%/avatars/Skype Artiste.png -%%SKYPEDIR%%/avatars/Skype Beauty.png -%%SKYPEDIR%%/avatars/Skype Bling.png -%%SKYPEDIR%%/avatars/Skype Boarder.png -%%SKYPEDIR%%/avatars/Skype Brrr... .png -%%SKYPEDIR%%/avatars/Skype Candy.png -%%SKYPEDIR%%/avatars/Skype Cola.png -%%SKYPEDIR%%/avatars/Skype Cool Shades.png -%%SKYPEDIR%%/avatars/Skype Extreme.png -%%SKYPEDIR%%/avatars/Skype Goaaaaal.png -%%SKYPEDIR%%/avatars/Skype Headset.png -%%SKYPEDIR%%/avatars/Skype Jah.png -%%SKYPEDIR%%/avatars/Skype Jyve.png -%%SKYPEDIR%%/avatars/Skype Safety.png -%%SKYPEDIR%%/avatars/Skype San.png -%%SKYPEDIR%%/avatars/Skype Shorty.png -%%SKYPEDIR%%/avatars/Skype Smiley.png -%%SKYPEDIR%%/avatars/Skype Time.png -%%SKYPEDIR%%/avatars/Skype in a Bag.png -%%SKYPEDIR%%/avatars/Skype-a-Manger.png -%%SKYPEDIR%%/avatars/Skype-ahoy.png -%%SKYPEDIR%%/avatars/Skype-in-one.png -%%SKYPEDIR%%/avatars/Skype.png -%%SKYPEDIR%%/avatars/Skypers of the Caribbean.png -%%SKYPEDIR%%/avatars/Star Skype.png -%%SKYPEDIR%%/avatars/Sushi Skype.png -%%SKYPEDIR%%/avatars/The Skypeness.png -%%SKYPEDIR%%/avatars/Travel Skype.png -%%SKYPEDIR%%/avatars/Wetsuit Skype.png -%%SKYPEDIR%%/avatars/Yin Yang Skype.png -%%SKYPEDIR%%/icons/SkypeBlue_16x16.png -%%SKYPEDIR%%/icons/SkypeBlue_32x32.png -%%SKYPEDIR%%/icons/SkypeBlue_48x48.png -%%SKYPEDIR%%/lang/skype_bg.qm -%%SKYPEDIR%%/lang/skype_bg.ts -%%SKYPEDIR%%/lang/skype_de.qm -%%SKYPEDIR%%/lang/skype_de.ts -%%SKYPEDIR%%/lang/skype_en.qm -%%SKYPEDIR%%/lang/skype_en.ts -%%SKYPEDIR%%/lang/skype_es.qm -%%SKYPEDIR%%/lang/skype_es.ts -%%SKYPEDIR%%/lang/skype_et.qm -%%SKYPEDIR%%/lang/skype_et.ts -%%SKYPEDIR%%/lang/skype_fr.qm -%%SKYPEDIR%%/lang/skype_fr.ts -%%SKYPEDIR%%/lang/skype_it.qm -%%SKYPEDIR%%/lang/skype_it.ts -%%SKYPEDIR%%/lang/skype_ja.qm -%%SKYPEDIR%%/lang/skype_ja.ts -%%SKYPEDIR%%/lang/skype_ko.qm -%%SKYPEDIR%%/lang/skype_ko.ts -%%SKYPEDIR%%/lang/skype_lt.qm -%%SKYPEDIR%%/lang/skype_lt.ts -%%SKYPEDIR%%/lang/skype_lv.qm -%%SKYPEDIR%%/lang/skype_lv.ts -%%SKYPEDIR%%/lang/skype_pl.qm -%%SKYPEDIR%%/lang/skype_pl.ts -%%SKYPEDIR%%/lang/skype_pt_br.qm -%%SKYPEDIR%%/lang/skype_pt_br.ts -%%SKYPEDIR%%/lang/skype_pt_pt.qm -%%SKYPEDIR%%/lang/skype_pt_pt.ts -%%SKYPEDIR%%/lang/skype_ro.qm -%%SKYPEDIR%%/lang/skype_ro.ts -%%SKYPEDIR%%/lang/skype_ru.qm -%%SKYPEDIR%%/lang/skype_ru.ts -%%SKYPEDIR%%/lang/skype_th.qm -%%SKYPEDIR%%/lang/skype_th.ts -%%SKYPEDIR%%/lang/skype_tr.qm -%%SKYPEDIR%%/lang/skype_tr.ts -%%SKYPEDIR%%/lang/skype_zh_s.qm -%%SKYPEDIR%%/lang/skype_zh_s.ts -%%SKYPEDIR%%/lang/skype_zh_t.qm -%%SKYPEDIR%%/lang/skype_zh_t.ts -%%SKYPEDIR%%/sounds/CallBusy.wav -%%SKYPEDIR%%/sounds/CallConnecting.wav -%%SKYPEDIR%%/sounds/CallFailed.wav -%%SKYPEDIR%%/sounds/CallHangup.wav -%%SKYPEDIR%%/sounds/CallHold.wav -%%SKYPEDIR%%/sounds/CallRemoteHangup.wav -%%SKYPEDIR%%/sounds/CallResume.wav -%%SKYPEDIR%%/sounds/CallRingingIn.wav -%%SKYPEDIR%%/sounds/CallRingingOut.wav -%%SKYPEDIR%%/sounds/ChatIncoming.wav -%%SKYPEDIR%%/sounds/ChatIncomingInitial.wav -%%SKYPEDIR%%/sounds/ChatOutgoing.wav -%%SKYPEDIR%%/sounds/ContactAdded.wav -%%SKYPEDIR%%/sounds/ContactAuthRequest.wav -%%SKYPEDIR%%/sounds/ContactOffline.wav -%%SKYPEDIR%%/sounds/ContactOnline.wav -%%SKYPEDIR%%/sounds/SkypeLogin.wav -%%SKYPEDIR%%/sounds/SkypeLogout.wav -%%SKYPEDIR%%/sounds/TransferComplete.wav -%%SKYPEDIR%%/sounds/TransferFailed.wav -%%SKYPEDIR%%/sounds/TransferRequest.wav -%%SKYPEDIR%%/sounds/VoicemailReceived.wav -@dirrm %%SKYPEDIR%%/sounds -@dirrm %%SKYPEDIR%%/lang -@dirrm %%SKYPEDIR%%/icons -@dirrm %%SKYPEDIR%%/avatars -@dirrm %%SKYPEDIR%% -@dirrmtry share/applications diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile deleted file mode 100644 index cf28555ceeec..000000000000 --- a/net-im/skype/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# New ports collection makefile for: skype -# Date created: Jun 21. 2004 -# Whom: netchild@FreeBSD.org -# -# Maintainers: Ion-Mihai Tetcu <itetcu@FreeBSD.org> -# Martin Wilke <miwi@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= skype -PORTVERSION= 2.0.0.72 -PORTEPOCH= 1 -CATEGORIES= net -MASTER_SITES= http://download.skype.com/linux/ -DISTNAME= skype_static-${DISTVERSION}-oss - -MAINTAINER= itetcu@FreeBSD.org -COMMENT= P2P VoIP software - -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -USE_LINUX_APPS+=xorglibs -.else -USE_LINUX_APPS+=dri -.endif - -BROKEN= This is the last version of skype that works on FreeBSD, but the distfile is no longer available from the vendor, and won't be in the future. We are working on alternative solutions. - -USE_BZIP2= yes -USE_LINUX= yes -USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20 -RESTRICTED= Redistribution prohibited. - -WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss -SKYPEDIR= share/skype -PORTDOCS= LICENSE README -PLIST_SUB+= SKYPEDIR=${SKYPEDIR} -SUB_FILES= skype.sh -SUB_LIST+= SKYPEDIR=${SKYPEDIR} - -.include <bsd.port.pre.mk> - -pre-fetch: - @${ECHO_MSG} "" - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * *" - @${ECHO_MSG} "ATTENTION!" - @${ECHO_MSG} "" - @${ECHO_MSG} "Skype requires at least linux_base-fc6" - @${ECHO_MSG} "which is NOT default at this time." - @${ECHO_MSG} "If you don't have that version or above installed," - @${ECHO_MSG} "hit 'control c' now!" - @${ECHO_MSG} "" - @${ECHO_MSG} "Please read ${PORTSDIR}/UPDATING 20080318" - @${ECHO_MSG} "for update and install instructions." - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * *" - @${ECHO_MSG} "" - -do-build: - @${BRANDELF} -t Linux ${WRKSRC}/skype - -do-install: - @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png - @cd ${WRKSRC}/ && ${MKDIR} ${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/ - -# The binary main program - @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/ - -# The wrapper for main program - @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype - -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - -.include <bsd.port.post.mk> diff --git a/net-im/skype/distinfo b/net-im/skype/distinfo deleted file mode 100644 index 30a1076738ff..000000000000 --- a/net-im/skype/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (skype_static-2.0.0.72-oss.tar.bz2) = ff41dd31906484863884ee0a7da441c1 -SHA256 (skype_static-2.0.0.72-oss.tar.bz2) = dbb70b25ec16202b867d8336649c8314f9fd8d224cf78ee444f168c8a67e5b6c -SIZE (skype_static-2.0.0.72-oss.tar.bz2) = 21587040 diff --git a/net-im/skype/files/skype.sh.in b/net-im/skype/files/skype.sh.in deleted file mode 100644 index b621c6483699..000000000000 --- a/net-im/skype/files/skype.sh.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% $@ - diff --git a/net-im/skype/pkg-descr b/net-im/skype/pkg-descr deleted file mode 100644 index 06e936789071..000000000000 --- a/net-im/skype/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Skype is a free program that uses the latest P2P technology to bring -affordable and high-quality voice communications to people all over -the world. - -WWW: http://www.skype.com/ diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist deleted file mode 100644 index ab473316b8d1..000000000000 --- a/net-im/skype/pkg-plist +++ /dev/null @@ -1,135 +0,0 @@ -bin/skype -share/pixmaps/skype.png -share/applications/skype.desktop -%%SKYPEDIR%%/skype -%%SKYPEDIR%%/avatars/Angel Skype.png -%%SKYPEDIR%%/avatars/Architect Skype.png -%%SKYPEDIR%%/avatars/Beach Skype.png -%%SKYPEDIR%%/avatars/Behind Skype.png -%%SKYPEDIR%%/avatars/Business Skype.png -%%SKYPEDIR%%/avatars/Call Me Sweetheart.png -%%SKYPEDIR%%/avatars/Call Me.png -%%SKYPEDIR%%/avatars/Carnaval Skype.png -%%SKYPEDIR%%/avatars/Chic Skype.png -%%SKYPEDIR%%/avatars/Christmas Skype.png -%%SKYPEDIR%%/avatars/College Skype.png -%%SKYPEDIR%%/avatars/DIY Skype.png -%%SKYPEDIR%%/avatars/DJ Skype.png -%%SKYPEDIR%%/avatars/Desert Skype.png -%%SKYPEDIR%%/avatars/Designer Skype.png -%%SKYPEDIR%%/avatars/Devil Skype.png -%%SKYPEDIR%%/avatars/Earbud Skype.png -%%SKYPEDIR%%/avatars/Empire Skype.png -%%SKYPEDIR%%/avatars/Fax Skype.png -%%SKYPEDIR%%/avatars/Geisha Skype.png -%%SKYPEDIR%%/avatars/Hula Skype.png -%%SKYPEDIR%%/avatars/Make Skype Not War.png -%%SKYPEDIR%%/avatars/Metal Skype.png -%%SKYPEDIR%%/avatars/Ninja Skype.png -%%SKYPEDIR%%/avatars/Party Skype.png -%%SKYPEDIR%%/avatars/Pop Skype.png -%%SKYPEDIR%%/avatars/Rice Skype.png -%%SKYPEDIR%%/avatars/Skypahontas.png -%%SKYPEDIR%%/avatars/Skype 502.png -%%SKYPEDIR%%/avatars/Skype Aid.png -%%SKYPEDIR%%/avatars/Skype Artiste.png -%%SKYPEDIR%%/avatars/Skype Beauty.png -%%SKYPEDIR%%/avatars/Skype Bling.png -%%SKYPEDIR%%/avatars/Skype Boarder.png -%%SKYPEDIR%%/avatars/Skype Brrr... .png -%%SKYPEDIR%%/avatars/Skype Candy.png -%%SKYPEDIR%%/avatars/Skype Cola.png -%%SKYPEDIR%%/avatars/Skype Cool Shades.png -%%SKYPEDIR%%/avatars/Skype Extreme.png -%%SKYPEDIR%%/avatars/Skype Goaaaaal.png -%%SKYPEDIR%%/avatars/Skype Headset.png -%%SKYPEDIR%%/avatars/Skype Jah.png -%%SKYPEDIR%%/avatars/Skype Jyve.png -%%SKYPEDIR%%/avatars/Skype Safety.png -%%SKYPEDIR%%/avatars/Skype San.png -%%SKYPEDIR%%/avatars/Skype Shorty.png -%%SKYPEDIR%%/avatars/Skype Smiley.png -%%SKYPEDIR%%/avatars/Skype Time.png -%%SKYPEDIR%%/avatars/Skype in a Bag.png -%%SKYPEDIR%%/avatars/Skype-a-Manger.png -%%SKYPEDIR%%/avatars/Skype-ahoy.png -%%SKYPEDIR%%/avatars/Skype-in-one.png -%%SKYPEDIR%%/avatars/Skype.png -%%SKYPEDIR%%/avatars/Skypers of the Caribbean.png -%%SKYPEDIR%%/avatars/Star Skype.png -%%SKYPEDIR%%/avatars/Sushi Skype.png -%%SKYPEDIR%%/avatars/The Skypeness.png -%%SKYPEDIR%%/avatars/Travel Skype.png -%%SKYPEDIR%%/avatars/Wetsuit Skype.png -%%SKYPEDIR%%/avatars/Yin Yang Skype.png -%%SKYPEDIR%%/icons/SkypeBlue_16x16.png -%%SKYPEDIR%%/icons/SkypeBlue_32x32.png -%%SKYPEDIR%%/icons/SkypeBlue_48x48.png -%%SKYPEDIR%%/lang/skype_bg.qm -%%SKYPEDIR%%/lang/skype_bg.ts -%%SKYPEDIR%%/lang/skype_de.qm -%%SKYPEDIR%%/lang/skype_de.ts -%%SKYPEDIR%%/lang/skype_en.qm -%%SKYPEDIR%%/lang/skype_en.ts -%%SKYPEDIR%%/lang/skype_es.qm -%%SKYPEDIR%%/lang/skype_es.ts -%%SKYPEDIR%%/lang/skype_et.qm -%%SKYPEDIR%%/lang/skype_et.ts -%%SKYPEDIR%%/lang/skype_fr.qm -%%SKYPEDIR%%/lang/skype_fr.ts -%%SKYPEDIR%%/lang/skype_it.qm -%%SKYPEDIR%%/lang/skype_it.ts -%%SKYPEDIR%%/lang/skype_ja.qm -%%SKYPEDIR%%/lang/skype_ja.ts -%%SKYPEDIR%%/lang/skype_ko.qm -%%SKYPEDIR%%/lang/skype_ko.ts -%%SKYPEDIR%%/lang/skype_lt.qm -%%SKYPEDIR%%/lang/skype_lt.ts -%%SKYPEDIR%%/lang/skype_lv.qm -%%SKYPEDIR%%/lang/skype_lv.ts -%%SKYPEDIR%%/lang/skype_pl.qm -%%SKYPEDIR%%/lang/skype_pl.ts -%%SKYPEDIR%%/lang/skype_pt_br.qm -%%SKYPEDIR%%/lang/skype_pt_br.ts -%%SKYPEDIR%%/lang/skype_pt_pt.qm -%%SKYPEDIR%%/lang/skype_pt_pt.ts -%%SKYPEDIR%%/lang/skype_ro.qm -%%SKYPEDIR%%/lang/skype_ro.ts -%%SKYPEDIR%%/lang/skype_ru.qm -%%SKYPEDIR%%/lang/skype_ru.ts -%%SKYPEDIR%%/lang/skype_th.qm -%%SKYPEDIR%%/lang/skype_th.ts -%%SKYPEDIR%%/lang/skype_tr.qm -%%SKYPEDIR%%/lang/skype_tr.ts -%%SKYPEDIR%%/lang/skype_zh_s.qm -%%SKYPEDIR%%/lang/skype_zh_s.ts -%%SKYPEDIR%%/lang/skype_zh_t.qm -%%SKYPEDIR%%/lang/skype_zh_t.ts -%%SKYPEDIR%%/sounds/CallBusy.wav -%%SKYPEDIR%%/sounds/CallConnecting.wav -%%SKYPEDIR%%/sounds/CallFailed.wav -%%SKYPEDIR%%/sounds/CallHangup.wav -%%SKYPEDIR%%/sounds/CallHold.wav -%%SKYPEDIR%%/sounds/CallRemoteHangup.wav -%%SKYPEDIR%%/sounds/CallResume.wav -%%SKYPEDIR%%/sounds/CallRingingIn.wav -%%SKYPEDIR%%/sounds/CallRingingOut.wav -%%SKYPEDIR%%/sounds/ChatIncoming.wav -%%SKYPEDIR%%/sounds/ChatIncomingInitial.wav -%%SKYPEDIR%%/sounds/ChatOutgoing.wav -%%SKYPEDIR%%/sounds/ContactAdded.wav -%%SKYPEDIR%%/sounds/ContactAuthRequest.wav -%%SKYPEDIR%%/sounds/ContactOffline.wav -%%SKYPEDIR%%/sounds/ContactOnline.wav -%%SKYPEDIR%%/sounds/SkypeLogin.wav -%%SKYPEDIR%%/sounds/SkypeLogout.wav -%%SKYPEDIR%%/sounds/TransferComplete.wav -%%SKYPEDIR%%/sounds/TransferFailed.wav -%%SKYPEDIR%%/sounds/TransferRequest.wav -%%SKYPEDIR%%/sounds/VoicemailReceived.wav -@dirrm %%SKYPEDIR%%/sounds -@dirrm %%SKYPEDIR%%/lang -@dirrm %%SKYPEDIR%%/icons -@dirrm %%SKYPEDIR%%/avatars -@dirrm %%SKYPEDIR%% -@dirrmtry share/applications diff --git a/net-im/skype12/Makefile b/net-im/skype12/Makefile deleted file mode 100644 index 36d3a96fee6f..000000000000 --- a/net-im/skype12/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# New ports collection makefile for: skype12 -# Date created: Jun 21. 2004 -# Whom: netchild@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= skype12 -PORTVERSION= 1.2.0.18 -CATEGORIES= net -MASTER_SITES= NETBSD -DISTNAME= skype_staticQT-${PORTVERSION} - -MAINTAINER= itetcu@FreeBSD.org -COMMENT= Legacy version P2P VoIP software - -USE_BZIP2= yes -USE_LINUX= yes -USE_LINUX_APPS= expat fontconfig -PORTDOCS= LICENSE README -SUB_FILES= pkg-message - -RESTRICTED= Redistribution prohibited. -CONFLICTS= skype-1.[0-9].* - -OPTIONS= NVIDIA_GL "Enable Nvidia Support" off - -.include <bsd.port.pre.mk> - -.if defined(WITH_NVIDIA_GL) -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else -USE_LINUX_APPS+=dri -.endif - -WRKSRC= ${WRKDIR}/skype-${PORTVERSION} - -post-patch: - @${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype --resources=${PREFIX}/${SKYPEDIR}|' \ - ${WRKSRC}/skype.desktop - -do-build: - ${BRANDELF} -t Linux ${WRKSRC}/skype - -do-install: - @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype - @${CHMOD} a+rx ${PREFIX}/bin/skype - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png - @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sound lang" ${DATADIR}/ - -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net-im/skype12/distinfo b/net-im/skype12/distinfo deleted file mode 100644 index 45a776b79003..000000000000 --- a/net-im/skype12/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (skype_staticQT-1.2.0.18.tar.bz2) = bc05f6883e8c0350186e1a376940d5c8 -SHA256 (skype_staticQT-1.2.0.18.tar.bz2) = fa825ff455b7c6fb53bd4090e7fb99038ce426b4078b4f1dda0307fc4fa216b3 -SIZE (skype_staticQT-1.2.0.18.tar.bz2) = 10678284 diff --git a/net-im/skype12/files/pkg-message.in b/net-im/skype12/files/pkg-message.in deleted file mode 100644 index d98bfdf5bf92..000000000000 --- a/net-im/skype12/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ - -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -Skype has been installed in: - -%%PREFIX%%/bin/skype - -If you are starting from a terminal, please use the following command: - skype --resources=%%DATADIR%% - -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/net-im/skype12/pkg-descr b/net-im/skype12/pkg-descr deleted file mode 100644 index 06e936789071..000000000000 --- a/net-im/skype12/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Skype is a free program that uses the latest P2P technology to bring -affordable and high-quality voice communications to people all over -the world. - -WWW: http://www.skype.com/ diff --git a/net-im/skype12/pkg-plist b/net-im/skype12/pkg-plist deleted file mode 100644 index c5fc6dd5f657..000000000000 --- a/net-im/skype12/pkg-plist +++ /dev/null @@ -1,38 +0,0 @@ -bin/skype -%%DATADIR%%/icons/skype_16_32.png -%%DATADIR%%/icons/skype_32_32.png -%%DATADIR%%/icons/skype_48_32.png -%%DATADIR%%/lang/skype_da.qm -%%DATADIR%%/lang/skype_de.qm -%%DATADIR%%/lang/skype_el.qm -%%DATADIR%%/lang/skype_en.qm -%%DATADIR%%/lang/skype_es.qm -%%DATADIR%%/lang/skype_es_AR.qm -%%DATADIR%%/lang/skype_et.qm -%%DATADIR%%/lang/skype_fi.qm -%%DATADIR%%/lang/skype_fr.qm -%%DATADIR%%/lang/skype_it.qm -%%DATADIR%%/lang/skype_iw.qm -%%DATADIR%%/lang/skype_ja.qm -%%DATADIR%%/lang/skype_ko.qm -%%DATADIR%%/lang/skype_nl.qm -%%DATADIR%%/lang/skype_no.qm -%%DATADIR%%/lang/skype_pl.qm -%%DATADIR%%/lang/skype_pt_BR.qm -%%DATADIR%%/lang/skype_ro.qm -%%DATADIR%%/lang/skype_ru.qm -%%DATADIR%%/lang/skype_sv.qm -%%DATADIR%%/lang/skype_zh_CN.qm -%%DATADIR%%/lang/skype_zh_TW.qm -%%DATADIR%%/sound/busy4.wav -%%DATADIR%%/sound/call_in.wav -%%DATADIR%%/sound/call_out.wav -%%DATADIR%%/sound/hangup.wav -%%DATADIR%%/sound/im.wav -share/applications/skype.desktop -share/pixmaps/skype.png -@dirrm %%DATADIR%%/sound -@dirrm %%DATADIR%%/lang -@dirrm %%DATADIR%%/icons -@dirrm %%DATADIR%% -@dirrmtry share/applications diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile deleted file mode 100644 index cf28555ceeec..000000000000 --- a/net-im/skype20/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# New ports collection makefile for: skype -# Date created: Jun 21. 2004 -# Whom: netchild@FreeBSD.org -# -# Maintainers: Ion-Mihai Tetcu <itetcu@FreeBSD.org> -# Martin Wilke <miwi@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= skype -PORTVERSION= 2.0.0.72 -PORTEPOCH= 1 -CATEGORIES= net -MASTER_SITES= http://download.skype.com/linux/ -DISTNAME= skype_static-${DISTVERSION}-oss - -MAINTAINER= itetcu@FreeBSD.org -COMMENT= P2P VoIP software - -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -USE_LINUX_APPS+=xorglibs -.else -USE_LINUX_APPS+=dri -.endif - -BROKEN= This is the last version of skype that works on FreeBSD, but the distfile is no longer available from the vendor, and won't be in the future. We are working on alternative solutions. - -USE_BZIP2= yes -USE_LINUX= yes -USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20 -RESTRICTED= Redistribution prohibited. - -WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss -SKYPEDIR= share/skype -PORTDOCS= LICENSE README -PLIST_SUB+= SKYPEDIR=${SKYPEDIR} -SUB_FILES= skype.sh -SUB_LIST+= SKYPEDIR=${SKYPEDIR} - -.include <bsd.port.pre.mk> - -pre-fetch: - @${ECHO_MSG} "" - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * *" - @${ECHO_MSG} "ATTENTION!" - @${ECHO_MSG} "" - @${ECHO_MSG} "Skype requires at least linux_base-fc6" - @${ECHO_MSG} "which is NOT default at this time." - @${ECHO_MSG} "If you don't have that version or above installed," - @${ECHO_MSG} "hit 'control c' now!" - @${ECHO_MSG} "" - @${ECHO_MSG} "Please read ${PORTSDIR}/UPDATING 20080318" - @${ECHO_MSG} "for update and install instructions." - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * *" - @${ECHO_MSG} "" - -do-build: - @${BRANDELF} -t Linux ${WRKSRC}/skype - -do-install: - @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png - @cd ${WRKSRC}/ && ${MKDIR} ${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/ - -# The binary main program - @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/ - -# The wrapper for main program - @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype - -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - -.include <bsd.port.post.mk> diff --git a/net-im/skype20/distinfo b/net-im/skype20/distinfo deleted file mode 100644 index 30a1076738ff..000000000000 --- a/net-im/skype20/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (skype_static-2.0.0.72-oss.tar.bz2) = ff41dd31906484863884ee0a7da441c1 -SHA256 (skype_static-2.0.0.72-oss.tar.bz2) = dbb70b25ec16202b867d8336649c8314f9fd8d224cf78ee444f168c8a67e5b6c -SIZE (skype_static-2.0.0.72-oss.tar.bz2) = 21587040 diff --git a/net-im/skype20/files/skype.sh.in b/net-im/skype20/files/skype.sh.in deleted file mode 100644 index b621c6483699..000000000000 --- a/net-im/skype20/files/skype.sh.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% $@ - diff --git a/net-im/skype20/pkg-descr b/net-im/skype20/pkg-descr deleted file mode 100644 index 06e936789071..000000000000 --- a/net-im/skype20/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Skype is a free program that uses the latest P2P technology to bring -affordable and high-quality voice communications to people all over -the world. - -WWW: http://www.skype.com/ diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist deleted file mode 100644 index ab473316b8d1..000000000000 --- a/net-im/skype20/pkg-plist +++ /dev/null @@ -1,135 +0,0 @@ -bin/skype -share/pixmaps/skype.png -share/applications/skype.desktop -%%SKYPEDIR%%/skype -%%SKYPEDIR%%/avatars/Angel Skype.png -%%SKYPEDIR%%/avatars/Architect Skype.png -%%SKYPEDIR%%/avatars/Beach Skype.png -%%SKYPEDIR%%/avatars/Behind Skype.png -%%SKYPEDIR%%/avatars/Business Skype.png -%%SKYPEDIR%%/avatars/Call Me Sweetheart.png -%%SKYPEDIR%%/avatars/Call Me.png -%%SKYPEDIR%%/avatars/Carnaval Skype.png -%%SKYPEDIR%%/avatars/Chic Skype.png -%%SKYPEDIR%%/avatars/Christmas Skype.png -%%SKYPEDIR%%/avatars/College Skype.png -%%SKYPEDIR%%/avatars/DIY Skype.png -%%SKYPEDIR%%/avatars/DJ Skype.png -%%SKYPEDIR%%/avatars/Desert Skype.png -%%SKYPEDIR%%/avatars/Designer Skype.png -%%SKYPEDIR%%/avatars/Devil Skype.png -%%SKYPEDIR%%/avatars/Earbud Skype.png -%%SKYPEDIR%%/avatars/Empire Skype.png -%%SKYPEDIR%%/avatars/Fax Skype.png -%%SKYPEDIR%%/avatars/Geisha Skype.png -%%SKYPEDIR%%/avatars/Hula Skype.png -%%SKYPEDIR%%/avatars/Make Skype Not War.png -%%SKYPEDIR%%/avatars/Metal Skype.png -%%SKYPEDIR%%/avatars/Ninja Skype.png -%%SKYPEDIR%%/avatars/Party Skype.png -%%SKYPEDIR%%/avatars/Pop Skype.png -%%SKYPEDIR%%/avatars/Rice Skype.png -%%SKYPEDIR%%/avatars/Skypahontas.png -%%SKYPEDIR%%/avatars/Skype 502.png -%%SKYPEDIR%%/avatars/Skype Aid.png -%%SKYPEDIR%%/avatars/Skype Artiste.png -%%SKYPEDIR%%/avatars/Skype Beauty.png -%%SKYPEDIR%%/avatars/Skype Bling.png -%%SKYPEDIR%%/avatars/Skype Boarder.png -%%SKYPEDIR%%/avatars/Skype Brrr... .png -%%SKYPEDIR%%/avatars/Skype Candy.png -%%SKYPEDIR%%/avatars/Skype Cola.png -%%SKYPEDIR%%/avatars/Skype Cool Shades.png -%%SKYPEDIR%%/avatars/Skype Extreme.png -%%SKYPEDIR%%/avatars/Skype Goaaaaal.png -%%SKYPEDIR%%/avatars/Skype Headset.png -%%SKYPEDIR%%/avatars/Skype Jah.png -%%SKYPEDIR%%/avatars/Skype Jyve.png -%%SKYPEDIR%%/avatars/Skype Safety.png -%%SKYPEDIR%%/avatars/Skype San.png -%%SKYPEDIR%%/avatars/Skype Shorty.png -%%SKYPEDIR%%/avatars/Skype Smiley.png -%%SKYPEDIR%%/avatars/Skype Time.png -%%SKYPEDIR%%/avatars/Skype in a Bag.png -%%SKYPEDIR%%/avatars/Skype-a-Manger.png -%%SKYPEDIR%%/avatars/Skype-ahoy.png -%%SKYPEDIR%%/avatars/Skype-in-one.png -%%SKYPEDIR%%/avatars/Skype.png -%%SKYPEDIR%%/avatars/Skypers of the Caribbean.png -%%SKYPEDIR%%/avatars/Star Skype.png -%%SKYPEDIR%%/avatars/Sushi Skype.png -%%SKYPEDIR%%/avatars/The Skypeness.png -%%SKYPEDIR%%/avatars/Travel Skype.png -%%SKYPEDIR%%/avatars/Wetsuit Skype.png -%%SKYPEDIR%%/avatars/Yin Yang Skype.png -%%SKYPEDIR%%/icons/SkypeBlue_16x16.png -%%SKYPEDIR%%/icons/SkypeBlue_32x32.png -%%SKYPEDIR%%/icons/SkypeBlue_48x48.png -%%SKYPEDIR%%/lang/skype_bg.qm -%%SKYPEDIR%%/lang/skype_bg.ts -%%SKYPEDIR%%/lang/skype_de.qm -%%SKYPEDIR%%/lang/skype_de.ts -%%SKYPEDIR%%/lang/skype_en.qm -%%SKYPEDIR%%/lang/skype_en.ts -%%SKYPEDIR%%/lang/skype_es.qm -%%SKYPEDIR%%/lang/skype_es.ts -%%SKYPEDIR%%/lang/skype_et.qm -%%SKYPEDIR%%/lang/skype_et.ts -%%SKYPEDIR%%/lang/skype_fr.qm -%%SKYPEDIR%%/lang/skype_fr.ts -%%SKYPEDIR%%/lang/skype_it.qm -%%SKYPEDIR%%/lang/skype_it.ts -%%SKYPEDIR%%/lang/skype_ja.qm -%%SKYPEDIR%%/lang/skype_ja.ts -%%SKYPEDIR%%/lang/skype_ko.qm -%%SKYPEDIR%%/lang/skype_ko.ts -%%SKYPEDIR%%/lang/skype_lt.qm -%%SKYPEDIR%%/lang/skype_lt.ts -%%SKYPEDIR%%/lang/skype_lv.qm -%%SKYPEDIR%%/lang/skype_lv.ts -%%SKYPEDIR%%/lang/skype_pl.qm -%%SKYPEDIR%%/lang/skype_pl.ts -%%SKYPEDIR%%/lang/skype_pt_br.qm -%%SKYPEDIR%%/lang/skype_pt_br.ts -%%SKYPEDIR%%/lang/skype_pt_pt.qm -%%SKYPEDIR%%/lang/skype_pt_pt.ts -%%SKYPEDIR%%/lang/skype_ro.qm -%%SKYPEDIR%%/lang/skype_ro.ts -%%SKYPEDIR%%/lang/skype_ru.qm -%%SKYPEDIR%%/lang/skype_ru.ts -%%SKYPEDIR%%/lang/skype_th.qm -%%SKYPEDIR%%/lang/skype_th.ts -%%SKYPEDIR%%/lang/skype_tr.qm -%%SKYPEDIR%%/lang/skype_tr.ts -%%SKYPEDIR%%/lang/skype_zh_s.qm -%%SKYPEDIR%%/lang/skype_zh_s.ts -%%SKYPEDIR%%/lang/skype_zh_t.qm -%%SKYPEDIR%%/lang/skype_zh_t.ts -%%SKYPEDIR%%/sounds/CallBusy.wav -%%SKYPEDIR%%/sounds/CallConnecting.wav -%%SKYPEDIR%%/sounds/CallFailed.wav -%%SKYPEDIR%%/sounds/CallHangup.wav -%%SKYPEDIR%%/sounds/CallHold.wav -%%SKYPEDIR%%/sounds/CallRemoteHangup.wav -%%SKYPEDIR%%/sounds/CallResume.wav -%%SKYPEDIR%%/sounds/CallRingingIn.wav -%%SKYPEDIR%%/sounds/CallRingingOut.wav -%%SKYPEDIR%%/sounds/ChatIncoming.wav -%%SKYPEDIR%%/sounds/ChatIncomingInitial.wav -%%SKYPEDIR%%/sounds/ChatOutgoing.wav -%%SKYPEDIR%%/sounds/ContactAdded.wav -%%SKYPEDIR%%/sounds/ContactAuthRequest.wav -%%SKYPEDIR%%/sounds/ContactOffline.wav -%%SKYPEDIR%%/sounds/ContactOnline.wav -%%SKYPEDIR%%/sounds/SkypeLogin.wav -%%SKYPEDIR%%/sounds/SkypeLogout.wav -%%SKYPEDIR%%/sounds/TransferComplete.wav -%%SKYPEDIR%%/sounds/TransferFailed.wav -%%SKYPEDIR%%/sounds/TransferRequest.wav -%%SKYPEDIR%%/sounds/VoicemailReceived.wav -@dirrm %%SKYPEDIR%%/sounds -@dirrm %%SKYPEDIR%%/lang -@dirrm %%SKYPEDIR%%/icons -@dirrm %%SKYPEDIR%%/avatars -@dirrm %%SKYPEDIR%% -@dirrmtry share/applications diff --git a/net-im/tkabber-plugins-devel/Makefile b/net-im/tkabber-plugins-devel/Makefile deleted file mode 100644 index 7bfde7cd2558..000000000000 --- a/net-im/tkabber-plugins-devel/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# New ports collection makefile for: tkabber-plugins -# Date created: Wed Oct 17 19:09:46 MSD 2007 -# Whom: Denis Shaposhnikov <dsh@vlink.ru> -# -# $FreeBSD$ -# - -PORTNAME= tkabber-plugins -PORTVERSION= 20100131 -CATEGORIES= net-im -MASTER_SITES= http://wizard.volgograd.ru/distfiles/ - -MAINTAINER= dsh@wizard.volgograd.ru -COMMENT= External Plugins for Tkabber - -RUN_DEPENDS= tkabber-devel>=0.11.1.a.20100207:${PORTSDIR}/net-im/tkabber-devel - -USE_BZIP2= yes - -NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message -WRKSRC= ${WRKDIR}/${PORTNAME} - -SUBDIRS= aniemoticons attline bc browser checkers chess ctcomp \ - custom-urls cyrillize debug ejabberd floatingcontact \ - floatinglog georoster gmail iconsets jidlink latex mute \ - openurl osd poker presencecmd quiz quotelastmsg receipts \ - renju reversi singularity socials spy stripes tclchat \ - tkabber-khim traffic unixkeys whiteboard - -do-install: - ${MKDIR} ${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} "${SUBDIRS}" ${DATADIR}) - -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for i in COPYING ChangeLog README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -. endfor -.endif - - ${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net-im/tkabber-plugins-devel/distinfo b/net-im/tkabber-plugins-devel/distinfo deleted file mode 100644 index 00450dc675ef..000000000000 --- a/net-im/tkabber-plugins-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (tkabber-plugins-20100131.tar.bz2) = ead2e8a5f54676c4a40c2555a5b1389a -SHA256 (tkabber-plugins-20100131.tar.bz2) = 13666978a693d8f31c62a446305cd2e904c432b0f2e20a89c0be86d29ae064c6 -SIZE (tkabber-plugins-20100131.tar.bz2) = 713812 diff --git a/net-im/tkabber-plugins-devel/files/pkg-message.in b/net-im/tkabber-plugins-devel/files/pkg-message.in deleted file mode 100644 index 4245c753d7bf..000000000000 --- a/net-im/tkabber-plugins-devel/files/pkg-message.in +++ /dev/null @@ -1,7 +0,0 @@ - -To enable desired plugins symlink their directories from - - %%DATADIR%% - -to ~/.tkabber/plugins/ - diff --git a/net-im/tkabber-plugins-devel/pkg-descr b/net-im/tkabber-plugins-devel/pkg-descr deleted file mode 100644 index 0acc7bd4344e..000000000000 --- a/net-im/tkabber-plugins-devel/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -External plugins for Tkabber. - -WWW: http://tkabber.jabber.ru/tkabber-plugins diff --git a/net-im/tkabber-plugins-devel/pkg-plist b/net-im/tkabber-plugins-devel/pkg-plist deleted file mode 100644 index 533d3444aa16..000000000000 --- a/net-im/tkabber-plugins-devel/pkg-plist +++ /dev/null @@ -1,864 +0,0 @@ -%%DATADIR%%/aniemoticons/aniemoticons.tcl -%%DATADIR%%/aniemoticons/anigif.tcl -%%DATADIR%%/aniemoticons/msgs/de.msg -%%DATADIR%%/aniemoticons/msgs/ru.msg -%%DATADIR%%/attline/AUTHORS -%%DATADIR%%/attline/INSTALL -%%DATADIR%%/attline/README -%%DATADIR%%/attline/TODO -%%DATADIR%%/attline/attline.tcl -%%DATADIR%%/attline/license.terms -%%DATADIR%%/attline/msgs/de.msg -%%DATADIR%%/attline/msgs/es.msg -%%DATADIR%%/attline/msgs/pl.msg -%%DATADIR%%/attline/msgs/ru.msg -%%DATADIR%%/bc/bc.tcl -%%DATADIR%%/bc/msgs/ru.msg -%%DATADIR%%/bc/ru.dic -%%DATADIR%%/browser/browser.tcl -%%DATADIR%%/browser/msgs/de.msg -%%DATADIR%%/browser/msgs/es.msg -%%DATADIR%%/browser/msgs/pl.msg -%%DATADIR%%/browser/msgs/ru.msg -%%DATADIR%%/checkers/README -%%DATADIR%%/checkers/checkers.tcl -%%DATADIR%%/checkers/msgs/es.msg -%%DATADIR%%/checkers/msgs/nl.msg -%%DATADIR%%/checkers/msgs/pl.msg -%%DATADIR%%/checkers/msgs/ru.msg -%%DATADIR%%/checkers/msgs/uk.msg -%%DATADIR%%/checkers/pixmaps/checkers/bf.gif -%%DATADIR%%/checkers/pixmaps/checkers/bk.gif -%%DATADIR%%/checkers/pixmaps/checkers/bp.gif -%%DATADIR%%/checkers/pixmaps/checkers/icondef.xml -%%DATADIR%%/checkers/pixmaps/checkers/wf.gif -%%DATADIR%%/checkers/pixmaps/checkers/wk.gif -%%DATADIR%%/checkers/pixmaps/checkers/wp.gif -%%DATADIR%%/checkers/pixmaps/xboard/bf.gif -%%DATADIR%%/checkers/pixmaps/xboard/bk.gif -%%DATADIR%%/checkers/pixmaps/xboard/bp.gif -%%DATADIR%%/checkers/pixmaps/xboard/icondef.xml -%%DATADIR%%/checkers/pixmaps/xboard/wf.gif -%%DATADIR%%/checkers/pixmaps/xboard/wk.gif -%%DATADIR%%/checkers/pixmaps/xboard/wp.gif -%%DATADIR%%/checkers/proto -%%DATADIR%%/checkers/rules/brasilian.txt -%%DATADIR%%/checkers/rules/italian.txt -%%DATADIR%%/checkers/rules/pool.txt -%%DATADIR%%/checkers/rules/russian.txt -%%DATADIR%%/checkers/rules/spanish.txt -%%DATADIR%%/checkers/rules/straight.txt -%%DATADIR%%/chess/chess.tcl -%%DATADIR%%/chess/msgs/es.msg -%%DATADIR%%/chess/msgs/nl.msg -%%DATADIR%%/chess/msgs/pl.msg -%%DATADIR%%/chess/msgs/ro.msg -%%DATADIR%%/chess/msgs/ru.msg -%%DATADIR%%/chess/msgs/uk.msg -%%DATADIR%%/chess/pixmaps/classic/bb.gif -%%DATADIR%%/chess/pixmaps/classic/bf.gif -%%DATADIR%%/chess/pixmaps/classic/bk.gif -%%DATADIR%%/chess/pixmaps/classic/bn.gif -%%DATADIR%%/chess/pixmaps/classic/bp.gif -%%DATADIR%%/chess/pixmaps/classic/bq.gif -%%DATADIR%%/chess/pixmaps/classic/br.gif -%%DATADIR%%/chess/pixmaps/classic/icondef.xml -%%DATADIR%%/chess/pixmaps/classic/wb.gif -%%DATADIR%%/chess/pixmaps/classic/wf.gif -%%DATADIR%%/chess/pixmaps/classic/wk.gif -%%DATADIR%%/chess/pixmaps/classic/wn.gif -%%DATADIR%%/chess/pixmaps/classic/wp.gif -%%DATADIR%%/chess/pixmaps/classic/wq.gif -%%DATADIR%%/chess/pixmaps/classic/wr.gif -%%DATADIR%%/chess/pixmaps/wooden/bb.gif -%%DATADIR%%/chess/pixmaps/wooden/bf.gif -%%DATADIR%%/chess/pixmaps/wooden/bk.gif -%%DATADIR%%/chess/pixmaps/wooden/bn.gif -%%DATADIR%%/chess/pixmaps/wooden/bp.gif -%%DATADIR%%/chess/pixmaps/wooden/bq.gif -%%DATADIR%%/chess/pixmaps/wooden/br.gif -%%DATADIR%%/chess/pixmaps/wooden/icondef.xml -%%DATADIR%%/chess/pixmaps/wooden/wb.gif -%%DATADIR%%/chess/pixmaps/wooden/wf.gif -%%DATADIR%%/chess/pixmaps/wooden/wk.gif -%%DATADIR%%/chess/pixmaps/wooden/wn.gif -%%DATADIR%%/chess/pixmaps/wooden/wp.gif -%%DATADIR%%/chess/pixmaps/wooden/wq.gif -%%DATADIR%%/chess/pixmaps/wooden/wr.gif -%%DATADIR%%/chess/pixmaps/xboard/bb.gif -%%DATADIR%%/chess/pixmaps/xboard/bf.gif -%%DATADIR%%/chess/pixmaps/xboard/bk.gif -%%DATADIR%%/chess/pixmaps/xboard/bn.gif -%%DATADIR%%/chess/pixmaps/xboard/bp.gif -%%DATADIR%%/chess/pixmaps/xboard/bq.gif -%%DATADIR%%/chess/pixmaps/xboard/br.gif -%%DATADIR%%/chess/pixmaps/xboard/icondef.xml -%%DATADIR%%/chess/pixmaps/xboard/wb.gif -%%DATADIR%%/chess/pixmaps/xboard/wf.gif -%%DATADIR%%/chess/pixmaps/xboard/wk.gif -%%DATADIR%%/chess/pixmaps/xboard/wn.gif -%%DATADIR%%/chess/pixmaps/xboard/wp.gif -%%DATADIR%%/chess/pixmaps/xboard/wq.gif -%%DATADIR%%/chess/pixmaps/xboard/wr.gif -%%DATADIR%%/chess/proto -%%DATADIR%%/ctcomp/AUTHORS -%%DATADIR%%/ctcomp/ChangeLog -%%DATADIR%%/ctcomp/INSTALL -%%DATADIR%%/ctcomp/README -%%DATADIR%%/ctcomp/TODO -%%DATADIR%%/ctcomp/VERSION -%%DATADIR%%/ctcomp/ctcomp.tcl -%%DATADIR%%/ctcomp/license.terms -%%DATADIR%%/custom-urls/custom-urls.tcl -%%DATADIR%%/custom-urls/msgs/ru.msg -%%DATADIR%%/cyrillize/cyrillize.tcl -%%DATADIR%%/cyrillize/engrus.tbl -%%DATADIR%%/cyrillize/msgs/ru.msg -%%DATADIR%%/debug/debug.tcl -%%DATADIR%%/debug/msgs/de.msg -%%DATADIR%%/debug/msgs/es.msg -%%DATADIR%%/debug/msgs/pl.msg -%%DATADIR%%/debug/msgs/ru.msg -%%DATADIR%%/debug/msgs/uk.msg -%%DATADIR%%/ejabberd/ejabberd.tcl -%%DATADIR%%/ejabberd/msgs/de.msg -%%DATADIR%%/ejabberd/msgs/es.msg -%%DATADIR%%/ejabberd/msgs/pl.msg -%%DATADIR%%/ejabberd/msgs/ru.msg -%%DATADIR%%/ejabberd/msgs/uk.msg -%%DATADIR%%/floatingcontact/README -%%DATADIR%%/floatingcontact/floatingcontact.tcl -%%DATADIR%%/floatingcontact/msgs/de.msg -%%DATADIR%%/floatingcontact/msgs/ru.msg -%%DATADIR%%/floatinglog/AUTHORS -%%DATADIR%%/floatinglog/ChangeLog -%%DATADIR%%/floatinglog/INSTALL -%%DATADIR%%/floatinglog/TODO -%%DATADIR%%/floatinglog/VERSION -%%DATADIR%%/floatinglog/floatinglog.tcl -%%DATADIR%%/floatinglog/license.terms -%%DATADIR%%/floatinglog/msgs/de.msg -%%DATADIR%%/floatinglog/msgs/es.msg -%%DATADIR%%/floatinglog/msgs/pl.msg -%%DATADIR%%/floatinglog/msgs/ru.msg -%%DATADIR%%/georoster/ChangeLog -%%DATADIR%%/georoster/bwmap2.gif -%%DATADIR%%/georoster/bwmap4.gif -%%DATADIR%%/georoster/colormap.jpg -%%DATADIR%%/georoster/darkmap.gif -%%DATADIR%%/georoster/de.coords -%%DATADIR%%/georoster/earth -%%DATADIR%%/georoster/earth.ru -%%DATADIR%%/georoster/georoster.tcl -%%DATADIR%%/georoster/howto.txt -%%DATADIR%%/georoster/iso3166 -%%DATADIR%%/georoster/jm.coords -%%DATADIR%%/georoster/msgs/de.msg -%%DATADIR%%/georoster/msgs/es.msg -%%DATADIR%%/georoster/msgs/nl.msg -%%DATADIR%%/georoster/msgs/pl.msg -%%DATADIR%%/georoster/msgs/ro.msg -%%DATADIR%%/georoster/msgs/ru.msg -%%DATADIR%%/georoster/msgs/uk.msg -%%DATADIR%%/georoster/nl.coords -%%DATADIR%%/georoster/ru.coords -%%DATADIR%%/georoster/ua.coords -%%DATADIR%%/georoster/us.coords -%%DATADIR%%/gmail/gmail.tcl -%%DATADIR%%/gmail/msgs/de.msg -%%DATADIR%%/gmail/msgs/es.msg -%%DATADIR%%/gmail/msgs/pl.msg -%%DATADIR%%/gmail/msgs/ru.msg -%%DATADIR%%/iconsets/amibulb/docking/tkabber.ico -%%DATADIR%%/iconsets/amibulb/icondef.xml -%%DATADIR%%/iconsets/amibulb/roster/available-away.gif -%%DATADIR%%/iconsets/amibulb/roster/available-chat.gif -%%DATADIR%%/iconsets/amibulb/roster/available-dnd.gif -%%DATADIR%%/iconsets/amibulb/roster/available-xa.gif -%%DATADIR%%/iconsets/amibulb/roster/available.gif -%%DATADIR%%/iconsets/amibulb/roster/group-closed.gif -%%DATADIR%%/iconsets/amibulb/roster/group-opened.gif -%%DATADIR%%/iconsets/amibulb/roster/icondef.xml -%%DATADIR%%/iconsets/amibulb/roster/invisible.gif -%%DATADIR%%/iconsets/amibulb/roster/stalker.gif -%%DATADIR%%/iconsets/amibulb/roster/unavailable.gif -%%DATADIR%%/iconsets/amibulb/tkabber/toolbar-add-user.gif -%%DATADIR%%/iconsets/amibulb/tkabber/toolbar-disco.gif -%%DATADIR%%/iconsets/amibulb/tkabber/toolbar-join-conference.gif -%%DATADIR%%/iconsets/amibulb/tkabber/toolbar-show-offline.gif -%%DATADIR%%/iconsets/amibulb/tkabber/toolbar-show-online.gif -%%DATADIR%%/iconsets/gabber/docking/available-away.gif -%%DATADIR%%/iconsets/gabber/docking/available-chat.gif -%%DATADIR%%/iconsets/gabber/docking/available-dnd.gif -%%DATADIR%%/iconsets/gabber/docking/available-xa.gif -%%DATADIR%%/iconsets/gabber/docking/available.gif -%%DATADIR%%/iconsets/gabber/docking/invisible.gif -%%DATADIR%%/iconsets/gabber/docking/message-personal.gif -%%DATADIR%%/iconsets/gabber/docking/message-server.gif -%%DATADIR%%/iconsets/gabber/docking/message.gif -%%DATADIR%%/iconsets/gabber/docking/tkabber.ico -%%DATADIR%%/iconsets/gabber/docking/unavailable.gif -%%DATADIR%%/iconsets/gabber/icondef.xml -%%DATADIR%%/iconsets/gabber/roster/available-away.gif -%%DATADIR%%/iconsets/gabber/roster/available-chat.gif -%%DATADIR%%/iconsets/gabber/roster/available-dnd.gif -%%DATADIR%%/iconsets/gabber/roster/available-xa.gif -%%DATADIR%%/iconsets/gabber/roster/available.gif -%%DATADIR%%/iconsets/gabber/roster/conference-available.gif -%%DATADIR%%/iconsets/gabber/roster/conference-unavailable.gif -%%DATADIR%%/iconsets/gabber/roster/group-closed.gif -%%DATADIR%%/iconsets/gabber/roster/group-opened.gif -%%DATADIR%%/iconsets/gabber/roster/invisible.gif -%%DATADIR%%/iconsets/gabber/roster/stalker.gif -%%DATADIR%%/iconsets/gabber/roster/unavailable.gif -%%DATADIR%%/iconsets/gabber/services/aim_away.gif -%%DATADIR%%/iconsets/gabber/services/aim_chat.gif -%%DATADIR%%/iconsets/gabber/services/aim_dnd.gif -%%DATADIR%%/iconsets/gabber/services/aim_offline.gif -%%DATADIR%%/iconsets/gabber/services/aim_online.gif -%%DATADIR%%/iconsets/gabber/services/aim_xa.gif -%%DATADIR%%/iconsets/gabber/services/icq_away.gif -%%DATADIR%%/iconsets/gabber/services/icq_chat.gif -%%DATADIR%%/iconsets/gabber/services/icq_dnd.gif -%%DATADIR%%/iconsets/gabber/services/icq_offline.gif -%%DATADIR%%/iconsets/gabber/services/icq_online.gif -%%DATADIR%%/iconsets/gabber/services/icq_xa.gif -%%DATADIR%%/iconsets/gabber/services/jud.gif -%%DATADIR%%/iconsets/gabber/services/msn_away.gif -%%DATADIR%%/iconsets/gabber/services/msn_chat.gif -%%DATADIR%%/iconsets/gabber/services/msn_dnd.gif -%%DATADIR%%/iconsets/gabber/services/msn_offline.gif -%%DATADIR%%/iconsets/gabber/services/msn_online.gif -%%DATADIR%%/iconsets/gabber/services/msn_xa.gif -%%DATADIR%%/iconsets/gabber/services/rss_away.gif -%%DATADIR%%/iconsets/gabber/services/rss_chat.gif -%%DATADIR%%/iconsets/gabber/services/rss_dnd.gif -%%DATADIR%%/iconsets/gabber/services/rss_offline.gif -%%DATADIR%%/iconsets/gabber/services/rss_online.gif -%%DATADIR%%/iconsets/gabber/services/rss_xa.gif -%%DATADIR%%/iconsets/gabber/services/sms.gif -%%DATADIR%%/iconsets/gabber/services/yahoo_away.gif -%%DATADIR%%/iconsets/gabber/services/yahoo_chat.gif -%%DATADIR%%/iconsets/gabber/services/yahoo_dnd.gif -%%DATADIR%%/iconsets/gabber/services/yahoo_offline.gif -%%DATADIR%%/iconsets/gabber/services/yahoo_online.gif -%%DATADIR%%/iconsets/gabber/services/yahoo_xa.gif -%%DATADIR%%/iconsets/gabber/tkabber/toolbar-add-user.gif -%%DATADIR%%/iconsets/gabber/tkabber/toolbar-disco.gif -%%DATADIR%%/iconsets/gabber/tkabber/toolbar-join-conference.gif -%%DATADIR%%/iconsets/gabber/tkabber/toolbar-show-offline.gif -%%DATADIR%%/iconsets/gabber/tkabber/toolbar-show-online.gif -%%DATADIR%%/iconsets/gush/docking/tkabber.ico -%%DATADIR%%/iconsets/gush/icondef.xml -%%DATADIR%%/iconsets/gush/roster/available-away.gif -%%DATADIR%%/iconsets/gush/roster/available-chat.gif -%%DATADIR%%/iconsets/gush/roster/available-dnd.gif -%%DATADIR%%/iconsets/gush/roster/available-xa.gif -%%DATADIR%%/iconsets/gush/roster/available.gif -%%DATADIR%%/iconsets/gush/roster/available2.gif -%%DATADIR%%/iconsets/gush/roster/group-closed.gif -%%DATADIR%%/iconsets/gush/roster/group-opened.gif -%%DATADIR%%/iconsets/gush/roster/invisible.gif -%%DATADIR%%/iconsets/gush/roster/stalker.gif -%%DATADIR%%/iconsets/gush/roster/unavailable.gif -%%DATADIR%%/iconsets/gush/tkabber/toolbar-add-user.gif -%%DATADIR%%/iconsets/gush/tkabber/toolbar-disco.gif -%%DATADIR%%/iconsets/gush/tkabber/toolbar-join-conference.gif -%%DATADIR%%/iconsets/gush/tkabber/toolbar-show-offline.gif -%%DATADIR%%/iconsets/gush/tkabber/toolbar-show-online.gif -%%DATADIR%%/iconsets/iconsets.tcl -%%DATADIR%%/iconsets/icq/docking/available-away.gif -%%DATADIR%%/iconsets/icq/docking/available-chat.gif -%%DATADIR%%/iconsets/icq/docking/available-dnd.gif -%%DATADIR%%/iconsets/icq/docking/available-xa.gif -%%DATADIR%%/iconsets/icq/docking/available.gif -%%DATADIR%%/iconsets/icq/docking/invisible.gif -%%DATADIR%%/iconsets/icq/docking/unavailable.gif -%%DATADIR%%/iconsets/icq/icondef.xml -%%DATADIR%%/iconsets/icq/roster/available-away.gif -%%DATADIR%%/iconsets/icq/roster/available-chat.gif -%%DATADIR%%/iconsets/icq/roster/available-dnd.gif -%%DATADIR%%/iconsets/icq/roster/available-xa.gif -%%DATADIR%%/iconsets/icq/roster/available.gif -%%DATADIR%%/iconsets/icq/roster/invisible.gif -%%DATADIR%%/iconsets/icq/roster/message.gif -%%DATADIR%%/iconsets/icq/roster/send.gif -%%DATADIR%%/iconsets/icq/roster/stalker.gif -%%DATADIR%%/iconsets/icq/roster/unavailable.gif -%%DATADIR%%/iconsets/icq/tkabber/toolbar-add-user.gif -%%DATADIR%%/iconsets/icq/tkabber/toolbar-disco.gif -%%DATADIR%%/iconsets/icq/tkabber/toolbar-join-conference.gif -%%DATADIR%%/iconsets/icq/tkabber/toolbar-show-offline.gif -%%DATADIR%%/iconsets/icq/tkabber/toolbar-show-online.gif -%%DATADIR%%/iconsets/jajc/docking/available-away.gif -%%DATADIR%%/iconsets/jajc/docking/available-chat.gif -%%DATADIR%%/iconsets/jajc/docking/available-dnd.gif -%%DATADIR%%/iconsets/jajc/docking/available-xa.gif -%%DATADIR%%/iconsets/jajc/docking/available.gif -%%DATADIR%%/iconsets/jajc/docking/tkabber.ico -%%DATADIR%%/iconsets/jajc/docking/unavailable.gif -%%DATADIR%%/iconsets/jajc/icondef.xml -%%DATADIR%%/iconsets/jajc/roster/available-away.gif -%%DATADIR%%/iconsets/jajc/roster/available-chat.gif -%%DATADIR%%/iconsets/jajc/roster/available-dnd.gif -%%DATADIR%%/iconsets/jajc/roster/available-xa.gif -%%DATADIR%%/iconsets/jajc/roster/available.gif -%%DATADIR%%/iconsets/jajc/roster/conference-available.gif -%%DATADIR%%/iconsets/jajc/roster/conference-unavailable.gif -%%DATADIR%%/iconsets/jajc/roster/group-closed.gif -%%DATADIR%%/iconsets/jajc/roster/group-opened.gif -%%DATADIR%%/iconsets/jajc/roster/group_closed.gif -%%DATADIR%%/iconsets/jajc/roster/group_opened.gif -%%DATADIR%%/iconsets/jajc/roster/unavailable.gif -%%DATADIR%%/iconsets/jajc/services/aim_away.gif -%%DATADIR%%/iconsets/jajc/services/aim_chat.gif -%%DATADIR%%/iconsets/jajc/services/aim_dnd.gif -%%DATADIR%%/iconsets/jajc/services/aim_offline.gif -%%DATADIR%%/iconsets/jajc/services/aim_online.gif -%%DATADIR%%/iconsets/jajc/services/aim_xa.gif -%%DATADIR%%/iconsets/jajc/services/icq_away.gif -%%DATADIR%%/iconsets/jajc/services/icq_chat.gif -%%DATADIR%%/iconsets/jajc/services/icq_dnd.gif -%%DATADIR%%/iconsets/jajc/services/icq_offline.gif -%%DATADIR%%/iconsets/jajc/services/icq_online.gif -%%DATADIR%%/iconsets/jajc/services/icq_xa.gif -%%DATADIR%%/iconsets/jajc/services/jud.gif -%%DATADIR%%/iconsets/jajc/services/msn_away.gif -%%DATADIR%%/iconsets/jajc/services/msn_chat.gif -%%DATADIR%%/iconsets/jajc/services/msn_dnd.gif -%%DATADIR%%/iconsets/jajc/services/msn_offline.gif -%%DATADIR%%/iconsets/jajc/services/msn_online.gif -%%DATADIR%%/iconsets/jajc/services/msn_xa.gif -%%DATADIR%%/iconsets/jajc/services/sms.gif -%%DATADIR%%/iconsets/jajc/services/yahoo_away.gif -%%DATADIR%%/iconsets/jajc/services/yahoo_chat.gif -%%DATADIR%%/iconsets/jajc/services/yahoo_dnd.gif -%%DATADIR%%/iconsets/jajc/services/yahoo_offline.gif -%%DATADIR%%/iconsets/jajc/services/yahoo_online.gif -%%DATADIR%%/iconsets/jajc/services/yahoo_xa.gif -%%DATADIR%%/iconsets/jajc/tkabber/toolbar-add-user.gif -%%DATADIR%%/iconsets/jajc/tkabber/toolbar-disco.gif -%%DATADIR%%/iconsets/jajc/tkabber/toolbar-join-conference.gif -%%DATADIR%%/iconsets/jajc/tkabber/toolbar-show-offline.gif -%%DATADIR%%/iconsets/jajc/tkabber/toolbar-show-online.gif -%%DATADIR%%/iconsets/jarl/icondef.xml -%%DATADIR%%/iconsets/jarl/roster/available-away.gif -%%DATADIR%%/iconsets/jarl/roster/available-chat.gif -%%DATADIR%%/iconsets/jarl/roster/available-dnd.gif -%%DATADIR%%/iconsets/jarl/roster/available-xa.gif -%%DATADIR%%/iconsets/jarl/roster/available.gif -%%DATADIR%%/iconsets/jarl/roster/invisible.gif -%%DATADIR%%/iconsets/jarl/roster/unavailable.gif -%%DATADIR%%/iconsets/kroc/docking/available-away.gif -%%DATADIR%%/iconsets/kroc/docking/available-chat.gif -%%DATADIR%%/iconsets/kroc/docking/available-dnd.gif -%%DATADIR%%/iconsets/kroc/docking/available-xa.gif -%%DATADIR%%/iconsets/kroc/docking/available.gif -%%DATADIR%%/iconsets/kroc/docking/invisible.gif -%%DATADIR%%/iconsets/kroc/docking/tkabber.ico -%%DATADIR%%/iconsets/kroc/docking/unavailable.gif -%%DATADIR%%/iconsets/kroc/icondef.xml -%%DATADIR%%/iconsets/kroc/roster/available-away.gif -%%DATADIR%%/iconsets/kroc/roster/available-chat.gif -%%DATADIR%%/iconsets/kroc/roster/available-dnd.gif -%%DATADIR%%/iconsets/kroc/roster/available-xa.gif -%%DATADIR%%/iconsets/kroc/roster/available.gif -%%DATADIR%%/iconsets/kroc/roster/conference-available.gif -%%DATADIR%%/iconsets/kroc/roster/conference-unavailable.gif -%%DATADIR%%/iconsets/kroc/roster/group-closed.gif -%%DATADIR%%/iconsets/kroc/roster/group-opened.gif -%%DATADIR%%/iconsets/kroc/roster/invisible.gif -%%DATADIR%%/iconsets/kroc/roster/stalker.gif -%%DATADIR%%/iconsets/kroc/roster/unavailable.gif -%%DATADIR%%/iconsets/kroc/roster/unsubscribed.gif -%%DATADIR%%/iconsets/kroc/services/aim_away.gif -%%DATADIR%%/iconsets/kroc/services/aim_chat.gif -%%DATADIR%%/iconsets/kroc/services/aim_dnd.gif -%%DATADIR%%/iconsets/kroc/services/aim_offline.gif -%%DATADIR%%/iconsets/kroc/services/aim_online.gif -%%DATADIR%%/iconsets/kroc/services/aim_xa.gif -%%DATADIR%%/iconsets/kroc/services/gg_away.gif -%%DATADIR%%/iconsets/kroc/services/gg_chat.gif -%%DATADIR%%/iconsets/kroc/services/gg_dnd.gif -%%DATADIR%%/iconsets/kroc/services/gg_offline.gif -%%DATADIR%%/iconsets/kroc/services/gg_online.gif -%%DATADIR%%/iconsets/kroc/services/gg_xa.gif -%%DATADIR%%/iconsets/kroc/services/icq_away.gif -%%DATADIR%%/iconsets/kroc/services/icq_chat.gif -%%DATADIR%%/iconsets/kroc/services/icq_dnd.gif -%%DATADIR%%/iconsets/kroc/services/icq_offline.gif -%%DATADIR%%/iconsets/kroc/services/icq_online.gif -%%DATADIR%%/iconsets/kroc/services/icq_xa.gif -%%DATADIR%%/iconsets/kroc/services/jud.gif -%%DATADIR%%/iconsets/kroc/services/msn_away.gif -%%DATADIR%%/iconsets/kroc/services/msn_chat.gif -%%DATADIR%%/iconsets/kroc/services/msn_dnd.gif -%%DATADIR%%/iconsets/kroc/services/msn_offline.gif -%%DATADIR%%/iconsets/kroc/services/msn_online.gif -%%DATADIR%%/iconsets/kroc/services/msn_xa.gif -%%DATADIR%%/iconsets/kroc/services/rss_away.gif -%%DATADIR%%/iconsets/kroc/services/rss_chat.gif -%%DATADIR%%/iconsets/kroc/services/rss_dnd.gif -%%DATADIR%%/iconsets/kroc/services/rss_offline.gif -%%DATADIR%%/iconsets/kroc/services/rss_online.gif -%%DATADIR%%/iconsets/kroc/services/rss_xa.gif -%%DATADIR%%/iconsets/kroc/services/sms.gif -%%DATADIR%%/iconsets/kroc/services/weather_away.gif -%%DATADIR%%/iconsets/kroc/services/weather_chat.gif -%%DATADIR%%/iconsets/kroc/services/weather_dnd.gif -%%DATADIR%%/iconsets/kroc/services/weather_offline.gif -%%DATADIR%%/iconsets/kroc/services/weather_online.gif -%%DATADIR%%/iconsets/kroc/services/weather_xa.gif -%%DATADIR%%/iconsets/kroc/services/yahoo_away.gif -%%DATADIR%%/iconsets/kroc/services/yahoo_chat.gif -%%DATADIR%%/iconsets/kroc/services/yahoo_dnd.gif -%%DATADIR%%/iconsets/kroc/services/yahoo_offline.gif -%%DATADIR%%/iconsets/kroc/services/yahoo_online.gif -%%DATADIR%%/iconsets/kroc/services/yahoo_xa.gif -%%DATADIR%%/iconsets/kroc/tkabber/gpg-badsigned.gif -%%DATADIR%%/iconsets/kroc/tkabber/gpg-encrypted.gif -%%DATADIR%%/iconsets/kroc/tkabber/gpg-signed.gif -%%DATADIR%%/iconsets/kroc/tkabber/gpg-unencrypted.gif -%%DATADIR%%/iconsets/kroc/tkabber/gpg-unsigned.gif -%%DATADIR%%/iconsets/kroc/tkabber/toolbar-add-user.gif -%%DATADIR%%/iconsets/kroc/tkabber/toolbar-disco.gif -%%DATADIR%%/iconsets/kroc/tkabber/toolbar-join-conference.gif -%%DATADIR%%/iconsets/kroc/tkabber/toolbar-show-offline.gif -%%DATADIR%%/iconsets/kroc/tkabber/toolbar-show-online.gif -%%DATADIR%%/iconsets/msgs/ru.msg -%%DATADIR%%/iconsets/psi/icondef.xml -%%DATADIR%%/iconsets/psi/roster/available-away.gif -%%DATADIR%%/iconsets/psi/roster/available-chat.gif -%%DATADIR%%/iconsets/psi/roster/available-dnd.gif -%%DATADIR%%/iconsets/psi/roster/available-xa.gif -%%DATADIR%%/iconsets/psi/roster/available.gif -%%DATADIR%%/iconsets/psi/roster/group-closed.gif -%%DATADIR%%/iconsets/psi/roster/group-opened.gif -%%DATADIR%%/iconsets/psi/roster/stalker.gif -%%DATADIR%%/iconsets/psi/roster/unavailable.gif -%%DATADIR%%/iconsets/psi/tkabber/toolbar-add-user.gif -%%DATADIR%%/iconsets/psi/tkabber/toolbar-disco.gif -%%DATADIR%%/iconsets/psi/tkabber/toolbar-join-conference.gif -%%DATADIR%%/iconsets/psi/tkabber/toolbar-show-offline.gif -%%DATADIR%%/iconsets/psi/tkabber/toolbar-show-online.gif -%%DATADIR%%/jidlink/README -%%DATADIR%%/jidlink/jidlink.tcl -%%DATADIR%%/jidlink/msgs/de.msg -%%DATADIR%%/jidlink/msgs/es.msg -%%DATADIR%%/jidlink/msgs/pl.msg -%%DATADIR%%/jidlink/msgs/ru.msg -%%DATADIR%%/jidlink/plugins/dtcp.tcl -%%DATADIR%%/jidlink/plugins/filetransfer.tcl -%%DATADIR%%/jidlink/plugins/ibb.tcl -%%DATADIR%%/jidlink/trans/ru.msg -%%DATADIR%%/latex/latex.tcl -%%DATADIR%%/latex/msgs/de.msg -%%DATADIR%%/latex/msgs/es.msg -%%DATADIR%%/latex/msgs/ru.msg -%%DATADIR%%/latex/msgs/uk.msg -%%DATADIR%%/mute/msgs/ru.msg -%%DATADIR%%/mute/mute.tcl -%%DATADIR%%/openurl/msgs/de.msg -%%DATADIR%%/openurl/msgs/es.msg -%%DATADIR%%/openurl/msgs/pl.msg -%%DATADIR%%/openurl/msgs/ru.msg -%%DATADIR%%/openurl/openurl.tcl -%%DATADIR%%/osd/ChangeLog -%%DATADIR%%/osd/osd.tcl -%%DATADIR%%/poker/pixmaps/classic/00.gif -%%DATADIR%%/poker/pixmaps/classic/01.gif -%%DATADIR%%/poker/pixmaps/classic/02.gif -%%DATADIR%%/poker/pixmaps/classic/03.gif -%%DATADIR%%/poker/pixmaps/classic/04.gif -%%DATADIR%%/poker/pixmaps/classic/05.gif -%%DATADIR%%/poker/pixmaps/classic/06.gif -%%DATADIR%%/poker/pixmaps/classic/07.gif -%%DATADIR%%/poker/pixmaps/classic/08.gif -%%DATADIR%%/poker/pixmaps/classic/09.gif -%%DATADIR%%/poker/pixmaps/classic/10.gif -%%DATADIR%%/poker/pixmaps/classic/11.gif -%%DATADIR%%/poker/pixmaps/classic/12.gif -%%DATADIR%%/poker/pixmaps/classic/13.gif -%%DATADIR%%/poker/pixmaps/classic/14.gif -%%DATADIR%%/poker/pixmaps/classic/15.gif -%%DATADIR%%/poker/pixmaps/classic/16.gif -%%DATADIR%%/poker/pixmaps/classic/17.gif -%%DATADIR%%/poker/pixmaps/classic/18.gif -%%DATADIR%%/poker/pixmaps/classic/19.gif -%%DATADIR%%/poker/pixmaps/classic/20.gif -%%DATADIR%%/poker/pixmaps/classic/21.gif -%%DATADIR%%/poker/pixmaps/classic/22.gif -%%DATADIR%%/poker/pixmaps/classic/23.gif -%%DATADIR%%/poker/pixmaps/classic/24.gif -%%DATADIR%%/poker/pixmaps/classic/25.gif -%%DATADIR%%/poker/pixmaps/classic/26.gif -%%DATADIR%%/poker/pixmaps/classic/27.gif -%%DATADIR%%/poker/pixmaps/classic/28.gif -%%DATADIR%%/poker/pixmaps/classic/29.gif -%%DATADIR%%/poker/pixmaps/classic/30.gif -%%DATADIR%%/poker/pixmaps/classic/31.gif -%%DATADIR%%/poker/pixmaps/classic/32.gif -%%DATADIR%%/poker/pixmaps/classic/33.gif -%%DATADIR%%/poker/pixmaps/classic/34.gif -%%DATADIR%%/poker/pixmaps/classic/35.gif -%%DATADIR%%/poker/pixmaps/classic/36.gif -%%DATADIR%%/poker/pixmaps/classic/37.gif -%%DATADIR%%/poker/pixmaps/classic/38.gif -%%DATADIR%%/poker/pixmaps/classic/39.gif -%%DATADIR%%/poker/pixmaps/classic/40.gif -%%DATADIR%%/poker/pixmaps/classic/41.gif -%%DATADIR%%/poker/pixmaps/classic/42.gif -%%DATADIR%%/poker/pixmaps/classic/43.gif -%%DATADIR%%/poker/pixmaps/classic/44.gif -%%DATADIR%%/poker/pixmaps/classic/45.gif -%%DATADIR%%/poker/pixmaps/classic/46.gif -%%DATADIR%%/poker/pixmaps/classic/47.gif -%%DATADIR%%/poker/pixmaps/classic/48.gif -%%DATADIR%%/poker/pixmaps/classic/49.gif -%%DATADIR%%/poker/pixmaps/classic/50.gif -%%DATADIR%%/poker/pixmaps/classic/51.gif -%%DATADIR%%/poker/pixmaps/classic/52.gif -%%DATADIR%%/poker/pixmaps/classic/big.gif -%%DATADIR%%/poker/pixmaps/classic/button.gif -%%DATADIR%%/poker/pixmaps/classic/icondef.xml -%%DATADIR%%/poker/pixmaps/classic/small.gif -%%DATADIR%%/poker/pixmaps/doods/101.gif -%%DATADIR%%/poker/pixmaps/doods/102.gif -%%DATADIR%%/poker/pixmaps/doods/103.gif -%%DATADIR%%/poker/pixmaps/doods/104.gif -%%DATADIR%%/poker/pixmaps/doods/105.gif -%%DATADIR%%/poker/pixmaps/doods/106.gif -%%DATADIR%%/poker/pixmaps/doods/107.gif -%%DATADIR%%/poker/pixmaps/doods/108.gif -%%DATADIR%%/poker/pixmaps/doods/109.gif -%%DATADIR%%/poker/pixmaps/doods/110.gif -%%DATADIR%%/poker/pixmaps/doods/111.gif -%%DATADIR%%/poker/pixmaps/doods/112.gif -%%DATADIR%%/poker/pixmaps/doods/113.gif -%%DATADIR%%/poker/pixmaps/doods/114.gif -%%DATADIR%%/poker/pixmaps/doods/115.gif -%%DATADIR%%/poker/pixmaps/doods/116.gif -%%DATADIR%%/poker/pixmaps/doods/117.gif -%%DATADIR%%/poker/pixmaps/doods/118.gif -%%DATADIR%%/poker/pixmaps/doods/119.gif -%%DATADIR%%/poker/pixmaps/doods/120.gif -%%DATADIR%%/poker/pixmaps/doods/121.gif -%%DATADIR%%/poker/pixmaps/doods/122.gif -%%DATADIR%%/poker/pixmaps/doods/123.gif -%%DATADIR%%/poker/pixmaps/doods/124.gif -%%DATADIR%%/poker/pixmaps/doods/125.gif -%%DATADIR%%/poker/pixmaps/doods/126.gif -%%DATADIR%%/poker/pixmaps/doods/127.gif -%%DATADIR%%/poker/pixmaps/doods/128.gif -%%DATADIR%%/poker/pixmaps/doods/129.gif -%%DATADIR%%/poker/pixmaps/doods/130.gif -%%DATADIR%%/poker/pixmaps/doods/131.gif -%%DATADIR%%/poker/pixmaps/doods/132.gif -%%DATADIR%%/poker/pixmaps/doods/133.gif -%%DATADIR%%/poker/pixmaps/doods/134.gif -%%DATADIR%%/poker/pixmaps/doods/135.gif -%%DATADIR%%/poker/pixmaps/doods/136.gif -%%DATADIR%%/poker/pixmaps/doods/137.gif -%%DATADIR%%/poker/pixmaps/doods/138.gif -%%DATADIR%%/poker/pixmaps/doods/139.gif -%%DATADIR%%/poker/pixmaps/doods/140.gif -%%DATADIR%%/poker/pixmaps/doods/141.gif -%%DATADIR%%/poker/pixmaps/doods/142.gif -%%DATADIR%%/poker/pixmaps/doods/143.gif -%%DATADIR%%/poker/pixmaps/doods/144.gif -%%DATADIR%%/poker/pixmaps/doods/145.gif -%%DATADIR%%/poker/pixmaps/doods/146.gif -%%DATADIR%%/poker/pixmaps/doods/147.gif -%%DATADIR%%/poker/pixmaps/doods/148.gif -%%DATADIR%%/poker/pixmaps/doods/149.gif -%%DATADIR%%/poker/pixmaps/doods/150.gif -%%DATADIR%%/poker/pixmaps/doods/151.gif -%%DATADIR%%/poker/pixmaps/doods/152.gif -%%DATADIR%%/poker/pixmaps/doods/153.gif -%%DATADIR%%/poker/pixmaps/doods/154.gif -%%DATADIR%%/poker/pixmaps/doods/155.gif -%%DATADIR%%/poker/pixmaps/doods/big.gif -%%DATADIR%%/poker/pixmaps/doods/button.gif -%%DATADIR%%/poker/pixmaps/doods/icondef.xml -%%DATADIR%%/poker/pixmaps/doods/small.gif -%%DATADIR%%/poker/poker.tcl -%%DATADIR%%/poker/proto -%%DATADIR%%/presencecmd/AUTHORS -%%DATADIR%%/presencecmd/INSTALL -%%DATADIR%%/presencecmd/README -%%DATADIR%%/presencecmd/TODO -%%DATADIR%%/presencecmd/VERSION -%%DATADIR%%/presencecmd/license.terms -%%DATADIR%%/presencecmd/msgs/de.msg -%%DATADIR%%/presencecmd/msgs/es.msg -%%DATADIR%%/presencecmd/msgs/pl.msg -%%DATADIR%%/presencecmd/msgs/ru.msg -%%DATADIR%%/presencecmd/presencecmd.tcl -%%DATADIR%%/quiz/msgs/ru.msg -%%DATADIR%%/quiz/quiz.tcl -%%DATADIR%%/quiz/quizdata.txt -%%DATADIR%%/quotelastmsg/AUTHORS -%%DATADIR%%/quotelastmsg/INSTALL -%%DATADIR%%/quotelastmsg/README -%%DATADIR%%/quotelastmsg/license.terms -%%DATADIR%%/quotelastmsg/msgs/ru.msg -%%DATADIR%%/quotelastmsg/quotelastmsg.tcl -%%DATADIR%%/receipts/AUTHORS -%%DATADIR%%/receipts/INSTALL -%%DATADIR%%/receipts/README -%%DATADIR%%/receipts/TODO -%%DATADIR%%/receipts/images/confirmed.gif -%%DATADIR%%/receipts/images/unconfirmed.gif -%%DATADIR%%/receipts/license.terms -%%DATADIR%%/receipts/msgs/de.msg -%%DATADIR%%/receipts/msgs/es.msg -%%DATADIR%%/receipts/msgs/pl.msg -%%DATADIR%%/receipts/msgs/ru.msg -%%DATADIR%%/receipts/receipts.tcl -%%DATADIR%%/renju/msgs/es.msg -%%DATADIR%%/renju/msgs/ru.msg -%%DATADIR%%/renju/pixmaps/black/b.gif -%%DATADIR%%/renju/pixmaps/black/bot.gif -%%DATADIR%%/renju/pixmaps/black/center.gif -%%DATADIR%%/renju/pixmaps/black/icondef.xml -%%DATADIR%%/renju/pixmaps/black/left.gif -%%DATADIR%%/renju/pixmaps/black/left_bot.gif -%%DATADIR%%/renju/pixmaps/black/left_top.gif -%%DATADIR%%/renju/pixmaps/black/middle.gif -%%DATADIR%%/renju/pixmaps/black/right.gif -%%DATADIR%%/renju/pixmaps/black/right_bot.gif -%%DATADIR%%/renju/pixmaps/black/right_top.gif -%%DATADIR%%/renju/pixmaps/black/top.gif -%%DATADIR%%/renju/pixmaps/black/w.gif -%%DATADIR%%/renju/pixmaps/stones/b.gif -%%DATADIR%%/renju/pixmaps/stones/bot.gif -%%DATADIR%%/renju/pixmaps/stones/center.gif -%%DATADIR%%/renju/pixmaps/stones/icondef.xml -%%DATADIR%%/renju/pixmaps/stones/left.gif -%%DATADIR%%/renju/pixmaps/stones/left_bot.gif -%%DATADIR%%/renju/pixmaps/stones/left_top.gif -%%DATADIR%%/renju/pixmaps/stones/middle.gif -%%DATADIR%%/renju/pixmaps/stones/right.gif -%%DATADIR%%/renju/pixmaps/stones/right_bot.gif -%%DATADIR%%/renju/pixmaps/stones/right_top.gif -%%DATADIR%%/renju/pixmaps/stones/top.gif -%%DATADIR%%/renju/pixmaps/stones/w.gif -%%DATADIR%%/renju/proto -%%DATADIR%%/renju/renju.tcl -%%DATADIR%%/reversi/msgs/es.msg -%%DATADIR%%/reversi/msgs/nl.msg -%%DATADIR%%/reversi/msgs/pl.msg -%%DATADIR%%/reversi/msgs/ru.msg -%%DATADIR%%/reversi/msgs/uk.msg -%%DATADIR%%/reversi/pixmaps/checkers/b.gif -%%DATADIR%%/reversi/pixmaps/checkers/bf.gif -%%DATADIR%%/reversi/pixmaps/checkers/icondef.xml -%%DATADIR%%/reversi/pixmaps/checkers/w.gif -%%DATADIR%%/reversi/pixmaps/checkers/wf.gif -%%DATADIR%%/reversi/pixmaps/xboard/b.gif -%%DATADIR%%/reversi/pixmaps/xboard/bf.gif -%%DATADIR%%/reversi/pixmaps/xboard/icondef.xml -%%DATADIR%%/reversi/pixmaps/xboard/w.gif -%%DATADIR%%/reversi/pixmaps/xboard/wf.gif -%%DATADIR%%/reversi/proto -%%DATADIR%%/reversi/reversi.tcl -%%DATADIR%%/singularity/AUTHORS -%%DATADIR%%/singularity/INSTALL -%%DATADIR%%/singularity/README -%%DATADIR%%/singularity/license.terms -%%DATADIR%%/singularity/msgs/ru.msg -%%DATADIR%%/singularity/singularity.tcl -%%DATADIR%%/socials/ChangeLog -%%DATADIR%%/socials/README -%%DATADIR%%/socials/msgs/de.msg -%%DATADIR%%/socials/msgs/ru.msg -%%DATADIR%%/socials/socials.en -%%DATADIR%%/socials/socials.ru -%%DATADIR%%/socials/socials.tcl -%%DATADIR%%/spy/msgs/de.msg -%%DATADIR%%/spy/msgs/es.msg -%%DATADIR%%/spy/msgs/pl.msg -%%DATADIR%%/spy/msgs/ru.msg -%%DATADIR%%/spy/msgs/uk.msg -%%DATADIR%%/spy/spy.tcl -%%DATADIR%%/stripes/AUTHORS -%%DATADIR%%/stripes/INSTALL -%%DATADIR%%/stripes/README -%%DATADIR%%/stripes/license.terms -%%DATADIR%%/stripes/stripes.tcl -%%DATADIR%%/tclchat/msgs/es.msg -%%DATADIR%%/tclchat/msgs/ru.msg -%%DATADIR%%/tclchat/tclchat.tcl -%%DATADIR%%/tclchat/tclchat_commands.tcl -%%DATADIR%%/tclchat/tclchat_messages.tcl -%%DATADIR%%/tkabber-khim/ChangeLog -%%DATADIR%%/tkabber-khim/INSTALL -%%DATADIR%%/tkabber-khim/VERSION -%%DATADIR%%/tkabber-khim/khim/ROOT.msg -%%DATADIR%%/tkabber-khim/khim/cs.msg -%%DATADIR%%/tkabber-khim/khim/da.msg -%%DATADIR%%/tkabber-khim/khim/de.msg -%%DATADIR%%/tkabber-khim/khim/en.msg -%%DATADIR%%/tkabber-khim/khim/es.msg -%%DATADIR%%/tkabber-khim/khim/khim.tcl -%%DATADIR%%/tkabber-khim/khim/pkgIndex.tcl -%%DATADIR%%/tkabber-khim/khim/pl.msg -%%DATADIR%%/tkabber-khim/khim/ru.msg -%%DATADIR%%/tkabber-khim/khim/uk.msg -%%DATADIR%%/tkabber-khim/msgs/es.msg -%%DATADIR%%/tkabber-khim/msgs/pl.msg -%%DATADIR%%/tkabber-khim/msgs/ru.msg -%%DATADIR%%/tkabber-khim/tkabber-khim.tcl -%%DATADIR%%/tkabber-khim/tklib_licence.terms -%%DATADIR%%/traffic/Changelog -%%DATADIR%%/traffic/msgs/de.msg -%%DATADIR%%/traffic/msgs/es.msg -%%DATADIR%%/traffic/msgs/pl.msg -%%DATADIR%%/traffic/msgs/ru.msg -%%DATADIR%%/traffic/msgs/uk.msg -%%DATADIR%%/traffic/traffic.tcl -%%DATADIR%%/traffic/version.txt -%%DATADIR%%/unixkeys/AUTHORS -%%DATADIR%%/unixkeys/INSTALL -%%DATADIR%%/unixkeys/README -%%DATADIR%%/unixkeys/TODO -%%DATADIR%%/unixkeys/license.terms -%%DATADIR%%/unixkeys/unixkeys.tcl -%%DATADIR%%/whiteboard/ChangeLog -%%DATADIR%%/whiteboard/msgs/de.msg -%%DATADIR%%/whiteboard/msgs/es.msg -%%DATADIR%%/whiteboard/msgs/nl.msg -%%DATADIR%%/whiteboard/msgs/pl.msg -%%DATADIR%%/whiteboard/msgs/ro.msg -%%DATADIR%%/whiteboard/msgs/ru.msg -%%DATADIR%%/whiteboard/msgs/uk.msg -%%DATADIR%%/whiteboard/svgrender.tcl -%%DATADIR%%/whiteboard/whiteboard.tcl -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/aniemoticons/msgs -@dirrm %%DATADIR%%/aniemoticons -@dirrm %%DATADIR%%/attline/msgs -@dirrm %%DATADIR%%/attline -@dirrm %%DATADIR%%/bc/msgs -@dirrm %%DATADIR%%/bc -@dirrm %%DATADIR%%/browser/msgs -@dirrm %%DATADIR%%/browser -@dirrm %%DATADIR%%/checkers/pixmaps/xboard -@dirrm %%DATADIR%%/checkers/pixmaps/checkers -@dirrm %%DATADIR%%/checkers/pixmaps -@dirrm %%DATADIR%%/checkers/msgs -@dirrm %%DATADIR%%/checkers/rules -@dirrm %%DATADIR%%/checkers -@dirrm %%DATADIR%%/chess/pixmaps/xboard -@dirrm %%DATADIR%%/chess/pixmaps/classic -@dirrm %%DATADIR%%/chess/pixmaps/wooden -@dirrm %%DATADIR%%/chess/pixmaps -@dirrm %%DATADIR%%/chess/msgs -@dirrm %%DATADIR%%/chess -@dirrm %%DATADIR%%/ctcomp -@dirrm %%DATADIR%%/custom-urls/msgs -@dirrm %%DATADIR%%/custom-urls -@dirrm %%DATADIR%%/cyrillize/msgs -@dirrm %%DATADIR%%/cyrillize -@dirrm %%DATADIR%%/debug/msgs -@dirrm %%DATADIR%%/debug -@dirrm %%DATADIR%%/ejabberd/msgs -@dirrm %%DATADIR%%/ejabberd -@dirrm %%DATADIR%%/floatingcontact/msgs -@dirrm %%DATADIR%%/floatingcontact -@dirrm %%DATADIR%%/floatinglog/msgs -@dirrm %%DATADIR%%/floatinglog -@dirrm %%DATADIR%%/georoster/msgs -@dirrm %%DATADIR%%/georoster -@dirrm %%DATADIR%%/gmail/msgs -@dirrm %%DATADIR%%/gmail -@dirrm %%DATADIR%%/iconsets/gabber/services -@dirrm %%DATADIR%%/iconsets/gabber/tkabber -@dirrm %%DATADIR%%/iconsets/gabber/docking -@dirrm %%DATADIR%%/iconsets/gabber/roster -@dirrm %%DATADIR%%/iconsets/gabber -@dirrm %%DATADIR%%/iconsets/gush/tkabber -@dirrm %%DATADIR%%/iconsets/gush/docking -@dirrm %%DATADIR%%/iconsets/gush/roster -@dirrm %%DATADIR%%/iconsets/gush -@dirrm %%DATADIR%%/iconsets/jajc/services -@dirrm %%DATADIR%%/iconsets/jajc/tkabber -@dirrm %%DATADIR%%/iconsets/jajc/docking -@dirrm %%DATADIR%%/iconsets/jajc/roster -@dirrm %%DATADIR%%/iconsets/jajc -@dirrm %%DATADIR%%/iconsets/jarl/roster -@dirrm %%DATADIR%%/iconsets/jarl -@dirrm %%DATADIR%%/iconsets/msgs -@dirrm %%DATADIR%%/iconsets/amibulb/tkabber -@dirrm %%DATADIR%%/iconsets/amibulb/docking -@dirrm %%DATADIR%%/iconsets/amibulb/roster -@dirrm %%DATADIR%%/iconsets/amibulb -@dirrm %%DATADIR%%/iconsets/psi/tkabber -@dirrm %%DATADIR%%/iconsets/psi/roster -@dirrm %%DATADIR%%/iconsets/psi -@dirrm %%DATADIR%%/iconsets/icq/tkabber -@dirrm %%DATADIR%%/iconsets/icq/docking -@dirrm %%DATADIR%%/iconsets/icq/roster -@dirrm %%DATADIR%%/iconsets/icq -@dirrm %%DATADIR%%/iconsets/kroc/services -@dirrm %%DATADIR%%/iconsets/kroc/tkabber -@dirrm %%DATADIR%%/iconsets/kroc/docking -@dirrm %%DATADIR%%/iconsets/kroc/roster -@dirrm %%DATADIR%%/iconsets/kroc -@dirrm %%DATADIR%%/iconsets -@dirrm %%DATADIR%%/jidlink/plugins -@dirrm %%DATADIR%%/jidlink/trans -@dirrm %%DATADIR%%/jidlink/msgs -@dirrm %%DATADIR%%/jidlink -@dirrm %%DATADIR%%/latex/msgs -@dirrm %%DATADIR%%/latex -@dirrm %%DATADIR%%/mute/msgs -@dirrm %%DATADIR%%/mute -@dirrm %%DATADIR%%/openurl/msgs -@dirrm %%DATADIR%%/openurl -@dirrm %%DATADIR%%/osd -@dirrm %%DATADIR%%/poker/pixmaps/classic -@dirrm %%DATADIR%%/poker/pixmaps/doods -@dirrm %%DATADIR%%/poker/pixmaps -@dirrm %%DATADIR%%/poker/msgs -@dirrm %%DATADIR%%/poker -@dirrm %%DATADIR%%/presencecmd/msgs -@dirrm %%DATADIR%%/presencecmd -@dirrm %%DATADIR%%/quiz/msgs -@dirrm %%DATADIR%%/quiz -@dirrm %%DATADIR%%/quotelastmsg/msgs -@dirrm %%DATADIR%%/quotelastmsg -@dirrm %%DATADIR%%/receipts/images -@dirrm %%DATADIR%%/receipts/msgs -@dirrm %%DATADIR%%/receipts -@dirrm %%DATADIR%%/renju/pixmaps/stones -@dirrm %%DATADIR%%/renju/pixmaps/black -@dirrm %%DATADIR%%/renju/pixmaps -@dirrm %%DATADIR%%/renju/msgs -@dirrm %%DATADIR%%/renju -@dirrm %%DATADIR%%/reversi/pixmaps/xboard -@dirrm %%DATADIR%%/reversi/pixmaps/checkers -@dirrm %%DATADIR%%/reversi/pixmaps -@dirrm %%DATADIR%%/reversi/msgs -@dirrm %%DATADIR%%/reversi -@dirrm %%DATADIR%%/singularity/msgs -@dirrm %%DATADIR%%/singularity -@dirrm %%DATADIR%%/socials/msgs -@dirrm %%DATADIR%%/socials -@dirrm %%DATADIR%%/spy/msgs -@dirrm %%DATADIR%%/spy -@dirrm %%DATADIR%%/stripes -@dirrm %%DATADIR%%/tclchat/msgs -@dirrm %%DATADIR%%/tclchat -@dirrm %%DATADIR%%/tkabber-khim/khim -@dirrm %%DATADIR%%/tkabber-khim/msgs -@dirrm %%DATADIR%%/tkabber-khim -@dirrm %%DATADIR%%/traffic/msgs -@dirrm %%DATADIR%%/traffic -@dirrm %%DATADIR%%/unixkeys -@dirrm %%DATADIR%%/whiteboard/msgs -@dirrm %%DATADIR%%/whiteboard -@dirrm %%DATADIR%% diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile deleted file mode 100644 index aad4933f50f1..000000000000 --- a/net-mgmt/collectd5/Makefile +++ /dev/null @@ -1,307 +0,0 @@ -# New ports collection makefile for: collectd -# Date created: Sat Sep 29 05:19:31 PDT 2007 -# Whom: Matt Peterson <matt@peterson.org> -# -# $FreeBSD$ -# - -PORTNAME= collectd -PORTVERSION= 4.9.2 -PORTREVISION= 1 -CATEGORIES= net-mgmt -MASTER_SITES= http://collectd.org/files/ - -MAINTAINER= ports@bsdserwis.com -COMMENT= Systems & network statistics collection daemon - -USE_GMAKE= yes -GNU_CONFIGURE= yes -WANT_GNOME= yes - -OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \ - DEBUG "Enable debugging" Off \ - APACHE "Input: Apache mod_status (libcurl)" Off \ - APCUPS "Input: APC UPS (apcupsd)" Off \ - CURL "Input: CURL generic web statistics" Off \ - NUTUPS "Input: NUT UPS daemon" Off \ - INTERFACE "Input: Network interfaces (libstatgrab)" On \ - MBMON "Input: MBMon" Off \ - MYSQL "Input: MySQL" Off \ - NGINX "Input: Nginx" Off \ - PDNS "Input: PowerDNS" Off \ - PGSQL "Input: PostgreSQL" Off \ - PING "Input: Network latency (liboping)" On \ - SNMP "Input: SNMP" On \ - XMMS "Input: XMMS" Off \ - RRDTOOL "Output: RRDTool" On - -MAN1= collectd.1 collectd-nagios.1 collectdmon.1 -MAN5= collectd.conf.5 collectd-email.5 collectd-exec.5 \ - collectd-snmp.5 collectd-unixsock.5 collectd-perl.5 \ - collectd-java.5 collectd-python.5 types.db.5 -USE_RC_SUBR= collectd collectdmon - -USE_LDCONFIG= yes - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} < 601103 ) -BROKEN= Need bind9 import post 6.1 -.endif - -.if ${OSVERSION} < 700000 -BROKEN= does not configure on 6.X -.endif - -# NOTE: Feel free to submit patches adding support for any of these -# disabled plugins. If a plugin requires external dependencies, -# make it optional through OPTIONS defaulting to Off. Some of -# these are Linux specific, but others will probably run on -# FreeBSD as well, given a bit of careful attention. -CONFIGURE_ARGS= --localstatedir=/var \ - --disable-getifaddrs \ - --disable-apple_sensors \ - --disable-ascent \ - --disable-battery \ - --disable-bind \ - --disable-conntrack \ - --disable-contextswitch \ - --disable-cpufreq \ - --disable-curl_json \ - --disable-dbi \ - --disable-disk \ - --disable-entropy \ - --disable-fscache \ - --disable-gmond \ - --disable-hddtemp \ - --disable-iptables \ - --disable-ipmi \ - --disable-ipvs \ - --disable-irq \ - --disable-java \ - --disable-libvirt \ - --disable-madwifi \ - --disable-match_empty_counter \ - --disable-match_hashed \ - --disable-match_regex \ - --disable-match_timediff \ - --disable-match_value \ - --disable-memcachec \ - --disable-multimeter \ - --disable-netapp \ - --disable-netlink \ - --disable-nfs \ - --disable-notify_desktop \ - --disable-notify_email \ - --disable-olsrd \ - --disable-onewire \ - --disable-openvpn \ - --disable-oracle \ - --disable-perl \ - --disable-python \ - --disable-protocols \ - --disable-routeros \ - --disable-rrdcached \ - --disable-sensors \ - --disable-serial \ - --disable-table \ - --disable-tape \ - --disable-target_notification \ - --disable-target_replace \ - --disable-target_scale \ - --disable-target_set \ - --disable-ted \ - --disable-thermal \ - --disable-tokyotyrant \ - --disable-users \ - --disable-vmem \ - --disable-vserver \ - --disable-wireless \ - --disable-write_http \ - --disable-zfs_arc \ - --without-perl-bindings - -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--enable-debug -.endif - -.if defined(WITH_CGI) -RUN_DEPENDS+= ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \ - ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper -PLIST_SUB+= CGI="" -.else -PLIST_SUB+= CGI="@comment " -.endif - -.if defined(WITH_APACHE) -CONFIGURE_ARGS+=--enable-apache -LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl -PLIST_SUB+= APACHE="" -.else -CONFIGURE_ARGS+=--disable-apache -PLIST_SUB+= APACHE="@comment " -.endif - -.if defined(WITH_APCUPS) -CONFIGURE_ARGS+=--enable-apcups -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd -PLIST_SUB+= APCUPS="" -.else -CONFIGURE_ARGS+=--disable-apcups -PLIST_SUB+= APCUPS="@comment " -.endif - -.if defined(WITH_CURL) -CONFIGURE_ARGS+=--enable-curl --with-libcurl=${LOCALBASE} -LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl -PLIST_SUB+= CURL="" -.else -CONFIGURE_ARGS+=--disable-curl -PLIST_SUB+= CURL="@comment " -.endif - -.if defined(WITH_NUTUPS) -CONFIGURE_ARGS+=--enable-nut -BUILD_DEPENDS+= ${LOCALBASE}/include/upsclient.h:${PORTSDIR}/sysutils/nut -PLIST_SUB+= NUTUPS="" -.else -CONFIGURE_ARGS+=--disable-nut -PLIST_SUB+= NUTUPS="@comment " -.endif - -.if defined(WITH_INTERFACE) -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config -CONFIGURE_ARGS+=--enable-interface -LIB_DEPENDS+= statgrab.8:${PORTSDIR}/devel/libstatgrab -PLIST_SUB+= INTERFACE="" -CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`" -.else -CONFIGURE_ARGS+=--disable-interface -PLIST_SUB+= INTERFACE="@comment " -.endif - -.if defined(WITH_MBMON) -CONFIGURE_ARGS+=--enable-mbmon -RUN_DEPENDS+= ${LOCALBASE}/sbin/mbmond:${PORTSDIR}/sysutils/mbmon -PLIST_SUB+= MBMON="" -.else -CONFIGURE_ARGS+=--disable-mbmon -PLIST_SUB+= MBMON="@comment " -.endif - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+=--enable-mysql -PLIST_SUB+= MYSQL="" -.else -CONFIGURE_ARGS+=--disable-mysql -PLIST_SUB+= MYSQL="@comment " -.endif - -.if defined(WITH_NGINX) -USE_NGINX= yes -LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl -CONFIGURE_ARGS+=--enable-nginx -PLIST_SUB+= NGINX="" -.else -CONFIGURE_ARGS+=--disable-nginx -PLIST_SUB+= NGINX="@comment " -.endif - -.if defined(WITH_PDNS) -USE_PDNS= yes -CONFIGURE_ARGS+=--enable-powerdns -PLIST_SUB+= PDNS="" -.else -CONFIGURE_ARGS+=--disable-powerdns -PLIST_SUB+= PDNS="@comment " -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL= yes -CONFIGURE_ARGS+=--enable-postgresql -PLIST_SUB+= PGSQL="" -.else -CONFIGURE_ARGS+=--disable-postgresql -PLIST_SUB+= PGSQL="@comment " -.endif - -.if defined(WITH_PING) -LIB_DEPENDS+= oping:${PORTSDIR}/net/liboping -CONFIGURE_ARGS+=--enable-ping -PLIST_SUB+= PING="" -.else -CONFIGURE_ARGS+=--disable-ping -PLIST_SUB+= PING="@comment " -.endif - -.if defined(WITH_RRDTOOL) -LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool -CONFIGURE_ARGS+=--enable-rrdtool -PLIST_SUB+= RRD="" -.else -CONFIGURE_ARGS+=--disable-rrdtool -PLIST_SUB+= RRD="@comment " -.endif - -.if defined(WITH_SNMP) -LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp -CONFIGURE_ARGS+=--enable-snmp -PLIST_SUB+= SNMP="" -.else -CONFIGURE_ARGS+=--disable-snmp -PLIST_SUB+= SNMP="@comment " -.endif - -.if defined(WITH_XMMS) -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms -CONFIGURE_ARGS+=--enable-xmms -CFLAGS+= `xmms-config --cflags` -PLIST_SUB+= XMMS="" -.else -CONFIGURE_ARGS+=--disable-xmms -PLIST_SUB+= XMMS="@comment " -.endif - -post-patch: - @${REINPLACE_CMD} \ - -e 's;@prefix@/var/;/var/;' \ - -e 's;/var/lib/;/var/db/;' \ - ${WRKSRC}/src/collectd.conf.in - @${REINPLACE_CMD} \ - -e 's;$$[(]DESTDIR)$$[(]sysconfdir)/collectd\.conf;&.sample;' \ - ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -e '/$$[(]mkinstalldirs)/d' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} \ - -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ - ${WRKSRC}/contrib/collection.cgi - @${REINPLACE_CMD} \ - -e 's;/opt/collectd/var/lib;/var/db;' \ - -e 's;/opt/collectd/lib;${PREFIX}/lib;' \ - ${WRKSRC}/contrib/collection.conf - @${REINPLACE_CMD} \ - -e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \ - ${WRKSRC}/configure - -post-install: - ${MKDIR} /var/db/collectd - if [ ! -f ${PREFIX}/etc/collectd.conf ]; then \ - ${CP} -p ${PREFIX}/etc/collectd.conf.sample \ - ${PREFIX}/etc/collectd.conf ; \ - fi -.if defined(WITH_CGI) - ${MKDIR} ${WWWDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${WWWDIR}/ - ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ - ${WWWDIR}/collection.conf.sample - if [ ! -f ${WWWDIR}/collection.conf ]; then \ - ${CP} -p ${WWWDIR}/collection.conf.sample \ - ${WWWDIR}/collection.conf ; \ - fi -.endif - -.include <bsd.port.post.mk> diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo deleted file mode 100644 index ba957ae32ec2..000000000000 --- a/net-mgmt/collectd5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (collectd-4.9.2.tar.gz) = 2734f272753bfa8523dfed133866ae04 -SHA256 (collectd-4.9.2.tar.gz) = a171adf3f94136df3f56148084531e786ed72bda807dc0b3d9fb2bebe53b904d -SIZE (collectd-4.9.2.tar.gz) = 1691127 diff --git a/net-mgmt/collectd5/files/collectd.in b/net-mgmt/collectd5/files/collectd.in deleted file mode 100644 index 71791883f3cb..000000000000 --- a/net-mgmt/collectd5/files/collectd.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# PROVIDE: collectd -# REQUIRE: LOGIN -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# collectd_enable (bool): Set to NO by default. -# Set it to YES to enable collectd. -# collectd_flags (string): Set to "" by default. -# Additional flags to collectd, see manual page. -# - -. /etc/rc.subr - -name="collectd" -rcvar=${name}_enable - -command=%%PREFIX%%/sbin/${name} - -load_rc_config $name - -: ${collectd_enable="NO"} - -run_rc_command "$1" diff --git a/net-mgmt/collectd5/files/collectdmon.in b/net-mgmt/collectd5/files/collectdmon.in deleted file mode 100644 index 09afc7129d37..000000000000 --- a/net-mgmt/collectd5/files/collectdmon.in +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# PROVIDE: collectdmon -# REQUIRE: LOGIN -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# collectdmon_enable (bool): Set to NO by default. -# Set it to YES to enable collectd. -# collectdmon_flags (string): Set to "-c %%PREFIX%%/sbin/collectd" by default. -# Additional flags to collectdmon, see manual page. -# - -. /etc/rc.subr - -name="collectdmon" -rcvar=${name}_enable - -command=%%PREFIX%%/sbin/${name} - -load_rc_config $name - -: ${collectdmon_enable="NO"} -: ${collectdmon_flags="-c %%PREFIX%%/sbin/collectd"} - -run_rc_command "$1" diff --git a/net-mgmt/collectd5/files/patch-src__collectd.h b/net-mgmt/collectd5/files/patch-src__collectd.h deleted file mode 100644 index 8058189613b1..000000000000 --- a/net-mgmt/collectd5/files/patch-src__collectd.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/collectd.h.orig 2007-09-28 17:55:34.000000000 +0300 -+++ ./src/collectd.h 2008-05-06 10:32:08.000000000 +0300 -@@ -183,7 +183,7 @@ - #endif - - #ifndef LOCALSTATEDIR --#define LOCALSTATEDIR PREFIX "/var" -+#define LOCALSTATEDIR "/var" - #endif - - #ifndef PKGLOCALSTATEDIR -@@ -191,7 +191,7 @@ - #endif - - #ifndef PIDFILE --#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" -+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" - #endif - - #ifndef PLUGINDIR diff --git a/net-mgmt/collectd5/files/patch-src__dns.c b/net-mgmt/collectd5/files/patch-src__dns.c deleted file mode 100644 index fb045049b25a..000000000000 --- a/net-mgmt/collectd5/files/patch-src__dns.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/dns.c.orig 2008-09-05 15:26:02.000000000 +0000 -+++ src/dns.c 2008-09-05 15:25:55.000000000 +0000 -@@ -210,6 +210,15 @@ - pthread_sigmask (SIG_SETMASK, &sigmask, NULL); - } - -+ /* Check for pcap_device, if needed */ -+#ifdef __sparc64__ -+ if (pcap_device == NULL) -+ { -+ ERROR ("dns plugin: Interface required"); -+ return (NULL); -+ } -+#endif -+ - /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ - DEBUG ("Creating PCAP object.."); - pcap_obj = pcap_open_live (pcap_device, diff --git a/net-mgmt/collectd5/pkg-descr b/net-mgmt/collectd5/pkg-descr deleted file mode 100644 index a591a0195caa..000000000000 --- a/net-mgmt/collectd5/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -collectd is a small daemon written in C for performance. It reads various -system & network statistics along with updating output RRD or CSV files. -The daemon is very fast and allows for frequent polling of values, with -support for polling as frequent as every 10 seconds. - -WWW: http://www.collectd.org/ diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist deleted file mode 100644 index 34cfb4a6af84..000000000000 --- a/net-mgmt/collectd5/pkg-plist +++ /dev/null @@ -1,135 +0,0 @@ -@stopdaemon collectd -sbin/collectd -sbin/collectdmon -@unexec if cmp -s %D/etc/collectd.conf.sample %D/etc/collectd.conf; then rm -f %D/etc/collectd.conf; fi -etc/collectd.conf.sample -@exec if [ ! -f %B/collectd.conf ] ; then cp -p %B/%f %B/collectd.conf; fi -%%CGI%%%%WWWDIR%%/collection.cgi -%%CGI%%@unexec if cmp -s %B/collection.conf.sample %B/collection.conf; then rm -f %B/collection.conf; fi -%%CGI%%%%WWWDIR%%/collection.conf.sample -%%CGI%%@exec if [ ! -f %B/collection.conf ] ; then cp -p %B/%f %B/collection.conf; fi -%%CGI%%@dirrmtry %%WWWDIR%% -bin/collectd-nagios -lib/libcollectdclient.a -lib/libcollectdclient.la -lib/libcollectdclient.so -lib/libcollectdclient.so.0 -%%APACHE%%lib/collectd/apache.a -%%APACHE%%lib/collectd/apache.la -%%APACHE%%lib/collectd/apache.so -%%APCUPS%%lib/collectd/apcups.a -%%APCUPS%%lib/collectd/apcups.la -%%APCUPS%%lib/collectd/apcups.so -lib/collectd/cpu.a -lib/collectd/cpu.la -lib/collectd/cpu.so -lib/collectd/csv.a -lib/collectd/csv.la -lib/collectd/csv.so -%%CURL%%lib/collectd/curl.a -%%CURL%%lib/collectd/curl.la -%%CURL%%lib/collectd/curl.so -lib/collectd/df.a -lib/collectd/df.la -lib/collectd/df.so -lib/collectd/dns.a -lib/collectd/dns.la -lib/collectd/dns.so -lib/collectd/email.a -lib/collectd/email.la -lib/collectd/email.so -lib/collectd/exec.a -lib/collectd/exec.la -lib/collectd/exec.so -lib/collectd/filecount.so -lib/collectd/filecount.la -lib/collectd/filecount.a -%%INTERFACE%%lib/collectd/interface.a -%%INTERFACE%%lib/collectd/interface.la -%%INTERFACE%%lib/collectd/interface.so -lib/collectd/load.a -lib/collectd/load.la -lib/collectd/load.so -lib/collectd/logfile.a -lib/collectd/logfile.la -lib/collectd/logfile.so -%%MBMON%%lib/collectd/mbmon.a -%%MBMON%%lib/collectd/mbmon.la -%%MBMON%%lib/collectd/mbmon.so -lib/collectd/memcached.so -lib/collectd/memcached.la -lib/collectd/memcached.a -lib/collectd/memory.a -lib/collectd/memory.la -lib/collectd/memory.so -%%MYSQL%%lib/collectd/mysql.a -%%MYSQL%%lib/collectd/mysql.la -%%MYSQL%%lib/collectd/mysql.so -%%NGINX%%lib/collectd/nginx.a -%%NGINX%%lib/collectd/nginx.la -%%NGINX%%lib/collectd/nginx.so -lib/collectd/network.a -lib/collectd/network.la -lib/collectd/network.so -%%NUTUPS%%lib/collectd/nut.a -%%NUTUPS%%lib/collectd/nut.la -%%NUTUPS%%lib/collectd/nut.so -lib/collectd/ntpd.a -lib/collectd/ntpd.la -lib/collectd/ntpd.so -%%PGSQL%%lib/collectd/postgresql.a -%%PGSQL%%lib/collectd/postgresql.la -%%PGSQL%%lib/collectd/postgresql.so -%%PING%%lib/collectd/ping.a -%%PING%%lib/collectd/ping.la -%%PING%%lib/collectd/ping.so -%%PDNS%%lib/collectd/powerdns.so -%%PDNS%%lib/collectd/powerdns.a -%%PDNS%%lib/collectd/powerdns.la -lib/collectd/processes.so -lib/collectd/processes.la -lib/collectd/processes.a -%%RRD%%lib/collectd/rrdtool.a -%%RRD%%lib/collectd/rrdtool.la -%%RRD%%lib/collectd/rrdtool.so -%%SNMP%%lib/collectd/snmp.a -%%SNMP%%lib/collectd/snmp.la -%%SNMP%%lib/collectd/snmp.so -lib/collectd/swap.a -lib/collectd/swap.la -lib/collectd/swap.so -lib/collectd/syslog.a -lib/collectd/syslog.la -lib/collectd/syslog.so -lib/collectd/tail.so -lib/collectd/tail.la -lib/collectd/tail.a -lib/collectd/tcpconns.so -lib/collectd/tcpconns.la -lib/collectd/tcpconns.a -lib/collectd/teamspeak2.so -lib/collectd/teamspeak2.la -lib/collectd/teamspeak2.a -lib/collectd/unixsock.a -lib/collectd/unixsock.la -lib/collectd/unixsock.so -lib/collectd/uptime.so -lib/collectd/uptime.la -lib/collectd/uptime.a -lib/collectd/uuid.so -lib/collectd/uuid.la -lib/collectd/uuid.a -include/collectd/client.h -include/collectd/lcc_features.h -libdata/pkgconfig/libcollectdclient.pc -%%XMMS%%lib/collectd/xmms.a -%%XMMS%%lib/collectd/xmms.la -%%XMMS%%lib/collectd/xmms.so -%%DATADIR%%/postgresql_default.conf -%%DATADIR%%/types.db -@dirrm lib/collectd -@dirrm include/collectd -@dirrm %%DATADIR%% -@exec mkdir -p /var/db/collectd -@cwd / -@dirrmtry /var/db/collectd diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile deleted file mode 100644 index 4308e6987d5c..000000000000 --- a/net-mgmt/zabbix2-agent/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# Ports collection makefile for: zabbix-agent -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PKGNAMESUFFIX= -agent - -MASTERDIR= ${.CURDIR}/../zabbix-server - -PLIST= ${PKGDIR}/pkg-plist.agent - -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS= IPV6 "Support for IPv6" on - -.include <bsd.port.options.mk> -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix2-frontend/Makefile b/net-mgmt/zabbix2-frontend/Makefile deleted file mode 100644 index 43193b42bbc3..000000000000 --- a/net-mgmt/zabbix2-frontend/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: zabbix-frontend -# Date created: 2009-12-09 -# Whom: Jim Riggs <ports@christianserving.org> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PKGNAMESUFFIX= -frontend - -MASTERDIR= ${.CURDIR}/../zabbix-server - -NO_BUILD= yes -PATCHDIR= -PLIST= ${PKGDIR}/pkg-plist.frontend - -USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ - xmlreader xmlwriter -IGNORE_WITH_PHP= 4 -WANT_PHP_WEB= yes - -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS= MYSQL "Use MySQL backend" on \ - PGSQL "Use PostgreSQL backend" off \ - SQLITE "Use SQLite backend" off - -.include <bsd.port.options.mk> - -.ifndef WITHOUT_MYSQL -USE_PHP+= mysql -.endif - -.ifdef WITH_MYSQLI -USE_PHP+= mysqli -.endif - -.ifdef WITH_PGSQL -USE_PHP+= pgsql -.endif - -.ifdef WITH_SQLITE -USE_PHP+= sqlite -.endif - -do-install: - @${INSTALL} -d ${WWWDIR} - @cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix2-proxy/Makefile b/net-mgmt/zabbix2-proxy/Makefile deleted file mode 100644 index d43f8c1952e3..000000000000 --- a/net-mgmt/zabbix2-proxy/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# New ports collection makefile for: zabbix-proxy -# Date created: 2009-12-09 -# Whom: Jim Riggs <ports@christianserving.org> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PKGNAMESUFFIX= -proxy - -MASTERDIR= ${.CURDIR}/../zabbix-server - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile deleted file mode 100644 index f9c1ad5f84cc..000000000000 --- a/net-mgmt/zabbix2-server/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# New ports collection makefile for: zabbix-server -# Date created: 2009-12-09 -# Whom: Jim Riggs <ports@christianserving.org> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PORTVERSION= 1.8.2 -PORTREVISION?= 2 -PORTEPOCH= 2 -CATEGORIES= net-mgmt -MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} -PKGNAMESUFFIX?= -server - -MAINTAINER= ports@christianserving.org -COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) - -CONFLICTS= ${PKGBASE}-1.[0-6]* - -.if ${PKGNAMESUFFIX} != "-agent" -CONFLICTS+= ${PORTNAME}-1.[0-6]* -.endif - -ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} - -.if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings -.if ${ZABBIX_BUILD} != "agent" -MAN8= ${PORTNAME}_${ZABBIX_BUILD}.8 -USE_RC_SUBR= ${PORTNAME}_${ZABBIX_BUILD} -.else -USE_ICONV= yes -MAN1= ${PORTNAME}_get.1 ${PORTNAME}_sender.1 -MAN8= ${PORTNAME}_${ZABBIX_BUILD}d.8 -USE_RC_SUBR= ${PORTNAME}_${ZABBIX_BUILD}d -.endif - -USERS= zabbix -GROUPS= zabbix - -PLIST_SUB= ZABBIX_BUILD=${ZABBIX_BUILD} -SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE} - -MAKE_ARGS+= ARCH=freebsd -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" - -.if ${ZABBIX_BUILD} != "agent" -LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \ - curl:${PORTSDIR}/ftp/curl - -SUB_FILES= pkg-message - -CONFIGURE_ARGS+= --with-net-snmp - -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS= MYSQL "Use MySQL backend" on \ - PGSQL "Use PostgreSQL backend" off \ - SQLITE "Use SQLite backend" off \ - IPV6 "Support for IPv6" on \ - LDAP "Support for checking LDAP servers" on \ - IPMI "Support for IPMI" off \ - JABBER "Use jabber media type" on \ - FPING "Use fping for pinging hosts" on \ - SSH "Use libssh2 for SSH-based checks" off - -.include <bsd.port.options.mk> - -.ifndef WITHOUT_MYSQL -ZABBIX_REQUIRE= " mysql" -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql -.elifdef WITH_PGSQL -ZABBIX_REQUIRE= " postgresql" -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-pgsql -.elifdef WITH_SQLITE -ZABBIX_REQUIRE= -USE_SQLITE= 3 -CONFIGURE_ARGS+= --with-sqlite3 -.else -IGNORE= zabbix requires a database backend -.endif - -.ifndef WITHOUT_LDAP -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldap -.endif - -.ifdef WITH_IPMI -LIB_DEPENDS+= OpenIPMI:${PORTSDIR}/sysutils/openipmi -CONFIGURE_ARGS+= --with-openipmi -.endif - -.ifndef WITHOUT_JABBER -LIB_DEPENDS+= iksemel:${PORTSDIR}/textproc/iksemel -CONFIGURE_ARGS+= --with-jabber -.endif - -.ifndef WITHOUT_FPING -RUN_DEPENDS+= fping:${PORTSDIR}/net/fping -.endif - -.ifdef WITH_SSH -LIB_DEPENDS+= ssh2:${PORTSDIR}/security/libssh2 -CONFIGURE_ARGS+= --with-ssh2 -.endif -.endif # if ${ZABBIX_BUILD} != "agent" - -.ifdef WITH_IPV6 -CONFIGURE_ARGS+= --enable-ipv6 -.endif - -post-patch: - @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ - | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' \ - && ${FIND} ${WRKSRC} -type f -name '*.bak' -exec ${RM} -f {} + - @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/misc/conf/${PORTNAME}_*.conf - -.if ${ZABBIX_BUILD} != "agent" -.ifdef WITHOUT_FPING - @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}.conf -.endif -.endif - -post-install: - @${INSTALL} -d ${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}.conf ${ETCDIR}/${PORTNAME}_${ZABBIX_BUILD}.conf.sample - -.if ${ZABBIX_BUILD} == "agent" - @${INSTALL_DATA} ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}d.conf ${ETCDIR}/${PORTNAME}_${ZABBIX_BUILD}d.conf.sample -.endif - -.if ${ZABBIX_BUILD} != "agent" - @cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/ - @cd ${WRKSRC}/create/ && ${COPYTREE_SHARE} "data schema" ${DATADIR}/${ZABBIX_BUILD}/create/ - @${CAT} ${PKGMESSAGE} -.endif -.endif # if ${ZABBIX_BUILD} != "frontend" - -.include <bsd.port.mk> diff --git a/net-mgmt/zabbix2-server/distinfo b/net-mgmt/zabbix2-server/distinfo deleted file mode 100644 index 993d92207709..000000000000 --- a/net-mgmt/zabbix2-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (zabbix-1.8.2.tar.gz) = fa4be4fa7ac20a33cc0aa5c27b827746 -SHA256 (zabbix-1.8.2.tar.gz) = ba1d00454551c1c6f0d270f76718b69ce9f54c427e22acb5a13ccbc9e621fd81 -SIZE (zabbix-1.8.2.tar.gz) = 3706540 diff --git a/net-mgmt/zabbix2-server/files/patch-configure b/net-mgmt/zabbix2-server/files/patch-configure deleted file mode 100644 index 54dbd17b2d6b..000000000000 --- a/net-mgmt/zabbix2-server/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ - ---- configure.orig 2010-05-17 15:38:52.189911152 +0400 -+++ configure 2010-05-17 15:39:13.793087125 +0400 -@@ -12472,7 +12472,7 @@ - fi #if test "x$_libssh2_dir" = "xno"; then - fi # if test "x$want_ssh2" != "xno"; then - -- if test "x$found_ssh2" == "xyes"; then -+ if test "x$found_ssh2" = "xyes"; then - am_save_cflags="$CFLAGS" - am_save_ldflags="$LDFLAGS" - am_save_libs="$LIBS" -@@ -12537,7 +12537,7 @@ - LDFLAGS="$am_save_ldflags" - LIBS="$am_save_libs" - -- if test "x$found_ssh2" == "xyes"; then -+ if test "x$found_ssh2" = "xyes"; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_SSH2 1 - - diff --git a/net-mgmt/zabbix2-server/files/pkg-message.in b/net-mgmt/zabbix2-server/files/pkg-message.in deleted file mode 100644 index 754f2c90ce66..000000000000 --- a/net-mgmt/zabbix2-server/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -====================================================================== -Zabbix requires a database. If you are using SQLite, one will be -created automatically. Otherwise you can install one as follows (<db> -is your database engine and <db_client> is its client program): - -% cd %%DATADIR%%/%%ZABBIX_BUILD%%/create -% cat schema/<db>.sql data/data.sql data/images_<db>.sql | <db_client> - -To upgrade an existing database, see the scripts in -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades. -====================================================================== diff --git a/net-mgmt/zabbix2-server/files/zabbix_agentd.in b/net-mgmt/zabbix2-server/files/zabbix_agentd.in deleted file mode 100644 index eacfffddb0c7..000000000000 --- a/net-mgmt/zabbix2-server/files/zabbix_agentd.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# PROVIDE: zabbix_agentd -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to -# enable zabbix_agentd: -# -# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to -# enable zabbix_agentd. -# - -. /etc/rc.subr - -name="zabbix_agentd" -rcvar=${name}_enable - -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - -load_rc_config $name - -: ${zabbix_agentd_enable="NO"} - -run_rc_command "$1" diff --git a/net-mgmt/zabbix2-server/files/zabbix_proxy.in b/net-mgmt/zabbix2-server/files/zabbix_proxy.in deleted file mode 100644 index c997126b98a9..000000000000 --- a/net-mgmt/zabbix2-server/files/zabbix_proxy.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# PROVIDE: zabbix_proxy -# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to -# enable zabbix_proxy: -# -# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to -# enable zabbix_proxy. -# - -. /etc/rc.subr - -name="zabbix_proxy" -rcvar=${name}_enable - -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - -load_rc_config $name - -: ${zabbix_proxy_enable="NO"} - -run_rc_command "$1" diff --git a/net-mgmt/zabbix2-server/files/zabbix_server.in b/net-mgmt/zabbix2-server/files/zabbix_server.in deleted file mode 100644 index 4f4bb8d2c0c4..000000000000 --- a/net-mgmt/zabbix2-server/files/zabbix_server.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# PROVIDE: zabbix_server -# REQUIRE: DAEMON%%ZABBIX_REQUIRE%% -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to -# enable zabbix_server: -# -# zabbix_server_enable (bool): Set to NO by default. Set it to YES to -# enable zabbix_server. -# - -. /etc/rc.subr - -name="zabbix_server" -rcvar=${name}_enable - -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - -load_rc_config $name - -: ${zabbix_server_enable="NO"} - -run_rc_command "$1" diff --git a/net-mgmt/zabbix2-server/pkg-descr b/net-mgmt/zabbix2-server/pkg-descr deleted file mode 100644 index 4165c097388f..000000000000 --- a/net-mgmt/zabbix2-server/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Zabbix is an enterprise-class open source distributed monitoring -solution. - -Zabbix is software that monitors numerous parameters of a network and -the health and integrity of servers. Zabbix uses a flexible -notification mechanism that allows users to configure e-mail based -alerts for virtually any event. This allows a fast reaction to server -problems. Zabbix offers excellent reporting and data visualisation -features based on the stored data. This makes Zabbix ideal for -capacity planning. - -WWW: http://www.zabbix.com/ diff --git a/net-mgmt/zabbix2-server/pkg-plist b/net-mgmt/zabbix2-server/pkg-plist deleted file mode 100644 index 3f1ab4463203..000000000000 --- a/net-mgmt/zabbix2-server/pkg-plist +++ /dev/null @@ -1,56 +0,0 @@ -@comment $FreeBSD$ -%%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample -sbin/zabbix_%%ZABBIX_BUILD%% -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/data.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Hub.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Hub_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Network.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Network_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Notebook.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Notebook_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Phone.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Phone_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Printer.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Printer_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Router.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Router_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Satellite.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Satellite_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Server.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Server_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/UPS.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/UPS_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Workstation.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Workstation_small.png -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_mysql.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_oracle.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_pgsql.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_sqlite3.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/mysql.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/oracle.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/postgresql.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/sqlite.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle/patch.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql/patch.sql -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/upgrade -%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/patch.sql -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8 -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6 -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create/schema -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create/data -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create -@dirrm %%DATADIR%%/%%ZABBIX_BUILD%% -@dirrmtry %%DATADIR%% -@dirrmtry %%ETCDIR%% diff --git a/net-mgmt/zabbix2-server/pkg-plist.agent b/net-mgmt/zabbix2-server/pkg-plist.agent deleted file mode 100644 index 098c6d80e769..000000000000 --- a/net-mgmt/zabbix2-server/pkg-plist.agent +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD$ -%%ETCDIR%%/zabbix_agent.conf.sample -%%ETCDIR%%/zabbix_agentd.conf.sample -bin/zabbix_get -bin/zabbix_sender -sbin/zabbix_agent -sbin/zabbix_agentd -@dirrmtry %%ETCDIR%% diff --git a/net-mgmt/zabbix2-server/pkg-plist.frontend b/net-mgmt/zabbix2-server/pkg-plist.frontend deleted file mode 100644 index ce99d0de6175..000000000000 --- a/net-mgmt/zabbix2-server/pkg-plist.frontend +++ /dev/null @@ -1,457 +0,0 @@ -@comment $FreeBSD$ -%%WWWDIR%%/acknow.php -%%WWWDIR%%/actionconf.php -%%WWWDIR%%/api/.htaccess -%%WWWDIR%%/api/classes/class.apiexception.php -%%WWWDIR%%/api/classes/class.caction.php -%%WWWDIR%%/api/classes/class.calert.php -%%WWWDIR%%/api/classes/class.capiinfo.php -%%WWWDIR%%/api/classes/class.capplication.php -%%WWWDIR%%/api/classes/class.cevent.php -%%WWWDIR%%/api/classes/class.cgraph.php -%%WWWDIR%%/api/classes/class.cgraphitem.php -%%WWWDIR%%/api/classes/class.chost.php -%%WWWDIR%%/api/classes/class.chostgroup.php -%%WWWDIR%%/api/classes/class.cimage.php -%%WWWDIR%%/api/classes/class.citem.php -%%WWWDIR%%/api/classes/class.cmaintenance.php -%%WWWDIR%%/api/classes/class.cmap.php -%%WWWDIR%%/api/classes/class.cproxy.php -%%WWWDIR%%/api/classes/class.cscreen.php -%%WWWDIR%%/api/classes/class.cscript.php -%%WWWDIR%%/api/classes/class.ctemplate.php -%%WWWDIR%%/api/classes/class.ctrigger.php -%%WWWDIR%%/api/classes/class.cuser.php -%%WWWDIR%%/api/classes/class.cusergroup.php -%%WWWDIR%%/api/classes/class.cusermacro.php -%%WWWDIR%%/api/classes/class.czbxapi.php -%%WWWDIR%%/api/rpc/class.cjsonrpc.php -%%WWWDIR%%/api/rpc/class.czbxrpc.php -%%WWWDIR%%/api_jsonrpc.php -%%WWWDIR%%/applications.php -%%WWWDIR%%/audio/trigger_off.wav -%%WWWDIR%%/audio/trigger_on.wav -%%WWWDIR%%/audio/trigger_on_average.wav -%%WWWDIR%%/audio/trigger_on_disaster.wav -%%WWWDIR%%/audio/trigger_on_high.wav -%%WWWDIR%%/audio/trigger_on_warning.wav -%%WWWDIR%%/auditacts.php -%%WWWDIR%%/auditlogs.php -%%WWWDIR%%/authentication.php -%%WWWDIR%%/chart.php -%%WWWDIR%%/chart2.php -%%WWWDIR%%/chart3.php -%%WWWDIR%%/chart4.php -%%WWWDIR%%/chart5.php -%%WWWDIR%%/chart6.php -%%WWWDIR%%/chart7.php -%%WWWDIR%%/chart_bar.php -%%WWWDIR%%/chart_sla.php -%%WWWDIR%%/charts.php -%%WWWDIR%%/conf/.htaccess -%%WWWDIR%%/conf/COPYING -%%WWWDIR%%/conf/maintenance.inc.php -%%WWWDIR%%/conf/zabbix.conf.php.example -%%WWWDIR%%/config.php -%%WWWDIR%%/css.css -%%WWWDIR%%/dashboard.php -%%WWWDIR%%/dashconf.php -%%WWWDIR%%/discovery.php -%%WWWDIR%%/discoveryconf.php -%%WWWDIR%%/events.php -%%WWWDIR%%/export.php -%%WWWDIR%%/fonts/DejaVuSans.ttf -%%WWWDIR%%/graphs.php -%%WWWDIR%%/history.php -%%WWWDIR%%/hostgroups.php -%%WWWDIR%%/hostprofiles.php -%%WWWDIR%%/hosts.php -%%WWWDIR%%/httpconf.php -%%WWWDIR%%/httpdetails.php -%%WWWDIR%%/httpmon.php -%%WWWDIR%%/image.php -%%WWWDIR%%/images/flash/zbxclock.swf -%%WWWDIR%%/images/general/arrowdown.gif -%%WWWDIR%%/images/general/arrowup.gif -%%WWWDIR%%/images/general/bar/arrow_down.gif -%%WWWDIR%%/images/general/bar/arrow_sm.gif -%%WWWDIR%%/images/general/bar/arrow_up.gif -%%WWWDIR%%/images/general/bar/bar_bg.png -%%WWWDIR%%/images/general/bar/bar_middle.png -%%WWWDIR%%/images/general/bar/bg.png -%%WWWDIR%%/images/general/bar/cal.gif -%%WWWDIR%%/images/general/bar/left.png -%%WWWDIR%%/images/general/bar/left_arr.png -%%WWWDIR%%/images/general/bar/right.png -%%WWWDIR%%/images/general/bar/right_arr.png -%%WWWDIR%%/images/general/bttn/arrowdown.png -%%WWWDIR%%/images/general/bttn/arrowdown_bb.png -%%WWWDIR%%/images/general/bttn/arrowleft.png -%%WWWDIR%%/images/general/bttn/arrowleft_bb.png -%%WWWDIR%%/images/general/bttn/arrowright.png -%%WWWDIR%%/images/general/bttn/arrowright_bb.png -%%WWWDIR%%/images/general/bttn/arrowup.png -%%WWWDIR%%/images/general/bttn/arrowup_bb.png -%%WWWDIR%%/images/general/bttn/config.png -%%WWWDIR%%/images/general/bttn/config_bb.png -%%WWWDIR%%/images/general/bttn/config_hl.png -%%WWWDIR%%/images/general/bttn/config_hl_bb.png -%%WWWDIR%%/images/general/bttn/down.png -%%WWWDIR%%/images/general/bttn/down_bb.png -%%WWWDIR%%/images/general/bttn/fullscreen.png -%%WWWDIR%%/images/general/bttn/fullscreen_bb.png -%%WWWDIR%%/images/general/bttn/help.png -%%WWWDIR%%/images/general/bttn/help_bb.png -%%WWWDIR%%/images/general/bttn/menu.png -%%WWWDIR%%/images/general/bttn/menu_bb.png -%%WWWDIR%%/images/general/bttn/minus.png -%%WWWDIR%%/images/general/bttn/minus_bb.png -%%WWWDIR%%/images/general/bttn/mute.png -%%WWWDIR%%/images/general/bttn/mute_bb.png -%%WWWDIR%%/images/general/bttn/plus.png -%%WWWDIR%%/images/general/bttn/plus_bb.png -%%WWWDIR%%/images/general/bttn/reset.png -%%WWWDIR%%/images/general/bttn/reset_bb.png -%%WWWDIR%%/images/general/bttn/sound.png -%%WWWDIR%%/images/general/bttn/sound_bb.png -%%WWWDIR%%/images/general/bttn/up.png -%%WWWDIR%%/images/general/bttn/up_bb.png -%%WWWDIR%%/images/general/chart.png -%%WWWDIR%%/images/general/closed.gif -%%WWWDIR%%/images/general/dbl_arrow_down.png -%%WWWDIR%%/images/general/dbl_arrow_down2.png -%%WWWDIR%%/images/general/dbl_arrow_up.png -%%WWWDIR%%/images/general/dbl_arrow_up2.png -%%WWWDIR%%/images/general/down_icon.png -%%WWWDIR%%/images/general/error.png -%%WWWDIR%%/images/general/error_icon.png -%%WWWDIR%%/images/general/error_small.gif -%%WWWDIR%%/images/general/help.gif -%%WWWDIR%%/images/general/inst_completed.gif -%%WWWDIR%%/images/general/inst_current.gif -%%WWWDIR%%/images/general/inst_step.gif -%%WWWDIR%%/images/general/ipmi_available.png -%%WWWDIR%%/images/general/ipmi_available_bb.png -%%WWWDIR%%/images/general/ipmi_unavailable.png -%%WWWDIR%%/images/general/ipmi_unknown.png -%%WWWDIR%%/images/general/no_icon.png -%%WWWDIR%%/images/general/ok.png -%%WWWDIR%%/images/general/ok_bb.png -%%WWWDIR%%/images/general/ok_icon.png -%%WWWDIR%%/images/general/ok_icon_bb.png -%%WWWDIR%%/images/general/opened.gif -%%WWWDIR%%/images/general/snmp_available.png -%%WWWDIR%%/images/general/snmp_available_bb.png -%%WWWDIR%%/images/general/snmp_unavailable.png -%%WWWDIR%%/images/general/snmp_unknown.png -%%WWWDIR%%/images/general/sort_down.png -%%WWWDIR%%/images/general/sort_down_bb.png -%%WWWDIR%%/images/general/sort_downw.gif -%%WWWDIR%%/images/general/sort_up.png -%%WWWDIR%%/images/general/sort_up_bb.png -%%WWWDIR%%/images/general/sort_upw.gif -%%WWWDIR%%/images/general/sortdown.gif -%%WWWDIR%%/images/general/sortdown_off.gif -%%WWWDIR%%/images/general/sortup.gif -%%WWWDIR%%/images/general/sortup_off.gif -%%WWWDIR%%/images/general/tick.png -%%WWWDIR%%/images/general/tr_space.gif -%%WWWDIR%%/images/general/tr_top_bottom.gif -%%WWWDIR%%/images/general/tr_top_right.gif -%%WWWDIR%%/images/general/tr_top_right_bottom.gif -%%WWWDIR%%/images/general/tree/minus.gif -%%WWWDIR%%/images/general/tree/plus.gif -%%WWWDIR%%/images/general/tree/point.gif -%%WWWDIR%%/images/general/tree/pointc.gif -%%WWWDIR%%/images/general/tree/pointl.gif -%%WWWDIR%%/images/general/tree/zero.gif -%%WWWDIR%%/images/general/up_icon.png -%%WWWDIR%%/images/general/warning16r.gif -%%WWWDIR%%/images/general/warning_small.gif -%%WWWDIR%%/images/general/zabbix.ico -%%WWWDIR%%/images/general/zabbix.png -%%WWWDIR%%/images/general/zabbix_available.png -%%WWWDIR%%/images/general/zabbix_available_bb.png -%%WWWDIR%%/images/general/zabbix_bb.ico -%%WWWDIR%%/images/general/zabbix_bb.png -%%WWWDIR%%/images/general/zabbix_ob.ico -%%WWWDIR%%/images/general/zabbix_unavailable.png -%%WWWDIR%%/images/general/zabbix_unknown.png -%%WWWDIR%%/images/general/zero.gif -%%WWWDIR%%/images/gradients/blink1.gif -%%WWWDIR%%/images/gradients/blink2.gif -%%WWWDIR%%/images/gradients/button.gif -%%WWWDIR%%/images/gradients/gradient.png -%%WWWDIR%%/images/gradients/menu_not_active.gif -%%WWWDIR%%/images/gradients/menu_not_active2.gif -%%WWWDIR%%/images/gradients/menu_not_active_bb.gif -%%WWWDIR%%/images/gradients/sla_blue.png -%%WWWDIR%%/images/gradients/sla_blue15.png -%%WWWDIR%%/images/gradients/sla_green.png -%%WWWDIR%%/images/gradients/sla_green15.png -%%WWWDIR%%/images/gradients/sla_red.png -%%WWWDIR%%/images/gradients/sla_red15.png -%%WWWDIR%%/images/gradients/table_head.gif -%%WWWDIR%%/images/gradients/table_head2.gif -%%WWWDIR%%/images/gradients/table_head2_bb.gif -%%WWWDIR%%/images/gradients/table_head_bb.gif -%%WWWDIR%%/images/sysmaps/Hub.png -%%WWWDIR%%/images/sysmaps/Hub_small.png -%%WWWDIR%%/images/sysmaps/Network.png -%%WWWDIR%%/images/sysmaps/Network_small.png -%%WWWDIR%%/images/sysmaps/Notebook.png -%%WWWDIR%%/images/sysmaps/Notebook_small.png -%%WWWDIR%%/images/sysmaps/Phone.png -%%WWWDIR%%/images/sysmaps/Phone_small.png -%%WWWDIR%%/images/sysmaps/Printer.png -%%WWWDIR%%/images/sysmaps/Printer_small.png -%%WWWDIR%%/images/sysmaps/README -%%WWWDIR%%/images/sysmaps/Router.png -%%WWWDIR%%/images/sysmaps/Router_small.png -%%WWWDIR%%/images/sysmaps/Satellite.png -%%WWWDIR%%/images/sysmaps/Satellite_small.png -%%WWWDIR%%/images/sysmaps/Server.png -%%WWWDIR%%/images/sysmaps/Server_small.png -%%WWWDIR%%/images/sysmaps/UPS.png -%%WWWDIR%%/images/sysmaps/UPS_small.png -%%WWWDIR%%/images/sysmaps/Workstation.png -%%WWWDIR%%/images/sysmaps/Workstation_small.png -%%WWWDIR%%/images/sysmaps/old/Hub.png -%%WWWDIR%%/images/sysmaps/old/Notebook.png -%%WWWDIR%%/images/sysmaps/old/Printer.png -%%WWWDIR%%/images/sysmaps/old/Router.png -%%WWWDIR%%/images/sysmaps/old/Server.png -%%WWWDIR%%/images/sysmaps/old/Workstation.png -%%WWWDIR%%/imgstore.php -%%WWWDIR%%/import.php -%%WWWDIR%%/include/.htaccess -%%WWWDIR%%/include/acknow.inc.php -%%WWWDIR%%/include/actions.inc.php -%%WWWDIR%%/include/apicalls.inc.php -%%WWWDIR%%/include/audit.inc.php -%%WWWDIR%%/include/blocks.inc.php -%%WWWDIR%%/include/classes/.htaccess -%%WWWDIR%%/include/classes/class.carea.php -%%WWWDIR%%/include/classes/class.careamap.php -%%WWWDIR%%/include/classes/class.cbar.php -%%WWWDIR%%/include/classes/class.cbutton.php -%%WWWDIR%%/include/classes/class.cbuttoncancel.php -%%WWWDIR%%/include/classes/class.cbuttondelete.php -%%WWWDIR%%/include/classes/class.cbuttonqmessage.php -%%WWWDIR%%/include/classes/class.cchart.php -%%WWWDIR%%/include/classes/class.ccheckbox.php -%%WWWDIR%%/include/classes/class.ccol.php -%%WWWDIR%%/include/classes/class.ccolor.php -%%WWWDIR%%/include/classes/class.ccolorcell.php -%%WWWDIR%%/include/classes/class.ccombobox.php -%%WWWDIR%%/include/classes/class.ccomboitem.php -%%WWWDIR%%/include/classes/class.cdiv.php -%%WWWDIR%%/include/classes/class.ceditablecombobox.php -%%WWWDIR%%/include/classes/class.cfile.php -%%WWWDIR%%/include/classes/class.cflash.php -%%WWWDIR%%/include/classes/class.cflashclock.php -%%WWWDIR%%/include/classes/class.cflashembed.php -%%WWWDIR%%/include/classes/class.cform.php -%%WWWDIR%%/include/classes/class.cformtable.php -%%WWWDIR%%/include/classes/class.cgraphdraw.php -%%WWWDIR%%/include/classes/class.chelp.php -%%WWWDIR%%/include/classes/class.chostsinfo.php -%%WWWDIR%%/include/classes/class.chttp_request.php -%%WWWDIR%%/include/classes/class.ciframe.php -%%WWWDIR%%/include/classes/class.cimagetexttable.php -%%WWWDIR%%/include/classes/class.cimg.php -%%WWWDIR%%/include/classes/class.cipbox.php -%%WWWDIR%%/include/classes/class.cjson.php -%%WWWDIR%%/include/classes/class.cjsscript.php -%%WWWDIR%%/include/classes/class.cldap.php -%%WWWDIR%%/include/classes/class.clink.php -%%WWWDIR%%/include/classes/class.clist.php -%%WWWDIR%%/include/classes/class.clistbox.php -%%WWWDIR%%/include/classes/class.clistitem.php -%%WWWDIR%%/include/classes/class.cnumericbox.php -%%WWWDIR%%/include/classes/class.cobject.php -%%WWWDIR%%/include/classes/class.cparam.php -%%WWWDIR%%/include/classes/class.cpassbox.php -%%WWWDIR%%/include/classes/class.cpie.php -%%WWWDIR%%/include/classes/class.cpumenu.php -%%WWWDIR%%/include/classes/class.crow.php -%%WWWDIR%%/include/classes/class.cserverinfo.php -%%WWWDIR%%/include/classes/class.cspan.php -%%WWWDIR%%/include/classes/class.ctable.php -%%WWWDIR%%/include/classes/class.ctableinfo.php -%%WWWDIR%%/include/classes/class.ctag.php -%%WWWDIR%%/include/classes/class.ctextarea.php -%%WWWDIR%%/include/classes/class.ctextbox.php -%%WWWDIR%%/include/classes/class.ctree.php -%%WWWDIR%%/include/classes/class.ctriggersinfo.php -%%WWWDIR%%/include/classes/class.ctweenbox.php -%%WWWDIR%%/include/classes/class.curl.php -%%WWWDIR%%/include/classes/class.cvar.php -%%WWWDIR%%/include/classes/class.cvartag.php -%%WWWDIR%%/include/classes/class.cvisibilitybox.php -%%WWWDIR%%/include/classes/class.cwidget.php -%%WWWDIR%%/include/config.inc.php -%%WWWDIR%%/include/copt.lib.php -%%WWWDIR%%/include/db.inc.php -%%WWWDIR%%/include/debug.inc.php -%%WWWDIR%%/include/defines.inc.php -%%WWWDIR%%/include/discovery.inc.php -%%WWWDIR%%/include/events.inc.php -%%WWWDIR%%/include/export.inc.php -%%WWWDIR%%/include/forms.inc.php -%%WWWDIR%%/include/func.inc.php -%%WWWDIR%%/include/graphs.inc.php -%%WWWDIR%%/include/hosts.inc.php -%%WWWDIR%%/include/html.inc.php -%%WWWDIR%%/include/httptest.inc.php -%%WWWDIR%%/include/ident.inc.php -%%WWWDIR%%/include/images.inc.php -%%WWWDIR%%/include/items.inc.php -%%WWWDIR%%/include/js.inc.php -%%WWWDIR%%/include/locales.inc.php -%%WWWDIR%%/include/locales/cn_zh.inc.php -%%WWWDIR%%/include/locales/de_de.inc.php -%%WWWDIR%%/include/locales/en_gb.inc.php -%%WWWDIR%%/include/locales/fr_fr.inc.php -%%WWWDIR%%/include/locales/hu_hu.inc.php -%%WWWDIR%%/include/locales/it_it.inc.php -%%WWWDIR%%/include/locales/ja_jp.inc.php -%%WWWDIR%%/include/locales/ko_kr.inc.php -%%WWWDIR%%/include/locales/lv_lv.inc.php -%%WWWDIR%%/include/locales/nl_nl.inc.php -%%WWWDIR%%/include/locales/pl_pl.inc.php -%%WWWDIR%%/include/locales/pt_br.inc.php -%%WWWDIR%%/include/locales/ru_ru.inc.php -%%WWWDIR%%/include/locales/sp_sp.inc.php -%%WWWDIR%%/include/locales/sv_se.inc.php -%%WWWDIR%%/include/locales/ua_ua.inc.php -%%WWWDIR%%/include/maintenances.inc.php -%%WWWDIR%%/include/maps.inc.php -%%WWWDIR%%/include/media.inc.php -%%WWWDIR%%/include/menu.inc.php -%%WWWDIR%%/include/nodes.inc.php -%%WWWDIR%%/include/page_footer.php -%%WWWDIR%%/include/page_header.php -%%WWWDIR%%/include/perm.inc.php -%%WWWDIR%%/include/profiles.inc.php -%%WWWDIR%%/include/regexp.inc.php -%%WWWDIR%%/include/reports.inc.php -%%WWWDIR%%/include/requirements.inc.php -%%WWWDIR%%/include/screens.inc.php -%%WWWDIR%%/include/scripts.inc.php -%%WWWDIR%%/include/services.inc.php -%%WWWDIR%%/include/setup.inc.php -%%WWWDIR%%/include/triggers.inc.php -%%WWWDIR%%/include/users.inc.php -%%WWWDIR%%/include/validate.inc.php -%%WWWDIR%%/index.php -%%WWWDIR%%/instal.php -%%WWWDIR%%/items.php -%%WWWDIR%%/js/class.calendar.js -%%WWWDIR%%/js/class.cdate.js -%%WWWDIR%%/js/class.cmap.js -%%WWWDIR%%/js/class.cookie.js -%%WWWDIR%%/js/class.cscreen.js -%%WWWDIR%%/js/class.cswitcher.js -%%WWWDIR%%/js/class.ctree.js -%%WWWDIR%%/js/class.curl.js -%%WWWDIR%%/js/class.pmaster.js -%%WWWDIR%%/js/common.js -%%WWWDIR%%/js/functions.js -%%WWWDIR%%/js/gtlc.js -%%WWWDIR%%/js/main.js -%%WWWDIR%%/js/menu.js -%%WWWDIR%%/js/prototype.js -%%WWWDIR%%/js/scriptaculous.js -%%WWWDIR%%/js/scriptaculous/builder.js -%%WWWDIR%%/js/scriptaculous/controls.js -%%WWWDIR%%/js/scriptaculous/dragdrop.js -%%WWWDIR%%/js/scriptaculous/effects.js -%%WWWDIR%%/js/scriptaculous/slider.js -%%WWWDIR%%/js/scriptaculous/sound.js -%%WWWDIR%%/latest.php -%%WWWDIR%%/locales.php -%%WWWDIR%%/maintenance.php -%%WWWDIR%%/map.php -%%WWWDIR%%/maps.php -%%WWWDIR%%/media_types.php -%%WWWDIR%%/nodes.php -%%WWWDIR%%/overview.php -%%WWWDIR%%/popup.php -%%WWWDIR%%/popup_bitem.php -%%WWWDIR%%/popup_gitem.php -%%WWWDIR%%/popup_httpstep.php -%%WWWDIR%%/popup_link_tr.php -%%WWWDIR%%/popup_media.php -%%WWWDIR%%/popup_period.php -%%WWWDIR%%/popup_right.php -%%WWWDIR%%/popup_trexpr.php -%%WWWDIR%%/popup_users.php -%%WWWDIR%%/popup_usrgrp.php -%%WWWDIR%%/profile.php -%%WWWDIR%%/proxies.php -%%WWWDIR%%/queue.php -%%WWWDIR%%/report1.php -%%WWWDIR%%/report2.php -%%WWWDIR%%/report3.php -%%WWWDIR%%/report4.php -%%WWWDIR%%/report5.php -%%WWWDIR%%/report6.php -%%WWWDIR%%/screenconf.php -%%WWWDIR%%/screenedit.php -%%WWWDIR%%/screens.php -%%WWWDIR%%/scripts.php -%%WWWDIR%%/scripts_exec.php -%%WWWDIR%%/search.php -%%WWWDIR%%/services.php -%%WWWDIR%%/services_form.php -%%WWWDIR%%/setup.php -%%WWWDIR%%/slides.php -%%WWWDIR%%/srv_status.php -%%WWWDIR%%/styles/blocks.css -%%WWWDIR%%/styles/calendar.css -%%WWWDIR%%/styles/css_bb.css -%%WWWDIR%%/styles/css_ob.css -%%WWWDIR%%/styles/default.css -%%WWWDIR%%/styles/div.css -%%WWWDIR%%/styles/form.css -%%WWWDIR%%/styles/link.css -%%WWWDIR%%/styles/p.css -%%WWWDIR%%/styles/popupmenu.css -%%WWWDIR%%/styles/table.css -%%WWWDIR%%/styles/ul.css -%%WWWDIR%%/sysmap.php -%%WWWDIR%%/sysmaps.php -%%WWWDIR%%/templates.php -%%WWWDIR%%/tr_comments.php -%%WWWDIR%%/tr_events.php -%%WWWDIR%%/tr_logform.php -%%WWWDIR%%/tr_status.php -%%WWWDIR%%/tr_testexpr.php -%%WWWDIR%%/triggers.php -%%WWWDIR%%/usergrps.php -%%WWWDIR%%/users.php -%%WWWDIR%%/vtext.php -%%WWWDIR%%/warning.php -@dirrm %%WWWDIR%%/styles -@dirrm %%WWWDIR%%/js/scriptaculous -@dirrm %%WWWDIR%%/js -@dirrm %%WWWDIR%%/include/locales -@dirrm %%WWWDIR%%/include/classes -@dirrm %%WWWDIR%%/include -@dirrm %%WWWDIR%%/images/sysmaps/old -@dirrm %%WWWDIR%%/images/sysmaps -@dirrm %%WWWDIR%%/images/gradients -@dirrm %%WWWDIR%%/images/general/tree -@dirrm %%WWWDIR%%/images/general/bttn -@dirrm %%WWWDIR%%/images/general/bar -@dirrm %%WWWDIR%%/images/general -@dirrm %%WWWDIR%%/images/flash -@dirrm %%WWWDIR%%/images -@dirrm %%WWWDIR%%/fonts -@dirrm %%WWWDIR%%/conf -@dirrm %%WWWDIR%%/audio -@dirrm %%WWWDIR%%/api/rpc -@dirrm %%WWWDIR%%/api/classes -@dirrm %%WWWDIR%%/api -@dirrm %%WWWDIR%% diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile deleted file mode 100644 index 1cd64f80ee26..000000000000 --- a/net-p2p/amule-devel/Makefile +++ /dev/null @@ -1,145 +0,0 @@ -# New ports collection makefile for: amule2 -# Date created: Wed Nov 05 09:30:00 UTC 2003 -# Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.com> -# -# $FreeBSD$ -# - -PORTNAME= aMule -PORTVERSION= 2.2.6 -PORTREVISION= 4 -CATEGORIES= net-p2p -MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION} - -MAINTAINER= boris@tagnet.ru -COMMENT= The all-platform eMule p2p client - -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ - ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp - -LATEST_LINK= aMule2 -CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.* - -USE_BZIP2= yes -USE_GNOME= gnomehier gnomehack gnomeprefix -USE_GMAKE= yes -USE_WX= 2.8 -WX_CONF_ARGS= absolute -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-debug \ - --without-included-gettext \ - --with-libintl-prefix=${LOCALBASE} \ - --with-libiconv-prefix=${LOCALBASE} \ - --with-crypto-prefix=${LOCALBASE} \ - --with-denoise-level=0 - -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" - -OPTIONS= OPTIMIZE "Build with optimization" on \ - ED2K "Compile aMule ed2k links handler" on \ - AMULECMD "Compile aMule command line client" on \ - AMULEWEBSRV "Compile aMule WebServer" on \ - CAS "Compile C aMule Statistics (+GUI)" on \ - ALC "Compile aMule Link Creator (+GUI)" on \ - AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \ - WXUNICODE "Enable Unicode support" on \ - GEOIP "Enable GeoIP IP2Country support" off \ - UPNP "Enable Universal Plug and Play support" off - -DOCSDIR= ${PREFIX}/share/doc/aMule-${PORTVERSION} -PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt \ - ED2K-Links.HOWTO INSTALL README TODO \ - amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol - -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -.else -CONFIGURE_ARGS+= --disable-nls -.endif - -# Configure options -.if !defined(WITHOUT_OPTIMIZE) -CONFIGURE_ARGS+= --enable-optimize -.else -CONFIGURE_ARGS+= --disable-optimize -.endif - -.if !defined(WITHOUT_ED2K) -CONFIGURE_ARGS+= --enable-ed2k -PLIST_SUB+= PL_ED2K="" -.else -CONFIGURE_ARGS+= --disable-ed2k -PLIST_SUB+= PL_ED2K="@comment " -.endif - -.if !defined(WITHOUT_AMULECMD) -CONFIGURE_ARGS+= --enable-amulecmd -PLIST_SUB+= PL_AMULECMD="" -.else -CONFIGURE_ARGS+= --disable-amulecmd -PLIST_SUB+= PL_AMULECMD="@comment " -.endif - -.if !defined(WITHOUT_AMULEWEBSRV) -CONFIGURE_ARGS+= --enable-webserver -PLIST_SUB+= PL_AMULEWEBSRV="" -.else -CONFIGURE_ARGS+= --disable-webserver -PLIST_SUB+= PL_AMULEWEBSRV="@comment " -.endif - -.if !defined(WITHOUT_CAS) -CONFIGURE_ARGS+= --enable-cas --enable-wxcas -PLIST_SUB+= PL_CAS="" -.else -CONFIGURE_ARGS+= --disable-cas --disable-wxcas -PLIST_SUB+= PL_CAS="@comment " -.endif - -.if !defined(WITHOUT_ALC) -CONFIGURE_ARGS+= --enable-alc --enable-alcc -PLIST_SUB+= PL_ALC="" -.else -CONFIGURE_ARGS+= --disable-alc --disable-alcc -PLIST_SUB+= PL_ALC="@comment " -.endif - -.if defined(WITH_AMULEDAEMON) -CONFIGURE_ARGS+= --enable-amule-daemon --enable-amule-gui -PLIST_SUB+= PL_AMULEDAEMON="" -USE_RC_SUBR= amuled.sh -.else -CONFIGURE_ARGS+= --disable-amule-daemon --disable-amule-gui -PLIST_SUB+= PL_AMULEDAEMON="@comment " -.endif - -.if defined(WITH_GEOIP) -CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP -.else -CONFIGURE_ARGS+= --disable-geoip -.endif - -.if defined(WITH_UPNP) -CONFIGURE_ARGS+= --with-libupnp-prefix=${LOCALBASE} -LIB_DEPENDS+= upnp.3:${PORTSDIR}/devel/upnp -.else -CONFIGURE_ARGS+= --disable-upnp -.endif - -.if !defined(WITHOUT_WXUNICODE) -WX_UNICODE=yes -.endif - -# Man pages management -.include "Makefile.man" - -.ifdef NOPORTDOCS -post-patch: - ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' ${WRKSRC}/docs/Makefile.in -.endif - -.include <bsd.port.post.mk> diff --git a/net-p2p/amule-devel/Makefile.man b/net-p2p/amule-devel/Makefile.man deleted file mode 100644 index 58b59b9dd592..000000000000 --- a/net-p2p/amule-devel/Makefile.man +++ /dev/null @@ -1,49 +0,0 @@ -# TODO : Add fr here when pages are complete -MANLANG= "" de es eu fr hu it -#MANCOMPRESSED= no -.if defined(WITH_CAS) -MAN1_EN+= cas.1 -MAN1_EN+= wxcas.1 -MAN1_DE+= cas.1 -MAN1_DE+= wxcas.1 -MAN1_ES+= cas.1 -MAN1_ES+= wxcas.1 -MAN1_EU+= cas.1 -MAN1_EU+= wxcas.1 -MAN1_HU+= cas.1 -MAN1_HU+= wxcas.1 -.endif -.if defined(WITH_ALC) -MAN1_EN+= alc.1 -MAN1_DE+= alc.1 -MAN1_ES+= alc.1 -MAN1_EU+= alc.1 -MAN1_HU+= alc.1 -MAN1_EN+= alcc.1 -MAN1_DE+= alcc.1 -MAN1_ES+= alcc.1 -MAN1_EU+= alcc.1 -MAN1_FR+= alcc.1 -MAN1_HU+= alcc.1 -.endif -.if defined(WITH_AMULEWEBSRV) -MAN1+= amuleweb.1 -.endif -.if defined(WITH_AMULECMD) -MAN1+= amulecmd.1 -.endif -.if defined(WITH_ED2K) -MAN1+= ed2k.1 -.endif -.if defined(WITH_AMULEDAEMON) -MAN1+= amuled.1 -MAN1_EN+= amulegui.1 -MAN1_DE+= amulegui.1 -MAN1_IT+= amulegui.1 -.endif -MAN1+= amule.1 -MAN1_EN+= xas.1 -MAN1_DE+= xas.1 -MAN1_ES+= xas.1 -MAN1_EU+= xas.1 -MAN1_HU+= xas.1 diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo deleted file mode 100644 index 33d7c91eee6f..000000000000 --- a/net-p2p/amule-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (aMule-2.2.6.tar.bz2) = 530d9b48187e36f78fc21bb19e94326d -SHA256 (aMule-2.2.6.tar.bz2) = 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122 -SIZE (aMule-2.2.6.tar.bz2) = 4722143 diff --git a/net-p2p/amule-devel/files/amuled.sh.in b/net-p2p/amule-devel/files/amuled.sh.in deleted file mode 100644 index d3dae43db169..000000000000 --- a/net-p2p/amule-devel/files/amuled.sh.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# aMule RCng startup script -# Ogirinal work from Gabriele Cecchetti (amule.org forum) -# - -# PROVIDE: amuled -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable amuled at startup -# amuled (bool): Set to "NO" by default. -# Set it to "YES" to enable amuled -# amuled_user (str): Set to user running amuled -# (default 'aMule') -# amuled_home (str): Set to home directory of user running amuled -# (default /home/${amuled_user}) -# -. /etc/rc.subr - -name="amuled" -rcvar=`set_rcvar` - -load_rc_config $name - -[ -z "$amuled_enable" ] && amuled_enable="NO" -[ -z "$amuled_user" ] && amuled_user="aMule" -[ -z "$amuled_home" ] && amuled_home="/home/${amuled_user}" - -required_dirs=${amuled_home} -required_files="${amuled_home}/.aMule/amule.conf" - -start_cmd="${name}_start" -stop_cmd="${name}_stop" - -amuled_start() -{ - if [ ! -f /var/run/${name}.run ] - then - su -l ${amuled_user} -c "amuled &" 2>>/var/log/${name}.log >>/var/log/${name}.log && touch /var/run/${name}.run - echo "Started ${name}." - echo `date` : "Started ${name}." >> /var/log/${name}.log - else - echo "${name} seems to be already running -- remove /var/run/${name}.run manually if needed." - fi -} - -amuled_stop() -{ - if [ -f /var/run/${name}.run ] - then - # The following line is much better, but doesn't stop totally amuled - # su -l ${amuled_user} -c "amulecmd -c Shutdown" 2>>/var/log/${name}.log >>/var/log/${name}.log - # Since amuled catches SIGTERM, this way is preferred for now - killall -TERM amuled 2>>/var/log/${name}.log >>/var/log/${name}.log ; sleep 3 - killall -KILL amuled 2>>/var/log/${name}.log >>/var/log/${name}.log - # Also kill amuleweb if needed - killall -KILL amuleweb 2>/dev/null >/dev/null - rm -f /var/run/${name}.run - echo "Stopped ${name}." - echo `date` : "Stopped ${name}." >> /var/log/${name}.log - else - echo "${name} doesn't seem to be running -- create /var/run/${name}.run if needed." - fi -} - -run_rc_command "$1" diff --git a/net-p2p/amule-devel/pkg-descr b/net-p2p/amule-devel/pkg-descr deleted file mode 100644 index afd986a280da..000000000000 --- a/net-p2p/amule-devel/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -aMule, the all-platform eMule p2p client - -aMule is a multiplatform fork of xMule -client using wxWindows class library. - -WWW: http://www.amule.org diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist deleted file mode 100644 index 423fed84f2f3..000000000000 --- a/net-p2p/amule-devel/pkg-plist +++ /dev/null @@ -1,371 +0,0 @@ -share/locale/ar/LC_MESSAGES/amule.mo -share/locale/ast/LC_MESSAGES/amule.mo -share/locale/bg/LC_MESSAGES/amule.mo -share/locale/ca/LC_MESSAGES/amule.mo -share/locale/cs/LC_MESSAGES/amule.mo -share/locale/da/LC_MESSAGES/amule.mo -share/locale/de/LC_MESSAGES/amule.mo -share/locale/el/LC_MESSAGES/amule.mo -share/locale/en_GB/LC_MESSAGES/amule.mo -share/locale/es/LC_MESSAGES/amule.mo -share/locale/et_EE/LC_MESSAGES/amule.mo -share/locale/eu/LC_MESSAGES/amule.mo -share/locale/fi/LC_MESSAGES/amule.mo -share/locale/fr/LC_MESSAGES/amule.mo -share/locale/gl/LC_MESSAGES/amule.mo -share/locale/he/LC_MESSAGES/amule.mo -share/locale/hr/LC_MESSAGES/amule.mo -share/locale/hu/LC_MESSAGES/amule.mo -share/locale/it/LC_MESSAGES/amule.mo -share/locale/it_CH/LC_MESSAGES/amule.mo -share/locale/ja/LC_MESSAGES/amule.mo -share/locale/ko_KR/LC_MESSAGES/amule.mo -share/locale/lt/LC_MESSAGES/amule.mo -share/locale/nl/LC_MESSAGES/amule.mo -share/locale/nn/LC_MESSAGES/amule.mo -share/locale/pl/LC_MESSAGES/amule.mo -share/locale/pt_BR/LC_MESSAGES/amule.mo -share/locale/pt_PT/LC_MESSAGES/amule.mo -share/locale/ru/LC_MESSAGES/amule.mo -share/locale/sl/LC_MESSAGES/amule.mo -share/locale/sq/LC_MESSAGES/amule.mo -share/locale/sv/LC_MESSAGES/amule.mo -share/locale/tr/LC_MESSAGES/amule.mo -share/locale/uk/LC_MESSAGES/amule.mo -share/locale/zh_CN/LC_MESSAGES/amule.mo -share/locale/zh_TW/LC_MESSAGES/amule.mo -@dirrmtry share/locale/ar/LC_MESSAGES -@dirrmtry share/locale/ar -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast -@dirrmtry share/locale/bg/LC_MESSAGES -@dirrmtry share/locale/bg -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/da/LC_MESSAGES -@dirrmtry share/locale/da -@dirrmtry share/locale/de/LC_MESSAGES -@dirrmtry share/locale/de -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/en_GB/LC_MESSAGES -@dirrmtry share/locale/en_GB -@dirrmtry share/locale/es/LC_MESSAGES -@dirrmtry share/locale/es -@dirrmtry share/locale/et_EE/LC_MESSAGES -@dirrmtry share/locale/et_EE -@dirrmtry share/locale/eu/LC_MESSAGES -@dirrmtry share/locale/eu -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/he/LC_MESSAGES -@dirrmtry share/locale/he -@dirrmtry share/locale/hr/LC_MESSAGES -@dirrmtry share/locale/hr -@dirrmtry share/locale/hu/LC_MESSAGES -@dirrmtry share/locale/hu -@dirrmtry share/locale/it/LC_MESSAGES -@dirrmtry share/locale/it -@dirrmtry share/locale/it_CH/LC_MESSAGES -@dirrmtry share/locale/it_CH -@dirrmtry share/locale/ja/LC_MESSAGES -@dirrmtry share/locale/ja -@dirrmtry share/locale/ko_KR/LC_MESSAGES -@dirrmtry share/locale/ko_KR -@dirrmtry share/locale/lt/LC_MESSAGES -@dirrmtry share/locale/lt -@dirrmtry share/locale/nl/LC_MESSAGES -@dirrmtry share/locale/nl -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/pt_BR/LC_MESSAGES -@dirrmtry share/locale/pt_BR -@dirrmtry share/locale/ru/LC_MESSAGES -@dirrmtry share/locale/ru -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/sq/LC_MESSAGES -@dirrmtry share/locale/sq -@dirrmtry share/locale/sv/LC_MESSAGES -@dirrmtry share/locale/sv -@dirrmtry share/locale/tr/LC_MESSAGES -@dirrmtry share/locale/tr -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW -%%PL_CAS%%share/cas/tmp.html -%%PL_CAS%%share/cas/stat.png -%%PL_CAS%%@dirrmtry share/cas -%%PL_CAS%%share/pixmaps/wxcas.xpm -%%PL_ALC%%share/pixmaps/alc.xpm -%%PL_AMULEDAEMON%%share/pixmaps/amulegui.xpm -share/pixmaps/amule.xpm -%%PL_CAS%%share/applications/wxcas.desktop -%%PL_ALC%%share/applications/alc.desktop -%%PL_AMULEDAEMON%%share/applications/amulegui.desktop -share/applications/amule.desktop -%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl -%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg -%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png -%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-dload.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-kad.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-log.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-prefs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/black.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blank1x1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue2.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue3.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue4.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue5.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue6.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/close.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/col.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/down.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/edkserv_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/edkserv_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/filter.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/fond.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/fond_haut.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/footer.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/index.html -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/kitty.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/log.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginfond.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginfond_haut.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginlogo.jpg -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginlogo.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/logo.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/maquette.dwt -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/ok.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/pause.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/play.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/red.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/refresh.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/search_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/search_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/shared_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/shared_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/sheserv_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/sheserv_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/style.css -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom_left.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom_right.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_left.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_right.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top_left.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top_right.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/transf_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/transf_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/up.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/yellow.gif -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/litoral -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver -%%PL_AMULEWEBSRV%%@dirrmtry share/amule -share/amule/skins/gnome.zip -share/amule/skins/kde4.zip -share/amule/skins/tango.zip -share/amule/skins/xfce.zip -@dirrm share/amule/skins -@dirrm share/amule -lib/xchat/plugins/xas.pl -@dirrmtry lib/xchat/plugins -@dirrmtry lib/xchat -%%PL_CAS%%bin/cas -%%PL_CAS%%bin/wxcas -%%PL_CAS%%bin/autostart-xas -%%PL_ALC%%bin/alc -%%PL_ALC%%bin/alcc -%%PL_AMULEWEBSRV%%bin/amuleweb -%%PL_AMULECMD%%bin/amulecmd -%%PL_ED2K%%bin/ed2k -%%PL_AMULEDAEMON%%bin/amulegui -%%PL_AMULEDAEMON%%bin/amuled -bin/amule -@dirrmtry share/applications diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile deleted file mode 100644 index 1cd64f80ee26..000000000000 --- a/net-p2p/amule/Makefile +++ /dev/null @@ -1,145 +0,0 @@ -# New ports collection makefile for: amule2 -# Date created: Wed Nov 05 09:30:00 UTC 2003 -# Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.com> -# -# $FreeBSD$ -# - -PORTNAME= aMule -PORTVERSION= 2.2.6 -PORTREVISION= 4 -CATEGORIES= net-p2p -MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION} - -MAINTAINER= boris@tagnet.ru -COMMENT= The all-platform eMule p2p client - -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ - ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp - -LATEST_LINK= aMule2 -CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.* - -USE_BZIP2= yes -USE_GNOME= gnomehier gnomehack gnomeprefix -USE_GMAKE= yes -USE_WX= 2.8 -WX_CONF_ARGS= absolute -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-debug \ - --without-included-gettext \ - --with-libintl-prefix=${LOCALBASE} \ - --with-libiconv-prefix=${LOCALBASE} \ - --with-crypto-prefix=${LOCALBASE} \ - --with-denoise-level=0 - -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" - -OPTIONS= OPTIMIZE "Build with optimization" on \ - ED2K "Compile aMule ed2k links handler" on \ - AMULECMD "Compile aMule command line client" on \ - AMULEWEBSRV "Compile aMule WebServer" on \ - CAS "Compile C aMule Statistics (+GUI)" on \ - ALC "Compile aMule Link Creator (+GUI)" on \ - AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \ - WXUNICODE "Enable Unicode support" on \ - GEOIP "Enable GeoIP IP2Country support" off \ - UPNP "Enable Universal Plug and Play support" off - -DOCSDIR= ${PREFIX}/share/doc/aMule-${PORTVERSION} -PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt \ - ED2K-Links.HOWTO INSTALL README TODO \ - amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol - -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -.else -CONFIGURE_ARGS+= --disable-nls -.endif - -# Configure options -.if !defined(WITHOUT_OPTIMIZE) -CONFIGURE_ARGS+= --enable-optimize -.else -CONFIGURE_ARGS+= --disable-optimize -.endif - -.if !defined(WITHOUT_ED2K) -CONFIGURE_ARGS+= --enable-ed2k -PLIST_SUB+= PL_ED2K="" -.else -CONFIGURE_ARGS+= --disable-ed2k -PLIST_SUB+= PL_ED2K="@comment " -.endif - -.if !defined(WITHOUT_AMULECMD) -CONFIGURE_ARGS+= --enable-amulecmd -PLIST_SUB+= PL_AMULECMD="" -.else -CONFIGURE_ARGS+= --disable-amulecmd -PLIST_SUB+= PL_AMULECMD="@comment " -.endif - -.if !defined(WITHOUT_AMULEWEBSRV) -CONFIGURE_ARGS+= --enable-webserver -PLIST_SUB+= PL_AMULEWEBSRV="" -.else -CONFIGURE_ARGS+= --disable-webserver -PLIST_SUB+= PL_AMULEWEBSRV="@comment " -.endif - -.if !defined(WITHOUT_CAS) -CONFIGURE_ARGS+= --enable-cas --enable-wxcas -PLIST_SUB+= PL_CAS="" -.else -CONFIGURE_ARGS+= --disable-cas --disable-wxcas -PLIST_SUB+= PL_CAS="@comment " -.endif - -.if !defined(WITHOUT_ALC) -CONFIGURE_ARGS+= --enable-alc --enable-alcc -PLIST_SUB+= PL_ALC="" -.else -CONFIGURE_ARGS+= --disable-alc --disable-alcc -PLIST_SUB+= PL_ALC="@comment " -.endif - -.if defined(WITH_AMULEDAEMON) -CONFIGURE_ARGS+= --enable-amule-daemon --enable-amule-gui -PLIST_SUB+= PL_AMULEDAEMON="" -USE_RC_SUBR= amuled.sh -.else -CONFIGURE_ARGS+= --disable-amule-daemon --disable-amule-gui -PLIST_SUB+= PL_AMULEDAEMON="@comment " -.endif - -.if defined(WITH_GEOIP) -CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP -.else -CONFIGURE_ARGS+= --disable-geoip -.endif - -.if defined(WITH_UPNP) -CONFIGURE_ARGS+= --with-libupnp-prefix=${LOCALBASE} -LIB_DEPENDS+= upnp.3:${PORTSDIR}/devel/upnp -.else -CONFIGURE_ARGS+= --disable-upnp -.endif - -.if !defined(WITHOUT_WXUNICODE) -WX_UNICODE=yes -.endif - -# Man pages management -.include "Makefile.man" - -.ifdef NOPORTDOCS -post-patch: - ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' ${WRKSRC}/docs/Makefile.in -.endif - -.include <bsd.port.post.mk> diff --git a/net-p2p/amule/Makefile.man b/net-p2p/amule/Makefile.man deleted file mode 100644 index 58b59b9dd592..000000000000 --- a/net-p2p/amule/Makefile.man +++ /dev/null @@ -1,49 +0,0 @@ -# TODO : Add fr here when pages are complete -MANLANG= "" de es eu fr hu it -#MANCOMPRESSED= no -.if defined(WITH_CAS) -MAN1_EN+= cas.1 -MAN1_EN+= wxcas.1 -MAN1_DE+= cas.1 -MAN1_DE+= wxcas.1 -MAN1_ES+= cas.1 -MAN1_ES+= wxcas.1 -MAN1_EU+= cas.1 -MAN1_EU+= wxcas.1 -MAN1_HU+= cas.1 -MAN1_HU+= wxcas.1 -.endif -.if defined(WITH_ALC) -MAN1_EN+= alc.1 -MAN1_DE+= alc.1 -MAN1_ES+= alc.1 -MAN1_EU+= alc.1 -MAN1_HU+= alc.1 -MAN1_EN+= alcc.1 -MAN1_DE+= alcc.1 -MAN1_ES+= alcc.1 -MAN1_EU+= alcc.1 -MAN1_FR+= alcc.1 -MAN1_HU+= alcc.1 -.endif -.if defined(WITH_AMULEWEBSRV) -MAN1+= amuleweb.1 -.endif -.if defined(WITH_AMULECMD) -MAN1+= amulecmd.1 -.endif -.if defined(WITH_ED2K) -MAN1+= ed2k.1 -.endif -.if defined(WITH_AMULEDAEMON) -MAN1+= amuled.1 -MAN1_EN+= amulegui.1 -MAN1_DE+= amulegui.1 -MAN1_IT+= amulegui.1 -.endif -MAN1+= amule.1 -MAN1_EN+= xas.1 -MAN1_DE+= xas.1 -MAN1_ES+= xas.1 -MAN1_EU+= xas.1 -MAN1_HU+= xas.1 diff --git a/net-p2p/amule/distinfo b/net-p2p/amule/distinfo deleted file mode 100644 index 33d7c91eee6f..000000000000 --- a/net-p2p/amule/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (aMule-2.2.6.tar.bz2) = 530d9b48187e36f78fc21bb19e94326d -SHA256 (aMule-2.2.6.tar.bz2) = 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122 -SIZE (aMule-2.2.6.tar.bz2) = 4722143 diff --git a/net-p2p/amule/files/amuled.sh.in b/net-p2p/amule/files/amuled.sh.in deleted file mode 100644 index d3dae43db169..000000000000 --- a/net-p2p/amule/files/amuled.sh.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# aMule RCng startup script -# Ogirinal work from Gabriele Cecchetti (amule.org forum) -# - -# PROVIDE: amuled -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable amuled at startup -# amuled (bool): Set to "NO" by default. -# Set it to "YES" to enable amuled -# amuled_user (str): Set to user running amuled -# (default 'aMule') -# amuled_home (str): Set to home directory of user running amuled -# (default /home/${amuled_user}) -# -. /etc/rc.subr - -name="amuled" -rcvar=`set_rcvar` - -load_rc_config $name - -[ -z "$amuled_enable" ] && amuled_enable="NO" -[ -z "$amuled_user" ] && amuled_user="aMule" -[ -z "$amuled_home" ] && amuled_home="/home/${amuled_user}" - -required_dirs=${amuled_home} -required_files="${amuled_home}/.aMule/amule.conf" - -start_cmd="${name}_start" -stop_cmd="${name}_stop" - -amuled_start() -{ - if [ ! -f /var/run/${name}.run ] - then - su -l ${amuled_user} -c "amuled &" 2>>/var/log/${name}.log >>/var/log/${name}.log && touch /var/run/${name}.run - echo "Started ${name}." - echo `date` : "Started ${name}." >> /var/log/${name}.log - else - echo "${name} seems to be already running -- remove /var/run/${name}.run manually if needed." - fi -} - -amuled_stop() -{ - if [ -f /var/run/${name}.run ] - then - # The following line is much better, but doesn't stop totally amuled - # su -l ${amuled_user} -c "amulecmd -c Shutdown" 2>>/var/log/${name}.log >>/var/log/${name}.log - # Since amuled catches SIGTERM, this way is preferred for now - killall -TERM amuled 2>>/var/log/${name}.log >>/var/log/${name}.log ; sleep 3 - killall -KILL amuled 2>>/var/log/${name}.log >>/var/log/${name}.log - # Also kill amuleweb if needed - killall -KILL amuleweb 2>/dev/null >/dev/null - rm -f /var/run/${name}.run - echo "Stopped ${name}." - echo `date` : "Stopped ${name}." >> /var/log/${name}.log - else - echo "${name} doesn't seem to be running -- create /var/run/${name}.run if needed." - fi -} - -run_rc_command "$1" diff --git a/net-p2p/amule/pkg-descr b/net-p2p/amule/pkg-descr deleted file mode 100644 index afd986a280da..000000000000 --- a/net-p2p/amule/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -aMule, the all-platform eMule p2p client - -aMule is a multiplatform fork of xMule -client using wxWindows class library. - -WWW: http://www.amule.org diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist deleted file mode 100644 index 423fed84f2f3..000000000000 --- a/net-p2p/amule/pkg-plist +++ /dev/null @@ -1,371 +0,0 @@ -share/locale/ar/LC_MESSAGES/amule.mo -share/locale/ast/LC_MESSAGES/amule.mo -share/locale/bg/LC_MESSAGES/amule.mo -share/locale/ca/LC_MESSAGES/amule.mo -share/locale/cs/LC_MESSAGES/amule.mo -share/locale/da/LC_MESSAGES/amule.mo -share/locale/de/LC_MESSAGES/amule.mo -share/locale/el/LC_MESSAGES/amule.mo -share/locale/en_GB/LC_MESSAGES/amule.mo -share/locale/es/LC_MESSAGES/amule.mo -share/locale/et_EE/LC_MESSAGES/amule.mo -share/locale/eu/LC_MESSAGES/amule.mo -share/locale/fi/LC_MESSAGES/amule.mo -share/locale/fr/LC_MESSAGES/amule.mo -share/locale/gl/LC_MESSAGES/amule.mo -share/locale/he/LC_MESSAGES/amule.mo -share/locale/hr/LC_MESSAGES/amule.mo -share/locale/hu/LC_MESSAGES/amule.mo -share/locale/it/LC_MESSAGES/amule.mo -share/locale/it_CH/LC_MESSAGES/amule.mo -share/locale/ja/LC_MESSAGES/amule.mo -share/locale/ko_KR/LC_MESSAGES/amule.mo -share/locale/lt/LC_MESSAGES/amule.mo -share/locale/nl/LC_MESSAGES/amule.mo -share/locale/nn/LC_MESSAGES/amule.mo -share/locale/pl/LC_MESSAGES/amule.mo -share/locale/pt_BR/LC_MESSAGES/amule.mo -share/locale/pt_PT/LC_MESSAGES/amule.mo -share/locale/ru/LC_MESSAGES/amule.mo -share/locale/sl/LC_MESSAGES/amule.mo -share/locale/sq/LC_MESSAGES/amule.mo -share/locale/sv/LC_MESSAGES/amule.mo -share/locale/tr/LC_MESSAGES/amule.mo -share/locale/uk/LC_MESSAGES/amule.mo -share/locale/zh_CN/LC_MESSAGES/amule.mo -share/locale/zh_TW/LC_MESSAGES/amule.mo -@dirrmtry share/locale/ar/LC_MESSAGES -@dirrmtry share/locale/ar -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast -@dirrmtry share/locale/bg/LC_MESSAGES -@dirrmtry share/locale/bg -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/da/LC_MESSAGES -@dirrmtry share/locale/da -@dirrmtry share/locale/de/LC_MESSAGES -@dirrmtry share/locale/de -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/en_GB/LC_MESSAGES -@dirrmtry share/locale/en_GB -@dirrmtry share/locale/es/LC_MESSAGES -@dirrmtry share/locale/es -@dirrmtry share/locale/et_EE/LC_MESSAGES -@dirrmtry share/locale/et_EE -@dirrmtry share/locale/eu/LC_MESSAGES -@dirrmtry share/locale/eu -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/he/LC_MESSAGES -@dirrmtry share/locale/he -@dirrmtry share/locale/hr/LC_MESSAGES -@dirrmtry share/locale/hr -@dirrmtry share/locale/hu/LC_MESSAGES -@dirrmtry share/locale/hu -@dirrmtry share/locale/it/LC_MESSAGES -@dirrmtry share/locale/it -@dirrmtry share/locale/it_CH/LC_MESSAGES -@dirrmtry share/locale/it_CH -@dirrmtry share/locale/ja/LC_MESSAGES -@dirrmtry share/locale/ja -@dirrmtry share/locale/ko_KR/LC_MESSAGES -@dirrmtry share/locale/ko_KR -@dirrmtry share/locale/lt/LC_MESSAGES -@dirrmtry share/locale/lt -@dirrmtry share/locale/nl/LC_MESSAGES -@dirrmtry share/locale/nl -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/pt_BR/LC_MESSAGES -@dirrmtry share/locale/pt_BR -@dirrmtry share/locale/ru/LC_MESSAGES -@dirrmtry share/locale/ru -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/sq/LC_MESSAGES -@dirrmtry share/locale/sq -@dirrmtry share/locale/sv/LC_MESSAGES -@dirrmtry share/locale/sv -@dirrmtry share/locale/tr/LC_MESSAGES -@dirrmtry share/locale/tr -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW -%%PL_CAS%%share/cas/tmp.html -%%PL_CAS%%share/cas/stat.png -%%PL_CAS%%@dirrmtry share/cas -%%PL_CAS%%share/pixmaps/wxcas.xpm -%%PL_ALC%%share/pixmaps/alc.xpm -%%PL_AMULEDAEMON%%share/pixmaps/amulegui.xpm -share/pixmaps/amule.xpm -%%PL_CAS%%share/applications/wxcas.desktop -%%PL_ALC%%share/applications/alc.desktop -%%PL_AMULEDAEMON%%share/applications/amulegui.desktop -share/applications/amule.desktop -%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl -%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg -%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png -%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-dload.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-kad.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-log.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-prefs.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-search.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-servers.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-shared.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/black.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blank1x1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue1.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue2.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue3.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue4.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue5.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue6.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/cancel.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/close.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/col.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/connect.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/down.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/edkserv_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/edkserv_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/favicon.ico -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/filter.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/fond.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/fond_haut.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/footer.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/index.html -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/kitty.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/log.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/login.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginfond.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginfond_haut.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginlogo.jpg -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginlogo.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/logo.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/maquette.dwt -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/ok.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/pause.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/play.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/red.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/refresh.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/search_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/search_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/shared_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/shared_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/sheserv_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/sheserv_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_tree.php -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/style.css -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom_left.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom_right.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_left.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_right.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top_left.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top_right.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/transf_0.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/transf_1.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-closed.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-leaf.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-open.gif -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/up.png -%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/yellow.gif -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/litoral -%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver -%%PL_AMULEWEBSRV%%@dirrmtry share/amule -share/amule/skins/gnome.zip -share/amule/skins/kde4.zip -share/amule/skins/tango.zip -share/amule/skins/xfce.zip -@dirrm share/amule/skins -@dirrm share/amule -lib/xchat/plugins/xas.pl -@dirrmtry lib/xchat/plugins -@dirrmtry lib/xchat -%%PL_CAS%%bin/cas -%%PL_CAS%%bin/wxcas -%%PL_CAS%%bin/autostart-xas -%%PL_ALC%%bin/alc -%%PL_ALC%%bin/alcc -%%PL_AMULEWEBSRV%%bin/amuleweb -%%PL_AMULECMD%%bin/amulecmd -%%PL_ED2K%%bin/ed2k -%%PL_AMULEDAEMON%%bin/amulegui -%%PL_AMULEDAEMON%%bin/amuled -bin/amule -@dirrmtry share/applications diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile deleted file mode 100644 index 12af638efc85..000000000000 --- a/net-p2p/transmission-remote-gui/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: transmisson-remote-gui -# Date created: 2009-05-20 -# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= transmisson-remote-gui -PORTVERSION= 1.1 -PORTREVISION= 3 -CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DISTNAME= transgui-${PORTVERSION}-src - -MAINTAINER= acm@FreeBSD.org -COMMENT= Remote GUI for transmission daemon - -BUILD_DEPENDS= lazbuild:${PORTSDIR}/editors/lazarus -RUN_DEPENDS= transmission-daemon:${PORTSDIR}/net-p2p/transmission-daemon - -USE_ZIP= yes -USE_DOS2UNIX= yes -USE_FPC= fcl-net - -WRKSRC= ${WRKDIR}/TransGUI -PLIST_FILES= bin/transgui -SUB_FILES= pkg-message - -LAZARUS_PROJECT_FILE= transgui.lpi -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild - -.include <bsd.port.pre.mk> - -.if exists(${LOCALBASE}/bin/lazbuild) -LCL_PLATFORM!= ${SED} -e 1d -e 's/^LCL_PLATFORM=\(.*\).*$$/\1/' ${LOCALBASE}/etc/lazbuild.cfg -.endif - -do-build: - @cd ${WRKSRC} && \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} ${LAZARUS_PROJECT_FILE} - -do-install: - @cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} units/transgui ${PREFIX}/bin - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net-p2p/transmission-remote-gui/distinfo b/net-p2p/transmission-remote-gui/distinfo deleted file mode 100644 index 53634f3fad28..000000000000 --- a/net-p2p/transmission-remote-gui/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (transgui-1.1-src.zip) = 8c93e97e7ae5b528e5280976907ee2bc -SHA256 (transgui-1.1-src.zip) = 179275083e65630d48b06b795048e7c271d80e45d1cb715d9e28e4c1f33102df -SIZE (transgui-1.1-src.zip) = 411225 diff --git a/net-p2p/transmission-remote-gui/files/patch-main.lfm b/net-p2p/transmission-remote-gui/files/patch-main.lfm deleted file mode 100644 index d6b5fa24557b..000000000000 --- a/net-p2p/transmission-remote-gui/files/patch-main.lfm +++ /dev/null @@ -1,11 +0,0 @@ ---- main.lfm 2009-05-21 17:53:53.000000000 -0500 -+++ main.lfm 2009-05-21 17:54:04.000000000 -0500 -@@ -214,8 +214,6 @@ - Top = 26 - Width = 772 - Align = alClient -- ClientHeight = 222 -- ClientWidth = 751 - TabOrder = 0 - OnResize = sbGenInfoResize - object panGeneralInfo: TPanel diff --git a/net-p2p/transmission-remote-gui/files/pkg-message.in b/net-p2p/transmission-remote-gui/files/pkg-message.in deleted file mode 100644 index 46cfba4cc7c4..000000000000 --- a/net-p2p/transmission-remote-gui/files/pkg-message.in +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################### - -The Transmisson remote gui was installed - -1) You can run it using: - - # transgui - -2) Don't forget that you need a transmission-daemon program configurated and - running before of use transgui. - -3) Run "transmission-daemon --help" for more configuration options - -4) Enjoy it ;) - -############################################################################### diff --git a/net-p2p/transmission-remote-gui/pkg-descr b/net-p2p/transmission-remote-gui/pkg-descr deleted file mode 100644 index 0ceaff03a374..000000000000 --- a/net-p2p/transmission-remote-gui/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Transmission Remote GUI is feature rich cross platform front-end to remotely -control Transmission daemon via its RPC protocol. It is faster and has more -functionality than build-in Transmission web interface. - -WWW: http://code.google.com/p/transmisson-remote-gui/ diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile deleted file mode 100644 index bec830c86655..000000000000 --- a/net/asterisk10/Makefile +++ /dev/null @@ -1,198 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.4.29 -PORTREVISION= 4 -CATEGORIES= net -MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ - http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ - newt.52:${PORTSDIR}/devel/newt \ - gsm.1:${PORTSDIR}/audio/gsm \ - curl.6:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} -CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 -USE_GMAKE= yes -USE_BISON= build -USE_RC_SUBR= asterisk.sh -MAKE_ENV= MKDIR="${MKDIR}" \ - PWLIBDIR=${LOCALBASE}/share/pwlib \ - OPENH323DIR=${LOCALBASE}/share/openh323 \ - OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ - ASTCFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" \ - ASTLDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 -CONFLICTS= asterisk*-1.2* asterisk*-1.6* - -OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ - ODBC "Enable ODBC support" on \ - POSTGRES "Enable PostgreSQL support" on \ - RADIUS "Enable RADIUS accounting support" on \ - SNMP "Enable SNMP support" on \ - H323 "Enable H.323 support" on \ - FREETDS "Enable FreeTDS support" on \ - JABBER "Enable Jabber and Gtalk support" on \ - SQLITE "Enable SQLITE support" on \ - CODEC_PATCH "Apply codec negotiation patch" off \ - ILBC "Enable iLBC codec" off \ - MISC_PATCHES "Apply additional patches" off - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" || ${ARCH} == "amd64" -OPTIONS+= ZAPTEL "Enable Zaptel support" off - -# Include this since we have altered OPTIONS. -.include "$(PORTSDIR)/Mk/bsd.port.options.mk" -.endif - -.if !defined(WITH_H323) -PLIST_SUB+= WITH_H323="@comment " -CONFIGURE_ARGS+= --without-h323 -.else -PLIST_SUB+= WITH_H323="" -CONFIGURE_ARGS+= --with-h323=${LOCALBASE} -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 -.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 -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if !defined(WITH_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -CONFIGURE_ARGS+= --without-odbc -.else -PLIST_SUB+= WITH_ODBC="" -CONFIGURE_ARGS+= --with-odbc --with-ltdl -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.7:${PORTSDIR}/devel/libltdl22 -.endif - -.if !defined(WITH_FREETDS) -PLIST_SUB+= WITH_FREETDS="@comment " -CONFIGURE_ARGS+= --without-tds -.else -PLIST_SUB+= WITH_FREETDS="" -CONFIGURE_ARGS+= --with-tds=${LOCALBASE} -LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds -.endif - -.if !defined(WITH_POSTGRES) -PLIST_SUB+= WITH_POSTGRES="@comment " -CONFIGURE_ARGS+= --without-postgres -.else -PLIST_SUB+= WITH_POSTGRES="" -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgres -.endif - -.if !defined(WITH_OGGVORBIS) -PLIST_SUB+= WITH_OGGVORBIS="@comment " -CONFIGURE_ARGS+= --without-ogg -.else -PLIST_SUB+= WITH_OGGVORBIS="" -CONFIGURE_ARGS+= --with-ogg -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis -.endif - -.if !defined(WITH_RADIUS) -PLIST_SUB+= WITH_RADIUS="@comment " -CONFIGURE_ARGS+= --without-radius -.else -PLIST_SUB+= WITH_RADIUS="" -CONFIGURE_ARGS+= --with-radius -LIB_DEPENDS+= radiusclient-ng.2:${PORTSDIR}/net/radiusclient -.endif - -.if !defined(WITH_SNMP) -PLIST_SUB+= WITH_SNMP="@comment " -CONFIGURE_ARGS+= --without-netsnmp -.else -PLIST_SUB+= WITH_SNMP="" -CONFIGURE_ARGS+= --with-netsnmp -LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp -.endif - -.if !defined(WITH_JABBER) -PLIST_SUB+= WITH_JABBER="@comment " -CONFIGURE_ARGS+= --without-iksemel -.else -PLIST_SUB+= WITH_JABBER="" -CONFIGURE_ARGS+= --with-iksemel -LIB_DEPENDS+= iksemel.4:${PORTSDIR}/textproc/iksemel -.endif - -.if !defined(WITH_SQLITE) -PLIST_SUB+= WITH_SQLITE="@comment " -CONFIGURE_ARGS+= --without-sqlite -.else -PLIST_SUB+= WITH_SQLITE="" -CONFIGURE_ARGS+= --with-sqlite -LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite2 -.endif - -.if !defined(WITH_ILBC) -PLIST_SUB+= WITH_ILBC="@comment " -.else -PLIST_SUB+= WITH_ILBC="" -EXTRA_PATCHES+= ${PATCHDIR}/ilbc_enable.diff -.endif - -.if defined(WITH_CODEC_PATCH) -PATCHFILES= asterisk-1.4.27-codec-negotiation-20091120.diff.gz -PATCH_SITES= http://b2bua.org/chrome/site/ -EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile -.else -EXTRA_PATCHES+= ${PATCHDIR}/nocodecnego-patch-Makefile -.endif - -.if defined(WITH_MISC_PATCHES) -EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff -EXTRA_PATCHES+= ${PATCHDIR}/sip_force_callid.diff -EXTRA_PATCHES+= ${PATCHDIR}/sip_set_auth.diff -.if defined(WITH_CODEC_PATCH) -EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-codecnego.diff -.else -EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-nocodecnego.diff -.endif -.endif - -post-extract: - ${MKDIR} ${WRKSRC}/codecs/ilbc - ${FIND} ${WRKSRC} -name '*.d' -delete - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include <bsd.port.post.mk> diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo deleted file mode 100644 index 1c21b1a25ead..000000000000 --- a/net/asterisk10/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.4.29.tar.gz) = b49d0a269e11b6e85c75edce577b5103 -SHA256 (asterisk-1.4.29.tar.gz) = ecb1202f50fc5d7738d1b5bf6451b28e356f3469266dd64bcd637be71f91bd09 -SIZE (asterisk-1.4.29.tar.gz) = 21534219 -MD5 (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 4dedd23b3c9c00bcdcc69b8be878f15c -SHA256 (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 68f895de29f30296a47d32a5eaab8df367d92ae87b01ea9f2262556a1f1e5cbb -SIZE (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 40455 diff --git a/net/asterisk10/files/asterisk.sh.in b/net/asterisk10/files/asterisk.sh.in deleted file mode 100644 index ca5941068460..000000000000 --- a/net/asterisk10/files/asterisk.sh.in +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# PROVIDE: asterisk -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -stop_precmd=asterisk_shutdown -sig_stop=KILL -asterisk_shutdown () { - %%PREFIX%%/sbin/asterisk -qrx 'stop now' - sleep 1 - return 0 -} - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk - -load_rc_config $name - -pidfile=${asterisk_pidfile:-"/var/run/asterisk.pid"} - -asterisk_enable=${asterisk_enable:-"NO"} - -run_rc_command "$1" diff --git a/net/asterisk10/files/codecnego-patch-Makefile b/net/asterisk10/files/codecnego-patch-Makefile deleted file mode 100644 index e39dd6f62082..000000000000 --- a/net/asterisk10/files/codecnego-patch-Makefile +++ /dev/null @@ -1,219 +0,0 @@ ---- Makefile.orig 2009-11-20 17:48:05.000000000 +0200 -+++ Makefile 2009-11-20 17:50:33.000000000 +0200 -@@ -101,7 +101,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - # Staging directory - # Files are copied here temporarily during the install process -@@ -135,7 +135,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk - endif -@@ -225,9 +225,11 @@ - _ASTLDFLAGS+=-L/usr/local/lib - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char -@@ -235,7 +237,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - endif -@@ -416,15 +418,15 @@ - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -445,47 +447,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -521,7 +523,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -559,31 +561,23 @@ - upgrade: bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ - if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ - done -- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ if true; then \ - ( \ - echo "[directories]" ; \ - echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -670,20 +664,23 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" diff --git a/net/asterisk10/files/dtmf_debug.diff b/net/asterisk10/files/dtmf_debug.diff deleted file mode 100644 index 2a5b6bc9ea33..000000000000 --- a/net/asterisk10/files/dtmf_debug.diff +++ /dev/null @@ -1,226 +0,0 @@ ---- channels/chan_sip.c.orig 2009-05-12 21:18:44.000000000 +0300 -+++ channels/chan_sip.c 2009-05-26 12:50:22.000000000 +0300 -@@ -3891,6 +3891,7 @@ - ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner); - else { - p->owner = newchan; -+ ast_rtp_set_chan_name(p->rtp, newchan->name); - /* Re-invite RTP back to Asterisk. Needed if channel is masqueraded out of a native - RTP bridge (i.e., RTP not going through Asterisk): RTP bridge code might not be - able to do this if the masquerade happens before the bridge breaks (e.g., AMI -@@ -4168,6 +4169,7 @@ - if (i->rtp) { - tmp->fds[0] = ast_rtp_fd(i->rtp); - tmp->fds[1] = ast_rtcp_fd(i->rtp); -+ ast_rtp_set_chan_id(i->rtp, i->callid); - } - if (needvideo && i->vrtp) { - tmp->fds[2] = ast_rtp_fd(i->vrtp); -@@ -4195,6 +4197,8 @@ - if (!ast_strlen_zero(i->language)) - ast_string_field_set(tmp, language, i->language); - i->owner = tmp; -+ ast_rtp_set_chan_name(i->rtp, tmp->name); -+ - ast_module_ref(ast_module_info->self); - ast_copy_string(tmp->context, i->context, sizeof(tmp->context)); - /*Since it is valid to have extensions in the dialplan that have unescaped characters in them -@@ -4621,8 +4625,10 @@ - build_via(p); - if (!callid) - build_callid_pvt(p); -- else -+ else { - ast_string_field_set(p, callid, callid); -+ ast_rtp_set_chan_id(p->rtp, p->callid); -+ } - /* Assign default music on hold class */ - ast_string_field_set(p, mohinterpret, default_mohinterpret); - ast_string_field_set(p, mohsuggest, default_mohsuggest); ---- include/asterisk/rtp.h.orig 2008-03-04 20:05:28.000000000 +0200 -+++ include/asterisk/rtp.h 2009-05-26 12:50:22.000000000 +0300 -@@ -243,6 +243,9 @@ - - int ast_rtp_codec_getformat(int pt); - -+void ast_rtp_set_chan_name(struct ast_rtp *, const char *); -+void ast_rtp_set_chan_id(struct ast_rtp *, const char *); -+ - /*! \brief Set rtp timeout */ - void ast_rtp_set_rtptimeout(struct ast_rtp *rtp, int timeout); - /*! \brief Set rtp hold timeout */ ---- main/rtp.c.orig 2009-11-20 17:51:49.000000000 +0200 -+++ main/rtp.c 2009-11-20 17:53:11.000000000 +0200 -@@ -81,6 +81,7 @@ - static int rtpstart; /*!< First port for RTP sessions (set in rtp.conf) */ - static int rtpend; /*!< Last port for RTP sessions (set in rtp.conf) */ - static int rtpdebug; /*!< Are we debugging? */ -+static int rtpdebugdtmf; /*!< Are we debugging DTMFs? */ - static int rtcpdebug; /*!< Are we debugging RTCP? */ - static int rtcpstats; /*!< Are we debugging RTCP? */ - static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */ -@@ -170,6 +171,8 @@ - struct ast_rtp *bridged; /*!< Who we are Packet bridged to */ - int set_marker_bit:1; /*!< Whether to set the marker bit or not */ - unsigned int constantssrc:1; -+ char chan_name[100]; -+ char chan_id[100]; - }; - - /* Forward declarations */ -@@ -676,8 +679,8 @@ - struct ast_frame *f = NULL; - event = ntohl(*((unsigned int *)(data))); - event &= 0x001F; -- if (option_debug > 2 || rtpdebug) -- ast_log(LOG_DEBUG, "Cisco DTMF Digit: %08x (len = %d)\n", event, len); -+ if (option_debug > 2 || rtpdebug || rtpdebugdtmf) -+ ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF packet: %08x (len = %d)\n", rtp->chan_name, rtp->chan_id, event, len); - if (event < 10) { - resp = '0' + event; - } else if (event < 11) { -@@ -691,12 +694,25 @@ - } - if (rtp->resp && (rtp->resp != resp)) { - f = send_dtmf(rtp, AST_FRAME_DTMF_END); -+ ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF event: %c\n", rtp->chan_name, rtp->chan_id, rtp->resp); - } - rtp->resp = resp; - rtp->dtmf_timeout = 0; - return f; - } - -+void ast_rtp_set_chan_id(struct ast_rtp *rtp, const char *chan_id) { -+ if (rtp == NULL || chan_id == NULL) -+ return; -+ snprintf(rtp->chan_id, sizeof(rtp->chan_id), "%s", chan_id); -+} -+ -+void ast_rtp_set_chan_name(struct ast_rtp *rtp, const char *chan_name) { -+ if (rtp == NULL || chan_name == NULL) -+ return; -+ snprintf(rtp->chan_name, sizeof(rtp->chan_name), "%s", chan_name); -+} -+ - /*! - * \brief Process RTP DTMF and events according to RFC 2833. - * -@@ -1101,6 +1117,10 @@ - struct rtpPayloadType rtpPT; - int reconstruct = ntohl(rtpheader[0]); - -+ /* If we are listening for DTMF - then feed all packets into the core to keep the RTP stream consistent when relaying DTMFs */ -+ if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF)) -+ return -1; -+ - /* Get fields from packet */ - payload = (reconstruct & 0x7f0000) >> 16; - mark = (((reconstruct & 0x800000) >> 23) != 0); -@@ -1108,10 +1128,6 @@ - /* Check what the payload value should be */ - rtpPT = ast_rtp_lookup_pt(rtp, payload); - -- /* If the payload is DTMF, and we are listening for DTMF - then feed it into the core */ -- if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF) && !rtpPT.isAstFormat && rtpPT.code == AST_RTP_DTMF) -- return -1; -- - /* Otherwise adjust bridged payload to match */ - bridged_payload = ast_rtp_lookup_code(bridged, rtpPT.isAstFormat, rtpPT.code); - -@@ -1306,11 +1322,12 @@ - /* This is special in-band data that's not one of our codecs */ - if (rtpPT.code == AST_RTP_DTMF) { - /* It's special -- rfc2833 process it */ -- if (rtp_debug_test_addr(&sin)) { -+ if (rtp_debug_test_addr(&sin) || rtpdebugdtmf) { - unsigned char *data; - unsigned int event; - unsigned int event_end; - unsigned int duration; -+ - data = rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen; - event = ntohl(*((unsigned int *)(data))); - event >>= 24; -@@ -1319,9 +1336,12 @@ - event_end >>= 24; - duration = ntohl(*((unsigned int *)(data))); - duration &= 0xFFFF; -- ast_verbose("Got RTP RFC2833 from %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration); -+ -+ ast_verbose("Channel: %s %s Got RTP RFC2833 from %s:%u to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d)\n", rtp->chan_name, rtp->chan_id, ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), ast_inet_ntoa(rtp->us.sin_addr), ntohs(rtp->us.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration); - } - f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen, seqno, timestamp); -+ if (rtpdebugdtmf && f) -+ ast_verbose("Channel: %s %s Got RFC2833 DTMF event %c of type %s\n", rtp->chan_name, rtp->chan_id, f->subclass, (f->frametype == AST_FRAME_DTMF_BEGIN ? "DTMF BEGIN" : (f->frametype == AST_FRAME_DTMF_END ? "DTMF_END" : "UNKNOWN"))); - } else if (rtpPT.code == AST_RTP_CISCO_DTMF) { - /* It's really special -- process it the Cisco way */ - if (rtp->lastevent <= seqno || (rtp->lastevent >= 65530 && seqno <= 6)) { -@@ -2287,8 +2307,9 @@ - ast_log(LOG_ERROR, "RTP Transmission error to %s:%u: %s\n", - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), strerror(errno)); -- if (rtp_debug_test_addr(&rtp->them)) -- ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf) -+ ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ rtp->chan_name, rtp->chan_id, - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); - /* Increment sequence number */ -@@ -2331,8 +2352,9 @@ - ast_log(LOG_ERROR, "RTP Transmission error to %s:%d: %s\n", - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), strerror(errno)); -- if (rtp_debug_test_addr(&rtp->them)) -- ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf) -+ ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ rtp->chan_name, rtp->chan_id, - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); - -@@ -3621,6 +3643,16 @@ - return RESULT_SUCCESS; - } - -+static int rtp_do_debug_dtmf(int fd, int argc, char *argv[]) -+{ -+ if (argc != 3) -+ return RESULT_SHOWUSAGE; -+ -+ rtpdebugdtmf = 1; -+ ast_cli(fd, "RTP DTMF debugging enabled\n"); -+ return RESULT_SUCCESS; -+} -+ - static int rtp_do_debug(int fd, int argc, char *argv[]) - { - if (argc != 2) { -@@ -3681,6 +3713,7 @@ - if (argc != 3) - return RESULT_SHOWUSAGE; - rtpdebug = 0; -+ rtpdebugdtmf = 0; - ast_cli(fd,"RTP Debugging Disabled\n"); - return RESULT_SUCCESS; - } -@@ -3741,7 +3774,7 @@ - } - - static char debug_usage[] = -- "Usage: rtp debug [ip host[:port]]\n" -+ "Usage: rtp debug [ip host[:port] | dtmf]\n" - " Enable dumping of all RTP packets to and from host.\n"; - - static char no_debug_usage[] = -@@ -3816,6 +3849,10 @@ - rtp_do_debug, "Enable RTP debugging", - debug_usage }, - -+ { { "rtp", "debug", "dtmf", NULL }, -+ rtp_do_debug_dtmf, "Enable RTP debugging on DTMFs", -+ debug_usage }, -+ - { { "rtp", "debug", "off", NULL }, - rtp_no_debug, "Disable RTP debugging", - no_debug_usage, NULL, &cli_rtp_no_debug_deprecated }, diff --git a/net/asterisk10/files/ilbc_enable.diff b/net/asterisk10/files/ilbc_enable.diff deleted file mode 100644 index a2a3c4f73d70..000000000000 --- a/net/asterisk10/files/ilbc_enable.diff +++ /dev/null @@ -1,7599 +0,0 @@ - -$FreeBSD$ - ---- menuselect-tree -+++ menuselect-tree -@@ -269,7 +269,6 @@ - <depend>gsm</depend> - </member> - <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so"> -- <defaultenabled>no</defaultenabled> - </member> - <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so"> - </member> -diff -druN codecs/ilbc.orig/FrameClassify.c codecs/ilbc/FrameClassify.c ---- codecs/ilbc.orig/FrameClassify.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/FrameClassify.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,110 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ FrameClassify.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "FrameClassify.h" -+ -+/*---------------------------------------------------------------* -+ * Classification of subframes to localize start state -+ *--------------------------------------------------------------*/ -+ -+int FrameClassify( /* index to the max-energy sub-frame */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i/o) the encoder state structure */ -+ float *residual /* (i) lpc residual signal */ -+) { -+ float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp; -+ int n, l, max_ssqEn_n; -+ const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9, -+ (float)1.0,(float)0.9,(float)0.8}; -+ const float sampEn_win[5]={(float)1.0/(float)6.0, -+ (float)2.0/(float)6.0, (float)3.0/(float)6.0, -+ (float)4.0/(float)6.0, (float)5.0/(float)6.0}; -+ -+ /* init the front and back energies to zero */ -+ -+ memset(fssqEn, 0, NSUB_MAX*sizeof(float)); -+ memset(bssqEn, 0, NSUB_MAX*sizeof(float)); -+ -+ /* Calculate front of first seqence */ -+ -+ n=0; -+ pp=residual; -+ -+ -+ for (l=0; l<5; l++) { -+ fssqEn[n] += sampEn_win[l] * (*pp) * (*pp); -+ pp++; -+ } -+ for (l=5; l<SUBL; l++) { -+ fssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ -+ /* Calculate front and back of all middle sequences */ -+ -+ for (n=1; n<iLBCenc_inst->nsub-1; n++) { -+ pp=residual+n*SUBL; -+ for (l=0; l<5; l++) { -+ fssqEn[n] += sampEn_win[l] * (*pp) * (*pp); -+ bssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ for (l=5; l<SUBL-5; l++) { -+ fssqEn[n] += (*pp) * (*pp); -+ bssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ for (l=SUBL-5; l<SUBL; l++) { -+ fssqEn[n] += (*pp) * (*pp); -+ bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp); -+ pp++; -+ } -+ } -+ -+ /* Calculate back of last seqence */ -+ -+ n=iLBCenc_inst->nsub-1; -+ pp=residual+n*SUBL; -+ for (l=0; l<SUBL-5; l++) { -+ bssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ for (l=SUBL-5; l<SUBL; l++) { -+ bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp); -+ pp++; -+ } -+ -+ /* find the index to the weighted 80 sample with -+ most energy */ -+ -+ if (iLBCenc_inst->mode==20) l=1; -+ else l=0; -+ -+ max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l]; -+ max_ssqEn_n=1; -+ for (n=2; n<iLBCenc_inst->nsub; n++) { -+ -+ l++; -+ -+ -+ if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) { -+ max_ssqEn=(fssqEn[n-1]+bssqEn[n]) * -+ ssqEn_win[l]; -+ max_ssqEn_n=n; -+ } -+ } -+ -+ return max_ssqEn_n; -+} -+ -+ -diff -druN codecs/ilbc.orig/FrameClassify.h codecs/ilbc/FrameClassify.h ---- codecs/ilbc.orig/FrameClassify.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/FrameClassify.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,26 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ FrameClassify.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+ -+ -+#ifndef __iLBC_FRAMECLASSIFY_H -+#define __iLBC_FRAMECLASSIFY_H -+ -+int FrameClassify( /* index to the max-energy sub-frame */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i/o) the encoder state structure */ -+ float *residual /* (i) lpc residual signal */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/LPCdecode.c codecs/ilbc/LPCdecode.c ---- codecs/ilbc.orig/LPCdecode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCdecode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,152 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPC_decode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "helpfun.h" -+#include "lsf.h" -+#include "iLBC_define.h" -+#include "LPCdecode.h" -+#include "constants.h" -+ -+/*---------------------------------------------------------------* -+ * interpolation of lsf coefficients for the decoder -+ *--------------------------------------------------------------*/ -+ -+void LSFinterpolate2a_dec( -+ float *a, /* (o) lpc coefficients for a sub-frame */ -+ float *lsf1, /* (i) first lsf coefficient vector */ -+ -+ -+ float *lsf2, /* (i) second lsf coefficient vector */ -+ float coef, /* (i) interpolation weight */ -+ int length /* (i) length of lsf vectors */ -+){ -+ float lsftmp[LPC_FILTERORDER]; -+ -+ interpolate(lsftmp, lsf1, lsf2, coef, length); -+ lsf2a(a, lsftmp); -+} -+ -+/*---------------------------------------------------------------* -+ * obtain dequantized lsf coefficients from quantization index -+ *--------------------------------------------------------------*/ -+ -+void SimplelsfDEQ( -+ float *lsfdeq, /* (o) dequantized lsf coefficients */ -+ int *index, /* (i) quantization index */ -+ int lpc_n /* (i) number of LPCs */ -+){ -+ int i, j, pos, cb_pos; -+ -+ /* decode first LSF */ -+ -+ pos = 0; -+ cb_pos = 0; -+ for (i = 0; i < LSF_NSPLIT; i++) { -+ for (j = 0; j < dim_lsfCbTbl[i]; j++) { -+ lsfdeq[pos + j] = lsfCbTbl[cb_pos + -+ (long)(index[i])*dim_lsfCbTbl[i] + j]; -+ } -+ pos += dim_lsfCbTbl[i]; -+ cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i]; -+ } -+ -+ if (lpc_n>1) { -+ -+ /* decode last LSF */ -+ -+ pos = 0; -+ cb_pos = 0; -+ for (i = 0; i < LSF_NSPLIT; i++) { -+ for (j = 0; j < dim_lsfCbTbl[i]; j++) { -+ lsfdeq[LPC_FILTERORDER + pos + j] = -+ lsfCbTbl[cb_pos + -+ (long)(index[LSF_NSPLIT + i])* -+ dim_lsfCbTbl[i] + j]; -+ } -+ pos += dim_lsfCbTbl[i]; -+ cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ -+ -+ * obtain synthesis and weighting filters form lsf coefficients -+ *---------------------------------------------------------------*/ -+ -+void DecoderInterpolateLSF( -+ float *syntdenum, /* (o) synthesis filter coefficients */ -+ float *weightdenum, /* (o) weighting denumerator -+ coefficients */ -+ float *lsfdeq, /* (i) dequantized lsf coefficients */ -+ int length, /* (i) length of lsf coefficient vector */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i) the decoder state structure */ -+){ -+ int i, pos, lp_length; -+ float lp[LPC_FILTERORDER + 1], *lsfdeq2; -+ -+ lsfdeq2 = lsfdeq + length; -+ lp_length = length + 1; -+ -+ if (iLBCdec_inst->mode==30) { -+ /* sub-frame 1: Interpolation between old and first */ -+ -+ LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq, -+ lsf_weightTbl_30ms[0], length); -+ memcpy(syntdenum,lp,lp_length*sizeof(float)); -+ bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, -+ lp_length); -+ -+ /* sub-frames 2 to 6: interpolation between first -+ and last LSF */ -+ -+ pos = lp_length; -+ for (i = 1; i < 6; i++) { -+ LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2, -+ lsf_weightTbl_30ms[i], length); -+ memcpy(syntdenum + pos,lp,lp_length*sizeof(float)); -+ bwexpand(weightdenum + pos, lp, -+ LPC_CHIRP_WEIGHTDENUM, lp_length); -+ pos += lp_length; -+ } -+ } -+ else { -+ pos = 0; -+ for (i = 0; i < iLBCdec_inst->nsub; i++) { -+ LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, -+ lsfdeq, lsf_weightTbl_20ms[i], length); -+ memcpy(syntdenum+pos,lp,lp_length*sizeof(float)); -+ bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM, -+ lp_length); -+ pos += lp_length; -+ } -+ } -+ -+ /* update memory */ -+ -+ -+ -+ if (iLBCdec_inst->mode==30) -+ memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2, -+ length*sizeof(float)); -+ else -+ memcpy(iLBCdec_inst->lsfdeqold, lsfdeq, -+ length*sizeof(float)); -+ -+} -+ -+ -diff -druN codecs/ilbc.orig/LPCdecode.h codecs/ilbc/LPCdecode.h ---- codecs/ilbc.orig/LPCdecode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCdecode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,44 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPC_decode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_LPC_DECODE_H -+#define __iLBC_LPC_DECODE_H -+ -+void LSFinterpolate2a_dec( -+ -+ -+ float *a, /* (o) lpc coefficients for a sub-frame */ -+ float *lsf1, /* (i) first lsf coefficient vector */ -+ float *lsf2, /* (i) second lsf coefficient vector */ -+ float coef, /* (i) interpolation weight */ -+ int length /* (i) length of lsf vectors */ -+); -+ -+void SimplelsfDEQ( -+ float *lsfdeq, /* (o) dequantized lsf coefficients */ -+ int *index, /* (i) quantization index */ -+ int lpc_n /* (i) number of LPCs */ -+); -+ -+void DecoderInterpolateLSF( -+ float *syntdenum, /* (o) synthesis filter coefficients */ -+ float *weightdenum, /* (o) weighting denumerator -+ coefficients */ -+ float *lsfdeq, /* (i) dequantized lsf coefficients */ -+ int length, /* (i) length of lsf coefficient vector */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i) the decoder state structure */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/LPCencode.c codecs/ilbc/LPCencode.c ---- codecs/ilbc.orig/LPCencode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCencode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,228 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPCencode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <string.h> -+ -+ -+ -+#include "iLBC_define.h" -+#include "LPCencode.h" -+#include "helpfun.h" -+#include "lsf.h" -+#include "constants.h" -+ -+/*----------------------------------------------------------------* -+ * lpc analysis (subrutine to LPCencode) -+ *---------------------------------------------------------------*/ -+ -+static void SimpleAnalysis( -+ float *lsf, /* (o) lsf coefficients */ -+ float *data, /* (i) new data vector */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+){ -+ int k, is; -+ float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1]; -+ float lp2[LPC_FILTERORDER + 1]; -+ float r[LPC_FILTERORDER + 1]; -+ -+ is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl; -+ memcpy(iLBCenc_inst->lpc_buffer+is,data, -+ iLBCenc_inst->blockl*sizeof(float)); -+ -+ /* No lookahead, last window is asymmetric */ -+ -+ for (k = 0; k < iLBCenc_inst->lpc_n; k++) { -+ -+ is = LPC_LOOKBACK; -+ -+ if (k < (iLBCenc_inst->lpc_n - 1)) { -+ window(temp, lpc_winTbl, -+ iLBCenc_inst->lpc_buffer, BLOCKL_MAX); -+ } else { -+ window(temp, lpc_asymwinTbl, -+ iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX); -+ } -+ -+ autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER); -+ window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1); -+ -+ levdurb(lp, temp, r, LPC_FILTERORDER); -+ bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1); -+ -+ a2lsf(lsf + k*LPC_FILTERORDER, lp2); -+ } -+ is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl; -+ memmove(iLBCenc_inst->lpc_buffer, -+ iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is, -+ is*sizeof(float)); -+} -+ -+/*----------------------------------------------------------------* -+ -+ -+ * lsf interpolator and conversion from lsf to a coefficients -+ * (subrutine to SimpleInterpolateLSF) -+ *---------------------------------------------------------------*/ -+ -+static void LSFinterpolate2a_enc( -+ float *a, /* (o) lpc coefficients */ -+ float *lsf1,/* (i) first set of lsf coefficients */ -+ float *lsf2,/* (i) second set of lsf coefficients */ -+ float coef, /* (i) weighting coefficient to use between -+ lsf1 and lsf2 */ -+ long length /* (i) length of coefficient vectors */ -+){ -+ float lsftmp[LPC_FILTERORDER]; -+ -+ interpolate(lsftmp, lsf1, lsf2, coef, length); -+ lsf2a(a, lsftmp); -+} -+ -+/*----------------------------------------------------------------* -+ * lsf interpolator (subrutine to LPCencode) -+ *---------------------------------------------------------------*/ -+ -+static void SimpleInterpolateLSF( -+ float *syntdenum, /* (o) the synthesis filter denominator -+ resulting from the quantized -+ interpolated lsf */ -+ float *weightdenum, /* (o) the weighting filter denominator -+ resulting from the unquantized -+ interpolated lsf */ -+ float *lsf, /* (i) the unquantized lsf coefficients */ -+ float *lsfdeq, /* (i) the dequantized lsf coefficients */ -+ float *lsfold, /* (i) the unquantized lsf coefficients of -+ the previous signal frame */ -+ float *lsfdeqold, /* (i) the dequantized lsf coefficients of -+ the previous signal frame */ -+ int length, /* (i) should equate LPC_FILTERORDER */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+){ -+ int i, pos, lp_length; -+ float lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2; -+ -+ lsf2 = lsf + length; -+ lsfdeq2 = lsfdeq + length; -+ lp_length = length + 1; -+ -+ if (iLBCenc_inst->mode==30) { -+ /* sub-frame 1: Interpolation between old and first -+ set of lsf coefficients */ -+ -+ LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, -+ lsf_weightTbl_30ms[0], length); -+ memcpy(syntdenum,lp,lp_length*sizeof(float)); -+ LSFinterpolate2a_enc(lp, lsfold, lsf, -+ -+ -+ lsf_weightTbl_30ms[0], length); -+ bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length); -+ -+ /* sub-frame 2 to 6: Interpolation between first -+ and second set of lsf coefficients */ -+ -+ pos = lp_length; -+ for (i = 1; i < iLBCenc_inst->nsub; i++) { -+ LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2, -+ lsf_weightTbl_30ms[i], length); -+ memcpy(syntdenum + pos,lp,lp_length*sizeof(float)); -+ -+ LSFinterpolate2a_enc(lp, lsf, lsf2, -+ lsf_weightTbl_30ms[i], length); -+ bwexpand(weightdenum + pos, lp, -+ LPC_CHIRP_WEIGHTDENUM, lp_length); -+ pos += lp_length; -+ } -+ } -+ else { -+ pos = 0; -+ for (i = 0; i < iLBCenc_inst->nsub; i++) { -+ LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, -+ lsf_weightTbl_20ms[i], length); -+ memcpy(syntdenum+pos,lp,lp_length*sizeof(float)); -+ LSFinterpolate2a_enc(lp, lsfold, lsf, -+ lsf_weightTbl_20ms[i], length); -+ bwexpand(weightdenum+pos, lp, -+ LPC_CHIRP_WEIGHTDENUM, lp_length); -+ pos += lp_length; -+ } -+ } -+ -+ /* update memory */ -+ -+ if (iLBCenc_inst->mode==30) { -+ memcpy(lsfold, lsf2, length*sizeof(float)); -+ memcpy(lsfdeqold, lsfdeq2, length*sizeof(float)); -+ } -+ else { -+ memcpy(lsfold, lsf, length*sizeof(float)); -+ memcpy(lsfdeqold, lsfdeq, length*sizeof(float)); -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * lsf quantizer (subrutine to LPCencode) -+ *---------------------------------------------------------------*/ -+ -+static void SimplelsfQ( -+ float *lsfdeq, /* (o) dequantized lsf coefficients -+ (dimension FILTERORDER) */ -+ int *index, /* (o) quantization index */ -+ float *lsf, /* (i) the lsf coefficient vector to be -+ -+ -+ quantized (dimension FILTERORDER ) */ -+ int lpc_n /* (i) number of lsf sets to quantize */ -+){ -+ /* Quantize first LSF with memoryless split VQ */ -+ SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT, -+ dim_lsfCbTbl, size_lsfCbTbl); -+ -+ if (lpc_n==2) { -+ /* Quantize second LSF with memoryless split VQ */ -+ SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT, -+ lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT, -+ dim_lsfCbTbl, size_lsfCbTbl); -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * lpc encoder -+ *---------------------------------------------------------------*/ -+ -+void LPCencode( -+ float *syntdenum, /* (i/o) synthesis filter coefficients -+ before/after encoding */ -+ float *weightdenum, /* (i/o) weighting denumerator -+ coefficients before/after -+ encoding */ -+ int *lsf_index, /* (o) lsf quantization index */ -+ float *data, /* (i) lsf coefficients to quantize */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+){ -+ float lsf[LPC_FILTERORDER * LPC_N_MAX]; -+ float lsfdeq[LPC_FILTERORDER * LPC_N_MAX]; -+ int change=0; -+ -+ SimpleAnalysis(lsf, data, iLBCenc_inst); -+ SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n); -+ change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n); -+ SimpleInterpolateLSF(syntdenum, weightdenum, -+ lsf, lsfdeq, iLBCenc_inst->lsfold, -+ iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst); -+} -+ -+ -+ -diff -druN codecs/ilbc.orig/LPCencode.h codecs/ilbc/LPCencode.h ---- codecs/ilbc.orig/LPCencode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCencode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,29 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPCencode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_LPCENCOD_H -+#define __iLBC_LPCENCOD_H -+ -+void LPCencode( -+ float *syntdenum, /* (i/o) synthesis filter coefficients -+ before/after encoding */ -+ float *weightdenum, /* (i/o) weighting denumerator coefficients -+ before/after encoding */ -+ int *lsf_index, /* (o) lsf quantization index */ -+ float *data, /* (i) lsf coefficients to quantize */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/Makefile codecs/ilbc/Makefile ---- codecs/ilbc.orig/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/Makefile 2007-10-29 15:12:16.000000000 -0700 -@@ -0,0 +1,20 @@ -+LIB=libilbc.a -+CFLAGS+=-fPIC -+ -+OBJS=anaFilter.o iCBSearch.o packing.o \ -+ constants.o gainquant.o iLBC_decode.o StateConstructW.o \ -+ createCB.o getCBvec.o iLBC_encode.o StateSearchW.o doCPLC.o \ -+ helpfun.o syntFilter.o enhancer.o hpInput.o LPCdecode.o \ -+ filter.o hpOutput.o LPCencode.o FrameClassify.o iCBConstruct.o lsf.o -+ -+include $(ASTTOPDIR)/Makefile.rules -+ -+all: $(LIB) -+ -+$(LIB): $(OBJS) -+ $(ECHO_PREFIX) echo " [AR] $^ -> $@" -+ $(CMD_PREFIX) $(AR) cr $@ $^ -+ $(CMD_PREFIX) $(RANLIB) $@ -+ -+clean: -+ rm -f $(LIB) *.o .*.d *.s *.i -diff -druN codecs/ilbc.orig/StateConstructW.c codecs/ilbc/StateConstructW.c ---- codecs/ilbc.orig/StateConstructW.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateConstructW.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,76 @@ -+ -+/****************************************************************** -+ -+ -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateConstructW.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "StateConstructW.h" -+#include "constants.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ * decoding of the start state -+ *---------------------------------------------------------------*/ -+ -+void StateConstructW( -+ int idxForMax, /* (i) 6-bit index for the quantization of -+ max amplitude */ -+ int *idxVec, /* (i) vector of quantization indexes */ -+ float *syntDenum, /* (i) synthesis filter denumerator */ -+ float *out, /* (o) the decoded state vector */ -+ int len /* (i) length of a state vector */ -+){ -+ float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp, -+ numerator[LPC_FILTERORDER+1]; -+ float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout; -+ int k,tmpi; -+ -+ /* decoding of the maximum value */ -+ -+ maxVal = state_frgqTbl[idxForMax]; -+ maxVal = (float)pow(10,maxVal)/(float)4.5; -+ -+ /* initialization of buffers and coefficients */ -+ -+ memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ for (k=0; k<LPC_FILTERORDER; k++) { -+ numerator[k]=syntDenum[LPC_FILTERORDER-k]; -+ } -+ numerator[LPC_FILTERORDER]=syntDenum[0]; -+ tmp = &tmpbuf[LPC_FILTERORDER]; -+ fout = &foutbuf[LPC_FILTERORDER]; -+ -+ /* decoding of the sample values */ -+ -+ for (k=0; k<len; k++) { -+ tmpi = len-1-k; -+ /* maxVal = 1/scal */ -+ -+ -+ tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]]; -+ } -+ -+ /* circular convolution with all-pass filter */ -+ -+ memset(tmp+len, 0, len*sizeof(float)); -+ ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, -+ LPC_FILTERORDER, fout); -+ for (k=0;k<len;k++) { -+ out[k] = fout[len-1-k]+fout[2*len-1-k]; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/StateConstructW.h codecs/ilbc/StateConstructW.h ---- codecs/ilbc.orig/StateConstructW.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateConstructW.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,27 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateConstructW.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_STATECONSTRUCTW_H -+#define __iLBC_STATECONSTRUCTW_H -+ -+void StateConstructW( -+ int idxForMax, /* (i) 6-bit index for the quantization of -+ max amplitude */ -+ int *idxVec, /* (i) vector of quantization indexes */ -+ float *syntDenum, /* (i) synthesis filter denumerator */ -+ float *out, /* (o) the decoded state vector */ -+ int len /* (i) length of a state vector */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/StateSearchW.c codecs/ilbc/StateSearchW.c ---- codecs/ilbc.orig/StateSearchW.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateSearchW.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,194 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateSearchW.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "StateSearchW.h" -+#include "constants.h" -+#include "filter.h" -+#include "helpfun.h" -+ -+/*----------------------------------------------------------------* -+ * predictive noise shaping encoding of scaled start state -+ * (subrutine for StateSearchW) -+ *---------------------------------------------------------------*/ -+ -+void AbsQuantW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *in, /* (i) vector to encode */ -+ float *syntDenum, /* (i) denominator of synthesis filter */ -+ float *weightDenum, /* (i) denominator of weighting filter */ -+ int *out, /* (o) vector of quantizer indexes */ -+ int len, /* (i) length of vector to encode and -+ vector of quantizer indexes */ -+ int state_first /* (i) position of start state in the -+ 80 vec */ -+){ -+ float *syntOut; -+ float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS]; -+ float toQ, xq; -+ int n; -+ int index; -+ -+ /* initialization of buffer for filtering */ -+ -+ memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ -+ -+ /* initialization of pointer for filtering */ -+ -+ syntOut = &syntOutBuf[LPC_FILTERORDER]; -+ -+ /* synthesis and weighting filters on input */ -+ -+ if (state_first) { -+ AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER); -+ } else { -+ AllPoleFilter (in, weightDenum, -+ iLBCenc_inst->state_short_len-SUBL, -+ LPC_FILTERORDER); -+ } -+ -+ /* encoding loop */ -+ -+ for (n=0; n<len; n++) { -+ -+ /* time update of filter coefficients */ -+ -+ if ((state_first)&&(n==SUBL)){ -+ syntDenum += (LPC_FILTERORDER+1); -+ weightDenum += (LPC_FILTERORDER+1); -+ -+ /* synthesis and weighting filters on input */ -+ AllPoleFilter (&in[n], weightDenum, len-n, -+ LPC_FILTERORDER); -+ -+ } else if ((state_first==0)&& -+ (n==(iLBCenc_inst->state_short_len-SUBL))) { -+ syntDenum += (LPC_FILTERORDER+1); -+ weightDenum += (LPC_FILTERORDER+1); -+ -+ /* synthesis and weighting filters on input */ -+ AllPoleFilter (&in[n], weightDenum, len-n, -+ LPC_FILTERORDER); -+ -+ } -+ -+ /* prediction of synthesized and weighted input */ -+ -+ syntOut[n] = 0.0; -+ AllPoleFilter (&syntOut[n], weightDenum, 1, -+ LPC_FILTERORDER); -+ -+ /* quantization */ -+ -+ toQ = in[n]-syntOut[n]; -+ sort_sq(&xq, &index, toQ, state_sq3Tbl, 8); -+ out[n]=index; -+ syntOut[n] = state_sq3Tbl[out[n]]; -+ -+ /* update of the prediction filter */ -+ -+ -+ -+ AllPoleFilter(&syntOut[n], weightDenum, 1, -+ LPC_FILTERORDER); -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * encoding of start state -+ *---------------------------------------------------------------*/ -+ -+void StateSearchW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *residual,/* (i) target residual vector */ -+ float *syntDenum, /* (i) lpc synthesis filter */ -+ float *weightDenum, /* (i) weighting filter denuminator */ -+ int *idxForMax, /* (o) quantizer index for maximum -+ amplitude */ -+ int *idxVec, /* (o) vector of quantization indexes */ -+ int len, /* (i) length of all vectors */ -+ int state_first /* (i) position of start state in the -+ 80 vec */ -+){ -+ float dtmp, maxVal; -+ float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS]; -+ float *tmp, numerator[1+LPC_FILTERORDER]; -+ float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout; -+ int k; -+ float qmax, scal; -+ -+ /* initialization of buffers and filter coefficients */ -+ -+ memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ for (k=0; k<LPC_FILTERORDER; k++) { -+ numerator[k]=syntDenum[LPC_FILTERORDER-k]; -+ } -+ numerator[LPC_FILTERORDER]=syntDenum[0]; -+ tmp = &tmpbuf[LPC_FILTERORDER]; -+ fout = &foutbuf[LPC_FILTERORDER]; -+ -+ /* circular convolution with the all-pass filter */ -+ -+ memcpy(tmp, residual, len*sizeof(float)); -+ memset(tmp+len, 0, len*sizeof(float)); -+ ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, -+ LPC_FILTERORDER, fout); -+ for (k=0; k<len; k++) { -+ fout[k] += fout[k+len]; -+ } -+ -+ /* identification of the maximum amplitude value */ -+ -+ maxVal = fout[0]; -+ -+ -+ for (k=1; k<len; k++) { -+ -+ if (fout[k]*fout[k] > maxVal*maxVal){ -+ maxVal = fout[k]; -+ } -+ } -+ maxVal=(float)fabs(maxVal); -+ -+ /* encoding of the maximum amplitude value */ -+ -+ if (maxVal < 10.0) { -+ maxVal = 10.0; -+ } -+ maxVal = (float)log10(maxVal); -+ sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64); -+ -+ /* decoding of the maximum amplitude representation value, -+ and corresponding scaling of start state */ -+ -+ maxVal=state_frgqTbl[*idxForMax]; -+ qmax = (float)pow(10,maxVal); -+ scal = (float)(4.5)/qmax; -+ for (k=0; k<len; k++){ -+ fout[k] *= scal; -+ } -+ -+ /* predictive noise shaping encoding of scaled start state */ -+ -+ AbsQuantW(iLBCenc_inst, fout,syntDenum, -+ weightDenum,idxVec, len, state_first); -+} -+ -+ -diff -druN codecs/ilbc.orig/StateSearchW.h codecs/ilbc/StateSearchW.h ---- codecs/ilbc.orig/StateSearchW.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateSearchW.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,48 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateSearchW.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_STATESEARCHW_H -+#define __iLBC_STATESEARCHW_H -+ -+void AbsQuantW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *in, /* (i) vector to encode */ -+ float *syntDenum, /* (i) denominator of synthesis filter */ -+ float *weightDenum, /* (i) denominator of weighting filter */ -+ int *out, /* (o) vector of quantizer indexes */ -+ int len, /* (i) length of vector to encode and -+ vector of quantizer indexes */ -+ int state_first /* (i) position of start state in the -+ 80 vec */ -+); -+ -+void StateSearchW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *residual,/* (i) target residual vector */ -+ float *syntDenum, /* (i) lpc synthesis filter */ -+ float *weightDenum, /* (i) weighting filter denuminator */ -+ int *idxForMax, /* (o) quantizer index for maximum -+ amplitude */ -+ int *idxVec, /* (o) vector of quantization indexes */ -+ int len, /* (i) length of all vectors */ -+ int state_first /* (i) position of start state in the -+ -+ -+ 80 vec */ -+); -+ -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/anaFilter.c codecs/ilbc/anaFilter.c ---- codecs/ilbc.orig/anaFilter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/anaFilter.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,71 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ anaFilter.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <string.h> -+#include "anaFilter.h" -+#include "iLBC_define.h" -+ -+/*----------------------------------------------------------------* -+ * LP analysis filter. -+ -+ -+ *---------------------------------------------------------------*/ -+ -+void anaFilter( -+ float *In, /* (i) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len,/* (i) Length of signal */ -+ float *Out, /* (o) Filtered signal */ -+ float *mem /* (i/o) Filter state */ -+){ -+ int i, j; -+ float *po, *pi, *pm, *pa; -+ -+ po = Out; -+ -+ /* Filter first part using memory from past */ -+ -+ for (i=0; i<LPC_FILTERORDER; i++) { -+ pi = &In[i]; -+ pm = &mem[LPC_FILTERORDER-1]; -+ pa = a; -+ *po=0.0; -+ for (j=0; j<=i; j++) { -+ *po+=(*pa++)*(*pi--); -+ } -+ for (j=i+1; j<LPC_FILTERORDER+1; j++) { -+ -+ *po+=(*pa++)*(*pm--); -+ } -+ po++; -+ } -+ -+ /* Filter last part where the state is entierly -+ in the input vector */ -+ -+ for (i=LPC_FILTERORDER; i<len; i++) { -+ pi = &In[i]; -+ pa = a; -+ *po=0.0; -+ for (j=0; j<LPC_FILTERORDER+1; j++) { -+ *po+=(*pa++)*(*pi--); -+ } -+ po++; -+ } -+ -+ /* Update state vector */ -+ -+ memcpy(mem, &In[len-LPC_FILTERORDER], -+ LPC_FILTERORDER*sizeof(float)); -+} -+ -+ -diff -druN codecs/ilbc.orig/anaFilter.h codecs/ilbc/anaFilter.h ---- codecs/ilbc.orig/anaFilter.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/anaFilter.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,26 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ anaFilter.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ANAFILTER_H -+#define __iLBC_ANAFILTER_H -+ -+void anaFilter( -+ float *In, /* (i) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len,/* (i) Length of signal */ -+ float *Out, /* (o) Filtered signal */ -+ float *mem /* (i/o) Filter state */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/constants.c codecs/ilbc/constants.c ---- codecs/ilbc.orig/constants.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/constants.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,729 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ constants.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+ -+/* ULP bit allocation */ -+ -+ /* 20 ms frame */ -+ -+const iLBC_ULP_Inst_t ULP_20msTbl = { -+ /* LSF */ -+ { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, -+ {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, -+ /* Start state location, gain and samples */ -+ {2,0,0,0,0}, -+ {1,0,0,0,0}, -+ {6,0,0,0,0}, -+ {0,1,2,0,0}, -+ /* extra CB index and extra CB gain */ -+ {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, -+ /* CB index and CB gain */ -+ { {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}, -+ { {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, -+ {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}} -+}; -+ -+ /* 30 ms frame */ -+ -+const iLBC_ULP_Inst_t ULP_30msTbl = { -+ /* LSF */ -+ { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, -+ -+ -+ {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}}, -+ /* Start state location, gain and samples */ -+ {3,0,0,0,0}, -+ {1,0,0,0,0}, -+ {6,0,0,0,0}, -+ {0,1,2,0,0}, -+ /* extra CB index and extra CB gain */ -+ {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, -+ /* CB index and CB gain */ -+ { {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, -+ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, -+ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}}, -+ { {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}}, -+ {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}}, -+ {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}, -+ {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}} -+}; -+ -+/* HP Filters */ -+ -+float hpi_zero_coefsTbl[3] = { -+ (float)0.92727436, (float)-1.8544941, (float)0.92727436 -+}; -+float hpi_pole_coefsTbl[3] = { -+ (float)1.0, (float)-1.9059465, (float)0.9114024 -+}; -+float hpo_zero_coefsTbl[3] = { -+ (float)0.93980581, (float)-1.8795834, (float)0.93980581 -+}; -+float hpo_pole_coefsTbl[3] = { -+ (float)1.0, (float)-1.9330735, (float)0.93589199 -+}; -+ -+/* LP Filter */ -+ -+float lpFilt_coefsTbl[FILTERORDER_DS]={ -+ (float)-0.066650, (float)0.125000, (float)0.316650, -+ (float)0.414063, (float)0.316650, -+ (float)0.125000, (float)-0.066650 -+}; -+ -+/* State quantization tables */ -+ -+float state_sq3Tbl[8] = { -+ (float)-3.719849, (float)-2.177490, (float)-1.130005, -+ (float)-0.309692, (float)0.444214, (float)1.329712, -+ (float)2.436279, (float)3.983887 -+}; -+ -+float state_frgqTbl[64] = { -+ (float)1.000085, (float)1.071695, (float)1.140395, -+ (float)1.206868, (float)1.277188, (float)1.351503, -+ -+ -+ (float)1.429380, (float)1.500727, (float)1.569049, -+ (float)1.639599, (float)1.707071, (float)1.781531, -+ (float)1.840799, (float)1.901550, (float)1.956695, -+ (float)2.006750, (float)2.055474, (float)2.102787, -+ (float)2.142819, (float)2.183592, (float)2.217962, -+ (float)2.257177, (float)2.295739, (float)2.332967, -+ (float)2.369248, (float)2.402792, (float)2.435080, -+ (float)2.468598, (float)2.503394, (float)2.539284, -+ (float)2.572944, (float)2.605036, (float)2.636331, -+ (float)2.668939, (float)2.698780, (float)2.729101, -+ (float)2.759786, (float)2.789834, (float)2.818679, -+ (float)2.848074, (float)2.877470, (float)2.906899, -+ (float)2.936655, (float)2.967804, (float)3.000115, -+ (float)3.033367, (float)3.066355, (float)3.104231, -+ (float)3.141499, (float)3.183012, (float)3.222952, -+ (float)3.265433, (float)3.308441, (float)3.350823, -+ (float)3.395275, (float)3.442793, (float)3.490801, -+ (float)3.542514, (float)3.604064, (float)3.666050, -+ (float)3.740994, (float)3.830749, (float)3.938770, -+ (float)4.101764 -+}; -+ -+/* CB tables */ -+ -+int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44}, -+ {108,108,108}, {108,108,108}, {108,108,108}}; -+int stMemLTbl=85; -+int memLfTbl[NASUB_MAX]={147,147,147,147}; -+ -+/* expansion filter(s) */ -+ -+float cbfiltersTbl[CB_FILTERLEN]={ -+ (float)-0.034180, (float)0.108887, (float)-0.184326, -+ (float)0.806152, (float)0.713379, (float)-0.144043, -+ (float)0.083740, (float)-0.033691 -+}; -+ -+/* Gain Quantization */ -+ -+float gain_sq3Tbl[8]={ -+ (float)-1.000000, (float)-0.659973, (float)-0.330017, -+ (float)0.000000, (float)0.250000, (float)0.500000, -+ (float)0.750000, (float)1.00000}; -+ -+float gain_sq4Tbl[16]={ -+ (float)-1.049988, (float)-0.900024, (float)-0.750000, -+ (float)-0.599976, (float)-0.450012, (float)-0.299988, -+ (float)-0.150024, (float)0.000000, (float)0.150024, -+ (float)0.299988, (float)0.450012, (float)0.599976, -+ (float)0.750000, (float)0.900024, (float)1.049988, -+ (float)1.200012}; -+ -+float gain_sq5Tbl[32]={ -+ (float)0.037476, (float)0.075012, (float)0.112488, -+ -+ -+ (float)0.150024, (float)0.187500, (float)0.224976, -+ (float)0.262512, (float)0.299988, (float)0.337524, -+ (float)0.375000, (float)0.412476, (float)0.450012, -+ (float)0.487488, (float)0.525024, (float)0.562500, -+ (float)0.599976, (float)0.637512, (float)0.674988, -+ (float)0.712524, (float)0.750000, (float)0.787476, -+ (float)0.825012, (float)0.862488, (float)0.900024, -+ (float)0.937500, (float)0.974976, (float)1.012512, -+ (float)1.049988, (float)1.087524, (float)1.125000, -+ (float)1.162476, (float)1.200012}; -+ -+/* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */ -+float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={ -+ (float)0.000000, (float)0.000000, (float)0.000000, -+(float)1.000000, -+ (float)0.000000, (float)0.000000, (float)0.000000, -+ (float)0.015625, (float)-0.076904, (float)0.288330, -+(float)0.862061, -+ (float)-0.106445, (float)0.018799, (float)-0.015625, -+ (float)0.023682, (float)-0.124268, (float)0.601563, -+(float)0.601563, -+ (float)-0.124268, (float)0.023682, (float)-0.023682, -+ (float)0.018799, (float)-0.106445, (float)0.862061, -+(float)0.288330, -+ (float)-0.076904, (float)0.015625, (float)-0.018799}; -+ -+float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0, -+ (float)200.0, (float)280.0, (float)360.0, -+ (float)440.0, (float)520.0, (float)600.0}; -+ -+/* LPC analysis and quantization */ -+ -+int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4}; -+int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128}; -+ -+ -+float lsfmeanTbl[LPC_FILTERORDER] = { -+ (float)0.281738, (float)0.445801, (float)0.663330, -+ (float)0.962524, (float)1.251831, (float)1.533081, -+ (float)1.850586, (float)2.137817, (float)2.481445, -+ (float)2.777344}; -+ -+float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0, -+(float)(2.0/3.0), -+ (float)(1.0/3.0), (float)0.0, (float)0.0}; -+ -+float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0), -+ (float)(1.0/4.0), (float)(0.0)}; -+ -+/* Hanning LPC window */ -+float lpc_winTbl[BLOCKL_MAX]={ -+ (float)0.000183, (float)0.000671, (float)0.001526, -+ (float)0.002716, (float)0.004242, (float)0.006104, -+ (float)0.008301, (float)0.010834, (float)0.013702, -+ -+ -+ (float)0.016907, (float)0.020416, (float)0.024261, -+ (float)0.028442, (float)0.032928, (float)0.037750, -+ (float)0.042877, (float)0.048309, (float)0.054047, -+ (float)0.060089, (float)0.066437, (float)0.073090, -+ (float)0.080017, (float)0.087219, (float)0.094727, -+ (float)0.102509, (float)0.110535, (float)0.118835, -+ (float)0.127411, (float)0.136230, (float)0.145294, -+ (float)0.154602, (float)0.164154, (float)0.173920, -+ (float)0.183899, (float)0.194122, (float)0.204529, -+ (float)0.215149, (float)0.225952, (float)0.236938, -+ (float)0.248108, (float)0.259460, (float)0.270966, -+ (float)0.282654, (float)0.294464, (float)0.306396, -+ (float)0.318481, (float)0.330688, (float)0.343018, -+ (float)0.355438, (float)0.367981, (float)0.380585, -+ (float)0.393280, (float)0.406067, (float)0.418884, -+ (float)0.431763, (float)0.444702, (float)0.457672, -+ (float)0.470673, (float)0.483704, (float)0.496735, -+ (float)0.509766, (float)0.522797, (float)0.535828, -+ (float)0.548798, (float)0.561768, (float)0.574677, -+ (float)0.587524, (float)0.600342, (float)0.613068, -+ (float)0.625732, (float)0.638306, (float)0.650787, -+ (float)0.663147, (float)0.675415, (float)0.687561, -+ (float)0.699585, (float)0.711487, (float)0.723206, -+ (float)0.734802, (float)0.746216, (float)0.757477, -+ (float)0.768585, (float)0.779480, (float)0.790192, -+ (float)0.800720, (float)0.811005, (float)0.821106, -+ (float)0.830994, (float)0.840668, (float)0.850067, -+ (float)0.859253, (float)0.868225, (float)0.876892, -+ (float)0.885345, (float)0.893524, (float)0.901428, -+ (float)0.909058, (float)0.916412, (float)0.923492, -+ (float)0.930267, (float)0.936768, (float)0.942963, -+ (float)0.948853, (float)0.954437, (float)0.959717, -+ (float)0.964691, (float)0.969360, (float)0.973694, -+ (float)0.977692, (float)0.981384, (float)0.984741, -+ (float)0.987762, (float)0.990479, (float)0.992828, -+ (float)0.994873, (float)0.996552, (float)0.997925, -+ (float)0.998932, (float)0.999603, (float)0.999969, -+ (float)0.999969, (float)0.999603, (float)0.998932, -+ (float)0.997925, (float)0.996552, (float)0.994873, -+ (float)0.992828, (float)0.990479, (float)0.987762, -+ (float)0.984741, (float)0.981384, (float)0.977692, -+ (float)0.973694, (float)0.969360, (float)0.964691, -+ (float)0.959717, (float)0.954437, (float)0.948853, -+ (float)0.942963, (float)0.936768, (float)0.930267, -+ (float)0.923492, (float)0.916412, (float)0.909058, -+ (float)0.901428, (float)0.893524, (float)0.885345, -+ (float)0.876892, (float)0.868225, (float)0.859253, -+ (float)0.850067, (float)0.840668, (float)0.830994, -+ (float)0.821106, (float)0.811005, (float)0.800720, -+ (float)0.790192, (float)0.779480, (float)0.768585, -+ (float)0.757477, (float)0.746216, (float)0.734802, -+ (float)0.723206, (float)0.711487, (float)0.699585, -+ (float)0.687561, (float)0.675415, (float)0.663147, -+ (float)0.650787, (float)0.638306, (float)0.625732, -+ -+ -+ (float)0.613068, (float)0.600342, (float)0.587524, -+ (float)0.574677, (float)0.561768, (float)0.548798, -+ (float)0.535828, (float)0.522797, (float)0.509766, -+ (float)0.496735, (float)0.483704, (float)0.470673, -+ (float)0.457672, (float)0.444702, (float)0.431763, -+ (float)0.418884, (float)0.406067, (float)0.393280, -+ (float)0.380585, (float)0.367981, (float)0.355438, -+ (float)0.343018, (float)0.330688, (float)0.318481, -+ (float)0.306396, (float)0.294464, (float)0.282654, -+ (float)0.270966, (float)0.259460, (float)0.248108, -+ (float)0.236938, (float)0.225952, (float)0.215149, -+ (float)0.204529, (float)0.194122, (float)0.183899, -+ (float)0.173920, (float)0.164154, (float)0.154602, -+ (float)0.145294, (float)0.136230, (float)0.127411, -+ (float)0.118835, (float)0.110535, (float)0.102509, -+ (float)0.094727, (float)0.087219, (float)0.080017, -+ (float)0.073090, (float)0.066437, (float)0.060089, -+ (float)0.054047, (float)0.048309, (float)0.042877, -+ (float)0.037750, (float)0.032928, (float)0.028442, -+ (float)0.024261, (float)0.020416, (float)0.016907, -+ (float)0.013702, (float)0.010834, (float)0.008301, -+ (float)0.006104, (float)0.004242, (float)0.002716, -+ (float)0.001526, (float)0.000671, (float)0.000183 -+}; -+ -+/* Asymmetric LPC window */ -+float lpc_asymwinTbl[BLOCKL_MAX]={ -+ (float)0.000061, (float)0.000214, (float)0.000458, -+ (float)0.000824, (float)0.001282, (float)0.001831, -+ (float)0.002472, (float)0.003235, (float)0.004120, -+ (float)0.005066, (float)0.006134, (float)0.007294, -+ (float)0.008545, (float)0.009918, (float)0.011383, -+ (float)0.012939, (float)0.014587, (float)0.016357, -+ (float)0.018219, (float)0.020172, (float)0.022217, -+ (float)0.024353, (float)0.026611, (float)0.028961, -+ (float)0.031372, (float)0.033905, (float)0.036530, -+ (float)0.039276, (float)0.042084, (float)0.044983, -+ (float)0.047974, (float)0.051086, (float)0.054260, -+ (float)0.057526, (float)0.060883, (float)0.064331, -+ (float)0.067871, (float)0.071503, (float)0.075226, -+ (float)0.079010, (float)0.082916, (float)0.086884, -+ (float)0.090942, (float)0.095062, (float)0.099304, -+ (float)0.103607, (float)0.107971, (float)0.112427, -+ (float)0.116974, (float)0.121582, (float)0.126282, -+ (float)0.131073, (float)0.135895, (float)0.140839, -+ (float)0.145813, (float)0.150879, (float)0.156006, -+ (float)0.161224, (float)0.166504, (float)0.171844, -+ (float)0.177246, (float)0.182709, (float)0.188263, -+ (float)0.193848, (float)0.199524, (float)0.205231, -+ (float)0.211029, (float)0.216858, (float)0.222778, -+ (float)0.228729, (float)0.234741, (float)0.240814, -+ (float)0.246918, (float)0.253082, (float)0.259308, -+ (float)0.265564, (float)0.271881, (float)0.278259, -+ (float)0.284668, (float)0.291107, (float)0.297607, -+ -+ -+ (float)0.304138, (float)0.310730, (float)0.317322, -+ (float)0.323975, (float)0.330658, (float)0.337372, -+ (float)0.344147, (float)0.350922, (float)0.357727, -+ (float)0.364594, (float)0.371460, (float)0.378357, -+ (float)0.385284, (float)0.392212, (float)0.399170, -+ (float)0.406158, (float)0.413177, (float)0.420197, -+ (float)0.427246, (float)0.434296, (float)0.441376, -+ (float)0.448456, (float)0.455536, (float)0.462646, -+ (float)0.469757, (float)0.476868, (float)0.483978, -+ (float)0.491089, (float)0.498230, (float)0.505341, -+ (float)0.512451, (float)0.519592, (float)0.526703, -+ (float)0.533813, (float)0.540924, (float)0.548004, -+ (float)0.555084, (float)0.562164, (float)0.569244, -+ (float)0.576294, (float)0.583313, (float)0.590332, -+ (float)0.597321, (float)0.604309, (float)0.611267, -+ (float)0.618195, (float)0.625092, (float)0.631989, -+ (float)0.638855, (float)0.645660, (float)0.652466, -+ (float)0.659241, (float)0.665985, (float)0.672668, -+ (float)0.679352, (float)0.685974, (float)0.692566, -+ (float)0.699127, (float)0.705658, (float)0.712128, -+ (float)0.718536, (float)0.724945, (float)0.731262, -+ (float)0.737549, (float)0.743805, (float)0.750000, -+ (float)0.756134, (float)0.762238, (float)0.768280, -+ (float)0.774261, (float)0.780182, (float)0.786072, -+ (float)0.791870, (float)0.797638, (float)0.803314, -+ (float)0.808960, (float)0.814514, (float)0.820038, -+ (float)0.825470, (float)0.830841, (float)0.836151, -+ (float)0.841400, (float)0.846558, (float)0.851654, -+ (float)0.856689, (float)0.861633, (float)0.866516, -+ (float)0.871338, (float)0.876068, (float)0.880737, -+ (float)0.885315, (float)0.889801, (float)0.894226, -+ (float)0.898560, (float)0.902832, (float)0.907013, -+ (float)0.911102, (float)0.915100, (float)0.919037, -+ (float)0.922882, (float)0.926636, (float)0.930328, -+ (float)0.933899, (float)0.937408, (float)0.940796, -+ (float)0.944122, (float)0.947357, (float)0.950470, -+ (float)0.953522, (float)0.956482, (float)0.959351, -+ (float)0.962097, (float)0.964783, (float)0.967377, -+ (float)0.969849, (float)0.972229, (float)0.974518, -+ (float)0.976715, (float)0.978821, (float)0.980835, -+ (float)0.982727, (float)0.984528, (float)0.986237, -+ (float)0.987854, (float)0.989380, (float)0.990784, -+ (float)0.992096, (float)0.993317, (float)0.994415, -+ (float)0.995422, (float)0.996338, (float)0.997162, -+ (float)0.997864, (float)0.998474, (float)0.998962, -+ (float)0.999390, (float)0.999695, (float)0.999878, -+ (float)0.999969, (float)0.999969, (float)0.996918, -+ (float)0.987701, (float)0.972382, (float)0.951050, -+ (float)0.923889, (float)0.891022, (float)0.852631, -+ (float)0.809021, (float)0.760406, (float)0.707092, -+ (float)0.649445, (float)0.587799, (float)0.522491, -+ (float)0.453979, (float)0.382690, (float)0.309021, -+ (float)0.233459, (float)0.156433, (float)0.078461 -+}; -+ -+ -+ -+/* Lag window for LPC */ -+float lpc_lagwinTbl[LPC_FILTERORDER + 1]={ -+ (float)1.000100, (float)0.998890, (float)0.995569, -+ (float)0.990057, (float)0.982392, -+ (float)0.972623, (float)0.960816, (float)0.947047, -+ (float)0.931405, (float)0.913989, (float)0.894909}; -+ -+/* LSF quantization*/ -+float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = { -+(float)0.155396, (float)0.273193, (float)0.451172, -+(float)0.390503, (float)0.648071, (float)1.002075, -+(float)0.440186, (float)0.692261, (float)0.955688, -+(float)0.343628, (float)0.642334, (float)1.071533, -+(float)0.318359, (float)0.491577, (float)0.670532, -+(float)0.193115, (float)0.375488, (float)0.725708, -+(float)0.364136, (float)0.510376, (float)0.658691, -+(float)0.297485, (float)0.527588, (float)0.842529, -+(float)0.227173, (float)0.365967, (float)0.563110, -+(float)0.244995, (float)0.396729, (float)0.636475, -+(float)0.169434, (float)0.300171, (float)0.520264, -+(float)0.312866, (float)0.464478, (float)0.643188, -+(float)0.248535, (float)0.429932, (float)0.626099, -+(float)0.236206, (float)0.491333, (float)0.817139, -+(float)0.334961, (float)0.625122, (float)0.895752, -+(float)0.343018, (float)0.518555, (float)0.698608, -+(float)0.372803, (float)0.659790, (float)0.945435, -+(float)0.176880, (float)0.316528, (float)0.581421, -+(float)0.416382, (float)0.625977, (float)0.805176, -+(float)0.303223, (float)0.568726, (float)0.915039, -+(float)0.203613, (float)0.351440, (float)0.588135, -+(float)0.221191, (float)0.375000, (float)0.614746, -+(float)0.199951, (float)0.323364, (float)0.476074, -+(float)0.300781, (float)0.433350, (float)0.566895, -+(float)0.226196, (float)0.354004, (float)0.507568, -+(float)0.300049, (float)0.508179, (float)0.711670, -+(float)0.312012, (float)0.492676, (float)0.763428, -+(float)0.329956, (float)0.541016, (float)0.795776, -+(float)0.373779, (float)0.604614, (float)0.928833, -+(float)0.210571, (float)0.452026, (float)0.755249, -+(float)0.271118, (float)0.473267, (float)0.662476, -+(float)0.285522, (float)0.436890, (float)0.634399, -+(float)0.246704, (float)0.565552, (float)0.859009, -+(float)0.270508, (float)0.406250, (float)0.553589, -+(float)0.361450, (float)0.578491, (float)0.813843, -+(float)0.342651, (float)0.482788, (float)0.622437, -+(float)0.340332, (float)0.549438, (float)0.743164, -+(float)0.200439, (float)0.336304, (float)0.540894, -+(float)0.407837, (float)0.644775, (float)0.895142, -+(float)0.294678, (float)0.454834, (float)0.699097, -+(float)0.193115, (float)0.344482, (float)0.643188, -+(float)0.275757, (float)0.420776, (float)0.598755, -+(float)0.380493, (float)0.608643, (float)0.861084, -+(float)0.222778, (float)0.426147, (float)0.676514, -+ -+ -+(float)0.407471, (float)0.700195, (float)1.053101, -+(float)0.218384, (float)0.377197, (float)0.669922, -+(float)0.313232, (float)0.454102, (float)0.600952, -+(float)0.347412, (float)0.571533, (float)0.874146, -+(float)0.238037, (float)0.405396, (float)0.729492, -+(float)0.223877, (float)0.412964, (float)0.822021, -+(float)0.395264, (float)0.582153, (float)0.743896, -+(float)0.247925, (float)0.485596, (float)0.720581, -+(float)0.229126, (float)0.496582, (float)0.907715, -+(float)0.260132, (float)0.566895, (float)1.012695, -+(float)0.337402, (float)0.611572, (float)0.978149, -+(float)0.267822, (float)0.447632, (float)0.769287, -+(float)0.250610, (float)0.381714, (float)0.530029, -+(float)0.430054, (float)0.805054, (float)1.221924, -+(float)0.382568, (float)0.544067, (float)0.701660, -+(float)0.383545, (float)0.710327, (float)1.149170, -+(float)0.271362, (float)0.529053, (float)0.775513, -+(float)0.246826, (float)0.393555, (float)0.588623, -+(float)0.266846, (float)0.422119, (float)0.676758, -+(float)0.311523, (float)0.580688, (float)0.838623, -+(float)1.331177, (float)1.576782, (float)1.779541, -+(float)1.160034, (float)1.401978, (float)1.768188, -+(float)1.161865, (float)1.525146, (float)1.715332, -+(float)0.759521, (float)0.913940, (float)1.119873, -+(float)0.947144, (float)1.121338, (float)1.282471, -+(float)1.015015, (float)1.557007, (float)1.804932, -+(float)1.172974, (float)1.402100, (float)1.692627, -+(float)1.087524, (float)1.474243, (float)1.665405, -+(float)0.899536, (float)1.105225, (float)1.406250, -+(float)1.148438, (float)1.484741, (float)1.796265, -+(float)0.785645, (float)1.209839, (float)1.567749, -+(float)0.867798, (float)1.166504, (float)1.450684, -+(float)0.922485, (float)1.229858, (float)1.420898, -+(float)0.791260, (float)1.123291, (float)1.409546, -+(float)0.788940, (float)0.966064, (float)1.340332, -+(float)1.051147, (float)1.272827, (float)1.556641, -+(float)0.866821, (float)1.181152, (float)1.538818, -+(float)0.906738, (float)1.373535, (float)1.607910, -+(float)1.244751, (float)1.581421, (float)1.933838, -+(float)0.913940, (float)1.337280, (float)1.539673, -+(float)0.680542, (float)0.959229, (float)1.662720, -+(float)0.887207, (float)1.430542, (float)1.800781, -+(float)0.912598, (float)1.433594, (float)1.683960, -+(float)0.860474, (float)1.060303, (float)1.455322, -+(float)1.005127, (float)1.381104, (float)1.706909, -+(float)0.800781, (float)1.363892, (float)1.829102, -+(float)0.781860, (float)1.124390, (float)1.505981, -+(float)1.003662, (float)1.471436, (float)1.684692, -+(float)0.981323, (float)1.309570, (float)1.618042, -+(float)1.228760, (float)1.554321, (float)1.756470, -+(float)0.734375, (float)0.895752, (float)1.225586, -+(float)0.841797, (float)1.055664, (float)1.249268, -+(float)0.920166, (float)1.119385, (float)1.486206, -+(float)0.894409, (float)1.539063, (float)1.828979, -+ -+ -+(float)1.283691, (float)1.543335, (float)1.858276, -+(float)0.676025, (float)0.933105, (float)1.490845, -+(float)0.821289, (float)1.491821, (float)1.739868, -+(float)0.923218, (float)1.144653, (float)1.580566, -+(float)1.057251, (float)1.345581, (float)1.635864, -+(float)0.888672, (float)1.074951, (float)1.353149, -+(float)0.942749, (float)1.195435, (float)1.505493, -+(float)1.492310, (float)1.788086, (float)2.039673, -+(float)1.070313, (float)1.634399, (float)1.860962, -+(float)1.253296, (float)1.488892, (float)1.686035, -+(float)0.647095, (float)0.864014, (float)1.401855, -+(float)0.866699, (float)1.254883, (float)1.453369, -+(float)1.063965, (float)1.532593, (float)1.731323, -+(float)1.167847, (float)1.521484, (float)1.884033, -+(float)0.956055, (float)1.502075, (float)1.745605, -+(float)0.928711, (float)1.288574, (float)1.479614, -+(float)1.088013, (float)1.380737, (float)1.570801, -+(float)0.905029, (float)1.186768, (float)1.371948, -+(float)1.057861, (float)1.421021, (float)1.617432, -+(float)1.108276, (float)1.312500, (float)1.501465, -+(float)0.979492, (float)1.416992, (float)1.624268, -+(float)1.276001, (float)1.661011, (float)2.007935, -+(float)0.993042, (float)1.168579, (float)1.331665, -+(float)0.778198, (float)0.944946, (float)1.235962, -+(float)1.223755, (float)1.491333, (float)1.815674, -+(float)0.852661, (float)1.350464, (float)1.722290, -+(float)1.134766, (float)1.593140, (float)1.787354, -+(float)1.051392, (float)1.339722, (float)1.531006, -+(float)0.803589, (float)1.271240, (float)1.652100, -+(float)0.755737, (float)1.143555, (float)1.639404, -+(float)0.700928, (float)0.837280, (float)1.130371, -+(float)0.942749, (float)1.197876, (float)1.669800, -+(float)0.993286, (float)1.378296, (float)1.566528, -+(float)0.801025, (float)1.095337, (float)1.298950, -+(float)0.739990, (float)1.032959, (float)1.383667, -+(float)0.845703, (float)1.072266, (float)1.543823, -+(float)0.915649, (float)1.072266, (float)1.224487, -+(float)1.021973, (float)1.226196, (float)1.481323, -+(float)0.999878, (float)1.204102, (float)1.555908, -+(float)0.722290, (float)0.913940, (float)1.340210, -+(float)0.673340, (float)0.835938, (float)1.259521, -+(float)0.832397, (float)1.208374, (float)1.394165, -+(float)0.962158, (float)1.576172, (float)1.912842, -+(float)1.166748, (float)1.370850, (float)1.556763, -+(float)0.946289, (float)1.138550, (float)1.400391, -+(float)1.035034, (float)1.218262, (float)1.386475, -+(float)1.393799, (float)1.717773, (float)2.000244, -+(float)0.972656, (float)1.260986, (float)1.760620, -+(float)1.028198, (float)1.288452, (float)1.484619, -+(float)0.773560, (float)1.258057, (float)1.756714, -+(float)1.080322, (float)1.328003, (float)1.742676, -+(float)0.823975, (float)1.450806, (float)1.917725, -+(float)0.859009, (float)1.016602, (float)1.191895, -+(float)0.843994, (float)1.131104, (float)1.645020, -+ -+ -+(float)1.189697, (float)1.702759, (float)1.894409, -+(float)1.346680, (float)1.763184, (float)2.066040, -+(float)0.980469, (float)1.253784, (float)1.441650, -+(float)1.338135, (float)1.641968, (float)1.932739, -+(float)1.223267, (float)1.424194, (float)1.626465, -+(float)0.765747, (float)1.004150, (float)1.579102, -+(float)1.042847, (float)1.269165, (float)1.647461, -+(float)0.968750, (float)1.257568, (float)1.555786, -+(float)0.826294, (float)0.993408, (float)1.275146, -+(float)0.742310, (float)0.950439, (float)1.430542, -+(float)1.054321, (float)1.439819, (float)1.828003, -+(float)1.072998, (float)1.261719, (float)1.441895, -+(float)0.859375, (float)1.036377, (float)1.314819, -+(float)0.895752, (float)1.267212, (float)1.605591, -+(float)0.805420, (float)0.962891, (float)1.142334, -+(float)0.795654, (float)1.005493, (float)1.468506, -+(float)1.105347, (float)1.313843, (float)1.584839, -+(float)0.792236, (float)1.221802, (float)1.465698, -+(float)1.170532, (float)1.467651, (float)1.664063, -+(float)0.838257, (float)1.153198, (float)1.342163, -+(float)0.968018, (float)1.198242, (float)1.391235, -+(float)1.250122, (float)1.623535, (float)1.823608, -+(float)0.711670, (float)1.058350, (float)1.512085, -+(float)1.204834, (float)1.454468, (float)1.739136, -+(float)1.137451, (float)1.421753, (float)1.620117, -+(float)0.820435, (float)1.322754, (float)1.578247, -+(float)0.798706, (float)1.005005, (float)1.213867, -+(float)0.980713, (float)1.324951, (float)1.512939, -+(float)1.112305, (float)1.438843, (float)1.735596, -+(float)1.135498, (float)1.356689, (float)1.635742, -+(float)1.101318, (float)1.387451, (float)1.686523, -+(float)0.849854, (float)1.276978, (float)1.523438, -+(float)1.377930, (float)1.627563, (float)1.858154, -+(float)0.884888, (float)1.095459, (float)1.287476, -+(float)1.289795, (float)1.505859, (float)1.756592, -+(float)0.817505, (float)1.384155, (float)1.650513, -+(float)1.446655, (float)1.702148, (float)1.931885, -+(float)0.835815, (float)1.023071, (float)1.385376, -+(float)0.916626, (float)1.139038, (float)1.335327, -+(float)0.980103, (float)1.174072, (float)1.453735, -+(float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408, -+(float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904, -+(float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477, -+(float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083, -+(float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196, -+(float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396, -+(float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854, -+(float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408, -+(float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987, -+(float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666, -+(float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434, -+(float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781, -+(float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416, -+(float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288, -+ -+ -+(float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672, -+(float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890, -+(float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508, -+(float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206, -+(float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086, -+(float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223, -+(float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101, -+(float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703, -+(float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094, -+(float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450, -+(float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704, -+(float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653, -+(float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723, -+(float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634, -+(float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494, -+(float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370, -+(float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542, -+(float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091, -+(float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346, -+(float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219, -+(float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810, -+(float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914, -+(float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198, -+(float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104, -+(float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892, -+(float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852, -+(float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199, -+(float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286, -+(float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127, -+(float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748, -+(float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676, -+(float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910, -+(float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555, -+(float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023, -+(float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851, -+(float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014, -+(float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307, -+(float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637, -+(float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643, -+(float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968, -+(float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562, -+(float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646, -+(float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818, -+(float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466, -+(float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945, -+(float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941, -+(float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618, -+(float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922, -+(float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794, -+(float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570, -+(float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595, -+(float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673, -+(float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925, -+(float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984, -+ -+ -+(float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904, -+(float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256, -+(float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279, -+(float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602, -+(float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331, -+(float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999, -+(float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096, -+(float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234, -+(float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771, -+(float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076, -+(float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058, -+(float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623, -+(float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284, -+(float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021, -+(float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693, -+(float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760, -+(float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676, -+(float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834, -+(float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058, -+(float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929, -+(float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892, -+(float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417, -+(float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149, -+(float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666, -+(float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521, -+(float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646, -+(float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247, -+(float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583, -+(float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876, -+(float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465, -+(float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253, -+(float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234, -+(float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402, -+(float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406, -+(float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807, -+(float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414, -+(float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991, -+(float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290, -+(float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414, -+(float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647, -+(float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145, -+(float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520, -+(float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117, -+(float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576, -+(float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705, -+(float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007, -+(float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964, -+(float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073, -+(float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873, -+(float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558, -+(float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791, -+(float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857, -+(float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050, -+(float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127, -+ -+ -+(float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545, -+(float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259, -+(float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993, -+(float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912, -+(float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757, -+(float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143 -+}; -+ -+ -diff -druN codecs/ilbc.orig/constants.h codecs/ilbc/constants.h ---- codecs/ilbc.orig/constants.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/constants.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,74 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ constants.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#ifndef __iLBC_CONSTANTS_H -+#define __iLBC_CONSTANTS_H -+ -+#include "iLBC_define.h" -+ -+ -+/* ULP bit allocation */ -+ -+extern const iLBC_ULP_Inst_t ULP_20msTbl; -+extern const iLBC_ULP_Inst_t ULP_30msTbl; -+ -+/* high pass filters */ -+ -+extern float hpi_zero_coefsTbl[]; -+extern float hpi_pole_coefsTbl[]; -+extern float hpo_zero_coefsTbl[]; -+extern float hpo_pole_coefsTbl[]; -+ -+/* low pass filters */ -+extern float lpFilt_coefsTbl[]; -+ -+/* LPC analysis and quantization */ -+ -+extern float lpc_winTbl[]; -+extern float lpc_asymwinTbl[]; -+extern float lpc_lagwinTbl[]; -+extern float lsfCbTbl[]; -+extern float lsfmeanTbl[]; -+extern int dim_lsfCbTbl[]; -+extern int size_lsfCbTbl[]; -+extern float lsf_weightTbl_30ms[]; -+extern float lsf_weightTbl_20ms[]; -+ -+/* state quantization tables */ -+ -+extern float state_sq3Tbl[]; -+extern float state_frgqTbl[]; -+ -+/* gain quantization tables */ -+ -+extern float gain_sq3Tbl[]; -+extern float gain_sq4Tbl[]; -+extern float gain_sq5Tbl[]; -+ -+/* adaptive codebook definitions */ -+ -+extern int search_rangeTbl[5][CB_NSTAGES]; -+extern int memLfTbl[]; -+extern int stMemLTbl; -+extern float cbfiltersTbl[CB_FILTERLEN]; -+ -+ -+ -+/* enhancer definitions */ -+ -+extern float polyphaserTbl[]; -+extern float enh_plocsTbl[]; -+ -+#endif -+ -diff -druN codecs/ilbc.orig/createCB.c codecs/ilbc/createCB.c ---- codecs/ilbc.orig/createCB.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/createCB.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,216 @@ -+ -+ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ createCB.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "createCB.h" -+#include "constants.h" -+#include <string.h> -+#include <math.h> -+ -+/*----------------------------------------------------------------* -+ * Construct an additional codebook vector by filtering the -+ * initial codebook buffer. This vector is then used to expand -+ * the codebook with an additional section. -+ *---------------------------------------------------------------*/ -+ -+void filteredCBvecs( -+ float *cbvectors, /* (o) Codebook vectors for the -+ higher section */ -+ float *mem, /* (i) Buffer to create codebook -+ vector from */ -+ int lMem /* (i) Length of buffer */ -+){ -+ int j, k; -+ float *pp, *pp1; -+ float tempbuff2[CB_MEML+CB_FILTERLEN]; -+ float *pos; -+ -+ memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float)); -+ memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float)); -+ memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0, -+ (CB_HALFFILTERLEN+1)*sizeof(float)); -+ -+ /* Create codebook vector for higher section by filtering */ -+ -+ /* do filtering */ -+ pos=cbvectors; -+ memset(pos, 0, lMem*sizeof(float)); -+ for (k=0; k<lMem; k++) { -+ pp=&tempbuff2[k]; -+ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; -+ for (j=0;j<CB_FILTERLEN;j++) { -+ (*pos)+=(*pp++)*(*pp1--); -+ } -+ pos++; -+ } -+} -+ -+ -+ -+/*----------------------------------------------------------------* -+ * Search the augmented part of the codebook to find the best -+ * measure. -+ *----------------------------------------------------------------*/ -+ -+void searchAugmentedCB( -+ int low, /* (i) Start index for the search */ -+ int high, /* (i) End index for the search */ -+ int stage, /* (i) Current stage */ -+ int startIndex, /* (i) Codebook index for the first -+ aug vector */ -+ float *target, /* (i) Target vector for encoding */ -+ float *buffer, /* (i) Pointer to the end of the buffer for -+ augmented codebook construction */ -+ float *max_measure, /* (i/o) Currently maximum measure */ -+ int *best_index,/* (o) Currently the best index */ -+ float *gain, /* (o) Currently the best gain */ -+ float *energy, /* (o) Energy of augmented codebook -+ vectors */ -+ float *invenergy/* (o) Inv energy of augmented codebook -+ vectors */ -+) { -+ int icount, ilow, j, tmpIndex; -+ float *pp, *ppo, *ppi, *ppe, crossDot, alfa; -+ float weighted, measure, nrjRecursive; -+ float ftmp; -+ -+ /* Compute the energy for the first (low-5) -+ noninterpolated samples */ -+ nrjRecursive = (float) 0.0; -+ pp = buffer - low + 1; -+ for (j=0; j<(low-5); j++) { -+ nrjRecursive += ( (*pp)*(*pp) ); -+ pp++; -+ } -+ ppe = buffer - low; -+ -+ -+ for (icount=low; icount<=high; icount++) { -+ -+ /* Index of the codebook vector used for retrieving -+ energy values */ -+ tmpIndex = startIndex+icount-20; -+ -+ ilow = icount-4; -+ -+ /* Update the energy recursively to save complexity */ -+ nrjRecursive = nrjRecursive + (*ppe)*(*ppe); -+ ppe--; -+ energy[tmpIndex] = nrjRecursive; -+ -+ /* Compute cross dot product for the first (low-5) -+ samples */ -+ crossDot = (float) 0.0; -+ -+ -+ pp = buffer-icount; -+ for (j=0; j<ilow; j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ /* interpolation */ -+ alfa = (float) 0.2; -+ ppo = buffer-4; -+ ppi = buffer-icount-4; -+ for (j=ilow; j<icount; j++) { -+ weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi); -+ ppo++; -+ ppi++; -+ energy[tmpIndex] += weighted*weighted; -+ crossDot += target[j]*weighted; -+ alfa += (float)0.2; -+ } -+ -+ /* Compute energy and cross dot product for the -+ remaining samples */ -+ pp = buffer - icount; -+ for (j=icount; j<SUBL; j++) { -+ energy[tmpIndex] += (*pp)*(*pp); -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (energy[tmpIndex]>0.0) { -+ invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS); -+ } else { -+ invenergy[tmpIndex] = (float) 0.0; -+ } -+ -+ if (stage==0) { -+ measure = (float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot*invenergy[tmpIndex]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[tmpIndex]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[tmpIndex]; -+ -+ if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ *best_index = tmpIndex; -+ *max_measure = measure; -+ *gain = ftmp; -+ } -+ } -+} -+ -+ -+ -+ -+/*----------------------------------------------------------------* -+ * Recreate a specific codebook vector from the augmented part. -+ * -+ *----------------------------------------------------------------*/ -+ -+void createAugmentedVec( -+ int index, /* (i) Index for the augmented vector -+ to be created */ -+ float *buffer, /* (i) Pointer to the end of the buffer for -+ augmented codebook construction */ -+ float *cbVec/* (o) The construced codebook vector */ -+) { -+ int ilow, j; -+ float *pp, *ppo, *ppi, alfa, alfa1, weighted; -+ -+ ilow = index-5; -+ -+ /* copy the first noninterpolated part */ -+ -+ pp = buffer-index; -+ memcpy(cbVec,pp,sizeof(float)*index); -+ -+ /* interpolation */ -+ -+ alfa1 = (float)0.2; -+ alfa = 0.0; -+ ppo = buffer-5; -+ ppi = buffer-index-5; -+ for (j=ilow; j<index; j++) { -+ weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi); -+ ppo++; -+ ppi++; -+ cbVec[j] = weighted; -+ alfa += alfa1; -+ } -+ -+ /* copy the second noninterpolated part */ -+ -+ pp = buffer - index; -+ memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index)); -+} -+ -+ -diff -druN codecs/ilbc.orig/createCB.h codecs/ilbc/createCB.h ---- codecs/ilbc.orig/createCB.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/createCB.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,56 @@ -+ -+/****************************************************************** -+ -+ -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ createCB.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_CREATECB_H -+#define __iLBC_CREATECB_H -+ -+void filteredCBvecs( -+ float *cbvectors, /* (o) Codebook vector for the -+ higher section */ -+ float *mem, /* (i) Buffer to create codebook -+ vectors from */ -+ int lMem /* (i) Length of buffer */ -+); -+ -+void searchAugmentedCB( -+ int low, /* (i) Start index for the search */ -+ int high, /* (i) End index for the search */ -+ int stage, /* (i) Current stage */ -+ int startIndex, /* (i) CB index for the first -+ augmented vector */ -+ float *target, /* (i) Target vector for encoding */ -+ float *buffer, /* (i) Pointer to the end of the -+ buffer for augmented codebook -+ construction */ -+ float *max_measure, /* (i/o) Currently maximum measure */ -+ int *best_index,/* (o) Currently the best index */ -+ float *gain, /* (o) Currently the best gain */ -+ float *energy, /* (o) Energy of augmented -+ codebook vectors */ -+ float *invenergy/* (o) Inv energy of aug codebook -+ vectors */ -+); -+ -+void createAugmentedVec( -+ int index, /* (i) Index for the aug vector -+ to be created */ -+ float *buffer, /* (i) Pointer to the end of the -+ buffer for augmented codebook -+ construction */ -+ float *cbVec /* (o) The construced codebook vector */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/doCPLC.c codecs/ilbc/doCPLC.c ---- codecs/ilbc.orig/doCPLC.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/doCPLC.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,259 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ doCPLC.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+#include <stdio.h> -+ -+#include "iLBC_define.h" -+#include "doCPLC.h" -+ -+/*----------------------------------------------------------------* -+ * Compute cross correlation and pitch gain for pitch prediction -+ * of last subframe at given lag. -+ *---------------------------------------------------------------*/ -+ -+static void compCorr( -+ float *cc, /* (o) cross correlation coefficient */ -+ float *gc, /* (o) gain */ -+ float *pm, -+ float *buffer, /* (i) signal buffer */ -+ int lag, /* (i) pitch lag */ -+ int bLen, /* (i) length of buffer */ -+ int sRange /* (i) correlation search length */ -+){ -+ -+ -+ int i; -+ float ftmp1, ftmp2, ftmp3; -+ -+ /* Guard against getting outside buffer */ -+ if ((bLen-sRange-lag)<0) { -+ sRange=bLen-lag; -+ } -+ -+ ftmp1 = 0.0; -+ ftmp2 = 0.0; -+ ftmp3 = 0.0; -+ for (i=0; i<sRange; i++) { -+ ftmp1 += buffer[bLen-sRange+i] * -+ buffer[bLen-sRange+i-lag]; -+ ftmp2 += buffer[bLen-sRange+i-lag] * -+ buffer[bLen-sRange+i-lag]; -+ ftmp3 += buffer[bLen-sRange+i] * -+ buffer[bLen-sRange+i]; -+ } -+ -+ if (ftmp2 > 0.0) { -+ *cc = ftmp1*ftmp1/ftmp2; -+ *gc = (float)fabs(ftmp1/ftmp2); -+ *pm=(float)fabs(ftmp1)/ -+ ((float)sqrt(ftmp2)*(float)sqrt(ftmp3)); -+ } -+ else { -+ *cc = 0.0; -+ *gc = 0.0; -+ *pm=0.0; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * Packet loss concealment routine. Conceals a residual signal -+ * and LP parameters. If no packet loss, update state. -+ *---------------------------------------------------------------*/ -+ -+void doThePLC( -+ float *PLCresidual, /* (o) concealed residual */ -+ float *PLClpc, /* (o) concealed LP parameters */ -+ int PLI, /* (i) packet loss indicator -+ 0 - no PL, 1 = PL */ -+ float *decresidual, /* (i) decoded residual */ -+ float *lpc, /* (i) decoded LPC (only used for no PL) */ -+ int inlag, /* (i) pitch lag */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i/o) decoder instance */ -+){ -+ int lag=20, randlag; -+ float gain, maxcc; -+ float use_gain; -+ float gain_comp, maxcc_comp, per, max_per; -+ int i, pick, use_lag; -+ -+ -+ float ftmp, randvec[BLOCKL_MAX], pitchfact, energy; -+ -+ /* Packet Loss */ -+ -+ if (PLI == 1) { -+ -+ iLBCdec_inst->consPLICount += 1; -+ -+ /* if previous frame not lost, -+ determine pitch pred. gain */ -+ -+ if (iLBCdec_inst->prevPLI != 1) { -+ -+ /* Search around the previous lag to find the -+ best pitch period */ -+ -+ lag=inlag-3; -+ compCorr(&maxcc, &gain, &max_per, -+ iLBCdec_inst->prevResidual, -+ lag, iLBCdec_inst->blockl, 60); -+ for (i=inlag-2;i<=inlag+3;i++) { -+ compCorr(&maxcc_comp, &gain_comp, &per, -+ iLBCdec_inst->prevResidual, -+ i, iLBCdec_inst->blockl, 60); -+ -+ if (maxcc_comp>maxcc) { -+ maxcc=maxcc_comp; -+ gain=gain_comp; -+ lag=i; -+ max_per=per; -+ } -+ } -+ -+ } -+ -+ /* previous frame lost, use recorded lag and periodicity */ -+ -+ else { -+ lag=iLBCdec_inst->prevLag; -+ max_per=iLBCdec_inst->per; -+ } -+ -+ /* downscaling */ -+ -+ use_gain=1.0; -+ if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320) -+ use_gain=(float)0.9; -+ else if (iLBCdec_inst->consPLICount* -+ iLBCdec_inst->blockl>2*320) -+ use_gain=(float)0.7; -+ else if (iLBCdec_inst->consPLICount* -+ iLBCdec_inst->blockl>3*320) -+ use_gain=(float)0.5; -+ else if (iLBCdec_inst->consPLICount* -+ -+ -+ iLBCdec_inst->blockl>4*320) -+ use_gain=(float)0.0; -+ -+ /* mix noise and pitch repeatition */ -+ ftmp=(float)sqrt(max_per); -+ if (ftmp>(float)0.7) -+ pitchfact=(float)1.0; -+ else if (ftmp>(float)0.4) -+ pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4); -+ else -+ pitchfact=0.0; -+ -+ -+ /* avoid repetition of same pitch cycle */ -+ use_lag=lag; -+ if (lag<80) { -+ use_lag=2*lag; -+ } -+ -+ /* compute concealed residual */ -+ -+ energy = 0.0; -+ for (i=0; i<iLBCdec_inst->blockl; i++) { -+ -+ /* noise component */ -+ -+ iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) & -+ (0x80000000L-1); -+ randlag = 50 + ((signed long) iLBCdec_inst->seed)%70; -+ pick = i - randlag; -+ -+ if (pick < 0) { -+ randvec[i] = -+ iLBCdec_inst->prevResidual[ -+ iLBCdec_inst->blockl+pick]; -+ } else { -+ randvec[i] = randvec[pick]; -+ } -+ -+ /* pitch repeatition component */ -+ pick = i - use_lag; -+ -+ if (pick < 0) { -+ PLCresidual[i] = -+ iLBCdec_inst->prevResidual[ -+ iLBCdec_inst->blockl+pick]; -+ } else { -+ PLCresidual[i] = PLCresidual[pick]; -+ } -+ -+ /* mix random and periodicity component */ -+ -+ if (i<80) -+ PLCresidual[i] = use_gain*(pitchfact * -+ -+ -+ PLCresidual[i] + -+ ((float)1.0 - pitchfact) * randvec[i]); -+ else if (i<160) -+ PLCresidual[i] = (float)0.95*use_gain*(pitchfact * -+ PLCresidual[i] + -+ ((float)1.0 - pitchfact) * randvec[i]); -+ else -+ PLCresidual[i] = (float)0.9*use_gain*(pitchfact * -+ PLCresidual[i] + -+ ((float)1.0 - pitchfact) * randvec[i]); -+ -+ energy += PLCresidual[i] * PLCresidual[i]; -+ } -+ -+ /* less than 30 dB, use only noise */ -+ -+ if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) { -+ gain=0.0; -+ for (i=0; i<iLBCdec_inst->blockl; i++) { -+ PLCresidual[i] = randvec[i]; -+ } -+ } -+ -+ /* use old LPC */ -+ -+ memcpy(PLClpc,iLBCdec_inst->prevLpc, -+ (LPC_FILTERORDER+1)*sizeof(float)); -+ -+ } -+ -+ /* no packet loss, copy input */ -+ -+ else { -+ memcpy(PLCresidual, decresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float)); -+ iLBCdec_inst->consPLICount = 0; -+ } -+ -+ /* update state */ -+ -+ if (PLI) { -+ iLBCdec_inst->prevLag = lag; -+ iLBCdec_inst->per=max_per; -+ } -+ -+ iLBCdec_inst->prevPLI = PLI; -+ memcpy(iLBCdec_inst->prevLpc, PLClpc, -+ (LPC_FILTERORDER+1)*sizeof(float)); -+ memcpy(iLBCdec_inst->prevResidual, PLCresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+} -+ -+ -+ -+ -diff -druN codecs/ilbc.orig/doCPLC.h codecs/ilbc/doCPLC.h ---- codecs/ilbc.orig/doCPLC.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/doCPLC.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,32 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ doCPLC.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#ifndef __iLBC_DOLPC_H -+#define __iLBC_DOLPC_H -+ -+void doThePLC( -+ float *PLCresidual, /* (o) concealed residual */ -+ float *PLClpc, /* (o) concealed LP parameters */ -+ int PLI, /* (i) packet loss indicator -+ 0 - no PL, 1 = PL */ -+ float *decresidual, /* (i) decoded residual */ -+ float *lpc, /* (i) decoded LPC (only used for no PL) */ -+ int inlag, /* (i) pitch lag */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i/o) decoder instance */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/enhancer.c codecs/ilbc/enhancer.c ---- codecs/ilbc.orig/enhancer.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/enhancer.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,665 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ enhancer.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+#include "iLBC_define.h" -+#include "enhancer.h" -+#include "constants.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ -+ -+ * Find index in array such that the array element with said -+ * index is the element of said array closest to "value" -+ * according to the squared-error criterion -+ *---------------------------------------------------------------*/ -+ -+static void NearestNeighbor( -+ int *index, /* (o) index of array element closest -+ to value */ -+ float *array, /* (i) data array */ -+ float value,/* (i) value */ -+ int arlength/* (i) dimension of data array */ -+){ -+ int i; -+ float bestcrit,crit; -+ -+ crit=array[0]-value; -+ bestcrit=crit*crit; -+ *index=0; -+ for (i=1; i<arlength; i++) { -+ crit=array[i]-value; -+ crit=crit*crit; -+ -+ if (crit<bestcrit) { -+ bestcrit=crit; -+ *index=i; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * compute cross correlation between sequences -+ *---------------------------------------------------------------*/ -+ -+static void mycorr1( -+ float* corr, /* (o) correlation of seq1 and seq2 */ -+ float* seq1, /* (i) first sequence */ -+ int dim1, /* (i) dimension first seq1 */ -+ const float *seq2, /* (i) second sequence */ -+ int dim2 /* (i) dimension seq2 */ -+){ -+ int i,j; -+ -+ for (i=0; i<=dim1-dim2; i++) { -+ corr[i]=0.0; -+ for (j=0; j<dim2; j++) { -+ corr[i] += seq1[i+j] * seq2[j]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * upsample finite array assuming zeros outside bounds -+ *---------------------------------------------------------------*/ -+ -+ -+ -+static void enh_upsample( -+ float* useq1, /* (o) upsampled output sequence */ -+ float* seq1,/* (i) unupsampled sequence */ -+ int dim1, /* (i) dimension seq1 */ -+ int hfl /* (i) polyphase filter length=2*hfl+1 */ -+){ -+ float *pu,*ps; -+ int i,j,k,q,filterlength,hfl2; -+ const float *polyp[ENH_UPS0]; /* pointers to -+ polyphase columns */ -+ const float *pp; -+ -+ /* define pointers for filter */ -+ -+ filterlength=2*hfl+1; -+ -+ if ( filterlength > dim1 ) { -+ hfl2=(int) (dim1/2); -+ for (j=0; j<ENH_UPS0; j++) { -+ polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2; -+ } -+ hfl=hfl2; -+ filterlength=2*hfl+1; -+ } -+ else { -+ for (j=0; j<ENH_UPS0; j++) { -+ polyp[j]=polyphaserTbl+j*filterlength; -+ } -+ } -+ -+ /* filtering: filter overhangs left side of sequence */ -+ -+ pu=useq1; -+ for (i=hfl; i<filterlength; i++) { -+ for (j=0; j<ENH_UPS0; j++) { -+ *pu=0.0; -+ pp = polyp[j]; -+ ps = seq1+i; -+ for (k=0; k<=i; k++) { -+ *pu += *ps-- * *pp++; -+ } -+ pu++; -+ } -+ } -+ -+ /* filtering: simple convolution=inner products */ -+ -+ for (i=filterlength; i<dim1; i++) { -+ for (j=0;j<ENH_UPS0; j++){ -+ *pu=0.0; -+ pp = polyp[j]; -+ ps = seq1+i; -+ for (k=0; k<filterlength; k++) { -+ *pu += *ps-- * *pp++; -+ -+ -+ } -+ pu++; -+ } -+ } -+ -+ /* filtering: filter overhangs right side of sequence */ -+ -+ for (q=1; q<=hfl; q++) { -+ for (j=0; j<ENH_UPS0; j++) { -+ *pu=0.0; -+ pp = polyp[j]+q; -+ ps = seq1+dim1-1; -+ for (k=0; k<filterlength-q; k++) { -+ *pu += *ps-- * *pp++; -+ } -+ pu++; -+ } -+ } -+} -+ -+ -+/*----------------------------------------------------------------* -+ * find segment starting near idata+estSegPos that has highest -+ * correlation with idata+centerStartPos through -+ * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a -+ * resolution of ENH_UPSO times the original of the original -+ * sampling rate -+ *---------------------------------------------------------------*/ -+ -+static void refiner( -+ float *seg, /* (o) segment array */ -+ float *updStartPos, /* (o) updated start point */ -+ float* idata, /* (i) original data buffer */ -+ int idatal, /* (i) dimension of idata */ -+ int centerStartPos, /* (i) beginning center segment */ -+ float estSegPos,/* (i) estimated beginning other segment */ -+ float period /* (i) estimated pitch period */ -+){ -+ int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim; -+ int tloc,tloc2,i,st,en,fraction; -+ float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv; -+ float corrVecUps[ENH_CORRDIM*ENH_UPS0]; -+ -+ /* defining array bounds */ -+ -+ estSegPosRounded=(int)(estSegPos - 0.5); -+ -+ searchSegStartPos=estSegPosRounded-ENH_SLOP; -+ -+ if (searchSegStartPos<0) { -+ searchSegStartPos=0; -+ } -+ searchSegEndPos=estSegPosRounded+ENH_SLOP; -+ -+ -+ -+ if (searchSegEndPos+ENH_BLOCKL >= idatal) { -+ searchSegEndPos=idatal-ENH_BLOCKL-1; -+ } -+ corrdim=searchSegEndPos-searchSegStartPos+1; -+ -+ /* compute upsampled correlation (corr33) and find -+ location of max */ -+ -+ mycorr1(corrVec,idata+searchSegStartPos, -+ corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL); -+ enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0); -+ tloc=0; maxv=corrVecUps[0]; -+ for (i=1; i<ENH_UPS0*corrdim; i++) { -+ -+ if (corrVecUps[i]>maxv) { -+ tloc=i; -+ maxv=corrVecUps[i]; -+ } -+ } -+ -+ /* make vector can be upsampled without ever running outside -+ bounds */ -+ -+ *updStartPos= (float)searchSegStartPos + -+ (float)tloc/(float)ENH_UPS0+(float)1.0; -+ tloc2=(int)(tloc/ENH_UPS0); -+ -+ if (tloc>tloc2*ENH_UPS0) { -+ tloc2++; -+ } -+ st=searchSegStartPos+tloc2-ENH_FL0; -+ -+ if (st<0) { -+ memset(vect,0,-st*sizeof(float)); -+ memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float)); -+ } -+ else { -+ en=st+ENH_VECTL; -+ -+ if (en>idatal) { -+ memcpy(vect, &idata[st], -+ (ENH_VECTL-(en-idatal))*sizeof(float)); -+ memset(&vect[ENH_VECTL-(en-idatal)], 0, -+ (en-idatal)*sizeof(float)); -+ } -+ else { -+ memcpy(vect, &idata[st], ENH_VECTL*sizeof(float)); -+ } -+ } -+ fraction=tloc2*ENH_UPS0-tloc; -+ -+ /* compute the segment (this is actually a convolution) */ -+ -+ mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction, -+ -+ -+ 2*ENH_FL0+1); -+} -+ -+/*----------------------------------------------------------------* -+ * find the smoothed output data -+ *---------------------------------------------------------------*/ -+ -+static void smath( -+ float *odata, /* (o) smoothed output */ -+ float *sseq,/* (i) said second sequence of waveforms */ -+ int hl, /* (i) 2*hl+1 is sseq dimension */ -+ float alpha0/* (i) max smoothing energy fraction */ -+){ -+ int i,k; -+ float w00,w10,w11,A,B,C,*psseq,err,errs; -+ float surround[BLOCKL_MAX]; /* shape contributed by other than -+ current */ -+ float wt[2*ENH_HL+1]; /* waveform weighting to get -+ surround shape */ -+ float denom; -+ -+ /* create shape of contribution from all waveforms except the -+ current one */ -+ -+ for (i=1; i<=2*hl+1; i++) { -+ wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2))); -+ } -+ wt[hl]=0.0; /* for clarity, not used */ -+ for (i=0; i<ENH_BLOCKL; i++) { -+ surround[i]=sseq[i]*wt[0]; -+ } -+ for (k=1; k<hl; k++) { -+ psseq=sseq+k*ENH_BLOCKL; -+ for(i=0;i<ENH_BLOCKL; i++) { -+ surround[i]+=psseq[i]*wt[k]; -+ } -+ } -+ for (k=hl+1; k<=2*hl; k++) { -+ psseq=sseq+k*ENH_BLOCKL; -+ for(i=0;i<ENH_BLOCKL; i++) { -+ surround[i]+=psseq[i]*wt[k]; -+ } -+ } -+ -+ /* compute some inner products */ -+ -+ w00 = w10 = w11 = 0.0; -+ psseq=sseq+hl*ENH_BLOCKL; /* current block */ -+ for (i=0; i<ENH_BLOCKL;i++) { -+ w00+=psseq[i]*psseq[i]; -+ w11+=surround[i]*surround[i]; -+ w10+=surround[i]*psseq[i]; -+ } -+ -+ -+ -+ if (fabs(w11) < 1.0) { -+ w11=1.0; -+ } -+ C = (float)sqrt( w00/w11); -+ -+ /* first try enhancement without power-constraint */ -+ -+ errs=0.0; -+ psseq=sseq+hl*ENH_BLOCKL; -+ for (i=0; i<ENH_BLOCKL; i++) { -+ odata[i]=C*surround[i]; -+ err=psseq[i]-odata[i]; -+ errs+=err*err; -+ } -+ -+ /* if constraint violated by first try, add constraint */ -+ -+ if (errs > alpha0 * w00) { -+ if ( w00 < 1) { -+ w00=1; -+ } -+ denom = (w11*w00-w10*w10)/(w00*w00); -+ -+ if (denom > 0.0001) { /* eliminates numerical problems -+ for if smooth */ -+ A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom); -+ B = -alpha0/2 - A * w10/w00; -+ B = B+1; -+ } -+ else { /* essentially no difference between cycles; -+ smoothing not needed */ -+ A= 0.0; -+ B= 1.0; -+ } -+ -+ /* create smoothed sequence */ -+ -+ psseq=sseq+hl*ENH_BLOCKL; -+ for (i=0; i<ENH_BLOCKL; i++) { -+ odata[i]=A*surround[i]+B*psseq[i]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * get the pitch-synchronous sample sequence -+ *---------------------------------------------------------------*/ -+ -+static void getsseq( -+ float *sseq, /* (o) the pitch-synchronous sequence */ -+ float *idata, /* (i) original data */ -+ int idatal, /* (i) dimension of data */ -+ int centerStartPos, /* (i) where current block starts */ -+ float *period, /* (i) rough-pitch-period array */ -+ -+ -+ float *plocs, /* (i) where periods of period array -+ are taken */ -+ int periodl, /* (i) dimension period array */ -+ int hl /* (i) 2*hl+1 is the number of sequences */ -+){ -+ int i,centerEndPos,q; -+ float blockStartPos[2*ENH_HL+1]; -+ int lagBlock[2*ENH_HL+1]; -+ float plocs2[ENH_PLOCSL]; -+ float *psseq; -+ -+ centerEndPos=centerStartPos+ENH_BLOCKL-1; -+ -+ /* present */ -+ -+ NearestNeighbor(lagBlock+hl,plocs, -+ (float)0.5*(centerStartPos+centerEndPos),periodl); -+ -+ blockStartPos[hl]=(float)centerStartPos; -+ psseq=sseq+ENH_BLOCKL*hl; -+ memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float)); -+ -+ /* past */ -+ -+ for (q=hl-1; q>=0; q--) { -+ blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]]; -+ NearestNeighbor(lagBlock+q,plocs, -+ blockStartPos[q]+ -+ ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl); -+ -+ -+ if (blockStartPos[q]-ENH_OVERHANG>=0) { -+ refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata, -+ idatal, centerStartPos, blockStartPos[q], -+ period[lagBlock[q+1]]); -+ } else { -+ psseq=sseq+q*ENH_BLOCKL; -+ memset(psseq, 0, ENH_BLOCKL*sizeof(float)); -+ } -+ } -+ -+ /* future */ -+ -+ for (i=0; i<periodl; i++) { -+ plocs2[i]=plocs[i]-period[i]; -+ } -+ for (q=hl+1; q<=2*hl; q++) { -+ NearestNeighbor(lagBlock+q,plocs2, -+ blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl); -+ -+ blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]]; -+ if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) { -+ refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata, -+ idatal, centerStartPos, blockStartPos[q], -+ -+ -+ period[lagBlock[q]]); -+ } -+ else { -+ psseq=sseq+q*ENH_BLOCKL; -+ memset(psseq, 0, ENH_BLOCKL*sizeof(float)); -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * perform enhancement on idata+centerStartPos through -+ * idata+centerStartPos+ENH_BLOCKL-1 -+ *---------------------------------------------------------------*/ -+ -+static void enhancer( -+ float *odata, /* (o) smoothed block, dimension blockl */ -+ float *idata, /* (i) data buffer used for enhancing */ -+ int idatal, /* (i) dimension idata */ -+ int centerStartPos, /* (i) first sample current block -+ within idata */ -+ float alpha0, /* (i) max correction-energy-fraction -+ (in [0,1]) */ -+ float *period, /* (i) pitch period array */ -+ float *plocs, /* (i) locations where period array -+ values valid */ -+ int periodl /* (i) dimension of period and plocs */ -+){ -+ float sseq[(2*ENH_HL+1)*ENH_BLOCKL]; -+ -+ /* get said second sequence of segments */ -+ -+ getsseq(sseq,idata,idatal,centerStartPos,period, -+ plocs,periodl,ENH_HL); -+ -+ /* compute the smoothed output from said second sequence */ -+ -+ smath(odata,sseq,ENH_HL,alpha0); -+ -+} -+ -+/*----------------------------------------------------------------* -+ * cross correlation -+ *---------------------------------------------------------------*/ -+ -+float xCorrCoef( -+ float *target, /* (i) first array */ -+ float *regressor, /* (i) second array */ -+ int subl /* (i) dimension arrays */ -+){ -+ int i; -+ float ftmp1, ftmp2; -+ -+ ftmp1 = 0.0; -+ ftmp2 = 0.0; -+ -+ -+ for (i=0; i<subl; i++) { -+ ftmp1 += target[i]*regressor[i]; -+ ftmp2 += regressor[i]*regressor[i]; -+ } -+ -+ if (ftmp1 > 0.0) { -+ return (float)(ftmp1*ftmp1/ftmp2); -+ } -+ else { -+ return (float)0.0; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * interface for enhancer -+ *---------------------------------------------------------------*/ -+ -+int enhancerInterface( -+ float *out, /* (o) enhanced signal */ -+ float *in, /* (i) unenhanced signal */ -+ iLBC_Dec_Inst_t *iLBCdec_inst /* (i) buffers etc */ -+){ -+ float *enh_buf, *enh_period; -+ int iblock, isample; -+ int lag=0, ilag, i, ioffset; -+ float cc, maxcc; -+ float ftmp1, ftmp2; -+ float *inPtr, *enh_bufPtr1, *enh_bufPtr2; -+ float plc_pred[ENH_BLOCKL]; -+ -+ float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2]; -+ int inLen=ENH_NBLOCKS*ENH_BLOCKL+120; -+ int start, plc_blockl, inlag; -+ -+ enh_buf=iLBCdec_inst->enh_buf; -+ enh_period=iLBCdec_inst->enh_period; -+ -+ memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl], -+ (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float)); -+ -+ memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in, -+ iLBCdec_inst->blockl*sizeof(float)); -+ -+ if (iLBCdec_inst->mode==30) -+ plc_blockl=ENH_BLOCKL; -+ else -+ plc_blockl=40; -+ -+ /* when 20 ms frame, move processing one block */ -+ ioffset=0; -+ if (iLBCdec_inst->mode==20) ioffset=1; -+ -+ i=3-ioffset; -+ memmove(enh_period, &enh_period[i], -+ -+ -+ (ENH_NBLOCKS_TOT-i)*sizeof(float)); -+ -+ /* Set state information to the 6 samples right before -+ the samples to be downsampled. */ -+ -+ memcpy(lpState, -+ enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126, -+ 6*sizeof(float)); -+ -+ /* Down sample a factor 2 to save computations */ -+ -+ DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120, -+ lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL, -+ lpState, downsampled); -+ -+ /* Estimate the pitch in the down sampled domain. */ -+ for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) { -+ -+ lag = 10; -+ maxcc = xCorrCoef(downsampled+60+iblock* -+ ENH_BLOCKL_HALF, downsampled+60+iblock* -+ ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF); -+ for (ilag=11; ilag<60; ilag++) { -+ cc = xCorrCoef(downsampled+60+iblock* -+ ENH_BLOCKL_HALF, downsampled+60+iblock* -+ ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF); -+ -+ if (cc > maxcc) { -+ maxcc = cc; -+ lag = ilag; -+ } -+ } -+ -+ /* Store the estimated lag in the non-downsampled domain */ -+ enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2; -+ -+ -+ } -+ -+ -+ /* PLC was performed on the previous packet */ -+ if (iLBCdec_inst->prev_enh_pl==1) { -+ -+ inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset]; -+ -+ lag = inlag-1; -+ maxcc = xCorrCoef(in, in+lag, plc_blockl); -+ for (ilag=inlag; ilag<=inlag+1; ilag++) { -+ cc = xCorrCoef(in, in+ilag, plc_blockl); -+ -+ if (cc > maxcc) { -+ maxcc = cc; -+ lag = ilag; -+ } -+ } -+ -+ -+ -+ enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag; -+ -+ /* compute new concealed residual for the old lookahead, -+ mix the forward PLC with a backward PLC from -+ the new frame */ -+ -+ inPtr=&in[lag-1]; -+ -+ enh_bufPtr1=&plc_pred[plc_blockl-1]; -+ -+ if (lag>plc_blockl) { -+ start=plc_blockl; -+ } else { -+ start=lag; -+ } -+ -+ for (isample = start; isample>0; isample--) { -+ *enh_bufPtr1-- = *inPtr--; -+ } -+ -+ enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl]; -+ for (isample = (plc_blockl-1-lag); isample>=0; isample--) -+{ -+ *enh_bufPtr1-- = *enh_bufPtr2--; -+ } -+ -+ /* limit energy change */ -+ ftmp2=0.0; -+ ftmp1=0.0; -+ for (i=0;i<plc_blockl;i++) { -+ ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]* -+ enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]; -+ ftmp1+=plc_pred[i]*plc_pred[i]; -+ } -+ ftmp1=(float)sqrt(ftmp1/(float)plc_blockl); -+ ftmp2=(float)sqrt(ftmp2/(float)plc_blockl); -+ if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) { -+ for (i=0;i<plc_blockl-10;i++) { -+ plc_pred[i]*=(float)2.0*ftmp2/ftmp1; -+ } -+ for (i=plc_blockl-10;i<plc_blockl;i++) { -+ plc_pred[i]*=(float)(i-plc_blockl+10)* -+ ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+ -+ (float)2.0*ftmp2/ftmp1; -+ } -+ } -+ -+ enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl]; -+ for (i=0; i<plc_blockl; i++) { -+ ftmp1 = (float) (i+1) / (float) (plc_blockl+1); -+ *enh_bufPtr1 *= ftmp1; -+ *enh_bufPtr1 += ((float)1.0-ftmp1)* -+ plc_pred[plc_blockl-1-i]; -+ enh_bufPtr1--; -+ } -+ -+ -+ } -+ -+ if (iLBCdec_inst->mode==20) { -+ /* Enhancer with 40 samples delay */ -+ for (iblock = 0; iblock<2; iblock++) { -+ enhancer(out+iblock*ENH_BLOCKL, enh_buf, -+ ENH_BUFL, (5+iblock)*ENH_BLOCKL+40, -+ ENH_ALPHA0, enh_period, enh_plocsTbl, -+ ENH_NBLOCKS_TOT); -+ } -+ } else if (iLBCdec_inst->mode==30) { -+ /* Enhancer with 80 samples delay */ -+ for (iblock = 0; iblock<3; iblock++) { -+ enhancer(out+iblock*ENH_BLOCKL, enh_buf, -+ ENH_BUFL, (4+iblock)*ENH_BLOCKL, -+ ENH_ALPHA0, enh_period, enh_plocsTbl, -+ ENH_NBLOCKS_TOT); -+ } -+ } -+ -+ return (lag*2); -+} -+ -+ -diff -druN codecs/ilbc.orig/enhancer.h codecs/ilbc/enhancer.h ---- codecs/ilbc.orig/enhancer.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/enhancer.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,33 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ enhancer.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __ENHANCER_H -+#define __ENHANCER_H -+ -+#include "iLBC_define.h" -+ -+float xCorrCoef( -+ float *target, /* (i) first array */ -+ float *regressor, /* (i) second array */ -+ int subl /* (i) dimension arrays */ -+); -+ -+int enhancerInterface( -+ float *out, /* (o) the enhanced recidual signal */ -+ float *in, /* (i) the recidual signal to enhance */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i/o) the decoder state structure */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/filter.c codecs/ilbc/filter.c ---- codecs/ilbc.orig/filter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/filter.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,168 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ filter.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+ -+ -+#include "iLBC_define.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ * all-pole filter -+ *---------------------------------------------------------------*/ -+ -+void AllPoleFilter( -+ float *InOut, /* (i/o) on entrance InOut[-orderCoef] to -+ InOut[-1] contain the state of the -+ filter (delayed samples). InOut[0] to -+ InOut[lengthInOut-1] contain the filter -+ input, on en exit InOut[-orderCoef] to -+ InOut[-1] is unchanged and InOut[0] to -+ InOut[lengthInOut-1] contain filtered -+ samples */ -+ float *Coef,/* (i) filter coefficients, Coef[0] is assumed -+ to be 1.0 */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef /* (i) number of filter coefficients */ -+){ -+ int n,k; -+ -+ for(n=0;n<lengthInOut;n++){ -+ for(k=1;k<=orderCoef;k++){ -+ *InOut -= Coef[k]*InOut[-k]; -+ } -+ InOut++; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * all-zero filter -+ *---------------------------------------------------------------*/ -+ -+void AllZeroFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain -+ filter input samples */ -+ float *Coef,/* (i) filter coefficients (Coef[0] is assumed -+ to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain the filter state, on exit Out[0] -+ to Out[lengthInOut-1] contain filtered -+ samples */ -+){ -+ int n,k; -+ -+ for(n=0;n<lengthInOut;n++){ -+ *Out = Coef[0]*In[0]; -+ for(k=1;k<=orderCoef;k++){ -+ *Out += Coef[k]*In[-k]; -+ } -+ -+ -+ Out++; -+ In++; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * pole-zero filter -+ *---------------------------------------------------------------*/ -+ -+void ZeroPoleFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain -+ filter input samples In[-orderCoef] to -+ In[-1] contain state of all-zero -+ section */ -+ float *ZeroCoef,/* (i) filter coefficients for all-zero -+ section (ZeroCoef[0] is assumed to -+ be 1.0) */ -+ float *PoleCoef,/* (i) filter coefficients for all-pole section -+ (ZeroCoef[0] is assumed to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain state of all-pole section. On -+ exit Out[0] to Out[lengthInOut-1] -+ contain filtered samples */ -+){ -+ AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out); -+ AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef); -+} -+ -+/*----------------------------------------------------------------* -+ * downsample (LP filter and decimation) -+ *---------------------------------------------------------------*/ -+ -+void DownSample ( -+ float *In, /* (i) input samples */ -+ float *Coef, /* (i) filter coefficients */ -+ int lengthIn, /* (i) number of input samples */ -+ float *state, /* (i) filter state */ -+ float *Out /* (o) downsampled output */ -+){ -+ float o; -+ float *Out_ptr = Out; -+ float *Coef_ptr, *In_ptr; -+ float *state_ptr; -+ int i, j, stop; -+ -+ /* LP filter and decimate at the same time */ -+ -+ for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS) -+ { -+ Coef_ptr = &Coef[0]; -+ In_ptr = &In[i]; -+ state_ptr = &state[FILTERORDER_DS-2]; -+ -+ -+ -+ o = (float)0.0; -+ -+ stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS; -+ -+ for (j = 0; j < stop; j++) -+ { -+ o += *Coef_ptr++ * (*In_ptr--); -+ } -+ for (j = i + 1; j < FILTERORDER_DS; j++) -+ { -+ o += *Coef_ptr++ * (*state_ptr--); -+ } -+ -+ *Out_ptr++ = o; -+ } -+ -+ /* Get the last part (use zeros as input for the future) */ -+ -+ for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS); -+ i+=FACTOR_DS) { -+ -+ o=(float)0.0; -+ -+ if (i<lengthIn) { -+ Coef_ptr = &Coef[0]; -+ In_ptr = &In[i]; -+ for (j=0; j<FILTERORDER_DS; j++) { -+ o += *Coef_ptr++ * (*Out_ptr--); -+ } -+ } else { -+ Coef_ptr = &Coef[i-lengthIn]; -+ In_ptr = &In[lengthIn-1]; -+ for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) { -+ o += *Coef_ptr++ * (*In_ptr--); -+ } -+ } -+ *Out_ptr++ = o; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/filter.h codecs/ilbc/filter.h ---- codecs/ilbc.orig/filter.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/filter.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,73 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ filter.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_FILTER_H -+#define __iLBC_FILTER_H -+ -+void AllPoleFilter( -+ float *InOut, /* (i/o) on entrance InOut[-orderCoef] to -+ InOut[-1] contain the state of the -+ filter (delayed samples). InOut[0] to -+ InOut[lengthInOut-1] contain the filter -+ input, on en exit InOut[-orderCoef] to -+ InOut[-1] is unchanged and InOut[0] to -+ InOut[lengthInOut-1] contain filtered -+ samples */ -+ float *Coef,/* (i) filter coefficients, Coef[0] is assumed -+ to be 1.0 */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef /* (i) number of filter coefficients */ -+); -+ -+ -+ -+void AllZeroFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain -+ filter input samples */ -+ float *Coef,/* (i) filter coefficients (Coef[0] is assumed -+ to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain the filter state, on exit Out[0] -+ to Out[lengthInOut-1] contain filtered -+ samples */ -+); -+ -+void ZeroPoleFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain filter -+ input samples In[-orderCoef] to In[-1] -+ contain state of all-zero section */ -+ float *ZeroCoef,/* (i) filter coefficients for all-zero -+ section (ZeroCoef[0] is assumed to -+ be 1.0) */ -+ float *PoleCoef,/* (i) filter coefficients for all-pole section -+ (ZeroCoef[0] is assumed to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain state of all-pole section. On -+ exit Out[0] to Out[lengthInOut-1] -+ contain filtered samples */ -+); -+ -+void DownSample ( -+ float *In, /* (i) input samples */ -+ float *Coef, /* (i) filter coefficients */ -+ int lengthIn, /* (i) number of input samples */ -+ float *state, /* (i) filter state */ -+ float *Out /* (o) downsampled output */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/gainquant.c codecs/ilbc/gainquant.c ---- codecs/ilbc.orig/gainquant.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/gainquant.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,107 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ gainquant.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#include <string.h> -+#include <math.h> -+#include "constants.h" -+#include "gainquant.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ * quantizer for the gain in the gain-shape coding of residual -+ *---------------------------------------------------------------*/ -+ -+float gainquant(/* (o) quantized gain value */ -+ float in, /* (i) gain value */ -+ float maxIn,/* (i) maximum of gain value */ -+ int cblen, /* (i) number of quantization indices */ -+ int *index /* (o) quantization index */ -+){ -+ int i, tindex; -+ float minmeasure,measure, *cb, scale; -+ -+ /* ensure a lower bound on the scaling factor */ -+ -+ scale=maxIn; -+ -+ if (scale<0.1) { -+ scale=(float)0.1; -+ } -+ -+ /* select the quantization table */ -+ -+ if (cblen == 8) { -+ cb = gain_sq3Tbl; -+ } else if (cblen == 16) { -+ cb = gain_sq4Tbl; -+ } else { -+ cb = gain_sq5Tbl; -+ } -+ -+ /* select the best index in the quantization table */ -+ -+ minmeasure=10000000.0; -+ tindex=0; -+ for (i=0; i<cblen; i++) { -+ measure=(in-scale*cb[i])*(in-scale*cb[i]); -+ -+ if (measure<minmeasure) { -+ tindex=i; -+ minmeasure=measure; -+ } -+ } -+ *index=tindex; -+ -+ /* return the quantized value */ -+ -+ -+ -+ return scale*cb[tindex]; -+} -+ -+/*----------------------------------------------------------------* -+ * decoder for quantized gains in the gain-shape coding of -+ * residual -+ *---------------------------------------------------------------*/ -+ -+float gaindequant( /* (o) quantized gain value */ -+ int index, /* (i) quantization index */ -+ float maxIn,/* (i) maximum of unquantized gain */ -+ int cblen /* (i) number of quantization indices */ -+){ -+ float scale; -+ -+ /* obtain correct scale factor */ -+ -+ scale=(float)fabs(maxIn); -+ -+ if (scale<0.1) { -+ scale=(float)0.1; -+ } -+ -+ /* select the quantization table and return the decoded value */ -+ -+ if (cblen==8) { -+ return scale*gain_sq3Tbl[index]; -+ } else if (cblen==16) { -+ return scale*gain_sq4Tbl[index]; -+ } -+ else if (cblen==32) { -+ return scale*gain_sq5Tbl[index]; -+ } -+ -+ return 0.0; -+} -+ -+ -diff -druN codecs/ilbc.orig/gainquant.h codecs/ilbc/gainquant.h ---- codecs/ilbc.orig/gainquant.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/gainquant.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,31 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ gainquant.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_GAINQUANT_H -+#define __iLBC_GAINQUANT_H -+ -+float gainquant(/* (o) quantized gain value */ -+ float in, /* (i) gain value */ -+ float maxIn,/* (i) maximum of gain value */ -+ int cblen, /* (i) number of quantization indices */ -+ int *index /* (o) quantization index */ -+); -+ -+float gaindequant( /* (o) quantized gain value */ -+ int index, /* (i) quantization index */ -+ float maxIn,/* (i) maximum of unquantized gain */ -+ int cblen /* (i) number of quantization indices */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/getCBvec.c codecs/ilbc/getCBvec.c ---- codecs/ilbc.orig/getCBvec.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/getCBvec.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,181 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ getCBvec.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "getCBvec.h" -+#include "constants.h" -+#include <string.h> -+ -+/*----------------------------------------------------------------* -+ * Construct codebook vector for given index. -+ *---------------------------------------------------------------*/ -+ -+void getCBvec( -+ float *cbvec, /* (o) Constructed codebook vector */ -+ float *mem, /* (i) Codebook buffer */ -+ int index, /* (i) Codebook index */ -+ int lMem, /* (i) Length of codebook buffer */ -+ int cbveclen/* (i) Codebook vector length */ -+){ -+ int j, k, n, memInd, sFilt; -+ float tmpbuf[CB_MEML]; -+ int base_size; -+ int ilow, ihigh; -+ float alfa, alfa1; -+ -+ /* Determine size of codebook sections */ -+ -+ base_size=lMem-cbveclen+1; -+ -+ if (cbveclen==SUBL) { -+ base_size+=cbveclen/2; -+ } -+ -+ /* No filter -> First codebook section */ -+ -+ -+ -+ if (index<lMem-cbveclen+1) { -+ -+ /* first non-interpolated vectors */ -+ -+ k=index+cbveclen; -+ /* get vector */ -+ memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float)); -+ -+ } else if (index < base_size) { -+ -+ k=2*(index-(lMem-cbveclen+1))+cbveclen; -+ -+ ihigh=k/2; -+ ilow=ihigh-5; -+ -+ /* Copy first noninterpolated part */ -+ -+ memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float)); -+ -+ /* interpolation */ -+ -+ alfa1=(float)0.2; -+ alfa=0.0; -+ for (j=ilow; j<ihigh; j++) { -+ cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+ -+ alfa*mem[lMem-k+j]; -+ alfa+=alfa1; -+ } -+ -+ /* Copy second noninterpolated part */ -+ -+ memcpy(cbvec+ihigh, mem+lMem-k+ihigh, -+ (cbveclen-ihigh)*sizeof(float)); -+ -+ } -+ -+ /* Higher codebbok section based on filtering */ -+ -+ else { -+ -+ /* first non-interpolated vectors */ -+ -+ if (index-base_size<lMem-cbveclen+1) { -+ float tempbuff2[CB_MEML+CB_FILTERLEN+1]; -+ float *pos; -+ float *pp, *pp1; -+ -+ memset(tempbuff2, 0, -+ CB_HALFFILTERLEN*sizeof(float)); -+ memcpy(&tempbuff2[CB_HALFFILTERLEN], mem, -+ lMem*sizeof(float)); -+ memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0, -+ (CB_HALFFILTERLEN+1)*sizeof(float)); -+ -+ -+ -+ k=index-base_size+cbveclen; -+ sFilt=lMem-k; -+ memInd=sFilt+1-CB_HALFFILTERLEN; -+ -+ /* do filtering */ -+ pos=cbvec; -+ memset(pos, 0, cbveclen*sizeof(float)); -+ for (n=0; n<cbveclen; n++) { -+ pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN]; -+ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; -+ for (j=0; j<CB_FILTERLEN; j++) { -+ (*pos)+=(*pp++)*(*pp1--); -+ } -+ pos++; -+ } -+ } -+ -+ /* interpolated vectors */ -+ -+ else { -+ float tempbuff2[CB_MEML+CB_FILTERLEN+1]; -+ -+ float *pos; -+ float *pp, *pp1; -+ int i; -+ -+ memset(tempbuff2, 0, -+ CB_HALFFILTERLEN*sizeof(float)); -+ memcpy(&tempbuff2[CB_HALFFILTERLEN], mem, -+ lMem*sizeof(float)); -+ memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0, -+ (CB_HALFFILTERLEN+1)*sizeof(float)); -+ -+ k=2*(index-base_size- -+ (lMem-cbveclen+1))+cbveclen; -+ sFilt=lMem-k; -+ memInd=sFilt+1-CB_HALFFILTERLEN; -+ -+ /* do filtering */ -+ pos=&tmpbuf[sFilt]; -+ memset(pos, 0, k*sizeof(float)); -+ for (i=0; i<k; i++) { -+ pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN]; -+ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; -+ for (j=0; j<CB_FILTERLEN; j++) { -+ (*pos)+=(*pp++)*(*pp1--); -+ } -+ pos++; -+ } -+ -+ ihigh=k/2; -+ ilow=ihigh-5; -+ -+ -+ -+ /* Copy first noninterpolated part */ -+ -+ memcpy(cbvec, tmpbuf+lMem-k/2, -+ ilow*sizeof(float)); -+ -+ /* interpolation */ -+ -+ alfa1=(float)0.2; -+ alfa=0.0; -+ for (j=ilow; j<ihigh; j++) { -+ cbvec[j]=((float)1.0-alfa)* -+ tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j]; -+ alfa+=alfa1; -+ } -+ -+ /* Copy second noninterpolated part */ -+ -+ memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh, -+ (cbveclen-ihigh)*sizeof(float)); -+ } -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/getCBvec.h codecs/ilbc/getCBvec.h ---- codecs/ilbc.orig/getCBvec.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/getCBvec.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,28 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ getCBvec.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_GETCBVEC_H -+#define __iLBC_GETCBVEC_H -+ -+ -+ -+void getCBvec( -+ float *cbvec, /* (o) Constructed codebook vector */ -+ float *mem, /* (i) Codebook buffer */ -+ int index, /* (i) Codebook index */ -+ int lMem, /* (i) Length of codebook buffer */ -+ int cbveclen/* (i) Codebook vector length */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/helpfun.c codecs/ilbc/helpfun.c ---- codecs/ilbc.orig/helpfun.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/helpfun.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,308 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ helpfun.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+ -+#include "iLBC_define.h" -+#include "helpfun.h" -+#include "constants.h" -+ -+/*----------------------------------------------------------------* -+ * calculation of auto correlation -+ *---------------------------------------------------------------*/ -+ -+void autocorr( -+ float *r, /* (o) autocorrelation vector */ -+ const float *x, /* (i) data vector */ -+ int N, /* (i) length of data vector */ -+ int order /* largest lag for calculated -+ autocorrelations */ -+){ -+ int lag, n; -+ float sum; -+ -+ for (lag = 0; lag <= order; lag++) { -+ sum = 0; -+ for (n = 0; n < N - lag; n++) { -+ sum += x[n] * x[n+lag]; -+ } -+ r[lag] = sum; -+ } -+} -+ -+ -+ -+/*----------------------------------------------------------------* -+ * window multiplication -+ *---------------------------------------------------------------*/ -+ -+void window( -+ float *z, /* (o) the windowed data */ -+ const float *x, /* (i) the original data vector */ -+ const float *y, /* (i) the window */ -+ int N /* (i) length of all vectors */ -+){ -+ int i; -+ -+ for (i = 0; i < N; i++) { -+ z[i] = x[i] * y[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * levinson-durbin solution for lpc coefficients -+ *---------------------------------------------------------------*/ -+ -+void levdurb( -+ float *a, /* (o) lpc coefficient vector starting -+ with 1.0 */ -+ float *k, /* (o) reflection coefficients */ -+ float *r, /* (i) autocorrelation vector */ -+ int order /* (i) order of lpc filter */ -+){ -+ float sum, alpha; -+ int m, m_h, i; -+ -+ a[0] = 1.0; -+ -+ if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */ -+ for (i = 0; i < order; i++) { -+ k[i] = 0; -+ a[i+1] = 0; -+ } -+ } else { -+ a[1] = k[0] = -r[1]/r[0]; -+ alpha = r[0] + r[1] * k[0]; -+ for (m = 1; m < order; m++){ -+ sum = r[m + 1]; -+ for (i = 0; i < m; i++){ -+ sum += a[i+1] * r[m - i]; -+ } -+ k[m] = -sum / alpha; -+ alpha += k[m] * sum; -+ m_h = (m + 1) >> 1; -+ for (i = 0; i < m_h; i++){ -+ sum = a[i+1] + k[m] * a[m - i]; -+ a[m - i] += k[m] * a[i+1]; -+ a[i+1] = sum; -+ -+ -+ } -+ a[m+1] = k[m]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * interpolation between vectors -+ *---------------------------------------------------------------*/ -+ -+void interpolate( -+ float *out, /* (o) the interpolated vector */ -+ float *in1, /* (i) the first vector for the -+ interpolation */ -+ float *in2, /* (i) the second vector for the -+ interpolation */ -+ float coef, /* (i) interpolation weights */ -+ int length /* (i) length of all vectors */ -+){ -+ int i; -+ float invcoef; -+ -+ invcoef = (float)1.0 - coef; -+ for (i = 0; i < length; i++) { -+ out[i] = coef * in1[i] + invcoef * in2[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * lpc bandwidth expansion -+ *---------------------------------------------------------------*/ -+ -+void bwexpand( -+ float *out, /* (o) the bandwidth expanded lpc -+ coefficients */ -+ float *in, /* (i) the lpc coefficients before bandwidth -+ expansion */ -+ float coef, /* (i) the bandwidth expansion factor */ -+ int length /* (i) the length of lpc coefficient vectors */ -+){ -+ int i; -+ float chirp; -+ -+ chirp = coef; -+ -+ out[0] = in[0]; -+ for (i = 1; i < length; i++) { -+ out[i] = chirp * in[i]; -+ chirp *= coef; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * vector quantization -+ -+ -+ *---------------------------------------------------------------*/ -+ -+void vq( -+ float *Xq, /* (o) the quantized vector */ -+ int *index, /* (o) the quantization index */ -+ const float *CB,/* (i) the vector quantization codebook */ -+ float *X, /* (i) the vector to quantize */ -+ int n_cb, /* (i) the number of vectors in the codebook */ -+ int dim /* (i) the dimension of all vectors */ -+){ -+ int i, j; -+ int pos, minindex; -+ float dist, tmp, mindist; -+ -+ pos = 0; -+ mindist = FLOAT_MAX; -+ minindex = 0; -+ for (j = 0; j < n_cb; j++) { -+ dist = X[0] - CB[pos]; -+ dist *= dist; -+ for (i = 1; i < dim; i++) { -+ tmp = X[i] - CB[pos + i]; -+ dist += tmp*tmp; -+ } -+ -+ if (dist < mindist) { -+ mindist = dist; -+ minindex = j; -+ } -+ pos += dim; -+ } -+ for (i = 0; i < dim; i++) { -+ Xq[i] = CB[minindex*dim + i]; -+ } -+ *index = minindex; -+} -+ -+/*----------------------------------------------------------------* -+ * split vector quantization -+ *---------------------------------------------------------------*/ -+ -+void SplitVQ( -+ float *qX, /* (o) the quantized vector */ -+ int *index, /* (o) a vector of indexes for all vector -+ codebooks in the split */ -+ float *X, /* (i) the vector to quantize */ -+ const float *CB,/* (i) the quantizer codebook */ -+ int nsplit, /* the number of vector splits */ -+ const int *dim, /* the dimension of X and qX */ -+ const int *cbsize /* the number of vectors in the codebook */ -+){ -+ int cb_pos, X_pos, i; -+ -+ cb_pos = 0; -+ -+ -+ X_pos= 0; -+ for (i = 0; i < nsplit; i++) { -+ vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos, -+ cbsize[i], dim[i]); -+ X_pos += dim[i]; -+ cb_pos += dim[i] * cbsize[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * scalar quantization -+ *---------------------------------------------------------------*/ -+ -+void sort_sq( -+ float *xq, /* (o) the quantized value */ -+ int *index, /* (o) the quantization index */ -+ float x, /* (i) the value to quantize */ -+ const float *cb,/* (i) the quantization codebook */ -+ int cb_size /* (i) the size of the quantization codebook */ -+){ -+ int i; -+ -+ if (x <= cb[0]) { -+ *index = 0; -+ *xq = cb[0]; -+ } else { -+ i = 0; -+ while ((x > cb[i]) && i < cb_size - 1) { -+ i++; -+ } -+ -+ if (x > ((cb[i] + cb[i - 1])/2)) { -+ *index = i; -+ *xq = cb[i]; -+ } else { -+ *index = i - 1; -+ *xq = cb[i - 1]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * check for stability of lsf coefficients -+ *---------------------------------------------------------------*/ -+ -+int LSF_check( /* (o) 1 for stable lsf vectors and 0 for -+ nonstable ones */ -+ float *lsf, /* (i) a table of lsf vectors */ -+ int dim, /* (i) the dimension of each lsf vector */ -+ int NoAn /* (i) the number of lsf vectors in the -+ table */ -+){ -+ int k,n,m, Nit=2, change=0,pos; -+ float tmp; -+ -+ -+ static float eps=(float)0.039; /* 50 Hz */ -+ static float eps2=(float)0.0195; -+ static float maxlsf=(float)3.14; /* 4000 Hz */ -+ static float minlsf=(float)0.01; /* 0 Hz */ -+ -+ /* LSF separation check*/ -+ -+ for (n=0; n<Nit; n++) { /* Run through a couple of times */ -+ for (m=0; m<NoAn; m++) { /* Number of analyses per frame */ -+ for (k=0; k<(dim-1); k++) { -+ pos=m*dim+k; -+ -+ if ((lsf[pos+1]-lsf[pos])<eps) { -+ -+ if (lsf[pos+1]<lsf[pos]) { -+ tmp=lsf[pos+1]; -+ lsf[pos+1]= lsf[pos]+eps2; -+ lsf[pos]= lsf[pos+1]-eps2; -+ } else { -+ lsf[pos]-=eps2; -+ lsf[pos+1]+=eps2; -+ } -+ change=1; -+ } -+ -+ if (lsf[pos]<minlsf) { -+ lsf[pos]=minlsf; -+ change=1; -+ } -+ -+ if (lsf[pos]>maxlsf) { -+ lsf[pos]=maxlsf; -+ change=1; -+ } -+ } -+ } -+ } -+ -+ return change; -+} -+ -+ -diff -druN codecs/ilbc.orig/helpfun.h codecs/ilbc/helpfun.h ---- codecs/ilbc.orig/helpfun.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/helpfun.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,101 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ helpfun.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_HELPFUN_H -+#define __iLBC_HELPFUN_H -+ -+void autocorr( -+ float *r, /* (o) autocorrelation vector */ -+ const float *x, /* (i) data vector */ -+ int N, /* (i) length of data vector */ -+ int order /* largest lag for calculated -+ autocorrelations */ -+); -+ -+void window( -+ float *z, /* (o) the windowed data */ -+ const float *x, /* (i) the original data vector */ -+ const float *y, /* (i) the window */ -+ int N /* (i) length of all vectors */ -+); -+ -+ -+ -+void levdurb( -+ float *a, /* (o) lpc coefficient vector starting -+ with 1.0 */ -+ float *k, /* (o) reflection coefficients */ -+ float *r, /* (i) autocorrelation vector */ -+ int order /* (i) order of lpc filter */ -+); -+ -+void interpolate( -+ float *out, /* (o) the interpolated vector */ -+ float *in1, /* (i) the first vector for the -+ interpolation */ -+ float *in2, /* (i) the second vector for the -+ interpolation */ -+ float coef, /* (i) interpolation weights */ -+ int length /* (i) length of all vectors */ -+); -+ -+void bwexpand( -+ float *out, /* (o) the bandwidth expanded lpc -+ coefficients */ -+ float *in, /* (i) the lpc coefficients before bandwidth -+ expansion */ -+ float coef, /* (i) the bandwidth expansion factor */ -+ int length /* (i) the length of lpc coefficient vectors */ -+); -+ -+void vq( -+ float *Xq, /* (o) the quantized vector */ -+ int *index, /* (o) the quantization index */ -+ const float *CB,/* (i) the vector quantization codebook */ -+ float *X, /* (i) the vector to quantize */ -+ int n_cb, /* (i) the number of vectors in the codebook */ -+ int dim /* (i) the dimension of all vectors */ -+); -+ -+void SplitVQ( -+ float *qX, /* (o) the quantized vector */ -+ int *index, /* (o) a vector of indexes for all vector -+ codebooks in the split */ -+ float *X, /* (i) the vector to quantize */ -+ const float *CB,/* (i) the quantizer codebook */ -+ int nsplit, /* the number of vector splits */ -+ const int *dim, /* the dimension of X and qX */ -+ const int *cbsize /* the number of vectors in the codebook */ -+); -+ -+ -+void sort_sq( -+ float *xq, /* (o) the quantized value */ -+ int *index, /* (o) the quantization index */ -+ float x, /* (i) the value to quantize */ -+ const float *cb,/* (i) the quantization codebook */ -+ -+ -+ int cb_size /* (i) the size of the quantization codebook */ -+); -+ -+int LSF_check( /* (o) 1 for stable lsf vectors and 0 for -+ nonstable ones */ -+ float *lsf, /* (i) a table of lsf vectors */ -+ int dim, /* (i) the dimension of each lsf vector */ -+ int NoAn /* (i) the number of lsf vectors in the -+ table */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/hpInput.c codecs/ilbc/hpInput.c ---- codecs/ilbc.orig/hpInput.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpInput.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,60 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpInput.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "constants.h" -+#include "hpInput.h" -+ -+/*----------------------------------------------------------------* -+ * Input high-pass filter -+ *---------------------------------------------------------------*/ -+ -+void hpInput( -+ float *In, /* (i) vector to filter */ -+ int len, /* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+){ -+ int i; -+ float *pi, *po; -+ -+ /* all-zero section*/ -+ -+ pi = &In[0]; -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po = hpi_zero_coefsTbl[0] * (*pi); -+ *po += hpi_zero_coefsTbl[1] * mem[0]; -+ *po += hpi_zero_coefsTbl[2] * mem[1]; -+ -+ mem[1] = mem[0]; -+ mem[0] = *pi; -+ po++; -+ -+ -+ pi++; -+ -+ } -+ -+ /* all-pole section*/ -+ -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po -= hpi_pole_coefsTbl[1] * mem[2]; -+ *po -= hpi_pole_coefsTbl[2] * mem[3]; -+ -+ mem[3] = mem[2]; -+ mem[2] = *po; -+ po++; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/hpInput.h codecs/ilbc/hpInput.h ---- codecs/ilbc.orig/hpInput.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpInput.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,27 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpInput.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+ -+ -+#ifndef __iLBC_HPINPUT_H -+#define __iLBC_HPINPUT_H -+ -+void hpInput( -+ float *In, /* (i) vector to filter */ -+ int len, /* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/hpOutput.c codecs/ilbc/hpOutput.c ---- codecs/ilbc.orig/hpOutput.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpOutput.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,59 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpOutput.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#include "constants.h" -+#include "hpOutput.h" -+/*----------------------------------------------------------------* -+ * Output high-pass filter -+ *---------------------------------------------------------------*/ -+ -+void hpOutput( -+ float *In, /* (i) vector to filter */ -+ int len,/* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+){ -+ int i; -+ float *pi, *po; -+ -+ /* all-zero section*/ -+ -+ pi = &In[0]; -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po = hpo_zero_coefsTbl[0] * (*pi); -+ *po += hpo_zero_coefsTbl[1] * mem[0]; -+ *po += hpo_zero_coefsTbl[2] * mem[1]; -+ -+ mem[1] = mem[0]; -+ mem[0] = *pi; -+ po++; -+ pi++; -+ -+ } -+ -+ /* all-pole section*/ -+ -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po -= hpo_pole_coefsTbl[1] * mem[2]; -+ *po -= hpo_pole_coefsTbl[2] * mem[3]; -+ -+ mem[3] = mem[2]; -+ mem[2] = *po; -+ po++; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/hpOutput.h codecs/ilbc/hpOutput.h ---- codecs/ilbc.orig/hpOutput.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpOutput.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,25 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpOutput.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_HPOUTPUT_H -+#define __iLBC_HPOUTPUT_H -+ -+void hpOutput( -+ float *In, /* (i) vector to filter */ -+ int len,/* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iCBConstruct.c codecs/ilbc/iCBConstruct.c ---- codecs/ilbc.orig/iCBConstruct.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBConstruct.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,108 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iCBConstruct.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+ -+#include "iLBC_define.h" -+#include "iCBConstruct.h" -+#include "gainquant.h" -+#include "getCBvec.h" -+ -+/*----------------------------------------------------------------* -+ * Convert the codebook indexes to make the search easier -+ *---------------------------------------------------------------*/ -+ -+ -+ -+void index_conv_enc( -+ int *index /* (i/o) Codebook indexes */ -+){ -+ int k; -+ -+ for (k=1; k<CB_NSTAGES; k++) { -+ -+ if ((index[k]>=108)&&(index[k]<172)) { -+ index[k]-=64; -+ } else if (index[k]>=236) { -+ index[k]-=128; -+ } else { -+ /* ERROR */ -+ } -+ } -+} -+ -+void index_conv_dec( -+ int *index /* (i/o) Codebook indexes */ -+){ -+ int k; -+ -+ for (k=1; k<CB_NSTAGES; k++) { -+ -+ if ((index[k]>=44)&&(index[k]<108)) { -+ index[k]+=64; -+ } else if ((index[k]>=108)&&(index[k]<128)) { -+ index[k]+=128; -+ } else { -+ /* ERROR */ -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * Construct decoded vector from codebook and gains. -+ *---------------------------------------------------------------*/ -+ -+void iCBConstruct( -+ float *decvector, /* (o) Decoded vector */ -+ int *index, /* (i) Codebook indices */ -+ int *gain_index,/* (i) Gain quantization indices */ -+ float *mem, /* (i) Buffer for codevector construction */ -+ int lMem, /* (i) Length of buffer */ -+ int veclen, /* (i) Length of vector */ -+ int nStages /* (i) Number of codebook stages */ -+){ -+ int j,k; -+ float gain[CB_NSTAGES]; -+ float cbvec[SUBL]; -+ -+ /* gain de-quantization */ -+ -+ gain[0] = gaindequant(gain_index[0], 1.0, 32); -+ -+ -+ if (nStages > 1) { -+ gain[1] = gaindequant(gain_index[1], -+ (float)fabs(gain[0]), 16); -+ } -+ if (nStages > 2) { -+ gain[2] = gaindequant(gain_index[2], -+ (float)fabs(gain[1]), 8); -+ } -+ -+ /* codebook vector construction and construction of -+ total vector */ -+ -+ getCBvec(cbvec, mem, index[0], lMem, veclen); -+ for (j=0;j<veclen;j++){ -+ decvector[j] = gain[0]*cbvec[j]; -+ } -+ if (nStages > 1) { -+ for (k=1; k<nStages; k++) { -+ getCBvec(cbvec, mem, index[k], lMem, veclen); -+ for (j=0;j<veclen;j++) { -+ decvector[j] += gain[k]*cbvec[j]; -+ } -+ } -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/iCBConstruct.h codecs/ilbc/iCBConstruct.h ---- codecs/ilbc.orig/iCBConstruct.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBConstruct.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,38 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ -+ -+ iCBConstruct.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ICBCONSTRUCT_H -+#define __iLBC_ICBCONSTRUCT_H -+ -+void index_conv_enc( -+ int *index /* (i/o) Codebook indexes */ -+); -+ -+void index_conv_dec( -+ int *index /* (i/o) Codebook indexes */ -+); -+ -+void iCBConstruct( -+ float *decvector, /* (o) Decoded vector */ -+ int *index, /* (i) Codebook indices */ -+ int *gain_index,/* (i) Gain quantization indices */ -+ float *mem, /* (i) Buffer for codevector construction */ -+ int lMem, /* (i) Length of buffer */ -+ int veclen, /* (i) Length of vector */ -+ int nStages /* (i) Number of codebook stages */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iCBSearch.c codecs/ilbc/iCBSearch.c ---- codecs/ilbc.orig/iCBSearch.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBSearch.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,480 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iCBSearch.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "iCBSearch.h" -+#include "gainquant.h" -+#include "createCB.h" -+#include "filter.h" -+#include "constants.h" -+ -+/*----------------------------------------------------------------* -+ * Search routine for codebook encoding and gain quantization. -+ *---------------------------------------------------------------*/ -+ -+void iCBSearch( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) the encoder state structure */ -+ int *index, /* (o) Codebook indices */ -+ int *gain_index,/* (o) Gain quantization indices */ -+ float *intarget,/* (i) Target vector for encoding */ -+ float *mem, /* (i) Buffer for codebook construction */ -+ int lMem, /* (i) Length of buffer */ -+ int lTarget, /* (i) Length of vector */ -+ int nStages, /* (i) Number of codebook stages */ -+ float *weightDenum, /* (i) weighting filter coefficients */ -+ float *weightState, /* (i) weighting filter state */ -+ int block /* (i) the sub-block number */ -+){ -+ int i, j, icount, stage, best_index, range, counter; -+ float max_measure, gain, measure, crossDot, ftmp; -+ float gains[CB_NSTAGES]; -+ float target[SUBL]; -+ int base_index, sInd, eInd, base_size; -+ int sIndAug=0, eIndAug=0; -+ float buf[CB_MEML+SUBL+2*LPC_FILTERORDER]; -+ -+ -+ float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128]; -+ float *pp, *ppi=0, *ppo=0, *ppe=0; -+ float cbvectors[CB_MEML]; -+ float tene, cene, cvec[SUBL]; -+ float aug_vec[SUBL]; -+ -+ memset(cvec,0,SUBL*sizeof(float)); -+ -+ /* Determine size of codebook sections */ -+ -+ base_size=lMem-lTarget+1; -+ -+ if (lTarget==SUBL) { -+ base_size=lMem-lTarget+1+lTarget/2; -+ } -+ -+ /* setup buffer for weighting */ -+ -+ memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER); -+ memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float)); -+ memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float)); -+ -+ /* weighting */ -+ -+ AllPoleFilter(buf+LPC_FILTERORDER, weightDenum, -+ lMem+lTarget, LPC_FILTERORDER); -+ -+ /* Construct the codebook and target needed */ -+ -+ memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float)); -+ -+ tene=0.0; -+ for (i=0; i<lTarget; i++) { -+ tene+=target[i]*target[i]; -+ } -+ -+ /* Prepare search over one more codebook section. This section -+ is created by filtering the original buffer with a filter. */ -+ -+ filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem); -+ -+ /* The Main Loop over stages */ -+ -+ for (stage=0; stage<nStages; stage++) { -+ -+ range = search_rangeTbl[block][stage]; -+ -+ /* initialize search measure */ -+ -+ max_measure = (float)-10000000.0; -+ gain = (float)0.0; -+ best_index = 0; -+ -+ /* Compute cross dot product between the target -+ -+ -+ and the CB memory */ -+ -+ crossDot=0.0; -+ pp=buf+LPC_FILTERORDER+lMem-lTarget; -+ for (j=0; j<lTarget; j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (stage==0) { -+ -+ /* Calculate energy in the first block of -+ 'lTarget' sampels. */ -+ ppe = energy; -+ ppi = buf+LPC_FILTERORDER+lMem-lTarget-1; -+ ppo = buf+LPC_FILTERORDER+lMem-1; -+ -+ *ppe=0.0; -+ pp=buf+LPC_FILTERORDER+lMem-lTarget; -+ for (j=0; j<lTarget; j++) { -+ *ppe+=(*pp)*(*pp); -+ pp++; -+ } -+ -+ if (*ppe>0.0) { -+ invenergy[0] = (float) 1.0 / (*ppe + EPS); -+ } else { -+ invenergy[0] = (float) 0.0; -+ } -+ ppe++; -+ -+ measure=(float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot*invenergy[0]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[0]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[0]; -+ -+ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ best_index = 0; -+ max_measure = measure; -+ gain = ftmp; -+ } -+ -+ /* loop over the main first codebook section, -+ full search */ -+ -+ for (icount=1; icount<range; icount++) { -+ -+ /* calculate measure */ -+ -+ -+ -+ crossDot=0.0; -+ pp = buf+LPC_FILTERORDER+lMem-lTarget-icount; -+ -+ for (j=0; j<lTarget; j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (stage==0) { -+ *ppe++ = energy[icount-1] + (*ppi)*(*ppi) - -+ (*ppo)*(*ppo); -+ ppo--; -+ ppi--; -+ -+ if (energy[icount]>0.0) { -+ invenergy[icount] = -+ (float)1.0/(energy[icount]+EPS); -+ } else { -+ invenergy[icount] = (float) 0.0; -+ } -+ -+ measure=(float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot*invenergy[icount]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[icount]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[icount]; -+ -+ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ best_index = icount; -+ max_measure = measure; -+ gain = ftmp; -+ } -+ } -+ -+ /* Loop over augmented part in the first codebook -+ * section, full search. -+ * The vectors are interpolated. -+ */ -+ -+ if (lTarget==SUBL) { -+ -+ /* Search for best possible cb vector and -+ compute the CB-vectors' energy. */ -+ searchAugmentedCB(20, 39, stage, base_size-lTarget/2, -+ target, buf+LPC_FILTERORDER+lMem, -+ &max_measure, &best_index, &gain, energy, -+ invenergy); -+ -+ -+ } -+ -+ /* set search range for following codebook sections */ -+ -+ base_index=best_index; -+ -+ /* unrestricted search */ -+ -+ if (CB_RESRANGE == -1) { -+ sInd=0; -+ eInd=range-1; -+ sIndAug=20; -+ eIndAug=39; -+ } -+ -+ /* restriced search around best index from first -+ codebook section */ -+ -+ else { -+ /* Initialize search indices */ -+ sIndAug=0; -+ eIndAug=0; -+ sInd=base_index-CB_RESRANGE/2; -+ eInd=sInd+CB_RESRANGE; -+ -+ if (lTarget==SUBL) { -+ -+ if (sInd<0) { -+ -+ sIndAug = 40 + sInd; -+ eIndAug = 39; -+ sInd=0; -+ -+ } else if ( base_index < (base_size-20) ) { -+ -+ if (eInd > range) { -+ sInd -= (eInd-range); -+ eInd = range; -+ } -+ } else { /* base_index >= (base_size-20) */ -+ -+ if (sInd < (base_size-20)) { -+ sIndAug = 20; -+ sInd = 0; -+ eInd = 0; -+ eIndAug = 19 + CB_RESRANGE; -+ -+ if(eIndAug > 39) { -+ eInd = eIndAug-39; -+ eIndAug = 39; -+ } -+ } else { -+ sIndAug = 20 + sInd - (base_size-20); -+ eIndAug = 39; -+ -+ -+ sInd = 0; -+ eInd = CB_RESRANGE - (eIndAug-sIndAug+1); -+ } -+ } -+ -+ } else { /* lTarget = 22 or 23 */ -+ -+ if (sInd < 0) { -+ eInd -= sInd; -+ sInd = 0; -+ } -+ -+ if(eInd > range) { -+ sInd -= (eInd - range); -+ eInd = range; -+ } -+ } -+ } -+ -+ /* search of higher codebook section */ -+ -+ /* index search range */ -+ counter = sInd; -+ sInd += base_size; -+ eInd += base_size; -+ -+ -+ if (stage==0) { -+ ppe = energy+base_size; -+ *ppe=0.0; -+ -+ pp=cbvectors+lMem-lTarget; -+ for (j=0; j<lTarget; j++) { -+ *ppe+=(*pp)*(*pp); -+ pp++; -+ } -+ -+ ppi = cbvectors + lMem - 1 - lTarget; -+ ppo = cbvectors + lMem - 1; -+ -+ for (j=0; j<(range-1); j++) { -+ *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo); -+ ppo--; -+ ppi--; -+ ppe++; -+ } -+ } -+ -+ /* loop over search range */ -+ -+ for (icount=sInd; icount<eInd; icount++) { -+ -+ /* calculate measure */ -+ -+ crossDot=0.0; -+ -+ -+ pp=cbvectors + lMem - (counter++) - lTarget; -+ -+ for (j=0;j<lTarget;j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (energy[icount]>0.0) { -+ invenergy[icount] =(float)1.0/(energy[icount]+EPS); -+ } else { -+ invenergy[icount] =(float)0.0; -+ } -+ -+ if (stage==0) { -+ -+ measure=(float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot* -+ invenergy[icount]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[icount]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[icount]; -+ -+ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ best_index = icount; -+ max_measure = measure; -+ gain = ftmp; -+ } -+ } -+ -+ /* Search the augmented CB inside the limited range. */ -+ -+ if ((lTarget==SUBL)&&(sIndAug!=0)) { -+ searchAugmentedCB(sIndAug, eIndAug, stage, -+ 2*base_size-20, target, cbvectors+lMem, -+ &max_measure, &best_index, &gain, energy, -+ invenergy); -+ } -+ -+ /* record best index */ -+ -+ index[stage] = best_index; -+ -+ /* gain quantization */ -+ -+ if (stage==0){ -+ -+ if (gain<0.0){ -+ gain = 0.0; -+ -+ -+ } -+ -+ if (gain>CB_MAXGAIN) { -+ gain = (float)CB_MAXGAIN; -+ } -+ gain = gainquant(gain, 1.0, 32, &gain_index[stage]); -+ } -+ else { -+ if (stage==1) { -+ gain = gainquant(gain, (float)fabs(gains[stage-1]), -+ 16, &gain_index[stage]); -+ } else { -+ gain = gainquant(gain, (float)fabs(gains[stage-1]), -+ 8, &gain_index[stage]); -+ } -+ } -+ -+ /* Extract the best (according to measure) -+ codebook vector */ -+ -+ if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) { -+ -+ if (index[stage]<base_size) { -+ pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage]; -+ } else { -+ pp=cbvectors+lMem-lTarget- -+ index[stage]+base_size; -+ } -+ } else { -+ -+ if (index[stage]<base_size) { -+ if (index[stage]<(base_size-20)) { -+ pp=buf+LPC_FILTERORDER+lMem- -+ lTarget-index[stage]; -+ } else { -+ createAugmentedVec(index[stage]-base_size+40, -+ buf+LPC_FILTERORDER+lMem,aug_vec); -+ pp=aug_vec; -+ } -+ } else { -+ int filterno, position; -+ -+ filterno=index[stage]/base_size; -+ position=index[stage]-filterno*base_size; -+ -+ -+ if (position<(base_size-20)) { -+ pp=cbvectors+filterno*lMem-lTarget- -+ index[stage]+filterno*base_size; -+ } else { -+ createAugmentedVec( -+ index[stage]-(filterno+1)*base_size+40, -+ cbvectors+filterno*lMem,aug_vec); -+ pp=aug_vec; -+ -+ -+ } -+ } -+ } -+ -+ /* Subtract the best codebook vector, according -+ to measure, from the target vector */ -+ -+ for (j=0;j<lTarget;j++) { -+ cvec[j] += gain*(*pp); -+ target[j] -= gain*(*pp++); -+ } -+ -+ /* record quantized gain */ -+ -+ gains[stage]=gain; -+ -+ }/* end of Main Loop. for (stage=0;... */ -+ -+ /* Gain adjustment for energy matching */ -+ cene=0.0; -+ for (i=0; i<lTarget; i++) { -+ cene+=cvec[i]*cvec[i]; -+ } -+ j=gain_index[0]; -+ -+ for (i=gain_index[0]; i<32; i++) { -+ ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i]; -+ -+ if ((ftmp<(tene*gains[0]*gains[0])) && -+ (gain_sq5Tbl[j]<(2.0*gains[0]))) { -+ j=i; -+ } -+ } -+ gain_index[0]=j; -+} -+ -+ -diff -druN codecs/ilbc.orig/iCBSearch.h codecs/ilbc/iCBSearch.h ---- codecs/ilbc.orig/iCBSearch.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBSearch.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,35 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iCBSearch.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ICBSEARCH_H -+#define __iLBC_ICBSEARCH_H -+ -+void iCBSearch( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) the encoder state structure */ -+ int *index, /* (o) Codebook indices */ -+ int *gain_index,/* (o) Gain quantization indices */ -+ float *intarget,/* (i) Target vector for encoding */ -+ float *mem, /* (i) Buffer for codebook construction */ -+ int lMem, /* (i) Length of buffer */ -+ int lTarget, /* (i) Length of vector */ -+ int nStages, /* (i) Number of codebook stages */ -+ float *weightDenum, /* (i) weighting filter coefficients */ -+ -+ -+ float *weightState, /* (i) weighting filter state */ -+ int block /* (i) the sub-block number */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iLBC_decode.c codecs/ilbc/iLBC_decode.c ---- codecs/ilbc.orig/iLBC_decode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_decode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,619 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_decode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <stdlib.h> -+ -+#include "iLBC_define.h" -+#include "iLBC_decode.h" -+#include "StateConstructW.h" -+#include "LPCdecode.h" -+#include "iCBConstruct.h" -+#include "doCPLC.h" -+#include "helpfun.h" -+#include "constants.h" -+#include "packing.h" -+#include "string.h" -+#include "enhancer.h" -+#include "hpOutput.h" -+#include "syntFilter.h" -+ -+/*----------------------------------------------------------------* -+ * Initiation of decoder instance. -+ *---------------------------------------------------------------*/ -+ -+short initDecode( /* (o) Number of decoded -+ samples */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */ -+ int mode, /* (i) frame size mode */ -+ int use_enhancer /* (i) 1 to use enhancer -+ 0 to run without -+ enhancer */ -+){ -+ int i; -+ -+ iLBCdec_inst->mode = mode; -+ -+ if (mode==30) { -+ iLBCdec_inst->blockl = BLOCKL_30MS; -+ iLBCdec_inst->nsub = NSUB_30MS; -+ iLBCdec_inst->nasub = NASUB_30MS; -+ iLBCdec_inst->lpc_n = LPC_N_30MS; -+ -+ -+ iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS; -+ iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS; -+ iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS; -+ /* ULP init */ -+ iLBCdec_inst->ULP_inst=&ULP_30msTbl; -+ } -+ else if (mode==20) { -+ iLBCdec_inst->blockl = BLOCKL_20MS; -+ iLBCdec_inst->nsub = NSUB_20MS; -+ iLBCdec_inst->nasub = NASUB_20MS; -+ iLBCdec_inst->lpc_n = LPC_N_20MS; -+ iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS; -+ iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS; -+ iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS; -+ /* ULP init */ -+ iLBCdec_inst->ULP_inst=&ULP_20msTbl; -+ } -+ else { -+ exit(2); -+ } -+ -+ memset(iLBCdec_inst->syntMem, 0, -+ LPC_FILTERORDER*sizeof(float)); -+ memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl, -+ LPC_FILTERORDER*sizeof(float)); -+ -+ memset(iLBCdec_inst->old_syntdenum, 0, -+ ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float)); -+ for (i=0; i<NSUB_MAX; i++) -+ iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0; -+ -+ iLBCdec_inst->last_lag = 20; -+ -+ iLBCdec_inst->prevLag = 120; -+ iLBCdec_inst->per = 0.0; -+ iLBCdec_inst->consPLICount = 0; -+ iLBCdec_inst->prevPLI = 0; -+ iLBCdec_inst->prevLpc[0] = 1.0; -+ memset(iLBCdec_inst->prevLpc+1,0, -+ LPC_FILTERORDER*sizeof(float)); -+ memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float)); -+ iLBCdec_inst->seed=777; -+ -+ memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float)); -+ -+ iLBCdec_inst->use_enhancer = use_enhancer; -+ memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float)); -+ for (i=0;i<ENH_NBLOCKS_TOT;i++) -+ iLBCdec_inst->enh_period[i]=(float)40.0; -+ -+ iLBCdec_inst->prev_enh_pl = 0; -+ -+ return (iLBCdec_inst->blockl); -+} -+ -+ -+ -+/*----------------------------------------------------------------* -+ * frame residual decoder function (subrutine to iLBC_decode) -+ *---------------------------------------------------------------*/ -+ -+static void Decode( -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state -+ structure */ -+ float *decresidual, /* (o) decoded residual frame */ -+ int start, /* (i) location of start -+ state */ -+ int idxForMax, /* (i) codebook index for the -+ maximum value */ -+ int *idxVec, /* (i) codebook indexes for the -+ samples in the start -+ state */ -+ float *syntdenum, /* (i) the decoded synthesis -+ filter coefficients */ -+ int *cb_index, /* (i) the indexes for the -+ adaptive codebook */ -+ int *gain_index, /* (i) the indexes for the -+ corresponding gains */ -+ int *extra_cb_index, /* (i) the indexes for the -+ adaptive codebook part -+ of start state */ -+ int *extra_gain_index, /* (i) the indexes for the -+ corresponding gains */ -+ int state_first /* (i) 1 if non adaptive part -+ of start state comes -+ first 0 if that part -+ comes last */ -+){ -+ float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML]; -+ int k, meml_gotten, Nfor, Nback, i; -+ int diff, start_pos; -+ int subcount, subframe; -+ -+ diff = STATE_LEN - iLBCdec_inst->state_short_len; -+ -+ if (state_first == 1) { -+ start_pos = (start-1)*SUBL; -+ } else { -+ start_pos = (start-1)*SUBL + diff; -+ } -+ -+ /* decode scalar part of start state */ -+ -+ StateConstructW(idxForMax, idxVec, -+ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], -+ &decresidual[start_pos], iLBCdec_inst->state_short_len); -+ -+ -+ if (state_first) { /* put adaptive part in the end */ -+ -+ -+ -+ /* setup memory */ -+ -+ memset(mem, 0, -+ (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float)); -+ memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len, -+ decresidual+start_pos, -+ iLBCdec_inst->state_short_len*sizeof(float)); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct( -+ &decresidual[start_pos+iLBCdec_inst->state_short_len], -+ extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl, -+ stMemLTbl, diff, CB_NSTAGES); -+ -+ } -+ else {/* put adaptive part in the beginning */ -+ -+ /* create reversed vectors for prediction */ -+ -+ for (k=0; k<diff; k++) { -+ reverseDecresidual[k] = -+ decresidual[(start+1)*SUBL-1- -+ (k+iLBCdec_inst->state_short_len)]; -+ } -+ -+ /* setup memory */ -+ -+ meml_gotten = iLBCdec_inst->state_short_len; -+ for (k=0; k<meml_gotten; k++){ -+ mem[CB_MEML-1-k] = decresidual[start_pos + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(reverseDecresidual, extra_cb_index, -+ extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl, -+ diff, CB_NSTAGES); -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (k=0; k<diff; k++) { -+ decresidual[start_pos-1-k] = reverseDecresidual[k]; -+ } -+ } -+ -+ /* counter for predicted sub-frames */ -+ -+ subcount=0; -+ -+ /* forward prediction of sub-frames */ -+ -+ Nfor = iLBCdec_inst->nsub-start-1; -+ -+ -+ -+ if ( Nfor > 0 ){ -+ -+ /* setup memory */ -+ -+ memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); -+ memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL, -+ STATE_LEN*sizeof(float)); -+ -+ /* loop over sub-frames to encode */ -+ -+ for (subframe=0; subframe<Nfor; subframe++) { -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&decresidual[(start+1+subframe)*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &decresidual[(start+1+subframe)*SUBL], -+ SUBL*sizeof(float)); -+ -+ subcount++; -+ -+ } -+ -+ } -+ -+ /* backward prediction of sub-frames */ -+ -+ Nback = start-1; -+ -+ if ( Nback > 0 ) { -+ -+ /* setup memory */ -+ -+ meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start); -+ -+ if ( meml_gotten > CB_MEML ) { -+ meml_gotten=CB_MEML; -+ } -+ for (k=0; k<meml_gotten; k++) { -+ mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ -+ /* loop over subframes to decode */ -+ -+ -+ -+ for (subframe=0; subframe<Nback; subframe++) { -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&reverseDecresidual[subframe*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount], -+ SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &reverseDecresidual[subframe*SUBL], -+ SUBL*sizeof(float)); -+ -+ subcount++; -+ } -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (i=0; i<SUBL*Nback; i++) -+ decresidual[SUBL*Nback - i - 1] = -+ reverseDecresidual[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * main decoder function -+ *---------------------------------------------------------------*/ -+ -+void iLBC_decode( -+ float *decblock, /* (o) decoded signal block */ -+ unsigned char *bytes, /* (i) encoded signal bits */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state -+ structure */ -+ int mode /* (i) 0: bad packet, PLC, -+ 1: normal */ -+){ -+ float data[BLOCKL_MAX]; -+ float lsfdeq[LPC_FILTERORDER*LPC_N_MAX]; -+ float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1]; -+ float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1]; -+ int k, i, start, idxForMax, pos, lastpart, ulp; -+ int lag, ilag; -+ float cc, maxcc; -+ int idxVec[STATE_LEN]; -+ int check; -+ int gain_index[NASUB_MAX*CB_NSTAGES], -+ extra_gain_index[CB_NSTAGES]; -+ int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES]; -+ int lsf_i[LSF_NSPLIT*LPC_N_MAX]; -+ int state_first; -+ -+ -+ int last_bit; -+ unsigned char *pbytes; -+ float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX]; -+ int order_plus_one; -+ float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; -+ float decresidual[BLOCKL_MAX]; -+ -+ if (mode>0) { /* the data are good */ -+ -+ /* decode data */ -+ -+ pbytes=bytes; -+ pos=0; -+ -+ /* Set everything to zero before decoding */ -+ -+ for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) { -+ lsf_i[k]=0; -+ } -+ start=0; -+ state_first=0; -+ idxForMax=0; -+ for (k=0; k<iLBCdec_inst->state_short_len; k++) { -+ idxVec[k]=0; -+ } -+ for (k=0; k<CB_NSTAGES; k++) { -+ extra_cb_index[k]=0; -+ } -+ for (k=0; k<CB_NSTAGES; k++) { -+ extra_gain_index[k]=0; -+ } -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ cb_index[i*CB_NSTAGES+k]=0; -+ } -+ } -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ gain_index[i*CB_NSTAGES+k]=0; -+ } -+ } -+ -+ /* loop over ULP classes */ -+ -+ for (ulp=0; ulp<3; ulp++) { -+ -+ /* LSF */ -+ for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos); -+ packcombine(&lsf_i[k], lastpart, -+ iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]); -+ } -+ -+ -+ -+ /* Start block info */ -+ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->start_bits[ulp], &pos); -+ packcombine(&start, lastpart, -+ iLBCdec_inst->ULP_inst->start_bits[ulp]); -+ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos); -+ packcombine(&state_first, lastpart, -+ iLBCdec_inst->ULP_inst->startfirst_bits[ulp]); -+ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos); -+ packcombine(&idxForMax, lastpart, -+ iLBCdec_inst->ULP_inst->scale_bits[ulp]); -+ -+ for (k=0; k<iLBCdec_inst->state_short_len; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->state_bits[ulp], &pos); -+ packcombine(idxVec+k, lastpart, -+ iLBCdec_inst->ULP_inst->state_bits[ulp]); -+ } -+ -+ /* 23/22 (20ms/30ms) sample block */ -+ -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp], -+ &pos); -+ packcombine(extra_cb_index+k, lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]); -+ } -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp], -+ &pos); -+ packcombine(extra_gain_index+k, lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]); -+ } -+ -+ /* The two/four (20ms/30ms) 40 sample sub-blocks */ -+ -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->cb_index[i][k][ulp], -+ &pos); -+ packcombine(cb_index+i*CB_NSTAGES+k, lastpart, -+ iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]); -+ } -+ } -+ -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ -+ -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ -+ iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp], -+ &pos); -+ packcombine(gain_index+i*CB_NSTAGES+k, lastpart, -+ iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]); -+ } -+ } -+ } -+ /* Extract last bit. If it is 1 this indicates an -+ empty/lost frame */ -+ unpack( &pbytes, &last_bit, 1, &pos); -+ -+ /* Check for bit errors or empty/lost frames */ -+ if (start<1) -+ mode = 0; -+ if (iLBCdec_inst->mode==20 && start>3) -+ mode = 0; -+ if (iLBCdec_inst->mode==30 && start>5) -+ mode = 0; -+ if (last_bit==1) -+ mode = 0; -+ -+ if (mode==1) { /* No bit errors was detected, -+ continue decoding */ -+ -+ /* adjust index */ -+ index_conv_dec(cb_index); -+ -+ /* decode the lsf */ -+ -+ SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n); -+ check=LSF_check(lsfdeq, LPC_FILTERORDER, -+ iLBCdec_inst->lpc_n); -+ DecoderInterpolateLSF(syntdenum, weightdenum, -+ lsfdeq, LPC_FILTERORDER, iLBCdec_inst); -+ -+ Decode(iLBCdec_inst, decresidual, start, idxForMax, -+ idxVec, syntdenum, cb_index, gain_index, -+ extra_cb_index, extra_gain_index, -+ state_first); -+ -+ /* preparing the plc for a future loss! */ -+ -+ doThePLC(PLCresidual, PLClpc, 0, decresidual, -+ syntdenum + -+ (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1), -+ (*iLBCdec_inst).last_lag, iLBCdec_inst); -+ -+ -+ memcpy(decresidual, PLCresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ } -+ -+ -+ -+ } -+ -+ if (mode == 0) { -+ /* the data is bad (either a PLC call -+ * was made or a severe bit error was detected) -+ */ -+ -+ /* packet loss conceal */ -+ -+ memset(zeros, 0, BLOCKL_MAX*sizeof(float)); -+ -+ one[0] = 1; -+ memset(one+1, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ start=0; -+ -+ doThePLC(PLCresidual, PLClpc, 1, zeros, one, -+ (*iLBCdec_inst).last_lag, iLBCdec_inst); -+ memcpy(decresidual, PLCresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ -+ order_plus_one = LPC_FILTERORDER + 1; -+ for (i = 0; i < iLBCdec_inst->nsub; i++) { -+ memcpy(syntdenum+(i*order_plus_one), PLClpc, -+ order_plus_one*sizeof(float)); -+ } -+ } -+ -+ if (iLBCdec_inst->use_enhancer == 1) { -+ -+ /* post filtering */ -+ -+ iLBCdec_inst->last_lag = -+ enhancerInterface(data, decresidual, iLBCdec_inst); -+ -+ /* synthesis filtering */ -+ -+ if (iLBCdec_inst->mode==20) { -+ /* Enhancer has 40 samples delay */ -+ i=0; -+ syntFilter(data + i*SUBL, -+ iLBCdec_inst->old_syntdenum + -+ (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1), -+ SUBL, iLBCdec_inst->syntMem); -+ for (i=1; i < iLBCdec_inst->nsub; i++) { -+ syntFilter(data + i*SUBL, -+ syntdenum + (i-1)*(LPC_FILTERORDER+1), -+ SUBL, iLBCdec_inst->syntMem); -+ } -+ } else if (iLBCdec_inst->mode==30) { -+ /* Enhancer has 80 samples delay */ -+ for (i=0; i < 2; i++) { -+ syntFilter(data + i*SUBL, -+ -+ -+ iLBCdec_inst->old_syntdenum + -+ (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1), -+ SUBL, iLBCdec_inst->syntMem); -+ } -+ for (i=2; i < iLBCdec_inst->nsub; i++) { -+ syntFilter(data + i*SUBL, -+ syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL, -+ iLBCdec_inst->syntMem); -+ } -+ } -+ -+ } else { -+ -+ /* Find last lag */ -+ lag = 20; -+ maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], -+ &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL); -+ -+ for (ilag=21; ilag<120; ilag++) { -+ cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], -+ &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag], -+ ENH_BLOCKL); -+ -+ if (cc > maxcc) { -+ maxcc = cc; -+ lag = ilag; -+ } -+ } -+ iLBCdec_inst->last_lag = lag; -+ -+ /* copy data and run synthesis filter */ -+ -+ memcpy(data, decresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ for (i=0; i < iLBCdec_inst->nsub; i++) { -+ syntFilter(data + i*SUBL, -+ syntdenum + i*(LPC_FILTERORDER+1), SUBL, -+ iLBCdec_inst->syntMem); -+ } -+ } -+ -+ /* high pass filtering on output if desired, otherwise -+ copy to out */ -+ -+ hpOutput(data, iLBCdec_inst->blockl, -+ decblock,iLBCdec_inst->hpomem); -+ -+ /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/ -+ -+ memcpy(iLBCdec_inst->old_syntdenum, syntdenum, -+ -+ iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float)); -+ -+ iLBCdec_inst->prev_enh_pl=0; -+ -+ -+ -+ if (mode==0) { /* PLC was used */ -+ iLBCdec_inst->prev_enh_pl=1; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/iLBC_decode.h codecs/ilbc/iLBC_decode.h ---- codecs/ilbc.orig/iLBC_decode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_decode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,40 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_decode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ILBCDECODE_H -+#define __iLBC_ILBCDECODE_H -+ -+#include "iLBC_define.h" -+ -+short initDecode( /* (o) Number of decoded -+ samples */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */ -+ int mode, /* (i) frame size mode */ -+ int use_enhancer /* (i) 1 to use enhancer -+ 0 to run without -+ enhancer */ -+); -+ -+void iLBC_decode( -+ float *decblock, /* (o) decoded signal block */ -+ unsigned char *bytes, /* (i) encoded signal bits */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state -+ structure */ -+ int mode /* (i) 0: bad packet, PLC, -+ 1: normal */ -+); -+ -+ -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iLBC_define.h codecs/ilbc/iLBC_define.h ---- codecs/ilbc.orig/iLBC_define.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_define.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,201 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_define.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+#include <string.h> -+ -+#ifndef __iLBC_ILBCDEFINE_H -+#define __iLBC_ILBCDEFINE_H -+ -+/* general codec settings */ -+ -+#define FS (float)8000.0 -+#define BLOCKL_20MS 160 -+#define BLOCKL_30MS 240 -+#define BLOCKL_MAX 240 -+#define NSUB_20MS 4 -+#define NSUB_30MS 6 -+#define NSUB_MAX 6 -+#define NASUB_20MS 2 -+#define NASUB_30MS 4 -+#define NASUB_MAX 4 -+#define SUBL 40 -+#define STATE_LEN 80 -+#define STATE_SHORT_LEN_30MS 58 -+#define STATE_SHORT_LEN_20MS 57 -+ -+/* LPC settings */ -+ -+#define LPC_FILTERORDER 10 -+#define LPC_CHIRP_SYNTDENUM (float)0.9025 -+#define LPC_CHIRP_WEIGHTDENUM (float)0.4222 -+#define LPC_LOOKBACK 60 -+#define LPC_N_20MS 1 -+#define LPC_N_30MS 2 -+#define LPC_N_MAX 2 -+#define LPC_ASYMDIFF 20 -+#define LPC_BW (float)60.0 -+#define LPC_WN (float)1.0001 -+#define LSF_NSPLIT 3 -+ -+#define LSF_NUMBER_OF_STEPS 4 -+#define LPC_HALFORDER (LPC_FILTERORDER/2) -+ -+/* cb settings */ -+ -+#define CB_NSTAGES 3 -+#define CB_EXPAND 2 -+#define CB_MEML 147 -+#define CB_FILTERLEN 2*4 -+#define CB_HALFFILTERLEN 4 -+#define CB_RESRANGE 34 -+#define CB_MAXGAIN (float)1.3 -+ -+/* enhancer */ -+ -+#define ENH_BLOCKL 80 /* block length */ -+#define ENH_BLOCKL_HALF (ENH_BLOCKL/2) -+#define ENH_HL 3 /* 2*ENH_HL+1 is number blocks -+ in said second sequence */ -+#define ENH_SLOP 2 /* max difference estimated and -+ correct pitch period */ -+#define ENH_PLOCSL 20 /* pitch-estimates and pitch- -+ locations buffer length */ -+#define ENH_OVERHANG 2 -+#define ENH_UPS0 4 /* upsampling rate */ -+#define ENH_FL0 3 /* 2*FLO+1 is the length of -+ each filter */ -+#define ENH_VECTL (ENH_BLOCKL+2*ENH_FL0) -+#define ENH_CORRDIM (2*ENH_SLOP+1) -+#define ENH_NBLOCKS (BLOCKL_MAX/ENH_BLOCKL) -+#define ENH_NBLOCKS_EXTRA 5 -+#define ENH_NBLOCKS_TOT 8 /* ENH_NBLOCKS + -+ ENH_NBLOCKS_EXTRA */ -+#define ENH_BUFL (ENH_NBLOCKS_TOT)*ENH_BLOCKL -+#define ENH_ALPHA0 (float)0.05 -+ -+/* Down sampling */ -+ -+#define FILTERORDER_DS 7 -+#define DELAY_DS 3 -+#define FACTOR_DS 2 -+ -+/* bit stream defs */ -+ -+#define NO_OF_BYTES_20MS 38 -+#define NO_OF_BYTES_30MS 50 -+#define NO_OF_WORDS_20MS 19 -+#define NO_OF_WORDS_30MS 25 -+#define STATE_BITS 3 -+#define BYTE_LEN 8 -+#define ULP_CLASSES 3 -+ -+/* help parameters */ -+ -+ -+#define FLOAT_MAX (float)1.0e37 -+#define EPS (float)2.220446049250313e-016 -+#define PI (float)3.14159265358979323846 -+#define MIN_SAMPLE -32768 -+#define MAX_SAMPLE 32767 -+#define TWO_PI (float)6.283185307 -+#define PI2 (float)0.159154943 -+ -+/* type definition encoder instance */ -+typedef struct iLBC_ULP_Inst_t_ { -+ int lsf_bits[6][ULP_CLASSES+2]; -+ int start_bits[ULP_CLASSES+2]; -+ int startfirst_bits[ULP_CLASSES+2]; -+ int scale_bits[ULP_CLASSES+2]; -+ int state_bits[ULP_CLASSES+2]; -+ int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2]; -+ int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2]; -+ int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2]; -+ int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2]; -+} iLBC_ULP_Inst_t; -+ -+/* type definition encoder instance */ -+typedef struct iLBC_Enc_Inst_t_ { -+ -+ /* flag for frame size mode */ -+ int mode; -+ -+ /* basic parameters for different frame sizes */ -+ int blockl; -+ int nsub; -+ int nasub; -+ int no_of_bytes, no_of_words; -+ int lpc_n; -+ int state_short_len; -+ const iLBC_ULP_Inst_t *ULP_inst; -+ -+ /* analysis filter state */ -+ float anaMem[LPC_FILTERORDER]; -+ -+ /* old lsf parameters for interpolation */ -+ float lsfold[LPC_FILTERORDER]; -+ float lsfdeqold[LPC_FILTERORDER]; -+ -+ /* signal buffer for LP analysis */ -+ float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX]; -+ -+ /* state of input HP filter */ -+ float hpimem[4]; -+ -+} iLBC_Enc_Inst_t; -+ -+/* type definition decoder instance */ -+typedef struct iLBC_Dec_Inst_t_ { -+ -+ -+ /* flag for frame size mode */ -+ int mode; -+ -+ /* basic parameters for different frame sizes */ -+ int blockl; -+ int nsub; -+ int nasub; -+ int no_of_bytes, no_of_words; -+ int lpc_n; -+ int state_short_len; -+ const iLBC_ULP_Inst_t *ULP_inst; -+ -+ /* synthesis filter state */ -+ float syntMem[LPC_FILTERORDER]; -+ -+ /* old LSF for interpolation */ -+ float lsfdeqold[LPC_FILTERORDER]; -+ -+ /* pitch lag estimated in enhancer and used in PLC */ -+ int last_lag; -+ -+ /* PLC state information */ -+ int prevLag, consPLICount, prevPLI, prev_enh_pl; -+ float prevLpc[LPC_FILTERORDER+1]; -+ float prevResidual[NSUB_MAX*SUBL]; -+ float per; -+ unsigned long seed; -+ -+ /* previous synthesis filter parameters */ -+ float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX]; -+ -+ /* state of output HP filter */ -+ float hpomem[4]; -+ -+ /* enhancer state information */ -+ int use_enhancer; -+ float enh_buf[ENH_BUFL]; -+ float enh_period[ENH_NBLOCKS_TOT]; -+ -+} iLBC_Dec_Inst_t; -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iLBC_encode.c codecs/ilbc/iLBC_encode.c ---- codecs/ilbc.orig/iLBC_encode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_encode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,514 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_encode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <stdlib.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "iLBC_encode.h" -+#include "LPCencode.h" -+#include "FrameClassify.h" -+#include "StateSearchW.h" -+#include "StateConstructW.h" -+#include "helpfun.h" -+#include "constants.h" -+#include "packing.h" -+#include "iCBSearch.h" -+#include "iCBConstruct.h" -+#include "hpInput.h" -+#include "anaFilter.h" -+#include "syntFilter.h" -+ -+/*----------------------------------------------------------------* -+ * Initiation of encoder instance. -+ *---------------------------------------------------------------*/ -+ -+short initEncode( /* (o) Number of bytes -+ encoded */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */ -+ int mode /* (i) frame size mode */ -+){ -+ iLBCenc_inst->mode = mode; -+ if (mode==30) { -+ iLBCenc_inst->blockl = BLOCKL_30MS; -+ iLBCenc_inst->nsub = NSUB_30MS; -+ -+ -+ iLBCenc_inst->nasub = NASUB_30MS; -+ iLBCenc_inst->lpc_n = LPC_N_30MS; -+ iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS; -+ iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS; -+ iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS; -+ /* ULP init */ -+ iLBCenc_inst->ULP_inst=&ULP_30msTbl; -+ } -+ else if (mode==20) { -+ iLBCenc_inst->blockl = BLOCKL_20MS; -+ iLBCenc_inst->nsub = NSUB_20MS; -+ iLBCenc_inst->nasub = NASUB_20MS; -+ iLBCenc_inst->lpc_n = LPC_N_20MS; -+ iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS; -+ iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS; -+ iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS; -+ /* ULP init */ -+ iLBCenc_inst->ULP_inst=&ULP_20msTbl; -+ } -+ else { -+ exit(2); -+ } -+ -+ memset((*iLBCenc_inst).anaMem, 0, -+ LPC_FILTERORDER*sizeof(float)); -+ memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl, -+ LPC_FILTERORDER*sizeof(float)); -+ memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl, -+ LPC_FILTERORDER*sizeof(float)); -+ memset((*iLBCenc_inst).lpc_buffer, 0, -+ (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float)); -+ memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float)); -+ -+ return (iLBCenc_inst->no_of_bytes); -+} -+ -+/*----------------------------------------------------------------* -+ * main encoder function -+ *---------------------------------------------------------------*/ -+ -+void iLBC_encode( -+ unsigned char *bytes, /* (o) encoded data bits iLBC */ -+ float *block, /* (o) speech vector to -+ encode */ -+ iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder -+ state */ -+){ -+ -+ float data[BLOCKL_MAX]; -+ float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX]; -+ -+ int start, idxForMax, idxVec[STATE_LEN]; -+ float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML]; -+ int n, k, meml_gotten, Nfor, Nback, i, pos; -+ -+ -+ int gain_index[CB_NSTAGES*NASUB_MAX], -+ extra_gain_index[CB_NSTAGES]; -+ int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES]; -+ int lsf_i[LSF_NSPLIT*LPC_N_MAX]; -+ unsigned char *pbytes; -+ int diff, start_pos, state_first; -+ float en1, en2; -+ int index, ulp, firstpart; -+ int subcount, subframe; -+ float weightState[LPC_FILTERORDER]; -+ float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; -+ float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; -+ float decresidual[BLOCKL_MAX]; -+ -+ /* high pass filtering of input signal if such is not done -+ prior to calling this function */ -+ -+ hpInput(block, iLBCenc_inst->blockl, -+ data, (*iLBCenc_inst).hpimem); -+ -+ /* otherwise simply copy */ -+ -+ /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/ -+ -+ /* LPC of hp filtered input data */ -+ -+ LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst); -+ -+ -+ /* inverse filter to get residual */ -+ -+ for (n=0; n<iLBCenc_inst->nsub; n++) { -+ anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)], -+ SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem); -+ } -+ -+ /* find state location */ -+ -+ start = FrameClassify(iLBCenc_inst, residual); -+ -+ /* check if state should be in first or last part of the -+ two subframes */ -+ -+ diff = STATE_LEN - iLBCenc_inst->state_short_len; -+ en1 = 0; -+ index = (start-1)*SUBL; -+ for (i = 0; i < iLBCenc_inst->state_short_len; i++) { -+ en1 += residual[index+i]*residual[index+i]; -+ } -+ en2 = 0; -+ index = (start-1)*SUBL+diff; -+ for (i = 0; i < iLBCenc_inst->state_short_len; i++) { -+ en2 += residual[index+i]*residual[index+i]; -+ } -+ -+ -+ -+ -+ if (en1 > en2) { -+ state_first = 1; -+ start_pos = (start-1)*SUBL; -+ } else { -+ state_first = 0; -+ start_pos = (start-1)*SUBL + diff; -+ } -+ -+ /* scalar quantization of state */ -+ -+ StateSearchW(iLBCenc_inst, &residual[start_pos], -+ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], -+ &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax, -+ idxVec, iLBCenc_inst->state_short_len, state_first); -+ -+ StateConstructW(idxForMax, idxVec, -+ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], -+ &decresidual[start_pos], iLBCenc_inst->state_short_len); -+ -+ /* predictive quantization in state */ -+ -+ if (state_first) { /* put adaptive part in the end */ -+ -+ /* setup memory */ -+ -+ memset(mem, 0, -+ (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float)); -+ memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len, -+ decresidual+start_pos, -+ iLBCenc_inst->state_short_len*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ /* encode sub-frames */ -+ -+ iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, -+ &residual[start_pos+iLBCenc_inst->state_short_len], -+ mem+CB_MEML-stMemLTbl, -+ stMemLTbl, diff, CB_NSTAGES, -+ &weightdenum[start*(LPC_FILTERORDER+1)], -+ weightState, 0); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct( -+ &decresidual[start_pos+iLBCenc_inst->state_short_len], -+ extra_cb_index, extra_gain_index, -+ mem+CB_MEML-stMemLTbl, -+ stMemLTbl, diff, CB_NSTAGES); -+ -+ } -+ else { /* put adaptive part in the beginning */ -+ -+ -+ -+ /* create reversed vectors for prediction */ -+ -+ for (k=0; k<diff; k++) { -+ reverseResidual[k] = residual[(start+1)*SUBL-1 -+ -(k+iLBCenc_inst->state_short_len)]; -+ } -+ -+ /* setup memory */ -+ -+ meml_gotten = iLBCenc_inst->state_short_len; -+ for (k=0; k<meml_gotten; k++) { -+ mem[CB_MEML-1-k] = decresidual[start_pos + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ /* encode sub-frames */ -+ -+ iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, -+ reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl, -+ diff, CB_NSTAGES, -+ &weightdenum[(start-1)*(LPC_FILTERORDER+1)], -+ weightState, 0); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(reverseDecresidual, extra_cb_index, -+ extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl, -+ diff, CB_NSTAGES); -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (k=0; k<diff; k++) { -+ decresidual[start_pos-1-k] = reverseDecresidual[k]; -+ } -+ } -+ -+ /* counter for predicted sub-frames */ -+ -+ subcount=0; -+ -+ /* forward prediction of sub-frames */ -+ -+ Nfor = iLBCenc_inst->nsub-start-1; -+ -+ -+ if ( Nfor > 0 ) { -+ -+ /* setup memory */ -+ -+ memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); -+ memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL, -+ STATE_LEN*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ -+ -+ /* loop over sub-frames to encode */ -+ -+ for (subframe=0; subframe<Nfor; subframe++) { -+ -+ /* encode sub-frame */ -+ -+ iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ &residual[(start+1+subframe)*SUBL], -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES, -+ &weightdenum[(start+1+subframe)* -+ (LPC_FILTERORDER+1)], -+ weightState, subcount+1); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&decresidual[(start+1+subframe)*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &decresidual[(start+1+subframe)*SUBL], -+ SUBL*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ subcount++; -+ } -+ } -+ -+ -+ /* backward prediction of sub-frames */ -+ -+ Nback = start-1; -+ -+ -+ if ( Nback > 0 ) { -+ -+ /* create reverse order vectors */ -+ -+ for (n=0; n<Nback; n++) { -+ for (k=0; k<SUBL; k++) { -+ reverseResidual[n*SUBL+k] = -+ residual[(start-1)*SUBL-1-n*SUBL-k]; -+ reverseDecresidual[n*SUBL+k] = -+ decresidual[(start-1)*SUBL-1-n*SUBL-k]; -+ } -+ } -+ -+ -+ -+ /* setup memory */ -+ -+ meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start); -+ -+ -+ if ( meml_gotten > CB_MEML ) { -+ meml_gotten=CB_MEML; -+ } -+ for (k=0; k<meml_gotten; k++) { -+ mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ /* loop over sub-frames to encode */ -+ -+ for (subframe=0; subframe<Nback; subframe++) { -+ -+ /* encode sub-frame */ -+ -+ iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ &reverseResidual[subframe*SUBL], -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES, -+ &weightdenum[(start-2-subframe)* -+ (LPC_FILTERORDER+1)], -+ weightState, subcount+1); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&reverseDecresidual[subframe*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &reverseDecresidual[subframe*SUBL], -+ SUBL*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ subcount++; -+ -+ } -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (i=0; i<SUBL*Nback; i++) { -+ decresidual[SUBL*Nback - i - 1] = -+ -+ -+ reverseDecresidual[i]; -+ } -+ } -+ /* end encoding part */ -+ -+ /* adjust index */ -+ index_conv_enc(cb_index); -+ -+ /* pack bytes */ -+ -+ pbytes=bytes; -+ pos=0; -+ -+ /* loop over the 3 ULP classes */ -+ -+ for (ulp=0; ulp<3; ulp++) { -+ -+ /* LSF */ -+ for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) { -+ packsplit(&lsf_i[k], &firstpart, &lsf_i[k], -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+ -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos); -+ } -+ -+ /* Start block info */ -+ -+ packsplit(&start, &firstpart, &start, -+ iLBCenc_inst->ULP_inst->start_bits[ulp], -+ iLBCenc_inst->ULP_inst->start_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->start_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->start_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->start_bits[ulp], &pos); -+ -+ packsplit(&state_first, &firstpart, &state_first, -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp], -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos); -+ -+ packsplit(&idxForMax, &firstpart, &idxForMax, -+ iLBCenc_inst->ULP_inst->scale_bits[ulp], -+ iLBCenc_inst->ULP_inst->scale_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->scale_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos); -+ -+ -+ -+ for (k=0; k<iLBCenc_inst->state_short_len; k++) { -+ packsplit(idxVec+k, &firstpart, idxVec+k, -+ iLBCenc_inst->ULP_inst->state_bits[ulp], -+ iLBCenc_inst->ULP_inst->state_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->state_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->state_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->state_bits[ulp], &pos); -+ } -+ -+ /* 23/22 (20ms/30ms) sample block */ -+ -+ for (k=0;k<CB_NSTAGES;k++) { -+ packsplit(extra_cb_index+k, &firstpart, -+ extra_cb_index+k, -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+ -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], -+ &pos); -+ } -+ -+ for (k=0;k<CB_NSTAGES;k++) { -+ packsplit(extra_gain_index+k, &firstpart, -+ extra_gain_index+k, -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+ -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], -+ &pos); -+ } -+ -+ /* The two/four (20ms/30ms) 40 sample sub-blocks */ -+ -+ for (i=0; i<iLBCenc_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ packsplit(cb_index+i*CB_NSTAGES+k, &firstpart, -+ cb_index+i*CB_NSTAGES+k, -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+ -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], -+ &pos); -+ } -+ } -+ -+ for (i=0; i<iLBCenc_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ -+ -+ packsplit(gain_index+i*CB_NSTAGES+k, &firstpart, -+ gain_index+i*CB_NSTAGES+k, -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+ -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], -+ &pos); -+ } -+ } -+ } -+ -+ /* set the last bit to zero (otherwise the decoder -+ will treat it as a lost frame) */ -+ dopack( &pbytes, 0, 1, &pos); -+} -+ -+ -+ -diff -druN codecs/ilbc.orig/iLBC_encode.h codecs/ilbc/iLBC_encode.h ---- codecs/ilbc.orig/iLBC_encode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_encode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,37 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_encode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ILBCENCODE_H -+#define __iLBC_ILBCENCODE_H -+ -+#include "iLBC_define.h" -+ -+short initEncode( /* (o) Number of bytes -+ encoded */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */ -+ int mode /* (i) frame size mode */ -+); -+ -+void iLBC_encode( -+ -+ -+ unsigned char *bytes, /* (o) encoded data bits iLBC */ -+ float *block, /* (o) speech vector to -+ encode */ -+ iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder -+ state */ -+); -+ -+#endif -+ -+ -+ -Files codecs/ilbc.orig/libilbc.a and codecs/ilbc/libilbc.a differ -diff -druN codecs/ilbc.orig/libilbc.vcproj codecs/ilbc/libilbc.vcproj ---- codecs/ilbc.orig/libilbc.vcproj 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/libilbc.vcproj 2006-03-20 13:25:50.000000000 -0800 -@@ -0,0 +1,353 @@ -+<?xml version="1.0" encoding="Windows-1252"?> -+<VisualStudioProject -+ ProjectType="Visual C++" -+ Version="8.00" -+ Name="libilbc" -+ ProjectGUID="{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" -+ RootNamespace="libilbc" -+ Keyword="Win32Proj" -+ > -+ <Platforms> -+ <Platform -+ Name="Win32" -+ /> -+ </Platforms> -+ <ToolFiles> -+ </ToolFiles> -+ <Configurations> -+ <Configuration -+ Name="Debug|Win32" -+ OutputDirectory="$(SolutionDir)$(ConfigurationName)" -+ IntermediateDirectory="$(ConfigurationName)" -+ ConfigurationType="4" -+ CharacterSet="1" -+ > -+ <Tool -+ Name="VCPreBuildEventTool" -+ /> -+ <Tool -+ Name="VCCustomBuildTool" -+ /> -+ <Tool -+ Name="VCXMLDataGeneratorTool" -+ /> -+ <Tool -+ Name="VCWebServiceProxyGeneratorTool" -+ /> -+ <Tool -+ Name="VCMIDLTool" -+ /> -+ <Tool -+ Name="VCCLCompilerTool" -+ Optimization="0" -+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB" -+ MinimalRebuild="true" -+ BasicRuntimeChecks="3" -+ RuntimeLibrary="3" -+ UsePrecompiledHeader="0" -+ WarningLevel="3" -+ Detect64BitPortabilityProblems="true" -+ DebugInformationFormat="4" -+ /> -+ <Tool -+ Name="VCManagedResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCPreLinkEventTool" -+ /> -+ <Tool -+ Name="VCLibrarianTool" -+ /> -+ <Tool -+ Name="VCALinkTool" -+ /> -+ <Tool -+ Name="VCXDCMakeTool" -+ /> -+ <Tool -+ Name="VCBscMakeTool" -+ /> -+ <Tool -+ Name="VCFxCopTool" -+ /> -+ <Tool -+ Name="VCPostBuildEventTool" -+ /> -+ </Configuration> -+ <Configuration -+ Name="Release|Win32" -+ OutputDirectory="$(SolutionDir)$(ConfigurationName)" -+ IntermediateDirectory="$(ConfigurationName)" -+ ConfigurationType="4" -+ CharacterSet="1" -+ WholeProgramOptimization="1" -+ > -+ <Tool -+ Name="VCPreBuildEventTool" -+ /> -+ <Tool -+ Name="VCCustomBuildTool" -+ /> -+ <Tool -+ Name="VCXMLDataGeneratorTool" -+ /> -+ <Tool -+ Name="VCWebServiceProxyGeneratorTool" -+ /> -+ <Tool -+ Name="VCMIDLTool" -+ /> -+ <Tool -+ Name="VCCLCompilerTool" -+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB" -+ RuntimeLibrary="2" -+ UsePrecompiledHeader="0" -+ WarningLevel="3" -+ Detect64BitPortabilityProblems="true" -+ DebugInformationFormat="3" -+ /> -+ <Tool -+ Name="VCManagedResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCPreLinkEventTool" -+ /> -+ <Tool -+ Name="VCLibrarianTool" -+ /> -+ <Tool -+ Name="VCALinkTool" -+ /> -+ <Tool -+ Name="VCXDCMakeTool" -+ /> -+ <Tool -+ Name="VCBscMakeTool" -+ /> -+ <Tool -+ Name="VCFxCopTool" -+ /> -+ <Tool -+ Name="VCPostBuildEventTool" -+ /> -+ </Configuration> -+ </Configurations> -+ <References> -+ </References> -+ <Files> -+ <Filter -+ Name="Source Files" -+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" -+ > -+ <File -+ RelativePath=".\anaFilter.c" -+ > -+ </File> -+ <File -+ RelativePath=".\constants.c" -+ > -+ </File> -+ <File -+ RelativePath=".\createCB.c" -+ > -+ </File> -+ <File -+ RelativePath=".\doCPLC.c" -+ > -+ </File> -+ <File -+ RelativePath=".\enhancer.c" -+ > -+ </File> -+ <File -+ RelativePath=".\filter.c" -+ > -+ </File> -+ <File -+ RelativePath=".\FrameClassify.c" -+ > -+ </File> -+ <File -+ RelativePath=".\gainquant.c" -+ > -+ </File> -+ <File -+ RelativePath=".\getCBvec.c" -+ > -+ </File> -+ <File -+ RelativePath=".\helpfun.c" -+ > -+ </File> -+ <File -+ RelativePath=".\hpInput.c" -+ > -+ </File> -+ <File -+ RelativePath=".\hpOutput.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBConstruct.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBSearch.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_decode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_encode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCdecode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCencode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\lsf.c" -+ > -+ </File> -+ <File -+ RelativePath=".\packing.c" -+ > -+ </File> -+ <File -+ RelativePath=".\StateConstructW.c" -+ > -+ </File> -+ <File -+ RelativePath=".\StateSearchW.c" -+ > -+ </File> -+ <File -+ RelativePath=".\syntFilter.c" -+ > -+ </File> -+ </Filter> -+ <Filter -+ Name="Header Files" -+ Filter="h;hpp;hxx;hm;inl;inc;xsd" -+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" -+ > -+ <File -+ RelativePath=".\anaFilter.h" -+ > -+ </File> -+ <File -+ RelativePath=".\constants.h" -+ > -+ </File> -+ <File -+ RelativePath=".\createCB.h" -+ > -+ </File> -+ <File -+ RelativePath=".\doCPLC.h" -+ > -+ </File> -+ <File -+ RelativePath=".\enhancer.h" -+ > -+ </File> -+ <File -+ RelativePath=".\filter.h" -+ > -+ </File> -+ <File -+ RelativePath=".\FrameClassify.h" -+ > -+ </File> -+ <File -+ RelativePath=".\gainquant.h" -+ > -+ </File> -+ <File -+ RelativePath=".\getCBvec.h" -+ > -+ </File> -+ <File -+ RelativePath=".\helpfun.h" -+ > -+ </File> -+ <File -+ RelativePath=".\hpInput.h" -+ > -+ </File> -+ <File -+ RelativePath=".\hpOutput.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBConstruct.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBSearch.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_decode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_define.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_encode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCdecode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCencode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\lsf.h" -+ > -+ </File> -+ <File -+ RelativePath=".\packing.h" -+ > -+ </File> -+ <File -+ RelativePath=".\StateConstructW.h" -+ > -+ </File> -+ <File -+ RelativePath=".\StateSearchW.h" -+ > -+ </File> -+ <File -+ RelativePath=".\syntFilter.h" -+ > -+ </File> -+ </Filter> -+ <Filter -+ Name="Resource Files" -+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" -+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" -+ > -+ </Filter> -+ </Files> -+ <Globals> -+ </Globals> -+</VisualStudioProject> -diff -druN codecs/ilbc.orig/lsf.c codecs/ilbc/lsf.c ---- codecs/ilbc.orig/lsf.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/lsf.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,264 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ lsf.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <string.h> -+#include <math.h> -+ -+#include "iLBC_define.h" -+#include "lsf.h" -+ -+/*----------------------------------------------------------------* -+ * conversion from lpc coefficients to lsf coefficients -+ *---------------------------------------------------------------*/ -+ -+void a2lsf( -+ float *freq,/* (o) lsf coefficients */ -+ float *a /* (i) lpc coefficients */ -+){ -+ float steps[LSF_NUMBER_OF_STEPS] = -+ {(float)0.00635, (float)0.003175, (float)0.0015875, -+ (float)0.00079375}; -+ float step; -+ int step_idx; -+ int lsp_index; -+ float p[LPC_HALFORDER]; -+ float q[LPC_HALFORDER]; -+ float p_pre[LPC_HALFORDER]; -+ -+ -+ float q_pre[LPC_HALFORDER]; -+ float old_p, old_q, *old; -+ float *pq_coef; -+ float omega, old_omega; -+ int i; -+ float hlp, hlp1, hlp2, hlp3, hlp4, hlp5; -+ -+ for (i=0; i<LPC_HALFORDER; i++) { -+ p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]); -+ q[i] = a[LPC_FILTERORDER - i] - a[i + 1]; -+ } -+ -+ p_pre[0] = (float)-1.0 - p[0]; -+ p_pre[1] = - p_pre[0] - p[1]; -+ p_pre[2] = - p_pre[1] - p[2]; -+ p_pre[3] = - p_pre[2] - p[3]; -+ p_pre[4] = - p_pre[3] - p[4]; -+ p_pre[4] = p_pre[4] / 2; -+ -+ q_pre[0] = (float)1.0 - q[0]; -+ q_pre[1] = q_pre[0] - q[1]; -+ q_pre[2] = q_pre[1] - q[2]; -+ q_pre[3] = q_pre[2] - q[3]; -+ q_pre[4] = q_pre[3] - q[4]; -+ q_pre[4] = q_pre[4] / 2; -+ -+ omega = 0.0; -+ old_omega = 0.0; -+ -+ old_p = FLOAT_MAX; -+ old_q = FLOAT_MAX; -+ -+ /* Here we loop through lsp_index to find all the -+ LPC_FILTERORDER roots for omega. */ -+ -+ for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) { -+ -+ /* Depending on lsp_index being even or odd, we -+ alternatively solve the roots for the two LSP equations. */ -+ -+ -+ if ((lsp_index & 0x1) == 0) { -+ pq_coef = p_pre; -+ old = &old_p; -+ } else { -+ pq_coef = q_pre; -+ old = &old_q; -+ } -+ -+ /* Start with low resolution grid */ -+ -+ for (step_idx = 0, step = steps[step_idx]; -+ step_idx < LSF_NUMBER_OF_STEPS;){ -+ -+ -+ -+ /* cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) + -+ pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */ -+ -+ hlp = (float)cos(omega * TWO_PI); -+ hlp1 = (float)2.0 * hlp + pq_coef[0]; -+ hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 + -+ pq_coef[1]; -+ hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2]; -+ hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3]; -+ hlp5 = hlp * hlp4 - hlp3 + pq_coef[4]; -+ -+ -+ if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){ -+ -+ if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){ -+ -+ if (fabs(hlp5) >= fabs(*old)) { -+ freq[lsp_index] = omega - step; -+ } else { -+ freq[lsp_index] = omega; -+ } -+ -+ -+ if ((*old) >= 0.0){ -+ *old = (float)-1.0 * FLOAT_MAX; -+ } else { -+ *old = FLOAT_MAX; -+ } -+ -+ omega = old_omega; -+ step_idx = 0; -+ -+ step_idx = LSF_NUMBER_OF_STEPS; -+ } else { -+ -+ if (step_idx == 0) { -+ old_omega = omega; -+ } -+ -+ step_idx++; -+ omega -= steps[step_idx]; -+ -+ /* Go back one grid step */ -+ -+ step = steps[step_idx]; -+ } -+ } else { -+ -+ /* increment omega until they are of different sign, -+ and we know there is at least one root between omega -+ and old_omega */ -+ *old = hlp5; -+ omega += step; -+ } -+ -+ -+ } -+ } -+ -+ for (i = 0; i<LPC_FILTERORDER; i++) { -+ freq[i] = freq[i] * TWO_PI; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * conversion from lsf coefficients to lpc coefficients -+ *---------------------------------------------------------------*/ -+ -+void lsf2a( -+ float *a_coef, /* (o) lpc coefficients */ -+ float *freq /* (i) lsf coefficients */ -+){ -+ int i, j; -+ float hlp; -+ float p[LPC_HALFORDER], q[LPC_HALFORDER]; -+ float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER], -+ a2[LPC_HALFORDER]; -+ float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER], -+ b2[LPC_HALFORDER]; -+ -+ for (i=0; i<LPC_FILTERORDER; i++) { -+ freq[i] = freq[i] * PI2; -+ } -+ -+ /* Check input for ill-conditioned cases. This part is not -+ found in the TIA standard. It involves the following 2 IF -+ blocks. If "freq" is judged ill-conditioned, then we first -+ modify freq[0] and freq[LPC_HALFORDER-1] (normally -+ LPC_HALFORDER = 10 for LPC applications), then we adjust -+ the other "freq" values slightly */ -+ -+ -+ if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){ -+ -+ -+ if (freq[0] <= 0.0) { -+ freq[0] = (float)0.022; -+ } -+ -+ -+ if (freq[LPC_FILTERORDER - 1] >= 0.5) { -+ freq[LPC_FILTERORDER - 1] = (float)0.499; -+ } -+ -+ hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) / -+ (float) (LPC_FILTERORDER - 1); -+ -+ for (i=1; i<LPC_FILTERORDER; i++) { -+ freq[i] = freq[i - 1] + hlp; -+ } -+ -+ -+ } -+ -+ memset(a1, 0, LPC_HALFORDER*sizeof(float)); -+ memset(a2, 0, LPC_HALFORDER*sizeof(float)); -+ memset(b1, 0, LPC_HALFORDER*sizeof(float)); -+ memset(b2, 0, LPC_HALFORDER*sizeof(float)); -+ memset(a, 0, (LPC_HALFORDER+1)*sizeof(float)); -+ memset(b, 0, (LPC_HALFORDER+1)*sizeof(float)); -+ -+ /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and -+ cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2. -+ Note that for this code p[i] specifies the coefficients -+ used in .Q_A(z) while q[i] specifies the coefficients used -+ in .P_A(z) */ -+ -+ for (i=0; i<LPC_HALFORDER; i++) { -+ p[i] = (float)cos(TWO_PI * freq[2 * i]); -+ q[i] = (float)cos(TWO_PI * freq[2 * i + 1]); -+ } -+ -+ a[0] = 0.25; -+ b[0] = 0.25; -+ -+ for (i= 0; i<LPC_HALFORDER; i++) { -+ a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i]; -+ b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i]; -+ a2[i] = a1[i]; -+ a1[i] = a[i]; -+ b2[i] = b1[i]; -+ b1[i] = b[i]; -+ } -+ -+ for (j=0; j<LPC_FILTERORDER; j++) { -+ -+ if (j == 0) { -+ a[0] = 0.25; -+ b[0] = -0.25; -+ } else { -+ a[0] = b[0] = 0.0; -+ } -+ -+ for (i=0; i<LPC_HALFORDER; i++) { -+ a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i]; -+ b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i]; -+ a2[i] = a1[i]; -+ a1[i] = a[i]; -+ b2[i] = b1[i]; -+ b1[i] = b[i]; -+ } -+ -+ a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]); -+ } -+ -+ a_coef[0] = 1.0; -+ -+ -+} -+ -+ -diff -druN codecs/ilbc.orig/lsf.h codecs/ilbc/lsf.h ---- codecs/ilbc.orig/lsf.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/lsf.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,30 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ lsf.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#ifndef __iLBC_LSF_H -+#define __iLBC_LSF_H -+ -+void a2lsf( -+ float *freq,/* (o) lsf coefficients */ -+ float *a /* (i) lpc coefficients */ -+); -+ -+void lsf2a( -+ float *a_coef, /* (o) lpc coefficients */ -+ float *freq /* (i) lsf coefficients */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/packing.c codecs/ilbc/packing.c ---- codecs/ilbc.orig/packing.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/packing.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,175 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ packing.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <stdlib.h> -+ -+#include "iLBC_define.h" -+#include "constants.h" -+#include "helpfun.h" -+#include "packing.h" -+#include "string.h" -+ -+/*----------------------------------------------------------------* -+ * splitting an integer into first most significant bits and -+ * remaining least significant bits -+ *---------------------------------------------------------------*/ -+ -+void packsplit( -+ int *index, /* (i) the value to split */ -+ int *firstpart, /* (o) the value specified by most -+ significant bits */ -+ int *rest, /* (o) the value specified by least -+ significant bits */ -+ int bitno_firstpart, /* (i) number of bits in most -+ significant part */ -+ int bitno_total /* (i) number of bits in full range -+ of value */ -+){ -+ int bitno_rest = bitno_total-bitno_firstpart; -+ -+ -+ -+ *firstpart = *index>>(bitno_rest); -+ *rest = *index-(*firstpart<<(bitno_rest)); -+} -+ -+/*----------------------------------------------------------------* -+ * combining a value corresponding to msb's with a value -+ * corresponding to lsb's -+ *---------------------------------------------------------------*/ -+ -+void packcombine( -+ int *index, /* (i/o) the msb value in the -+ combined value out */ -+ int rest, /* (i) the lsb value */ -+ int bitno_rest /* (i) the number of bits in the -+ lsb part */ -+){ -+ *index = *index<<bitno_rest; -+ *index += rest; -+} -+ -+/*----------------------------------------------------------------* -+ * packing of bits into bitstream, i.e., vector of bytes -+ *---------------------------------------------------------------*/ -+ -+void dopack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ place in bitstream to pack -+ new data, on exit pointer -+ to place in bitstream to -+ pack future data */ -+ int index, /* (i) the value to pack */ -+ int bitno, /* (i) the number of bits that the -+ value will fit within */ -+ int *pos /* (i/o) write position in the -+ current byte */ -+){ -+ int posLeft; -+ -+ /* Clear the bits before starting in a new byte */ -+ -+ if ((*pos)==0) { -+ **bitstream=0; -+ } -+ -+ while (bitno>0) { -+ -+ /* Jump to the next byte if end of this byte is reached*/ -+ -+ if (*pos==8) { -+ *pos=0; -+ (*bitstream)++; -+ **bitstream=0; -+ } -+ -+ -+ -+ posLeft=8-(*pos); -+ -+ /* Insert index into the bitstream */ -+ -+ if (bitno <= posLeft) { -+ **bitstream |= (unsigned char)(index<<(posLeft-bitno)); -+ *pos+=bitno; -+ bitno=0; -+ } else { -+ **bitstream |= (unsigned char)(index>>(bitno-posLeft)); -+ -+ *pos=8; -+ index-=((index>>(bitno-posLeft))<<(bitno-posLeft)); -+ -+ bitno-=posLeft; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * unpacking of bits from bitstream, i.e., vector of bytes -+ *---------------------------------------------------------------*/ -+ -+void unpack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ place in bitstream to -+ unpack new data from, on -+ exit pointer to place in -+ bitstream to unpack future -+ data from */ -+ int *index, /* (o) resulting value */ -+ int bitno, /* (i) number of bits used to -+ represent the value */ -+ int *pos /* (i/o) read position in the -+ current byte */ -+){ -+ int BitsLeft; -+ -+ *index=0; -+ -+ while (bitno>0) { -+ -+ /* move forward in bitstream when the end of the -+ byte is reached */ -+ -+ if (*pos==8) { -+ *pos=0; -+ (*bitstream)++; -+ } -+ -+ BitsLeft=8-(*pos); -+ -+ /* Extract bits to index */ -+ -+ -+ -+ if (BitsLeft>=bitno) { -+ *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno)); -+ -+ *pos+=bitno; -+ bitno=0; -+ } else { -+ -+ if ((8-bitno)>0) { -+ *index+=((((**bitstream)<<(*pos)) & 0xFF)>> -+ (8-bitno)); -+ *pos=8; -+ } else { -+ *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<< -+ (bitno-8)); -+ *pos=8; -+ } -+ bitno-=BitsLeft; -+ } -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/packing.h codecs/ilbc/packing.h ---- codecs/ilbc.orig/packing.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/packing.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,67 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ packing.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __PACKING_H -+#define __PACKING_H -+ -+void packsplit( -+ int *index, /* (i) the value to split */ -+ int *firstpart, /* (o) the value specified by most -+ significant bits */ -+ int *rest, /* (o) the value specified by least -+ significant bits */ -+ int bitno_firstpart, /* (i) number of bits in most -+ significant part */ -+ int bitno_total /* (i) number of bits in full range -+ of value */ -+); -+ -+void packcombine( -+ int *index, /* (i/o) the msb value in the -+ combined value out */ -+ int rest, /* (i) the lsb value */ -+ int bitno_rest /* (i) the number of bits in the -+ lsb part */ -+); -+ -+void dopack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ place in bitstream to pack -+ new data, on exit pointer -+ to place in bitstream to -+ pack future data */ -+ int index, /* (i) the value to pack */ -+ int bitno, /* (i) the number of bits that the -+ value will fit within */ -+ int *pos /* (i/o) write position in the -+ current byte */ -+); -+ -+void unpack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ -+ -+ place in bitstream to -+ unpack new data from, on -+ exit pointer to place in -+ bitstream to unpack future -+ data from */ -+ int *index, /* (o) resulting value */ -+ int bitno, /* (i) number of bits used to -+ represent the value */ -+ int *pos /* (i/o) read position in the -+ current byte */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/syntFilter.c codecs/ilbc/syntFilter.c ---- codecs/ilbc.orig/syntFilter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/syntFilter.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,108 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ syntFilter.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "syntFilter.h" -+ -+/*----------------------------------------------------------------* -+ * LP synthesis filter. -+ *---------------------------------------------------------------*/ -+ -+void syntFilter( -+ float *Out, /* (i/o) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len, /* (i) Length of signal */ -+ float *mem /* (i/o) Filter state */ -+){ -+ int i, j; -+ float *po, *pi, *pa, *pm; -+ -+ po=Out; -+ -+ /* Filter first part using memory from past */ -+ -+ for (i=0; i<LPC_FILTERORDER; i++) { -+ pi=&Out[i-1]; -+ pa=&a[1]; -+ pm=&mem[LPC_FILTERORDER-1]; -+ for (j=1; j<=i; j++) { -+ *po-=(*pa++)*(*pi--); -+ } -+ for (j=i+1; j<LPC_FILTERORDER+1; j++) { -+ *po-=(*pa++)*(*pm--); -+ } -+ po++; -+ } -+ -+ /* Filter last part where the state is entierly in -+ the output vector */ -+ -+ for (i=LPC_FILTERORDER; i<len; i++) { -+ -+ -+ pi=&Out[i-1]; -+ pa=&a[1]; -+ for (j=1; j<LPC_FILTERORDER+1; j++) { -+ *po-=(*pa++)*(*pi--); -+ } -+ po++; -+ } -+ -+ /* Update state vector */ -+ -+ memcpy(mem, &Out[len-LPC_FILTERORDER], -+ LPC_FILTERORDER*sizeof(float)); -+} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -druN codecs/ilbc.orig/syntFilter.h codecs/ilbc/syntFilter.h ---- codecs/ilbc.orig/syntFilter.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/syntFilter.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,27 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ syntFilter.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_SYNTFILTER_H -+#define __iLBC_SYNTFILTER_H -+ -+void syntFilter( -+ float *Out, /* (i/o) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len, /* (i) Length of signal */ -+ float *mem /* (i/o) Filter state */ -+ -+ -+); -+ -+#endif -+ -+ ---- codecs/.moduleinfo 2008/08/20 23:00:58 1.1 -+++ codecs/.moduleinfo 2008/08/20 23:01:12 -@@ -11,7 +11,6 @@ - <depend>gsm</depend> - </member> - <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so"> -- <defaultenabled>no</defaultenabled> - </member> - <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so"> - </member> diff --git a/net/asterisk10/files/nocodecnego-patch-Makefile b/net/asterisk10/files/nocodecnego-patch-Makefile deleted file mode 100644 index c5df459f1b2c..000000000000 --- a/net/asterisk10/files/nocodecnego-patch-Makefile +++ /dev/null @@ -1,228 +0,0 @@ ---- Makefile.orig 2009-10-23 17:00:01.000000000 +0300 -+++ Makefile 2009-11-23 16:44:36.000000000 +0200 -@@ -101,7 +101,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - # Staging directory - # Files are copied here temporarily during the install process -@@ -135,7 +135,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk - endif -@@ -225,9 +225,11 @@ - _ASTLDFLAGS+=-L/usr/local/lib - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char -@@ -235,7 +237,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - endif -@@ -410,21 +412,21 @@ - rm -f build_tools/menuselect-deps - - datafiles: _all -- if [ `$(ID) -u` = 0 ]; then \ -- CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \ -- fi -+ #if [ `$(ID) -u` = 0 ]; then \ -+ # CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \ -+ #fi - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -445,47 +447,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -521,7 +523,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -559,31 +561,23 @@ - upgrade: bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ - if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ - done -- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ if true; then \ - ( \ - echo "[directories]" ; \ - echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -629,20 +623,23 @@ - echo ";astctlowner = root" ; \ - echo ";astctlgroup = apache" ; \ - echo ";astctl = asterisk.ctl" ; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" diff --git a/net/asterisk10/files/patch-Makefile.rules b/net/asterisk10/files/patch-Makefile.rules deleted file mode 100644 index f90430ec9ddd..000000000000 --- a/net/asterisk10/files/patch-Makefile.rules +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.rules.orig 2009-09-28 22:09:25.000000000 +0300 -+++ Makefile.rules 2009-11-23 16:15:23.000000000 +0200 -@@ -37,11 +37,13 @@ - - OPTIMIZE?=-O6 - -+ifneq ($(OSARCH),FreeBSD) - ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) - _ASTCFLAGS+=$(OPTIMIZE) - else - _ASTCFLAGS+=-O0 - endif -+endif - - # shortcuts for common combinations of flags; these must be recursively expanded so that - # per-target settings will be applied diff --git a/net/asterisk10/files/patch-agi::Makefile b/net/asterisk10/files/patch-agi::Makefile deleted file mode 100644 index f9910fe96dd6..000000000000 --- a/net/asterisk10/files/patch-agi::Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- agi/Makefile.orig Sat Dec 16 23:14:34 2006 -+++ agi/Makefile Wed Mar 28 11:13:21 2007 -@@ -13,7 +13,9 @@ - - .PHONY: clean all uninstall - --AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi jukebox.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - ifeq ($(OSARCH),SunOS) - LIBS+=-lsocket -lnsl -@@ -31,8 +33,9 @@ eagi-test: eagi-test.o strcompat.o - eagi-sphinx-test: eagi-sphinx-test.o - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - uninstall: - for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile deleted file mode 100644 index bb9d20047899..000000000000 --- a/net/asterisk10/files/patch-channels::Makefile +++ /dev/null @@ -1,48 +0,0 @@ ---- channels/Makefile.orig 2009-07-21 16:04:44.000000000 +0300 -+++ channels/Makefile 2009-11-20 18:05:45.000000000 +0200 -@@ -32,9 +32,10 @@ - endif - - ifeq ($(OSARCH),FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -+ PTLIB=-lpt_r -+ H323LIB=-lh323_r - CHANH323LIB=-pthread -+ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) - endif - - ifeq ($(OSARCH),NetBSD) -@@ -78,12 +79,13 @@ - h323/libchanh323.a h323/Makefile.ast: - $(CMD_PREFIX) $(MAKE) -C h323 - $(CMD_PREFIX) rm -f ../main/asterisk -- $(CMD_PREFIX) echo "***************************************************************" -- $(CMD_PREFIX) echo -- $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" -- $(CMD_PREFIX) echo -- $(CMD_PREFIX) echo "***************************************************************" -- $(CMD_PREFIX) exit 1 -+ $(CMD_PREFIX) $(MAKE) -C . chan_h323.so -+# $(CMD_PREFIX) echo "***************************************************************" -+# $(CMD_PREFIX) echo -+# $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" -+# $(CMD_PREFIX) echo -+# $(CMD_PREFIX) echo "***************************************************************" -+# $(CMD_PREFIX) exit 1 - endif - - dist-clean:: -@@ -111,8 +113,12 @@ - else - chan_h323.so: chan_h323.o h323/libchanh323.a - $(ECHO_PREFIX) echo " [LD] $^ -> $@" -+ifeq ($(OSARCH),FreeBSD) -+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) -+else - $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat $(ASTLDFLAGS) - endif -+endif - - chan_misdn.o: _ASTCFLAGS+=-Imisdn - diff --git a/net/asterisk10/files/patch-channels::chan_sip.c b/net/asterisk10/files/patch-channels::chan_sip.c deleted file mode 100644 index 9bb8267ffcc5..000000000000 --- a/net/asterisk10/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,11 +0,0 @@ ---- channels/chan_sip.c.orig 2008-06-10 00:46:46.000000000 -0700 -+++ channels/chan_sip.c 2008-06-10 00:46:46.000000000 -0700 -@@ -496,7 +496,7 @@ - #define DEFAULT_MOHINTERPRET "default" - #define DEFAULT_MOHSUGGEST "" - #define DEFAULT_VMEXTEN "asterisk" --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - #define DEFAULT_NOTIFYMIME "application/simple-message-summary" - #define DEFAULT_MWITIME 10 - #define DEFAULT_ALLOWGUEST TRUE diff --git a/net/asterisk10/files/patch-channels_h323_Makefile.in b/net/asterisk10/files/patch-channels_h323_Makefile.in deleted file mode 100644 index 105eb3c41547..000000000000 --- a/net/asterisk10/files/patch-channels_h323_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.in -+++ channels/h323/Makefile.in -@@ -13,7 +13,7 @@ - STDCCFLAGS += -I../../include -include ../../include/asterisk/autoconfig.h - STDCCFLAGS += -fPIC - #OPTCCFLAGS += --CFLAGS = -pipe -+CFLAGS = -pipe @CXXFLAGS@ - TARGET = libchanh323.a - TARGET += Makefile.ast - SOURCES = ast_h323.cxx compat_h323.cxx cisco-h225.cxx caps_h323.cxx diff --git a/net/asterisk10/files/patch-configure b/net/asterisk10/files/patch-configure deleted file mode 100644 index 93432489e415..000000000000 --- a/net/asterisk10/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- configure.orig -+++ configure -@@ -4308,8 +4308,6 @@ - case "${host_os}" in - freebsd*) - ac_default_prefix=/usr/local -- CPPFLAGS=-I/usr/local/include -- LDFLAGS=-L/usr/local/lib - ;; - darwin*) - -@@ -16837,7 +16835,7 @@ - - fi - -- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}" -+ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" - - if test "${HAS_OPENH323:-unset}" != "unset"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 diff --git a/net/asterisk10/files/patch-include::asterisk::utils.h b/net/asterisk10/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk10/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk10/files/patch-main::Makefile b/net/asterisk10/files/patch-main::Makefile deleted file mode 100644 index a4758b78bdc9..000000000000 --- a/net/asterisk10/files/patch-main::Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- main/Makefile.orig 2009-08-01 03:52:00.000000000 +0300 -+++ main/Makefile 2009-11-20 18:09:06.000000000 +0200 -@@ -92,8 +92,8 @@ - cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=)) $(ASTCFLAGS)" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: -- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a -+#db1-ast/libdb1.a: -+# _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a - - ast_expr2.c ast_expr2.h: - bison -o $@ -d --name-prefix=ast_yy ast_expr2.y -@@ -127,18 +127,18 @@ - H323LDLIBS= - endif - --asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) asterisk.exports -+asterisk: $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) asterisk.exports - @$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp - @if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \ - mv $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; \ - fi - @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp - @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) -- $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@" -+ $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) -> $@" - ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) -- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS) -+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS) - else -- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS) -+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS) - endif - - clean:: diff --git a/net/asterisk10/files/patch-main::db.c b/net/asterisk10/files/patch-main::db.c deleted file mode 100644 index 0b26f3b2cca6..000000000000 --- a/net/asterisk10/files/patch-main::db.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- main/db.c.orig Fri Jan 13 11:05:32 2006 -+++ main/db.c Fri Jan 13 11:06:55 2006 -@@ -35,6 +35,7 @@ - #include <errno.h> - #include <unistd.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk10/files/patch-main::frame.c b/net/asterisk10/files/patch-main::frame.c deleted file mode 100644 index 232de08a9e21..000000000000 --- a/net/asterisk10/files/patch-main::frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- main/frame.c.orig Wed Jan 25 13:22:43 2006 -+++ main/frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk10/files/patch-main::utils.c b/net/asterisk10/files/patch-main::utils.c deleted file mode 100644 index 7f2f1495d714..000000000000 --- a/net/asterisk10/files/patch-main::utils.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- main/utils.c.orig -+++ main/utils.c -@@ -914,8 +914,8 @@ - pthread_attr_init(attr); - } - --#ifdef __linux__ -- /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, -+#if defined(__linux__) || defined(__FreeBSD__) -+ /* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, - which is kind of useless. Change this here to - PTHREAD_INHERIT_SCHED; that way the -p option to set realtime - priority will propagate down to new threads by default. diff --git a/net/asterisk10/files/patch-rtp_timeout b/net/asterisk10/files/patch-rtp_timeout deleted file mode 100644 index 6f60c74cff41..000000000000 --- a/net/asterisk10/files/patch-rtp_timeout +++ /dev/null @@ -1,25 +0,0 @@ ---- channels/chan_sip.c.orig 2009-04-14 08:58:13.000000000 +0100 -+++ channels/chan_sip.c 2009-04-14 09:00:58.000000000 +0100 -@@ -16287,7 +16287,6 @@ - restartsearch: - /* Check for interfaces needing to be killed */ - ast_mutex_lock(&iflock); -- t = time(NULL); - /* don't scan the interface list if it hasn't been a reasonable period - of time since the last time we did it (when MWI is being sent, we can - get back to this point every millisecond or less) -@@ -16306,12 +16305,14 @@ - (sip->owner->_state == AST_STATE_UP) && - !sip->redirip.sin_addr.s_addr && - sip->t38.state != T38_ENABLED) { -+ t = time(NULL); - if (sip->lastrtptx && - ast_rtp_get_rtpkeepalive(sip->rtp) && - (t > sip->lastrtptx + ast_rtp_get_rtpkeepalive(sip->rtp))) { - /* Need to send an empty RTP packet */ - sip->lastrtptx = time(NULL); - ast_rtp_sendcng(sip->rtp, 0); -+ t = time(NULL); - } - if (sip->lastrtprx && - (ast_rtp_get_rtptimeout(sip->rtp) || ast_rtp_get_rtpholdtimeout(sip->rtp)) && diff --git a/net/asterisk10/files/patch-suppress_log_dups.diff b/net/asterisk10/files/patch-suppress_log_dups.diff deleted file mode 100644 index 115b69f21ca1..000000000000 --- a/net/asterisk10/files/patch-suppress_log_dups.diff +++ /dev/null @@ -1,270 +0,0 @@ -Index: main/logger.c -=================================================================== ---- main/logger.c (revision 188505) -+++ main/logger.c (working copy) -@@ -140,6 +140,17 @@ - AST_THREADSTORAGE(log_buf, log_buf_init); - #define LOG_BUF_INIT_SIZE 128 - -+/* -+ * Storage for previous log message to prevent log storms -+ */ -+static int stored_log_level; -+static int stored_log_dup_count = 0; -+static char *stored_log_msg = NULL; -+static const char *stored_log_file; -+static int stored_log_line; -+static const char *stored_log_function; -+static ast_mutex_t stored_log_msg_lock; -+ - static int make_components(char *s, int lineno) - { - char *w; -@@ -591,6 +602,8 @@ - char tmp[256]; - int res = 0; - -+ ast_mutex_init(&stored_log_msg_lock); -+ - /* auto rotate if sig SIGXFSZ comes a-knockin */ - (void) signal(SIGXFSZ,(void *) handle_SIGXFSZ); - -@@ -655,14 +668,14 @@ - return; - } - --static void __attribute__((format(printf, 5, 0))) ast_log_vsyslog(int level, const char *file, int line, const char *function, const char *fmt, va_list args) -+static void ast_log_syslog(int level, const char *file, int line, const char *function, const char *msg) - { - char buf[BUFSIZ]; - char *s; - - if (level >= SYSLOG_NLEVELS) { - /* we are locked here, so cannot ast_log() */ -- fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", level); -+ fprintf(stderr, "ast_log_syslog called with bogus level: %d\n", level); - return; - } - if (level == __LOG_VERBOSE) { -@@ -676,27 +689,20 @@ - levels[level], (long)GETTID(), file, line, function); - } - s = buf + strlen(buf); -- vsnprintf(s, sizeof(buf) - strlen(buf), fmt, args); -+ snprintf(s, sizeof(buf) - strlen(buf), "%s", msg); - term_strip(s, s, strlen(s) + 1); - syslog(syslog_level_map[level], "%s", buf); - } - --/*! -- * \brief send log messages to syslog and/or the console -- */ --void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) -+static void __ast_log(int level, const char *file, int line, const char *function, char *msg, int msglen) - { - struct logchannel *chan; -- struct ast_dynamic_str *buf; - time_t t; - struct tm tm; - char date[256]; -+ char buf[2048]; -+ int res; - -- va_list ap; -- -- if (!(buf = ast_dynamic_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE))) -- return; -- - if (AST_LIST_EMPTY(&logchannels)) - { - /* -@@ -704,35 +710,12 @@ - * so just log to stdout - */ - if (level != __LOG_VERBOSE) { -- int res; -- va_start(ap, fmt); -- res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -- va_end(ap); -- if (res != AST_DYNSTR_BUILD_FAILED) { -- term_filter_escapes(buf->str); -- fputs(buf->str, stdout); -- } -+ term_filter_escapes(msg); -+ fputs(msg, stdout); - } - return; - } - -- /* don't display LOG_DEBUG messages unless option_verbose _or_ option_debug -- are non-zero; LOG_DEBUG messages can still be displayed if option_debug -- is zero, if option_verbose is non-zero (this allows for 'level zero' -- LOG_DEBUG messages to be displayed, if the logmask on any channel -- allows it) -- */ -- if (!option_verbose && !option_debug && (level == __LOG_DEBUG)) -- return; -- -- /* Ignore anything that never gets logged anywhere */ -- if (!(global_logmask & (1 << level))) -- return; -- -- /* Ignore anything other than the currently debugged file if there is one */ -- if ((level == __LOG_DEBUG) && !ast_strlen_zero(debug_filename) && strcasecmp(debug_filename, file)) -- return; -- - time(&t); - ast_localtime(&t, &tm, NULL); - strftime(date, sizeof(date), dateformat, &tm); -@@ -740,13 +723,8 @@ - AST_LIST_LOCK(&logchannels); - - if (logfiles.event_log && level == __LOG_EVENT) { -- va_start(ap, fmt); -- -- fprintf(eventlog, "%s asterisk[%ld]: ", date, (long)getpid()); -- vfprintf(eventlog, fmt, ap); -+ fprintf(eventlog, "%s asterisk[%ld]: %s", date, (long)getpid(), msg); - fflush(eventlog); -- -- va_end(ap); - AST_LIST_UNLOCK(&logchannels); - return; - } -@@ -756,18 +734,15 @@ - break; - /* Check syslog channels */ - if (chan->type == LOGTYPE_SYSLOG && (chan->logmask & (1 << level))) { -- va_start(ap, fmt); -- ast_log_vsyslog(level, file, line, function, fmt, ap); -- va_end(ap); -+ ast_log_syslog(level, file, line, function, msg); - /* Console channels */ - } else if ((chan->logmask & (1 << level)) && (chan->type == LOGTYPE_CONSOLE)) { - char linestr[128]; - char tmp1[80], tmp2[80], tmp3[80], tmp4[80]; - - if (level != __LOG_VERBOSE) { -- int res; - sprintf(linestr, "%d", line); -- ast_dynamic_str_thread_set(&buf, BUFSIZ, &log_buf, -+ snprintf(buf, sizeof(buf), - "[%s] %s[%ld]: %s:%s %s: ", - date, - term_color(tmp1, levels[level], colors[level], 0, sizeof(tmp1)), -@@ -776,23 +751,17 @@ - term_color(tmp3, linestr, COLOR_BRWHITE, 0, sizeof(tmp3)), - term_color(tmp4, function, COLOR_BRWHITE, 0, sizeof(tmp4))); - /*filter to the console!*/ -- term_filter_escapes(buf->str); -- ast_console_puts_mutable(buf->str); -- -- va_start(ap, fmt); -- res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -- va_end(ap); -- if (res != AST_DYNSTR_BUILD_FAILED) -- ast_console_puts_mutable(buf->str); -+ term_filter_escapes(buf); -+ ast_console_puts_mutable(buf); -+ ast_console_puts_mutable(msg); - } - /* File channels */ - } else if ((chan->logmask & (1 << level)) && (chan->fileptr)) { -- int res; -- ast_dynamic_str_thread_set(&buf, BUFSIZ, &log_buf, -+ snprintf(buf, sizeof(buf), - "[%s] %s[%ld] %s: ", - date, levels[level], (long)GETTID(), file); -- res = fprintf(chan->fileptr, "%s", buf->str); -- if (res <= 0 && !ast_strlen_zero(buf->str)) { /* Error, no characters printed */ -+ res = fprintf(chan->fileptr, "%s", buf); -+ if (res <= 0 && !ast_strlen_zero(buf)) { /* Error, no characters printed */ - fprintf(stderr,"**** Asterisk Logging Error: ***********\n"); - if (errno == ENOMEM || errno == ENOSPC) { - fprintf(stderr, "Asterisk logging error: Out of disk space, can't log to log file %s\n", chan->filename); -@@ -801,16 +770,10 @@ - manager_event(EVENT_FLAG_SYSTEM, "LogChannel", "Channel: %s\r\nEnabled: No\r\nReason: %d - %s\r\n", chan->filename, errno, strerror(errno)); - chan->disabled = 1; - } else { -- int res; - /* No error message, continue printing */ -- va_start(ap, fmt); -- res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -- va_end(ap); -- if (res != AST_DYNSTR_BUILD_FAILED) { -- term_strip(buf->str, buf->str, buf->len); -- fputs(buf->str, chan->fileptr); -- fflush(chan->fileptr); -- } -+ term_strip(msg, msg, msglen); -+ fputs(msg, chan->fileptr); -+ fflush(chan->fileptr); - } - } - } -@@ -825,6 +788,65 @@ - } - } - -+/*! -+ * \brief send log messages to syslog and/or the console -+ */ -+void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) -+{ -+ struct ast_dynamic_str *buf; -+ int res; -+ va_list ap; -+ -+ if (!(buf = ast_dynamic_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE))) -+ return; -+ -+ va_start(ap, fmt); -+ res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -+ va_end(ap); -+ if (res == AST_DYNSTR_BUILD_FAILED) -+ return; -+ -+ /* don't display LOG_DEBUG messages unless option_verbose _or_ option_debug -+ are non-zero; LOG_DEBUG messages can still be displayed if option_debug -+ is zero, if option_verbose is non-zero (this allows for 'level zero' -+ LOG_DEBUG messages to be displayed, if the logmask on any channel -+ allows it) -+ */ -+ if (!option_verbose && !option_debug && (level == __LOG_DEBUG)) -+ return; -+ -+ /* Ignore anything that never gets logged anywhere */ -+ if (!(global_logmask & (1 << level))) -+ return; -+ -+ /* Ignore anything other than the currently debugged file if there is one */ -+ if ((level == __LOG_DEBUG) && !ast_strlen_zero(debug_filename) && strcasecmp(debug_filename, file)) -+ return; -+ -+ ast_mutex_lock(&stored_log_msg_lock); -+ if (stored_log_msg == NULL || stored_log_level != level || strcmp(buf->str, stored_log_msg) != 0) { -+ if (stored_log_dup_count > 0) { -+ char buf2[1024]; -+ -+ snprintf(buf2, sizeof(buf2), "Last message repeated %d times\n", stored_log_dup_count); -+ __ast_log(stored_log_level, stored_log_file, stored_log_line, stored_log_function, buf2, strlen(buf2)); -+ } -+ if (stored_log_msg != NULL) -+ ast_free(stored_log_msg); -+ stored_log_msg = ast_strdup(buf->str); -+ stored_log_level = level; -+ stored_log_dup_count = 0; -+ stored_log_file = file; -+ stored_log_line = line; -+ stored_log_function = function; -+ __ast_log(level, file, line, function, buf->str, buf->len); -+ } -+ else -+ ++stored_log_dup_count; -+ -+ ast_mutex_unlock(&stored_log_msg_lock); -+} -+ - void ast_backtrace(void) - { - #ifdef linux diff --git a/net/asterisk10/files/rtp_force_dtmf-codecnego.diff b/net/asterisk10/files/rtp_force_dtmf-codecnego.diff deleted file mode 100644 index a670364ba603..000000000000 --- a/net/asterisk10/files/rtp_force_dtmf-codecnego.diff +++ /dev/null @@ -1,86 +0,0 @@ ---- channels/chan_sip.c.orig 2009-11-20 17:56:30.000000000 +0200 -+++ channels/chan_sip.c 2009-11-20 17:59:43.000000000 +0200 -@@ -565,6 +565,9 @@ - static unsigned int global_tos_sip; /*!< IP type of service for SIP packets */ - static unsigned int global_tos_audio; /*!< IP type of service for audio RTP packets */ - static unsigned int global_tos_video; /*!< IP type of service for video RTP packets */ -+static int global_force_dtmf_relay = 0; -+static int global_force_dtmf_relay_pt = 101; -+ - static int compactheaders; /*!< send compact sip headers */ - static int recordhistory; /*!< Record SIP history. Off by default */ - static int dumphistory; /*!< Dump history to verbose before destroying SIP dialog */ -@@ -5329,6 +5332,7 @@ - int x; - int codec_index = 0; - int codec_pt_order[256]; -+ int dtmf_present = 0; - - /* Host information */ - struct ast_hostent audiohp; -@@ -5600,12 +5604,21 @@ - for (x = 0; x < codec_index; ++x) { - struct rtpPayloadType pt; - pt = ast_rtp_lookup_pt(p->rtp, codec_pt_order[x]); -+ if (pt.code == AST_RTP_DTMF) -+ dtmf_present = 1; - if (!pt.isAstFormat && !pt.code && p->vrtp) - pt = ast_rtp_lookup_pt(p->vrtp, codec_pt_order[x]); - if (pt.isAstFormat) - ast_codec_pref_append(&p->formats, pt.code); - } - ast_codec_pref_remove2(&p->formats, ~p->usercapability); -+ if (!dtmf_present && global_force_dtmf_relay) { -+ newnoncodeccapability |= AST_RTP_DTMF; -+ ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt); -+ codec_pt_order[codec_index++] = global_force_dtmf_relay_pt; -+ ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0); -+ } -+ - - /* Now gather all of the codecs that we are asked for: */ - ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability); -@@ -18369,6 +18382,9 @@ - - global_matchexterniplocally = FALSE; - -+ global_force_dtmf_relay = 0; -+ global_force_dtmf_relay_pt = 101; -+ - /* Copy the default jb config over global_jbconf */ - memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); - -@@ -18431,6 +18447,18 @@ - } - } else if (!strcasecmp(v->name, "vmexten")) { - ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten)); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) { -+ if ((global_force_dtmf_relay = ast_true(v->value))) -+ ast_verbose("RTP DTMF relaying will be enforced\n"); -+ else -+ ast_verbose("RTP DTMF relaying will not be enforced\n"); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) { -+ sscanf(v->value, "%d", &global_force_dtmf_relay_pt); -+ if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) { -+ ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt); -+ global_force_dtmf_relay_pt = 101; -+ } else -+ ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt); - } else if (!strcasecmp(v->name, "rtptimeout")) { - if ((sscanf(v->value, "%30d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) { - ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d. Using default.\n", v->value, v->lineno); ---- configs/sip.conf.sample.orig 2008-04-25 08:53:52.000000000 -0700 -+++ configs/sip.conf.sample 2008-06-10 00:45:37.000000000 -0700 -@@ -53,6 +53,12 @@ - ; and multiline formatted headers for strict - ; SIP compatibility (defaults to "no") - -+;rtp_force_dtmf_relay=no ; Enable RFC2833 DTMFs to be sent even if peer -+ ; hasn't announced support for it. Default: no -+ -+;rtp_force_dtmf_relay_pt=101 ; RTP payload type value for enforced RFC2833 -+ ; DTMFs. Default: 101 -+ - ; See doc/ip-tos.txt for a description of these parameters. - ;tos_sip=cs3 ; Sets TOS for SIP packets. - ;tos_audio=ef ; Sets TOS for RTP audio packets. diff --git a/net/asterisk10/files/rtp_force_dtmf-nocodecnego.diff b/net/asterisk10/files/rtp_force_dtmf-nocodecnego.diff deleted file mode 100644 index 9dcb7d8b134f..000000000000 --- a/net/asterisk10/files/rtp_force_dtmf-nocodecnego.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- channels/chan_sip.c.orig 2009-11-23 17:28:47.000000000 +0200 -+++ channels/chan_sip.c 2009-11-23 17:29:29.000000000 +0200 -@@ -565,6 +565,9 @@ - static unsigned int global_tos_sip; /*!< IP type of service for SIP packets */ - static unsigned int global_tos_audio; /*!< IP type of service for audio RTP packets */ - static unsigned int global_tos_video; /*!< IP type of service for video RTP packets */ -+static int global_force_dtmf_relay = 0; -+static int global_force_dtmf_relay_pt = 101; -+ - static int compactheaders; /*!< send compact sip headers */ - static int recordhistory; /*!< Record SIP history. Off by default */ - static int dumphistory; /*!< Dump history to verbose before destroying SIP dialog */ -@@ -5593,6 +5596,12 @@ - - /* Now gather all of the codecs that we are asked for: */ - ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability); -+ /* Add telephone-event */ -+ if (global_force_dtmf_relay && !(peernoncodeccapability & AST_RTP_DTMF)) { -+ ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt); -+ ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0); -+ peernoncodeccapability |= AST_RTP_DTMF; -+ } - ast_rtp_get_current_formats(newvideortp, &vpeercapability, &vpeernoncodeccapability); - - newjointcapability = p->capability & (peercapability | vpeercapability); -@@ -18366,6 +18375,9 @@ - - global_matchexterniplocally = FALSE; - -+ global_force_dtmf_relay = 0; -+ global_force_dtmf_relay_pt = 101; -+ - /* Copy the default jb config over global_jbconf */ - memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); - -@@ -18428,6 +18440,18 @@ - } - } else if (!strcasecmp(v->name, "vmexten")) { - ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten)); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) { -+ if ((global_force_dtmf_relay = ast_true(v->value))) -+ ast_verbose("RTP DTMF relaying will be enforced\n"); -+ else -+ ast_verbose("RTP DTMF relaying will not be enforced\n"); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) { -+ sscanf(v->value, "%d", &global_force_dtmf_relay_pt); -+ if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) { -+ ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt); -+ global_force_dtmf_relay_pt = 101; -+ } else -+ ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt); - } else if (!strcasecmp(v->name, "rtptimeout")) { - if ((sscanf(v->value, "%30d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) { - ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d. Using default.\n", v->value, v->lineno); ---- configs/sip.conf.sample.orig 2008-08-16 01:33:42.000000000 +0300 -+++ configs/sip.conf.sample 2008-12-12 17:03:11.000000000 +0200 -@@ -49,6 +49,12 @@ - ; and multiline formatted headers for strict - ; SIP compatibility (defaults to "no") - -+;rtp_force_dtmf_relay=no ; Enable RFC2833 DTMFs to be sent even if peer -+ ; hasn't announced support for it. Default: no -+ -+;rtp_force_dtmf_relay_pt=101 ; RTP payload type value for enforced RFC2833 -+ ; DTMFs. Default: 101 -+ - ; See doc/ip-tos.txt for a description of these parameters. - ;tos_sip=cs3 ; Sets TOS for SIP packets. - ;tos_audio=ef ; Sets TOS for RTP audio packets. diff --git a/net/asterisk10/files/sip_force_callid.diff b/net/asterisk10/files/sip_force_callid.diff deleted file mode 100644 index 09cf274581d1..000000000000 --- a/net/asterisk10/files/sip_force_callid.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- channels/chan_sip.c.orig 2009-05-12 21:18:44.000000000 +0300 -+++ channels/chan_sip.c 2009-05-26 12:58:10.000000000 +0300 -@@ -3061,6 +3061,8 @@ - } else if (!strcasecmp(ast_var_name(current), "SIPTRANSFER_REPLACES")) { - /* We're replacing a call. */ - p->options->replaces = ast_var_value(current); -+ } else if (!strcasecmp(ast_var_name(current), "SIP_FORCE_CALLID")) { -+ ast_string_field_set(p, callid, ast_var_value(current)); - } - } - diff --git a/net/asterisk10/files/sip_set_auth.diff b/net/asterisk10/files/sip_set_auth.diff deleted file mode 100644 index 1addc4f48add..000000000000 --- a/net/asterisk10/files/sip_set_auth.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- channels/chan_sip.c.orig 2008-04-29 08:21:05.000000000 -0400 -+++ channels/chan_sip.c 2008-05-28 18:41:48.000000000 -0400 -@@ -15962,6 +15978,9 @@ - char *ext, *host; - char tmp[256]; - char *dest = data; -+ char *secret = NULL; -+ char *md5secret = NULL; -+ char *authname = NULL; - - if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE))) { - ast_log(LOG_ERROR, "Unable to build sip pvt data for '%s' (Out of memory or socket error)\n", (char *)data); -@@ -15983,6 +16002,17 @@ - if (host) { - *host++ = '\0'; - ext = tmp; -+ secret = strchr(ext, ':'); -+ if (secret) { -+ *secret++ = '\0'; -+ md5secret = strchr(secret, ':'); -+ if (md5secret) { -+ *md5secret++ = '\0'; -+ authname = strchr(md5secret, ':'); -+ if (authname) -+ *authname++ = '\0'; -+ } -+ } - } else { - ext = strchr(tmp, '/'); - if (ext) -@@ -16015,6 +16045,14 @@ - ast_string_field_set(p, username, ext); - ast_string_field_free(p, fullcontact); - } -+ if (secret && !ast_strlen_zero(secret)) -+ ast_string_field_set(p, peersecret, secret); -+ -+ if (md5secret && !ast_strlen_zero(md5secret)) -+ ast_string_field_set(p, peermd5secret, md5secret); -+ -+ if (authname && !ast_strlen_zero(authname)) -+ ast_string_field_set(p, authname, authname); - #if 0 - printf("Setting up to call extension '%s' at '%s'\n", ext ? ext : "<none>", host); - #endif diff --git a/net/asterisk10/pkg-descr b/net/asterisk10/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk10/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist deleted file mode 100644 index fa747b6e8a6e..000000000000 --- a/net/asterisk10/pkg-plist +++ /dev/null @@ -1,950 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_pgsql.conf %D/etc/asterisk/res_pgsql.conf-dist; then rm -f %D/etc/asterisk/res_pgsql.conf; fi -etc/asterisk/res_pgsql.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@unexec if cmp -s %D/etc/asterisk/chan_dahdi.conf %D/etc/asterisk/chan_dahdi.conf-dist; then rm -f %D/etc/asterisk/chan_dahdi.conf; fi -etc/asterisk/chan_dahdi.conf-dist -@unexec if cmp -s %D/etc/asterisk/udptl.conf %D/etc/asterisk/udptl.conf-dist; then rm -f %D/etc/asterisk/udptl.conf; fi -etc/asterisk/udptl.conf-dist -@unexec if cmp -s %D/etc/asterisk/users.conf %D/etc/asterisk/users.conf-dist; then rm -f %D/etc/asterisk/users.conf; fi -etc/asterisk/users.conf-dist -@unexec if cmp -s %D/etc/asterisk/smdi.conf %D/etc/asterisk/smdi.conf-dist; then rm -f %D/etc/asterisk/smdi.conf; fi -etc/asterisk/smdi.conf-dist -@unexec if cmp -s %D/etc/asterisk/sla.conf %D/etc/asterisk/sla.conf-dist; then rm -f %D/etc/asterisk/sla.conf; fi -etc/asterisk/sla.conf-dist -@unexec if cmp -s %D/etc/asterisk/say.conf %D/etc/asterisk/say.conf-dist; then rm -f %D/etc/asterisk/say.conf; fi -etc/asterisk/say.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_snmp.conf %D/etc/asterisk/res_snmp.conf-dist; then rm -f %D/etc/asterisk/res_snmp.conf; fi -etc/asterisk/res_snmp.conf-dist -@unexec if cmp -s %D/etc/asterisk/muted.conf %D/etc/asterisk/muted.conf-dist; then rm -f %D/etc/asterisk/muted.conf; fi -etc/asterisk/muted.conf-dist -@unexec if cmp -s %D/etc/asterisk/jabber.conf %D/etc/asterisk/jabber.conf-dist; then rm -f %D/etc/asterisk/jabber.conf; fi -etc/asterisk/jabber.conf-dist -@unexec if cmp -s %D/etc/asterisk/http.conf %D/etc/asterisk/http.conf-dist; then rm -f %D/etc/asterisk/http.conf; fi -etc/asterisk/http.conf-dist -@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@unexec if cmp -s %D/etc/asterisk/gtalk.conf %D/etc/asterisk/gtalk.conf-dist; then rm -f %D/etc/asterisk/gtalk.conf; fi -etc/asterisk/gtalk.conf-dist -@unexec if cmp -s %D/etc/asterisk/func_odbc.conf %D/etc/asterisk/func_odbc.conf-dist; then rm -f %D/etc/asterisk/func_odbc.conf; fi -etc/asterisk/func_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/followme.conf %D/etc/asterisk/followme.conf-dist; then rm -f %D/etc/asterisk/followme.conf; fi -etc/asterisk/followme.conf-dist -@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi -etc/asterisk/amd.conf-dist -@exec if test ! -e %D/etc/asterisk/adsi.conf; then cp -p %D/etc/asterisk/adsi.conf-dist %D/etc/asterisk/adsi.conf; fi -@exec if test ! -e %D/etc/asterisk/adtranvofr.conf; then cp -p %D/etc/asterisk/adtranvofr.conf-dist %D/etc/asterisk/adtranvofr.conf; fi -@exec if test ! -e %D/etc/asterisk/agents.conf; then cp -p %D/etc/asterisk/agents.conf-dist %D/etc/asterisk/agents.conf; fi -@exec if test ! -e %D/etc/asterisk/alarmreceiver.conf; then cp -p %D/etc/asterisk/alarmreceiver.conf-dist %D/etc/asterisk/alarmreceiver.conf; fi -@exec if test ! -e %D/etc/asterisk/alsa.conf; then cp -p %D/etc/asterisk/alsa.conf-dist %D/etc/asterisk/alsa.conf; fi -@exec if test ! -e %D/etc/asterisk/asterisk.adsi; then cp -p %D/etc/asterisk/asterisk.adsi-dist %D/etc/asterisk/asterisk.adsi; fi -@exec if test ! -e %D/etc/asterisk/asterisk.conf; then cp -p %D/etc/asterisk/asterisk.conf-dist %D/etc/asterisk/asterisk.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr.conf; then cp -p %D/etc/asterisk/cdr.conf-dist %D/etc/asterisk/cdr.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_custom.conf; then cp -p %D/etc/asterisk/cdr_custom.conf-dist %D/etc/asterisk/cdr_custom.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_manager.conf; then cp -p %D/etc/asterisk/cdr_manager.conf-dist %D/etc/asterisk/cdr_manager.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_odbc.conf; then cp -p %D/etc/asterisk/cdr_odbc.conf-dist %D/etc/asterisk/cdr_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_pgsql.conf; then cp -p %D/etc/asterisk/cdr_pgsql.conf-dist %D/etc/asterisk/cdr_pgsql.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_tds.conf; then cp -p %D/etc/asterisk/cdr_tds.conf-dist %D/etc/asterisk/cdr_tds.conf; fi -@exec if test ! -e %D/etc/asterisk/codecs.conf; then cp -p %D/etc/asterisk/codecs.conf-dist %D/etc/asterisk/codecs.conf; fi -@exec if test ! -e %D/etc/asterisk/dnsmgr.conf; then cp -p %D/etc/asterisk/dnsmgr.conf-dist %D/etc/asterisk/dnsmgr.conf; fi -@exec if test ! -e %D/etc/asterisk/dundi.conf; then cp -p %D/etc/asterisk/dundi.conf-dist %D/etc/asterisk/dundi.conf; fi -@exec if test ! -e %D/etc/asterisk/enum.conf; then cp -p %D/etc/asterisk/enum.conf-dist %D/etc/asterisk/enum.conf; fi -@exec if test ! -e %D/etc/asterisk/extconfig.conf; then cp -p %D/etc/asterisk/extconfig.conf-dist %D/etc/asterisk/extconfig.conf; fi -@exec if test ! -e %D/etc/asterisk/extensions.ael; then cp -p %D/etc/asterisk/extensions.ael-dist %D/etc/asterisk/extensions.ael; fi -@exec if test ! -e %D/etc/asterisk/extensions.conf; then cp -p %D/etc/asterisk/extensions.conf-dist %D/etc/asterisk/extensions.conf; fi -@exec if test ! -e %D/etc/asterisk/features.conf; then cp -p %D/etc/asterisk/features.conf-dist %D/etc/asterisk/features.conf; fi -@exec if test ! -e %D/etc/asterisk/festival.conf; then cp -p %D/etc/asterisk/festival.conf-dist %D/etc/asterisk/festival.conf; fi -@exec if test ! -e %D/etc/asterisk/iax.conf; then cp -p %D/etc/asterisk/iax.conf-dist %D/etc/asterisk/iax.conf; fi -@exec if test ! -e %D/etc/asterisk/iaxprov.conf; then cp -p %D/etc/asterisk/iaxprov.conf-dist %D/etc/asterisk/iaxprov.conf; fi -@exec if test ! -e %D/etc/asterisk/indications.conf; then cp -p %D/etc/asterisk/indications.conf-dist %D/etc/asterisk/indications.conf; fi -@exec if test ! -e %D/etc/asterisk/logger.conf; then cp -p %D/etc/asterisk/logger.conf-dist %D/etc/asterisk/logger.conf; fi -@exec if test ! -e %D/etc/asterisk/manager.conf; then cp -p %D/etc/asterisk/manager.conf-dist %D/etc/asterisk/manager.conf; fi -@exec if test ! -e %D/etc/asterisk/meetme.conf; then cp -p %D/etc/asterisk/meetme.conf-dist %D/etc/asterisk/meetme.conf; fi -@exec if test ! -e %D/etc/asterisk/mgcp.conf; then cp -p %D/etc/asterisk/mgcp.conf-dist %D/etc/asterisk/mgcp.conf; fi -@exec if test ! -e %D/etc/asterisk/misdn.conf; then cp -p %D/etc/asterisk/misdn.conf-dist %D/etc/asterisk/misdn.conf; fi -@exec if test ! -e %D/etc/asterisk/modules.conf; then cp -p %D/etc/asterisk/modules.conf-dist %D/etc/asterisk/modules.conf; fi -@exec if test ! -e %D/etc/asterisk/musiconhold.conf; then cp -p %D/etc/asterisk/musiconhold.conf-dist %D/etc/asterisk/musiconhold.conf; fi -@exec if test ! -e %D/etc/asterisk/osp.conf; then cp -p %D/etc/asterisk/osp.conf-dist %D/etc/asterisk/osp.conf; fi -@exec if test ! -e %D/etc/asterisk/oss.conf; then cp -p %D/etc/asterisk/oss.conf-dist %D/etc/asterisk/oss.conf; fi -@exec if test ! -e %D/etc/asterisk/phone.conf; then cp -p %D/etc/asterisk/phone.conf-dist %D/etc/asterisk/phone.conf; fi -@exec if test ! -e %D/etc/asterisk/privacy.conf; then cp -p %D/etc/asterisk/privacy.conf-dist %D/etc/asterisk/privacy.conf; fi -@exec if test ! -e %D/etc/asterisk/queues.conf; then cp -p %D/etc/asterisk/queues.conf-dist %D/etc/asterisk/queues.conf; fi -@exec if test ! -e %D/etc/asterisk/res_pgsql.conf; then cp -p %D/etc/asterisk/res_pgsql.conf-dist %D/etc/asterisk/res_pgsql.conf; fi -@exec if test ! -e %D/etc/asterisk/res_odbc.conf; then cp -p %D/etc/asterisk/res_odbc.conf-dist %D/etc/asterisk/res_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/rpt.conf; then cp -p %D/etc/asterisk/rpt.conf-dist %D/etc/asterisk/rpt.conf; fi -@exec if test ! -e %D/etc/asterisk/rtp.conf; then cp -p %D/etc/asterisk/rtp.conf-dist %D/etc/asterisk/rtp.conf; fi -@exec if test ! -e %D/etc/asterisk/sip.conf; then cp -p %D/etc/asterisk/sip.conf-dist %D/etc/asterisk/sip.conf; fi -@exec if test ! -e %D/etc/asterisk/sip_notify.conf; then cp -p %D/etc/asterisk/sip_notify.conf-dist %D/etc/asterisk/sip_notify.conf; fi -@exec if test ! -e %D/etc/asterisk/skinny.conf; then cp -p %D/etc/asterisk/skinny.conf-dist %D/etc/asterisk/skinny.conf; fi -@exec if test ! -e %D/etc/asterisk/telcordia-1.adsi; then cp -p %D/etc/asterisk/telcordia-1.adsi-dist %D/etc/asterisk/telcordia-1.adsi; fi -@exec if test ! -e %D/etc/asterisk/voicemail.conf; then cp -p %D/etc/asterisk/voicemail.conf-dist %D/etc/asterisk/voicemail.conf; fi -@exec if test ! -e %D/etc/asterisk/vpb.conf; then cp -p %D/etc/asterisk/vpb.conf-dist %D/etc/asterisk/vpb.conf; fi -@exec if test ! -e %D/etc/asterisk/chan_dahdi.conf; then cp -p %D/etc/asterisk/chan_dahdi.conf-dist %D/etc/asterisk/chan_dahdi.conf; fi -@exec if test ! -e %D/etc/asterisk/udptl.conf; then cp -p %D/etc/asterisk/udptl.conf-dist %D/etc/asterisk/udptl.conf; fi -@exec if test ! -e %D/etc/asterisk/users.conf; then cp -p %D/etc/asterisk/users.conf-dist %D/etc/asterisk/users.conf; fi -@exec if test ! -e %D/etc/asterisk/smdi.conf; then cp -p %D/etc/asterisk/smdi.conf-dist %D/etc/asterisk/smdi.conf; fi -@exec if test ! -e %D/etc/asterisk/sla.conf; then cp -p %D/etc/asterisk/sla.conf-dist %D/etc/asterisk/sla.conf; fi -@exec if test ! -e %D/etc/asterisk/say.conf; then cp -p %D/etc/asterisk/say.conf-dist %D/etc/asterisk/say.conf; fi -@exec if test ! -e %D/etc/asterisk/res_snmp.conf; then cp -p %D/etc/asterisk/res_snmp.conf-dist %D/etc/asterisk/res_snmp.conf; fi -@exec if test ! -e %D/etc/asterisk/muted.conf; then cp -p %D/etc/asterisk/muted.conf-dist %D/etc/asterisk/muted.conf; fi -@exec if test ! -e %D/etc/asterisk/jabber.conf; then cp -p %D/etc/asterisk/jabber.conf-dist %D/etc/asterisk/jabber.conf; fi -@exec if test ! -e %D/etc/asterisk/http.conf; then cp -p %D/etc/asterisk/http.conf-dist %D/etc/asterisk/http.conf; fi -@exec if test ! -e %D/etc/asterisk/h323.conf; then cp -p %D/etc/asterisk/h323.conf-dist %D/etc/asterisk/h323.conf; fi -@exec if test ! -e %D/etc/asterisk/gtalk.conf; then cp -p %D/etc/asterisk/gtalk.conf-dist %D/etc/asterisk/gtalk.conf; fi -@exec if test ! -e %D/etc/asterisk/func_odbc.conf; then cp -p %D/etc/asterisk/func_odbc.conf-dist %D/etc/asterisk/func_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/followme.conf; then cp -p %D/etc/asterisk/followme.conf-dist %D/etc/asterisk/followme.conf; fi -@exec if test ! -e %D/etc/asterisk/amd.conf; then cp -p %D/etc/asterisk/amd.conf-dist %D/etc/asterisk/amd.conf; fi -include/asterisk.h -include/asterisk/abstract_jb.h -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/ael_structs.h -include/asterisk/aes.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -include/asterisk/ast_expr.h -include/asterisk/astdb.h -include/asterisk/astmm.h -include/asterisk/astobj.h -include/asterisk/astobj2.h -include/asterisk/astosp.h -include/asterisk/audiohook.h -include/asterisk/autoconfig.h -include/asterisk/build.h -include/asterisk/buildopts.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/compiler.h -include/asterisk/config.h -include/asterisk/crypto.h -include/asterisk/dahdi_compat.h -include/asterisk/devicestate.h -include/asterisk/dial.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/endian.h -include/asterisk/enum.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/global_datastores.h -include/asterisk/http.h -include/asterisk/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.h -include/asterisk/jabber.h -include/asterisk/jingle.h -include/asterisk/linkedlists.h -include/asterisk/localtime.h -include/asterisk/lock.h -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -include/asterisk/monitor.h -include/asterisk/musiconhold.h -include/asterisk/netsock.h -include/asterisk/options.h -include/asterisk/paths.h -include/asterisk/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/sha1.h -include/asterisk/slinfactory.h -include/asterisk/smdi.h -include/asterisk/speech.h -include/asterisk/srv.h -include/asterisk/stringfields.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/threadstorage.h -include/asterisk/time.h -include/asterisk/tonezone_compat.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/udptl.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_amd.so -lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_channelredirect.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.so -lib/asterisk/modules/app_dumpchan.so -lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -lib/asterisk/modules/app_followme.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_morsecode.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_speech_utils.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so -%%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so -%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so -lib/asterisk/modules/chan_agent.so -%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -%%WITH_ILBC%%lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_g723.so -lib/asterisk/modules/format_g726.so -lib/asterisk/modules/format_g729.so -lib/asterisk/modules/format_gsm.so -lib/asterisk/modules/format_h263.so -lib/asterisk/modules/format_h264.so -lib/asterisk/modules/format_ilbc.so -lib/asterisk/modules/format_jpeg.so -%%WITH_OGGVORBIS%%lib/asterisk/modules/format_ogg_vorbis.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_audiohookinherit.so -lib/asterisk/modules/func_base64.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_cdr.so -lib/asterisk/modules/func_channel.so -lib/asterisk/modules/func_curl.so -lib/asterisk/modules/func_cut.so -lib/asterisk/modules/func_db.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_env.so -lib/asterisk/modules/func_global.so -lib/asterisk/modules/func_groupcount.so -lib/asterisk/modules/func_language.so -lib/asterisk/modules/func_logic.so -lib/asterisk/modules/func_math.so -lib/asterisk/modules/func_md5.so -lib/asterisk/modules/func_moh.so -%%WITH_ODBC%%lib/asterisk/modules/func_odbc.so -lib/asterisk/modules/func_rand.so -lib/asterisk/modules/func_realtime.so -lib/asterisk/modules/func_sha1.so -lib/asterisk/modules/func_strings.so -lib/asterisk/modules/func_timeout.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -lib/asterisk/modules/res_clioriginate.so -%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so -lib/asterisk/modules/res_convert.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_musiconhold.so -lib/asterisk/modules/res_smdi.so -%%WITH_SNMP%%lib/asterisk/modules/res_snmp.so -lib/asterisk/modules/res_speech.so -sbin/aelparse -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/muted -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/agi-bin/jukebox.agi -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/moh/.asterisk-moh-opsound-wav -share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav -share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav -share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav -share/asterisk/moh/macroform-cold_day.wav -share/asterisk/moh/macroform-robot_dity.wav -share/asterisk/moh/macroform-the_simplicity.wav -share/asterisk/moh/manolo_camp-morning_coffee.wav -share/asterisk/moh/reno_project-system.wav -share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17 -share/asterisk/sounds/CHANGES-asterisk-core-en-1.4.17 -share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.17 -share/asterisk/sounds/LICENSE-asterisk-core-en-1.4.17 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/beeperr.gsm -share/asterisk/sounds/conf-nonextended.gsm -share/asterisk/sounds/conf-usermenu-162.gsm -share/asterisk/sounds/dir-usingkeypad.gsm -share/asterisk/sounds/dir-welcome.gsm -share/asterisk/sounds/spy-dahdi.gsm -share/asterisk/sounds/vm-Urgent.gsm -share/asterisk/sounds/vm-forward-multiple.gsm -share/asterisk/sounds/vm-invalid-password.gsm -share/asterisk/sounds/vm-marked-nonurgent.gsm -share/asterisk/sounds/vm-marked-urgent.gsm -share/asterisk/sounds/vm-record-prepend.gsm -share/asterisk/sounds/vm-review-nonurgent.gsm -share/asterisk/sounds/vm-review-urgent.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-adminmenu-162.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-extended.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-hasjoin.gsm -share/asterisk/sounds/conf-hasleft.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-leaderhasleft.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyone.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-otherinparty.gsm -share/asterisk/sounds/conf-placeintoconf.gsm -share/asterisk/sounds/conf-thereare.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/conf-userswilljoin.gsm -share/asterisk/sounds/conf-userwilljoin.gsm -share/asterisk/sounds/conf-waitforleader.gsm -share/asterisk/sounds/core-sounds-en.txt -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/dictate/both_help.gsm -share/asterisk/sounds/dictate/enter_filename.gsm -share/asterisk/sounds/dictate/forhelp.gsm -share/asterisk/sounds/dictate/pause.gsm -share/asterisk/sounds/dictate/paused.gsm -share/asterisk/sounds/dictate/play_help.gsm -share/asterisk/sounds/dictate/playback.gsm -share/asterisk/sounds/dictate/playback_mode.gsm -share/asterisk/sounds/dictate/record.gsm -share/asterisk/sounds/dictate/record_help.gsm -share/asterisk/sounds/dictate/record_mode.gsm -share/asterisk/sounds/dictate/truncating_audio.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/minus.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-first.gsm -share/asterisk/sounds/dir-firstlast.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-last.gsm -share/asterisk/sounds/dir-multi1.gsm -share/asterisk/sounds/dir-multi2.gsm -share/asterisk/sounds/dir-multi3.gsm -share/asterisk/sounds/dir-multi9.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/dir-pls-enter.gsm -share/asterisk/sounds/followme/call-from.gsm -share/asterisk/sounds/followme/no-recording.gsm -share/asterisk/sounds/followme/options.gsm -share/asterisk/sounds/followme/pls-hold-while-try.gsm -share/asterisk/sounds/followme/sorry.gsm -share/asterisk/sounds/followme/status.gsm -share/asterisk/sounds/hello-world.gsm -share/asterisk/sounds/hours.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/ascii123.gsm -share/asterisk/sounds/letters/ascii124.gsm -share/asterisk/sounds/letters/ascii125.gsm -share/asterisk/sounds/letters/ascii126.gsm -share/asterisk/sounds/letters/ascii34.gsm -share/asterisk/sounds/letters/ascii36.gsm -share/asterisk/sounds/letters/ascii37.gsm -share/asterisk/sounds/letters/ascii38.gsm -share/asterisk/sounds/letters/ascii39.gsm -share/asterisk/sounds/letters/ascii40.gsm -share/asterisk/sounds/letters/ascii41.gsm -share/asterisk/sounds/letters/ascii42.gsm -share/asterisk/sounds/letters/ascii44.gsm -share/asterisk/sounds/letters/ascii58.gsm -share/asterisk/sounds/letters/ascii59.gsm -share/asterisk/sounds/letters/ascii60.gsm -share/asterisk/sounds/letters/ascii62.gsm -share/asterisk/sounds/letters/ascii63.gsm -share/asterisk/sounds/letters/ascii91.gsm -share/asterisk/sounds/letters/ascii92.gsm -share/asterisk/sounds/letters/ascii93.gsm -share/asterisk/sounds/letters/ascii94.gsm -share/asterisk/sounds/letters/ascii95.gsm -share/asterisk/sounds/letters/ascii96.gsm -share/asterisk/sounds/letters/asterisk.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/minutes.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/priv-callee-options.gsm -share/asterisk/sounds/priv-callpending.gsm -share/asterisk/sounds/priv-introsaved.gsm -share/asterisk/sounds/priv-recordintro.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-periodic-announce.gsm -share/asterisk/sounds/queue-quantity1.gsm -share/asterisk/sounds/queue-quantity2.gsm -share/asterisk/sounds/queue-reporthold.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/screen-callee-options.gsm -share/asterisk/sounds/seconds.gsm -share/asterisk/sounds/silence/1.gsm -share/asterisk/sounds/silence/10.gsm -share/asterisk/sounds/silence/2.gsm -share/asterisk/sounds/silence/3.gsm -share/asterisk/sounds/silence/4.gsm -share/asterisk/sounds/silence/5.gsm -share/asterisk/sounds/silence/6.gsm -share/asterisk/sounds/silence/7.gsm -share/asterisk/sounds/silence/8.gsm -share/asterisk/sounds/silence/9.gsm -share/asterisk/sounds/spy-agent.gsm -share/asterisk/sounds/spy-console.gsm -share/asterisk/sounds/spy-h323.gsm -share/asterisk/sounds/spy-iax.gsm -share/asterisk/sounds/spy-iax2.gsm -share/asterisk/sounds/spy-jingle.gsm -share/asterisk/sounds/spy-local.gsm -share/asterisk/sounds/spy-mgcp.gsm -share/asterisk/sounds/spy-misdn.gsm -share/asterisk/sounds/spy-mobile.gsm -share/asterisk/sounds/spy-nbs.gsm -share/asterisk/sounds/spy-sip.gsm -share/asterisk/sounds/spy-skinny.gsm -share/asterisk/sounds/spy-unistim.gsm -share/asterisk/sounds/spy-usbradio.gsm -share/asterisk/sounds/spy-zap.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-duration.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forward.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-invalidpassword.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-minutes.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-newuser.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-onefor-full.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-opts-full.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-pls-try-again.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-temp.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-saveoper.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-tempgreetactive.gsm -share/asterisk/sounds/vm-tempgreeting.gsm -share/asterisk/sounds/vm-tempgreeting2.gsm -share/asterisk/sounds/vm-tempremoved.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tmpexists.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -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_ZAPTEL%%lib/asterisk/modules/codec_dahdi.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_ODBC%%lib/asterisk/modules/res_config_odbc.so -%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so -@dirrm share/asterisk/static-http -@dirrm share/asterisk/sounds/silence -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/fr -@dirrm share/asterisk/sounds/followme -@dirrm share/asterisk/sounds/es -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds/dictate -@dirrm share/asterisk/sounds -@dirrm share/asterisk/moh -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrmtry etc/asterisk -@exec mkdir -p %D/share/asterisk/sounds/fr -@exec mkdir -p %D/share/asterisk/sounds/es -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/log/asterisk/cdr-custom -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@exec mkdir -p %D/spool/asterisk/dictate -@exec mkdir -p %D/spool/asterisk/meetme -@exec mkdir -p %D/spool/asterisk/monitor -@exec mkdir -p %D/spool/asterisk/system -@exec mkdir -p %D/spool/asterisk/tmp -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile deleted file mode 100644 index 36db44c0a449..000000000000 --- a/net/asterisk14-addons/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# New ports collection makefile for: asterisk-addons -# Date created: 23 March 2006 -# Whom: Fabian Gast <fgast@only640k.org> -# -# $FreeBSD$ -# - -PORTNAME= asterisk-addons -PORTVERSION= 1.4.9 -PORTREVISION= 3 -CATEGORIES= net -MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ - http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= pneumann@gmail.com -COMMENT= GPL modules for the Asterisk Open Source PBX - -BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk -RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk - -OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off - -ONLY_FOR_ARCHS= i386 amd64 powerpc -USE_AUTOTOOLS= libtool:22 -USE_MYSQL= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes - -.include <bsd.port.pre.mk> - -.if defined(WITH_SAMPLE_CONFIG) -PLIST_SUB+= SAMPLE_CONFIG="" -.else -PLIST_SUB+= SAMPLE_CONFIG="@comment " -.endif - -pre-configure: - if ${GREP} -sq fixup_codecs ${LOCALBASE}/include/asterisk/channel.h; \ - then \ - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/codecnego.diff; \ - fi - -post-install: -.if defined(WITH_SAMPLE_CONFIG) - @cd ${WRKSRC} && ${GMAKE} samples -.endif - -.include <bsd.port.post.mk> diff --git a/net/asterisk14-addons/distinfo b/net/asterisk14-addons/distinfo deleted file mode 100644 index 593cb16c6f57..000000000000 --- a/net/asterisk14-addons/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (asterisk-addons-1.4.9.tar.gz) = 0c0ddf2386a9541e416e122ca082e611 -SHA256 (asterisk-addons-1.4.9.tar.gz) = 3d7bbcbbc074b58fcd81b8398b5c68c927ab2dca542b85fbac666ecc8bda11f0 -SIZE (asterisk-addons-1.4.9.tar.gz) = 806132 diff --git a/net/asterisk14-addons/files/codecnego.diff b/net/asterisk14-addons/files/codecnego.diff deleted file mode 100644 index 0cfe569b41ea..000000000000 --- a/net/asterisk14-addons/files/codecnego.diff +++ /dev/null @@ -1,215 +0,0 @@ ---- channels/chan_ooh323.c.orig 2007-07-21 15:17:52.000000000 +0800 -+++ channels/chan_ooh323.c 2008-02-13 15:37:17.000000000 +0800 -@@ -42,8 +42,8 @@ - - - /* Channel Definition */ --static struct ast_channel *ooh323_request(const char *type, int format, -- void *data, int *cause); -+static struct ast_channel *ooh323_request(const char *type, const struct ast_codec_pref *format, void *data, int *cause); -+ - static int ooh323_digit_begin(struct ast_channel *ast, char digit); - static int ooh323_digit_end(struct ast_channel *ast, char digit, unsigned int duration); - static int ooh323_call(struct ast_channel *ast, char *dest, int timeout); -@@ -57,8 +57,7 @@ - - static enum ast_rtp_get_result ooh323_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp); - static enum ast_rtp_get_result ooh323_get_vrtp_peer(struct ast_channel *chan, struct ast_rtp **rtp); --static int ooh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, -- struct ast_rtp *vrtp, int codecs, int nat_active); -+static int ooh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, const struct ast_codec_pref *codecs, int nat_active); - - static void print_codec_to_cli(int fd, struct ast_codec_pref *pref); - static void ast_ooh323c_exit(); -@@ -244,6 +243,7 @@ - { - struct ast_channel *ch = NULL; - int fmt; -+ int cap; - if(gH323Debug) - ast_log(LOG_DEBUG, "--- ooh323_new - %s\n", host); - -@@ -258,10 +258,11 @@ - ast_mutex_lock(&ch->lock); - ch->tech = &ooh323_tech; - -- ch->nativeformats = i->capability; -- -+ ast_codec_pref_init(&ch->nativeformats); -+ ast_codec_pref_append_missing2(&ch->nativeformats, i->capability); - -- fmt = ast_best_codec(ch->nativeformats); -+ cap = ast_codec_pref_bits(&ch->nativeformats); -+ fmt = ast_best_codec(cap); - - ch->fds[0] = ast_rtp_fd(i->rtp); - ch->fds[1] = ast_rtcp_fd(i->rtp); -@@ -451,8 +452,7 @@ - /* - Possible data values - peername, exten/peername, exten@ip - */ --static struct ast_channel *ooh323_request(const char *type, int format, -- void *data, int *cause) -+static struct ast_channel *ooh323_request(const char *type, const struct ast_codec_pref *formats, void *data, int *cause) - - { - struct ast_channel *chan=NULL; -@@ -461,22 +461,11 @@ - char *dest = NULL; - char *ext = NULL; - char tmp[256]; -- char formats[512]; -- int oldformat; - char *sport = NULL; - int port = 0; - - if(gH323Debug) -- ast_verbose("--- ooh323_request - data %s format %s\n", (char*)data, -- ast_getformatname_multiple(formats,512,format) ); -- -- oldformat = format; -- format &= ((AST_FORMAT_MAX_AUDIO << 1) - 1); -- if (!format) { -- ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format " -- "'%d'\n", format); -- return NULL; -- } -+ ast_verbose("--- ooh323_request - data %s format %s\n", (char*)data, ast_codec_pref_dump(tmp, sizeof(tmp), formats) ); - - p = ooh323_alloc(0,0); /* Initial callRef is zero */ - -@@ -536,8 +525,8 @@ - if(ext) - strncpy(p->exten, ext, sizeof(p->exten)-1); - -- if(peer->capability & format) -- p->capability = peer->capability & format; -+ if(peer->capability & formats->audio_bits) -+ p->capability = peer->capability & formats->audio_bits; - else{ - p->capability = peer->capability; - } -@@ -971,11 +960,11 @@ - - if(f->frametype == AST_FRAME_VOICE) - { -- if(!(f->subclass & ast->nativeformats)) -+ if(!(f->subclass & ast->nativeformats.audio_bits)) - { - ast_log(LOG_WARNING, "Asked to transmit frame type %d, while native " - "formats is %d (read/write = %d/%d)\n", -- f->subclass, ast->nativeformats, ast->readformat, -+ f->subclass, ast->nativeformats.audio_bits, ast->readformat, - ast->writeformat); - return 0; - } -@@ -2219,12 +2208,12 @@ - int x, codec; - - for(x = 0; x < 32 ; x++) { -- codec = ast_codec_pref_index(pref, x); -+ codec = ast_codec_pref_index_audio(pref, x); - if (!codec) - break; - ast_cli(fd, "%s", ast_getformatname(codec)); -- ast_cli(fd, ":%d", pref->framing[x]); -- if (x < 31 && ast_codec_pref_index(pref, x + 1)) -+ ast_cli(fd, ":%d", pref->audio_framing[x]); -+ if (x < 31 && ast_codec_pref_index_audio(pref, x + 1)) - ast_cli(fd, ","); - } - if (!x) -@@ -3020,13 +3009,13 @@ - (ooCallData *call, struct ast_codec_pref *prefs) - { - int i=0; -- int codec = ast_codec_pref_index(prefs, i); -+ int codec = ast_codec_pref_index_audio(prefs, i); - - ooResetCapPrefs(call); - while(codec) - { - ooAppendCapToCapPrefs(call, ooh323_convertAsteriskCapToH323Cap(codec)); -- codec = ast_codec_pref_index(prefs, ++i); -+ codec = ast_codec_pref_index_audio(prefs, ++i); - } - - return 0; -@@ -3058,7 +3047,7 @@ - - static int ooh323_set_rtp_peer - (struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, -- int codecs, int nat_active) -+ const struct ast_codec_pref *codecs, int nat_active) - { - /* XXX Deal with Video */ - struct ooh323_pvt *p; -@@ -3106,7 +3095,7 @@ - strncpy(mediaInfo.lMediaIP, ast_inet_ntoa(us.sin_addr), sizeof(mediaInfo.lMediaIP)-1); - mediaInfo.lMediaPort = ntohs(us.sin_port); - mediaInfo.lMediaCntrlPort = mediaInfo.lMediaPort +1; -- for(x=0; 0 != (format=ast_codec_pref_index(&p->prefs, x)); x++) -+ for(x=0; 0 != (format=ast_codec_pref_index_audio(&p->prefs, x)); x++) - { - strcpy(mediaInfo.dir, "transmit"); - mediaInfo.cap = ooh323_convertAsteriskCapToH323Cap(format); -@@ -3250,10 +3239,11 @@ - /* We already hold the channel lock */ - if (f->frametype == AST_FRAME_VOICE) - { -- if (f->subclass != p->owner->nativeformats) -+ if (!(f->subclass & p->owner->nativeformats.audio_bits)) - { - ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); -- p->owner->nativeformats = f->subclass; -+ ast_codec_pref_append(&p->owner->nativeformats, f->subclass); -+ p->capability |= f->subclass; - ast_set_read_format(p->owner, p->owner->readformat); - ast_set_write_format(p->owner, p->owner->writeformat); - } ---- channels/ooh323cDriver.c.orig 2007-01-20 06:27:05.000000000 +0800 -+++ channels/ooh323cDriver.c 2008-02-11 16:47:24.000000000 +0800 -@@ -66,7 +66,7 @@ - if(gH323Debug) - ast_verbose("\tAdding capabilities to H323 endpoint\n"); - -- for(x=0; 0 != (format=ast_codec_pref_index(prefs, x)); x++) -+ for(x=0; 0 != (format=ast_codec_pref_index_audio(prefs, x)); x++) - { - if(format & AST_FORMAT_ULAW) - { -@@ -172,14 +172,14 @@ - ret |= ooCallEnableDTMFH245Signal(call); - - -- for(x=0; 0 !=(format=ast_codec_pref_index(prefs, x)); x++) -+ for(x=0; 0 !=(format=ast_codec_pref_index_audio(prefs, x)); x++) - { - if(format & AST_FORMAT_ULAW) - { - if(gH323Debug) - ast_verbose("\tAdding g711 ulaw capability to call(%s, %s)\n", - call->callType, call->callToken); -- txframes = prefs->framing[x]; -+ txframes = prefs->audio_framing[x]; - ret= ooCallAddG711Capability(call, OO_G711ULAW64K, txframes, - grxframes, OORXANDTX, - &ooh323c_start_receive_channel, -@@ -192,7 +192,7 @@ - if(gH323Debug) - ast_verbose("\tAdding g711 alaw capability to call(%s, %s)\n", - call->callType, call->callToken); -- txframes = prefs->framing[x]; -+ txframes = prefs->audio_framing[x]; - ret= ooCallAddG711Capability(call, OO_G711ALAW64K, txframes, - grxframes, OORXANDTX, - &ooh323c_start_receive_channel, -@@ -206,7 +206,7 @@ - if(gH323Debug) - ast_verbose("\tAdding g729A capability to call(%s, %s)\n", - call->callType, call->callToken); -- txframes = (prefs->framing[x])/10; -+ txframes = (prefs->audio_framing[x])/10; - ret= ooCallAddG729Capability(call, OO_G729A, txframes, 24, - OORXANDTX, &ooh323c_start_receive_channel, - &ooh323c_start_transmit_channel, diff --git a/net/asterisk14-addons/files/patch-Makefile b/net/asterisk14-addons/files/patch-Makefile deleted file mode 100644 index 4bcc7f4e3115..000000000000 --- a/net/asterisk14-addons/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig Thu Feb 14 00:58:11 2008 -+++ Makefile Fri Feb 22 19:17:58 2008 -@@ -27,7 +27,7 @@ - # Overwite config files on "make samples" - OVERWRITE:=y - --ASTCFLAGS+=-fPIC -+ASTCFLAGS+=-fPIC -I${PREFIX}/include - - #NOISY_BUILD=yes - diff --git a/net/asterisk14-addons/pkg-descr b/net/asterisk14-addons/pkg-descr deleted file mode 100644 index d2454dbd184f..000000000000 --- a/net/asterisk14-addons/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This package contains additional modules for the Asterisk Open Source PBX -which are, not included in the normal base distribution, becouse of licence -incompatilities. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk14-addons/pkg-plist b/net/asterisk14-addons/pkg-plist deleted file mode 100644 index eec5dd3eca6e..000000000000 --- a/net/asterisk14-addons/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -lib/asterisk/modules/app_addon_sql_mysql.so -lib/asterisk/modules/app_saycountpl.so -lib/asterisk/modules/cdr_addon_mysql.so -lib/asterisk/modules/res_config_mysql.so -lib/asterisk/modules/format_mp3.so -lib/asterisk/modules/chan_ooh323.so -%%SAMPLE_CONFIG%%etc/asterisk/cdr_mysql.conf -%%SAMPLE_CONFIG%%etc/asterisk/res_mysql.conf -%%SAMPLE_CONFIG%%etc/asterisk/ooh323.conf -%%SAMPLE_CONFIG%%etc/asterisk/mysql.conf diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile deleted file mode 100644 index bec830c86655..000000000000 --- a/net/asterisk14/Makefile +++ /dev/null @@ -1,198 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.4.29 -PORTREVISION= 4 -CATEGORIES= net -MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ - http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ - newt.52:${PORTSDIR}/devel/newt \ - gsm.1:${PORTSDIR}/audio/gsm \ - curl.6:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} -CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 -USE_GMAKE= yes -USE_BISON= build -USE_RC_SUBR= asterisk.sh -MAKE_ENV= MKDIR="${MKDIR}" \ - PWLIBDIR=${LOCALBASE}/share/pwlib \ - OPENH323DIR=${LOCALBASE}/share/openh323 \ - OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ - ASTCFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" \ - ASTLDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 -CONFLICTS= asterisk*-1.2* asterisk*-1.6* - -OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ - ODBC "Enable ODBC support" on \ - POSTGRES "Enable PostgreSQL support" on \ - RADIUS "Enable RADIUS accounting support" on \ - SNMP "Enable SNMP support" on \ - H323 "Enable H.323 support" on \ - FREETDS "Enable FreeTDS support" on \ - JABBER "Enable Jabber and Gtalk support" on \ - SQLITE "Enable SQLITE support" on \ - CODEC_PATCH "Apply codec negotiation patch" off \ - ILBC "Enable iLBC codec" off \ - MISC_PATCHES "Apply additional patches" off - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" || ${ARCH} == "amd64" -OPTIONS+= ZAPTEL "Enable Zaptel support" off - -# Include this since we have altered OPTIONS. -.include "$(PORTSDIR)/Mk/bsd.port.options.mk" -.endif - -.if !defined(WITH_H323) -PLIST_SUB+= WITH_H323="@comment " -CONFIGURE_ARGS+= --without-h323 -.else -PLIST_SUB+= WITH_H323="" -CONFIGURE_ARGS+= --with-h323=${LOCALBASE} -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 -.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 -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if !defined(WITH_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -CONFIGURE_ARGS+= --without-odbc -.else -PLIST_SUB+= WITH_ODBC="" -CONFIGURE_ARGS+= --with-odbc --with-ltdl -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.7:${PORTSDIR}/devel/libltdl22 -.endif - -.if !defined(WITH_FREETDS) -PLIST_SUB+= WITH_FREETDS="@comment " -CONFIGURE_ARGS+= --without-tds -.else -PLIST_SUB+= WITH_FREETDS="" -CONFIGURE_ARGS+= --with-tds=${LOCALBASE} -LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds -.endif - -.if !defined(WITH_POSTGRES) -PLIST_SUB+= WITH_POSTGRES="@comment " -CONFIGURE_ARGS+= --without-postgres -.else -PLIST_SUB+= WITH_POSTGRES="" -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgres -.endif - -.if !defined(WITH_OGGVORBIS) -PLIST_SUB+= WITH_OGGVORBIS="@comment " -CONFIGURE_ARGS+= --without-ogg -.else -PLIST_SUB+= WITH_OGGVORBIS="" -CONFIGURE_ARGS+= --with-ogg -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis -.endif - -.if !defined(WITH_RADIUS) -PLIST_SUB+= WITH_RADIUS="@comment " -CONFIGURE_ARGS+= --without-radius -.else -PLIST_SUB+= WITH_RADIUS="" -CONFIGURE_ARGS+= --with-radius -LIB_DEPENDS+= radiusclient-ng.2:${PORTSDIR}/net/radiusclient -.endif - -.if !defined(WITH_SNMP) -PLIST_SUB+= WITH_SNMP="@comment " -CONFIGURE_ARGS+= --without-netsnmp -.else -PLIST_SUB+= WITH_SNMP="" -CONFIGURE_ARGS+= --with-netsnmp -LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp -.endif - -.if !defined(WITH_JABBER) -PLIST_SUB+= WITH_JABBER="@comment " -CONFIGURE_ARGS+= --without-iksemel -.else -PLIST_SUB+= WITH_JABBER="" -CONFIGURE_ARGS+= --with-iksemel -LIB_DEPENDS+= iksemel.4:${PORTSDIR}/textproc/iksemel -.endif - -.if !defined(WITH_SQLITE) -PLIST_SUB+= WITH_SQLITE="@comment " -CONFIGURE_ARGS+= --without-sqlite -.else -PLIST_SUB+= WITH_SQLITE="" -CONFIGURE_ARGS+= --with-sqlite -LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite2 -.endif - -.if !defined(WITH_ILBC) -PLIST_SUB+= WITH_ILBC="@comment " -.else -PLIST_SUB+= WITH_ILBC="" -EXTRA_PATCHES+= ${PATCHDIR}/ilbc_enable.diff -.endif - -.if defined(WITH_CODEC_PATCH) -PATCHFILES= asterisk-1.4.27-codec-negotiation-20091120.diff.gz -PATCH_SITES= http://b2bua.org/chrome/site/ -EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile -.else -EXTRA_PATCHES+= ${PATCHDIR}/nocodecnego-patch-Makefile -.endif - -.if defined(WITH_MISC_PATCHES) -EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff -EXTRA_PATCHES+= ${PATCHDIR}/sip_force_callid.diff -EXTRA_PATCHES+= ${PATCHDIR}/sip_set_auth.diff -.if defined(WITH_CODEC_PATCH) -EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-codecnego.diff -.else -EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-nocodecnego.diff -.endif -.endif - -post-extract: - ${MKDIR} ${WRKSRC}/codecs/ilbc - ${FIND} ${WRKSRC} -name '*.d' -delete - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include <bsd.port.post.mk> diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo deleted file mode 100644 index 1c21b1a25ead..000000000000 --- a/net/asterisk14/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.4.29.tar.gz) = b49d0a269e11b6e85c75edce577b5103 -SHA256 (asterisk-1.4.29.tar.gz) = ecb1202f50fc5d7738d1b5bf6451b28e356f3469266dd64bcd637be71f91bd09 -SIZE (asterisk-1.4.29.tar.gz) = 21534219 -MD5 (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 4dedd23b3c9c00bcdcc69b8be878f15c -SHA256 (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 68f895de29f30296a47d32a5eaab8df367d92ae87b01ea9f2262556a1f1e5cbb -SIZE (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 40455 diff --git a/net/asterisk14/files/asterisk.sh.in b/net/asterisk14/files/asterisk.sh.in deleted file mode 100644 index ca5941068460..000000000000 --- a/net/asterisk14/files/asterisk.sh.in +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# PROVIDE: asterisk -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -stop_precmd=asterisk_shutdown -sig_stop=KILL -asterisk_shutdown () { - %%PREFIX%%/sbin/asterisk -qrx 'stop now' - sleep 1 - return 0 -} - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk - -load_rc_config $name - -pidfile=${asterisk_pidfile:-"/var/run/asterisk.pid"} - -asterisk_enable=${asterisk_enable:-"NO"} - -run_rc_command "$1" diff --git a/net/asterisk14/files/codecnego-patch-Makefile b/net/asterisk14/files/codecnego-patch-Makefile deleted file mode 100644 index e39dd6f62082..000000000000 --- a/net/asterisk14/files/codecnego-patch-Makefile +++ /dev/null @@ -1,219 +0,0 @@ ---- Makefile.orig 2009-11-20 17:48:05.000000000 +0200 -+++ Makefile 2009-11-20 17:50:33.000000000 +0200 -@@ -101,7 +101,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - # Staging directory - # Files are copied here temporarily during the install process -@@ -135,7 +135,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk - endif -@@ -225,9 +225,11 @@ - _ASTLDFLAGS+=-L/usr/local/lib - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char -@@ -235,7 +237,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - endif -@@ -416,15 +418,15 @@ - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -445,47 +447,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -521,7 +523,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -559,31 +561,23 @@ - upgrade: bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ - if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ - done -- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ if true; then \ - ( \ - echo "[directories]" ; \ - echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -670,20 +664,23 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" diff --git a/net/asterisk14/files/dtmf_debug.diff b/net/asterisk14/files/dtmf_debug.diff deleted file mode 100644 index 2a5b6bc9ea33..000000000000 --- a/net/asterisk14/files/dtmf_debug.diff +++ /dev/null @@ -1,226 +0,0 @@ ---- channels/chan_sip.c.orig 2009-05-12 21:18:44.000000000 +0300 -+++ channels/chan_sip.c 2009-05-26 12:50:22.000000000 +0300 -@@ -3891,6 +3891,7 @@ - ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner); - else { - p->owner = newchan; -+ ast_rtp_set_chan_name(p->rtp, newchan->name); - /* Re-invite RTP back to Asterisk. Needed if channel is masqueraded out of a native - RTP bridge (i.e., RTP not going through Asterisk): RTP bridge code might not be - able to do this if the masquerade happens before the bridge breaks (e.g., AMI -@@ -4168,6 +4169,7 @@ - if (i->rtp) { - tmp->fds[0] = ast_rtp_fd(i->rtp); - tmp->fds[1] = ast_rtcp_fd(i->rtp); -+ ast_rtp_set_chan_id(i->rtp, i->callid); - } - if (needvideo && i->vrtp) { - tmp->fds[2] = ast_rtp_fd(i->vrtp); -@@ -4195,6 +4197,8 @@ - if (!ast_strlen_zero(i->language)) - ast_string_field_set(tmp, language, i->language); - i->owner = tmp; -+ ast_rtp_set_chan_name(i->rtp, tmp->name); -+ - ast_module_ref(ast_module_info->self); - ast_copy_string(tmp->context, i->context, sizeof(tmp->context)); - /*Since it is valid to have extensions in the dialplan that have unescaped characters in them -@@ -4621,8 +4625,10 @@ - build_via(p); - if (!callid) - build_callid_pvt(p); -- else -+ else { - ast_string_field_set(p, callid, callid); -+ ast_rtp_set_chan_id(p->rtp, p->callid); -+ } - /* Assign default music on hold class */ - ast_string_field_set(p, mohinterpret, default_mohinterpret); - ast_string_field_set(p, mohsuggest, default_mohsuggest); ---- include/asterisk/rtp.h.orig 2008-03-04 20:05:28.000000000 +0200 -+++ include/asterisk/rtp.h 2009-05-26 12:50:22.000000000 +0300 -@@ -243,6 +243,9 @@ - - int ast_rtp_codec_getformat(int pt); - -+void ast_rtp_set_chan_name(struct ast_rtp *, const char *); -+void ast_rtp_set_chan_id(struct ast_rtp *, const char *); -+ - /*! \brief Set rtp timeout */ - void ast_rtp_set_rtptimeout(struct ast_rtp *rtp, int timeout); - /*! \brief Set rtp hold timeout */ ---- main/rtp.c.orig 2009-11-20 17:51:49.000000000 +0200 -+++ main/rtp.c 2009-11-20 17:53:11.000000000 +0200 -@@ -81,6 +81,7 @@ - static int rtpstart; /*!< First port for RTP sessions (set in rtp.conf) */ - static int rtpend; /*!< Last port for RTP sessions (set in rtp.conf) */ - static int rtpdebug; /*!< Are we debugging? */ -+static int rtpdebugdtmf; /*!< Are we debugging DTMFs? */ - static int rtcpdebug; /*!< Are we debugging RTCP? */ - static int rtcpstats; /*!< Are we debugging RTCP? */ - static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */ -@@ -170,6 +171,8 @@ - struct ast_rtp *bridged; /*!< Who we are Packet bridged to */ - int set_marker_bit:1; /*!< Whether to set the marker bit or not */ - unsigned int constantssrc:1; -+ char chan_name[100]; -+ char chan_id[100]; - }; - - /* Forward declarations */ -@@ -676,8 +679,8 @@ - struct ast_frame *f = NULL; - event = ntohl(*((unsigned int *)(data))); - event &= 0x001F; -- if (option_debug > 2 || rtpdebug) -- ast_log(LOG_DEBUG, "Cisco DTMF Digit: %08x (len = %d)\n", event, len); -+ if (option_debug > 2 || rtpdebug || rtpdebugdtmf) -+ ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF packet: %08x (len = %d)\n", rtp->chan_name, rtp->chan_id, event, len); - if (event < 10) { - resp = '0' + event; - } else if (event < 11) { -@@ -691,12 +694,25 @@ - } - if (rtp->resp && (rtp->resp != resp)) { - f = send_dtmf(rtp, AST_FRAME_DTMF_END); -+ ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF event: %c\n", rtp->chan_name, rtp->chan_id, rtp->resp); - } - rtp->resp = resp; - rtp->dtmf_timeout = 0; - return f; - } - -+void ast_rtp_set_chan_id(struct ast_rtp *rtp, const char *chan_id) { -+ if (rtp == NULL || chan_id == NULL) -+ return; -+ snprintf(rtp->chan_id, sizeof(rtp->chan_id), "%s", chan_id); -+} -+ -+void ast_rtp_set_chan_name(struct ast_rtp *rtp, const char *chan_name) { -+ if (rtp == NULL || chan_name == NULL) -+ return; -+ snprintf(rtp->chan_name, sizeof(rtp->chan_name), "%s", chan_name); -+} -+ - /*! - * \brief Process RTP DTMF and events according to RFC 2833. - * -@@ -1101,6 +1117,10 @@ - struct rtpPayloadType rtpPT; - int reconstruct = ntohl(rtpheader[0]); - -+ /* If we are listening for DTMF - then feed all packets into the core to keep the RTP stream consistent when relaying DTMFs */ -+ if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF)) -+ return -1; -+ - /* Get fields from packet */ - payload = (reconstruct & 0x7f0000) >> 16; - mark = (((reconstruct & 0x800000) >> 23) != 0); -@@ -1108,10 +1128,6 @@ - /* Check what the payload value should be */ - rtpPT = ast_rtp_lookup_pt(rtp, payload); - -- /* If the payload is DTMF, and we are listening for DTMF - then feed it into the core */ -- if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF) && !rtpPT.isAstFormat && rtpPT.code == AST_RTP_DTMF) -- return -1; -- - /* Otherwise adjust bridged payload to match */ - bridged_payload = ast_rtp_lookup_code(bridged, rtpPT.isAstFormat, rtpPT.code); - -@@ -1306,11 +1322,12 @@ - /* This is special in-band data that's not one of our codecs */ - if (rtpPT.code == AST_RTP_DTMF) { - /* It's special -- rfc2833 process it */ -- if (rtp_debug_test_addr(&sin)) { -+ if (rtp_debug_test_addr(&sin) || rtpdebugdtmf) { - unsigned char *data; - unsigned int event; - unsigned int event_end; - unsigned int duration; -+ - data = rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen; - event = ntohl(*((unsigned int *)(data))); - event >>= 24; -@@ -1319,9 +1336,12 @@ - event_end >>= 24; - duration = ntohl(*((unsigned int *)(data))); - duration &= 0xFFFF; -- ast_verbose("Got RTP RFC2833 from %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration); -+ -+ ast_verbose("Channel: %s %s Got RTP RFC2833 from %s:%u to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d)\n", rtp->chan_name, rtp->chan_id, ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), ast_inet_ntoa(rtp->us.sin_addr), ntohs(rtp->us.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration); - } - f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen, seqno, timestamp); -+ if (rtpdebugdtmf && f) -+ ast_verbose("Channel: %s %s Got RFC2833 DTMF event %c of type %s\n", rtp->chan_name, rtp->chan_id, f->subclass, (f->frametype == AST_FRAME_DTMF_BEGIN ? "DTMF BEGIN" : (f->frametype == AST_FRAME_DTMF_END ? "DTMF_END" : "UNKNOWN"))); - } else if (rtpPT.code == AST_RTP_CISCO_DTMF) { - /* It's really special -- process it the Cisco way */ - if (rtp->lastevent <= seqno || (rtp->lastevent >= 65530 && seqno <= 6)) { -@@ -2287,8 +2307,9 @@ - ast_log(LOG_ERROR, "RTP Transmission error to %s:%u: %s\n", - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), strerror(errno)); -- if (rtp_debug_test_addr(&rtp->them)) -- ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf) -+ ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ rtp->chan_name, rtp->chan_id, - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); - /* Increment sequence number */ -@@ -2331,8 +2352,9 @@ - ast_log(LOG_ERROR, "RTP Transmission error to %s:%d: %s\n", - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), strerror(errno)); -- if (rtp_debug_test_addr(&rtp->them)) -- ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf) -+ ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", -+ rtp->chan_name, rtp->chan_id, - ast_inet_ntoa(rtp->them.sin_addr), - ntohs(rtp->them.sin_port), rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); - -@@ -3621,6 +3643,16 @@ - return RESULT_SUCCESS; - } - -+static int rtp_do_debug_dtmf(int fd, int argc, char *argv[]) -+{ -+ if (argc != 3) -+ return RESULT_SHOWUSAGE; -+ -+ rtpdebugdtmf = 1; -+ ast_cli(fd, "RTP DTMF debugging enabled\n"); -+ return RESULT_SUCCESS; -+} -+ - static int rtp_do_debug(int fd, int argc, char *argv[]) - { - if (argc != 2) { -@@ -3681,6 +3713,7 @@ - if (argc != 3) - return RESULT_SHOWUSAGE; - rtpdebug = 0; -+ rtpdebugdtmf = 0; - ast_cli(fd,"RTP Debugging Disabled\n"); - return RESULT_SUCCESS; - } -@@ -3741,7 +3774,7 @@ - } - - static char debug_usage[] = -- "Usage: rtp debug [ip host[:port]]\n" -+ "Usage: rtp debug [ip host[:port] | dtmf]\n" - " Enable dumping of all RTP packets to and from host.\n"; - - static char no_debug_usage[] = -@@ -3816,6 +3849,10 @@ - rtp_do_debug, "Enable RTP debugging", - debug_usage }, - -+ { { "rtp", "debug", "dtmf", NULL }, -+ rtp_do_debug_dtmf, "Enable RTP debugging on DTMFs", -+ debug_usage }, -+ - { { "rtp", "debug", "off", NULL }, - rtp_no_debug, "Disable RTP debugging", - no_debug_usage, NULL, &cli_rtp_no_debug_deprecated }, diff --git a/net/asterisk14/files/ilbc_enable.diff b/net/asterisk14/files/ilbc_enable.diff deleted file mode 100644 index a2a3c4f73d70..000000000000 --- a/net/asterisk14/files/ilbc_enable.diff +++ /dev/null @@ -1,7599 +0,0 @@ - -$FreeBSD$ - ---- menuselect-tree -+++ menuselect-tree -@@ -269,7 +269,6 @@ - <depend>gsm</depend> - </member> - <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so"> -- <defaultenabled>no</defaultenabled> - </member> - <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so"> - </member> -diff -druN codecs/ilbc.orig/FrameClassify.c codecs/ilbc/FrameClassify.c ---- codecs/ilbc.orig/FrameClassify.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/FrameClassify.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,110 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ FrameClassify.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "FrameClassify.h" -+ -+/*---------------------------------------------------------------* -+ * Classification of subframes to localize start state -+ *--------------------------------------------------------------*/ -+ -+int FrameClassify( /* index to the max-energy sub-frame */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i/o) the encoder state structure */ -+ float *residual /* (i) lpc residual signal */ -+) { -+ float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp; -+ int n, l, max_ssqEn_n; -+ const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9, -+ (float)1.0,(float)0.9,(float)0.8}; -+ const float sampEn_win[5]={(float)1.0/(float)6.0, -+ (float)2.0/(float)6.0, (float)3.0/(float)6.0, -+ (float)4.0/(float)6.0, (float)5.0/(float)6.0}; -+ -+ /* init the front and back energies to zero */ -+ -+ memset(fssqEn, 0, NSUB_MAX*sizeof(float)); -+ memset(bssqEn, 0, NSUB_MAX*sizeof(float)); -+ -+ /* Calculate front of first seqence */ -+ -+ n=0; -+ pp=residual; -+ -+ -+ for (l=0; l<5; l++) { -+ fssqEn[n] += sampEn_win[l] * (*pp) * (*pp); -+ pp++; -+ } -+ for (l=5; l<SUBL; l++) { -+ fssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ -+ /* Calculate front and back of all middle sequences */ -+ -+ for (n=1; n<iLBCenc_inst->nsub-1; n++) { -+ pp=residual+n*SUBL; -+ for (l=0; l<5; l++) { -+ fssqEn[n] += sampEn_win[l] * (*pp) * (*pp); -+ bssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ for (l=5; l<SUBL-5; l++) { -+ fssqEn[n] += (*pp) * (*pp); -+ bssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ for (l=SUBL-5; l<SUBL; l++) { -+ fssqEn[n] += (*pp) * (*pp); -+ bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp); -+ pp++; -+ } -+ } -+ -+ /* Calculate back of last seqence */ -+ -+ n=iLBCenc_inst->nsub-1; -+ pp=residual+n*SUBL; -+ for (l=0; l<SUBL-5; l++) { -+ bssqEn[n] += (*pp) * (*pp); -+ pp++; -+ } -+ for (l=SUBL-5; l<SUBL; l++) { -+ bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp); -+ pp++; -+ } -+ -+ /* find the index to the weighted 80 sample with -+ most energy */ -+ -+ if (iLBCenc_inst->mode==20) l=1; -+ else l=0; -+ -+ max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l]; -+ max_ssqEn_n=1; -+ for (n=2; n<iLBCenc_inst->nsub; n++) { -+ -+ l++; -+ -+ -+ if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) { -+ max_ssqEn=(fssqEn[n-1]+bssqEn[n]) * -+ ssqEn_win[l]; -+ max_ssqEn_n=n; -+ } -+ } -+ -+ return max_ssqEn_n; -+} -+ -+ -diff -druN codecs/ilbc.orig/FrameClassify.h codecs/ilbc/FrameClassify.h ---- codecs/ilbc.orig/FrameClassify.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/FrameClassify.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,26 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ FrameClassify.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+ -+ -+#ifndef __iLBC_FRAMECLASSIFY_H -+#define __iLBC_FRAMECLASSIFY_H -+ -+int FrameClassify( /* index to the max-energy sub-frame */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i/o) the encoder state structure */ -+ float *residual /* (i) lpc residual signal */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/LPCdecode.c codecs/ilbc/LPCdecode.c ---- codecs/ilbc.orig/LPCdecode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCdecode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,152 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPC_decode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "helpfun.h" -+#include "lsf.h" -+#include "iLBC_define.h" -+#include "LPCdecode.h" -+#include "constants.h" -+ -+/*---------------------------------------------------------------* -+ * interpolation of lsf coefficients for the decoder -+ *--------------------------------------------------------------*/ -+ -+void LSFinterpolate2a_dec( -+ float *a, /* (o) lpc coefficients for a sub-frame */ -+ float *lsf1, /* (i) first lsf coefficient vector */ -+ -+ -+ float *lsf2, /* (i) second lsf coefficient vector */ -+ float coef, /* (i) interpolation weight */ -+ int length /* (i) length of lsf vectors */ -+){ -+ float lsftmp[LPC_FILTERORDER]; -+ -+ interpolate(lsftmp, lsf1, lsf2, coef, length); -+ lsf2a(a, lsftmp); -+} -+ -+/*---------------------------------------------------------------* -+ * obtain dequantized lsf coefficients from quantization index -+ *--------------------------------------------------------------*/ -+ -+void SimplelsfDEQ( -+ float *lsfdeq, /* (o) dequantized lsf coefficients */ -+ int *index, /* (i) quantization index */ -+ int lpc_n /* (i) number of LPCs */ -+){ -+ int i, j, pos, cb_pos; -+ -+ /* decode first LSF */ -+ -+ pos = 0; -+ cb_pos = 0; -+ for (i = 0; i < LSF_NSPLIT; i++) { -+ for (j = 0; j < dim_lsfCbTbl[i]; j++) { -+ lsfdeq[pos + j] = lsfCbTbl[cb_pos + -+ (long)(index[i])*dim_lsfCbTbl[i] + j]; -+ } -+ pos += dim_lsfCbTbl[i]; -+ cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i]; -+ } -+ -+ if (lpc_n>1) { -+ -+ /* decode last LSF */ -+ -+ pos = 0; -+ cb_pos = 0; -+ for (i = 0; i < LSF_NSPLIT; i++) { -+ for (j = 0; j < dim_lsfCbTbl[i]; j++) { -+ lsfdeq[LPC_FILTERORDER + pos + j] = -+ lsfCbTbl[cb_pos + -+ (long)(index[LSF_NSPLIT + i])* -+ dim_lsfCbTbl[i] + j]; -+ } -+ pos += dim_lsfCbTbl[i]; -+ cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ -+ -+ * obtain synthesis and weighting filters form lsf coefficients -+ *---------------------------------------------------------------*/ -+ -+void DecoderInterpolateLSF( -+ float *syntdenum, /* (o) synthesis filter coefficients */ -+ float *weightdenum, /* (o) weighting denumerator -+ coefficients */ -+ float *lsfdeq, /* (i) dequantized lsf coefficients */ -+ int length, /* (i) length of lsf coefficient vector */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i) the decoder state structure */ -+){ -+ int i, pos, lp_length; -+ float lp[LPC_FILTERORDER + 1], *lsfdeq2; -+ -+ lsfdeq2 = lsfdeq + length; -+ lp_length = length + 1; -+ -+ if (iLBCdec_inst->mode==30) { -+ /* sub-frame 1: Interpolation between old and first */ -+ -+ LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq, -+ lsf_weightTbl_30ms[0], length); -+ memcpy(syntdenum,lp,lp_length*sizeof(float)); -+ bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, -+ lp_length); -+ -+ /* sub-frames 2 to 6: interpolation between first -+ and last LSF */ -+ -+ pos = lp_length; -+ for (i = 1; i < 6; i++) { -+ LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2, -+ lsf_weightTbl_30ms[i], length); -+ memcpy(syntdenum + pos,lp,lp_length*sizeof(float)); -+ bwexpand(weightdenum + pos, lp, -+ LPC_CHIRP_WEIGHTDENUM, lp_length); -+ pos += lp_length; -+ } -+ } -+ else { -+ pos = 0; -+ for (i = 0; i < iLBCdec_inst->nsub; i++) { -+ LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, -+ lsfdeq, lsf_weightTbl_20ms[i], length); -+ memcpy(syntdenum+pos,lp,lp_length*sizeof(float)); -+ bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM, -+ lp_length); -+ pos += lp_length; -+ } -+ } -+ -+ /* update memory */ -+ -+ -+ -+ if (iLBCdec_inst->mode==30) -+ memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2, -+ length*sizeof(float)); -+ else -+ memcpy(iLBCdec_inst->lsfdeqold, lsfdeq, -+ length*sizeof(float)); -+ -+} -+ -+ -diff -druN codecs/ilbc.orig/LPCdecode.h codecs/ilbc/LPCdecode.h ---- codecs/ilbc.orig/LPCdecode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCdecode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,44 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPC_decode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_LPC_DECODE_H -+#define __iLBC_LPC_DECODE_H -+ -+void LSFinterpolate2a_dec( -+ -+ -+ float *a, /* (o) lpc coefficients for a sub-frame */ -+ float *lsf1, /* (i) first lsf coefficient vector */ -+ float *lsf2, /* (i) second lsf coefficient vector */ -+ float coef, /* (i) interpolation weight */ -+ int length /* (i) length of lsf vectors */ -+); -+ -+void SimplelsfDEQ( -+ float *lsfdeq, /* (o) dequantized lsf coefficients */ -+ int *index, /* (i) quantization index */ -+ int lpc_n /* (i) number of LPCs */ -+); -+ -+void DecoderInterpolateLSF( -+ float *syntdenum, /* (o) synthesis filter coefficients */ -+ float *weightdenum, /* (o) weighting denumerator -+ coefficients */ -+ float *lsfdeq, /* (i) dequantized lsf coefficients */ -+ int length, /* (i) length of lsf coefficient vector */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i) the decoder state structure */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/LPCencode.c codecs/ilbc/LPCencode.c ---- codecs/ilbc.orig/LPCencode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCencode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,228 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPCencode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <string.h> -+ -+ -+ -+#include "iLBC_define.h" -+#include "LPCencode.h" -+#include "helpfun.h" -+#include "lsf.h" -+#include "constants.h" -+ -+/*----------------------------------------------------------------* -+ * lpc analysis (subrutine to LPCencode) -+ *---------------------------------------------------------------*/ -+ -+static void SimpleAnalysis( -+ float *lsf, /* (o) lsf coefficients */ -+ float *data, /* (i) new data vector */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+){ -+ int k, is; -+ float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1]; -+ float lp2[LPC_FILTERORDER + 1]; -+ float r[LPC_FILTERORDER + 1]; -+ -+ is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl; -+ memcpy(iLBCenc_inst->lpc_buffer+is,data, -+ iLBCenc_inst->blockl*sizeof(float)); -+ -+ /* No lookahead, last window is asymmetric */ -+ -+ for (k = 0; k < iLBCenc_inst->lpc_n; k++) { -+ -+ is = LPC_LOOKBACK; -+ -+ if (k < (iLBCenc_inst->lpc_n - 1)) { -+ window(temp, lpc_winTbl, -+ iLBCenc_inst->lpc_buffer, BLOCKL_MAX); -+ } else { -+ window(temp, lpc_asymwinTbl, -+ iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX); -+ } -+ -+ autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER); -+ window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1); -+ -+ levdurb(lp, temp, r, LPC_FILTERORDER); -+ bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1); -+ -+ a2lsf(lsf + k*LPC_FILTERORDER, lp2); -+ } -+ is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl; -+ memmove(iLBCenc_inst->lpc_buffer, -+ iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is, -+ is*sizeof(float)); -+} -+ -+/*----------------------------------------------------------------* -+ -+ -+ * lsf interpolator and conversion from lsf to a coefficients -+ * (subrutine to SimpleInterpolateLSF) -+ *---------------------------------------------------------------*/ -+ -+static void LSFinterpolate2a_enc( -+ float *a, /* (o) lpc coefficients */ -+ float *lsf1,/* (i) first set of lsf coefficients */ -+ float *lsf2,/* (i) second set of lsf coefficients */ -+ float coef, /* (i) weighting coefficient to use between -+ lsf1 and lsf2 */ -+ long length /* (i) length of coefficient vectors */ -+){ -+ float lsftmp[LPC_FILTERORDER]; -+ -+ interpolate(lsftmp, lsf1, lsf2, coef, length); -+ lsf2a(a, lsftmp); -+} -+ -+/*----------------------------------------------------------------* -+ * lsf interpolator (subrutine to LPCencode) -+ *---------------------------------------------------------------*/ -+ -+static void SimpleInterpolateLSF( -+ float *syntdenum, /* (o) the synthesis filter denominator -+ resulting from the quantized -+ interpolated lsf */ -+ float *weightdenum, /* (o) the weighting filter denominator -+ resulting from the unquantized -+ interpolated lsf */ -+ float *lsf, /* (i) the unquantized lsf coefficients */ -+ float *lsfdeq, /* (i) the dequantized lsf coefficients */ -+ float *lsfold, /* (i) the unquantized lsf coefficients of -+ the previous signal frame */ -+ float *lsfdeqold, /* (i) the dequantized lsf coefficients of -+ the previous signal frame */ -+ int length, /* (i) should equate LPC_FILTERORDER */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+){ -+ int i, pos, lp_length; -+ float lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2; -+ -+ lsf2 = lsf + length; -+ lsfdeq2 = lsfdeq + length; -+ lp_length = length + 1; -+ -+ if (iLBCenc_inst->mode==30) { -+ /* sub-frame 1: Interpolation between old and first -+ set of lsf coefficients */ -+ -+ LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, -+ lsf_weightTbl_30ms[0], length); -+ memcpy(syntdenum,lp,lp_length*sizeof(float)); -+ LSFinterpolate2a_enc(lp, lsfold, lsf, -+ -+ -+ lsf_weightTbl_30ms[0], length); -+ bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length); -+ -+ /* sub-frame 2 to 6: Interpolation between first -+ and second set of lsf coefficients */ -+ -+ pos = lp_length; -+ for (i = 1; i < iLBCenc_inst->nsub; i++) { -+ LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2, -+ lsf_weightTbl_30ms[i], length); -+ memcpy(syntdenum + pos,lp,lp_length*sizeof(float)); -+ -+ LSFinterpolate2a_enc(lp, lsf, lsf2, -+ lsf_weightTbl_30ms[i], length); -+ bwexpand(weightdenum + pos, lp, -+ LPC_CHIRP_WEIGHTDENUM, lp_length); -+ pos += lp_length; -+ } -+ } -+ else { -+ pos = 0; -+ for (i = 0; i < iLBCenc_inst->nsub; i++) { -+ LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, -+ lsf_weightTbl_20ms[i], length); -+ memcpy(syntdenum+pos,lp,lp_length*sizeof(float)); -+ LSFinterpolate2a_enc(lp, lsfold, lsf, -+ lsf_weightTbl_20ms[i], length); -+ bwexpand(weightdenum+pos, lp, -+ LPC_CHIRP_WEIGHTDENUM, lp_length); -+ pos += lp_length; -+ } -+ } -+ -+ /* update memory */ -+ -+ if (iLBCenc_inst->mode==30) { -+ memcpy(lsfold, lsf2, length*sizeof(float)); -+ memcpy(lsfdeqold, lsfdeq2, length*sizeof(float)); -+ } -+ else { -+ memcpy(lsfold, lsf, length*sizeof(float)); -+ memcpy(lsfdeqold, lsfdeq, length*sizeof(float)); -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * lsf quantizer (subrutine to LPCencode) -+ *---------------------------------------------------------------*/ -+ -+static void SimplelsfQ( -+ float *lsfdeq, /* (o) dequantized lsf coefficients -+ (dimension FILTERORDER) */ -+ int *index, /* (o) quantization index */ -+ float *lsf, /* (i) the lsf coefficient vector to be -+ -+ -+ quantized (dimension FILTERORDER ) */ -+ int lpc_n /* (i) number of lsf sets to quantize */ -+){ -+ /* Quantize first LSF with memoryless split VQ */ -+ SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT, -+ dim_lsfCbTbl, size_lsfCbTbl); -+ -+ if (lpc_n==2) { -+ /* Quantize second LSF with memoryless split VQ */ -+ SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT, -+ lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT, -+ dim_lsfCbTbl, size_lsfCbTbl); -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * lpc encoder -+ *---------------------------------------------------------------*/ -+ -+void LPCencode( -+ float *syntdenum, /* (i/o) synthesis filter coefficients -+ before/after encoding */ -+ float *weightdenum, /* (i/o) weighting denumerator -+ coefficients before/after -+ encoding */ -+ int *lsf_index, /* (o) lsf quantization index */ -+ float *data, /* (i) lsf coefficients to quantize */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+){ -+ float lsf[LPC_FILTERORDER * LPC_N_MAX]; -+ float lsfdeq[LPC_FILTERORDER * LPC_N_MAX]; -+ int change=0; -+ -+ SimpleAnalysis(lsf, data, iLBCenc_inst); -+ SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n); -+ change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n); -+ SimpleInterpolateLSF(syntdenum, weightdenum, -+ lsf, lsfdeq, iLBCenc_inst->lsfold, -+ iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst); -+} -+ -+ -+ -diff -druN codecs/ilbc.orig/LPCencode.h codecs/ilbc/LPCencode.h ---- codecs/ilbc.orig/LPCencode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCencode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,29 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ LPCencode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_LPCENCOD_H -+#define __iLBC_LPCENCOD_H -+ -+void LPCencode( -+ float *syntdenum, /* (i/o) synthesis filter coefficients -+ before/after encoding */ -+ float *weightdenum, /* (i/o) weighting denumerator coefficients -+ before/after encoding */ -+ int *lsf_index, /* (o) lsf quantization index */ -+ float *data, /* (i) lsf coefficients to quantize */ -+ iLBC_Enc_Inst_t *iLBCenc_inst -+ /* (i/o) the encoder state structure */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/Makefile codecs/ilbc/Makefile ---- codecs/ilbc.orig/Makefile 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/Makefile 2007-10-29 15:12:16.000000000 -0700 -@@ -0,0 +1,20 @@ -+LIB=libilbc.a -+CFLAGS+=-fPIC -+ -+OBJS=anaFilter.o iCBSearch.o packing.o \ -+ constants.o gainquant.o iLBC_decode.o StateConstructW.o \ -+ createCB.o getCBvec.o iLBC_encode.o StateSearchW.o doCPLC.o \ -+ helpfun.o syntFilter.o enhancer.o hpInput.o LPCdecode.o \ -+ filter.o hpOutput.o LPCencode.o FrameClassify.o iCBConstruct.o lsf.o -+ -+include $(ASTTOPDIR)/Makefile.rules -+ -+all: $(LIB) -+ -+$(LIB): $(OBJS) -+ $(ECHO_PREFIX) echo " [AR] $^ -> $@" -+ $(CMD_PREFIX) $(AR) cr $@ $^ -+ $(CMD_PREFIX) $(RANLIB) $@ -+ -+clean: -+ rm -f $(LIB) *.o .*.d *.s *.i -diff -druN codecs/ilbc.orig/StateConstructW.c codecs/ilbc/StateConstructW.c ---- codecs/ilbc.orig/StateConstructW.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateConstructW.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,76 @@ -+ -+/****************************************************************** -+ -+ -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateConstructW.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "StateConstructW.h" -+#include "constants.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ * decoding of the start state -+ *---------------------------------------------------------------*/ -+ -+void StateConstructW( -+ int idxForMax, /* (i) 6-bit index for the quantization of -+ max amplitude */ -+ int *idxVec, /* (i) vector of quantization indexes */ -+ float *syntDenum, /* (i) synthesis filter denumerator */ -+ float *out, /* (o) the decoded state vector */ -+ int len /* (i) length of a state vector */ -+){ -+ float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp, -+ numerator[LPC_FILTERORDER+1]; -+ float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout; -+ int k,tmpi; -+ -+ /* decoding of the maximum value */ -+ -+ maxVal = state_frgqTbl[idxForMax]; -+ maxVal = (float)pow(10,maxVal)/(float)4.5; -+ -+ /* initialization of buffers and coefficients */ -+ -+ memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ for (k=0; k<LPC_FILTERORDER; k++) { -+ numerator[k]=syntDenum[LPC_FILTERORDER-k]; -+ } -+ numerator[LPC_FILTERORDER]=syntDenum[0]; -+ tmp = &tmpbuf[LPC_FILTERORDER]; -+ fout = &foutbuf[LPC_FILTERORDER]; -+ -+ /* decoding of the sample values */ -+ -+ for (k=0; k<len; k++) { -+ tmpi = len-1-k; -+ /* maxVal = 1/scal */ -+ -+ -+ tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]]; -+ } -+ -+ /* circular convolution with all-pass filter */ -+ -+ memset(tmp+len, 0, len*sizeof(float)); -+ ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, -+ LPC_FILTERORDER, fout); -+ for (k=0;k<len;k++) { -+ out[k] = fout[len-1-k]+fout[2*len-1-k]; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/StateConstructW.h codecs/ilbc/StateConstructW.h ---- codecs/ilbc.orig/StateConstructW.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateConstructW.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,27 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateConstructW.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_STATECONSTRUCTW_H -+#define __iLBC_STATECONSTRUCTW_H -+ -+void StateConstructW( -+ int idxForMax, /* (i) 6-bit index for the quantization of -+ max amplitude */ -+ int *idxVec, /* (i) vector of quantization indexes */ -+ float *syntDenum, /* (i) synthesis filter denumerator */ -+ float *out, /* (o) the decoded state vector */ -+ int len /* (i) length of a state vector */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/StateSearchW.c codecs/ilbc/StateSearchW.c ---- codecs/ilbc.orig/StateSearchW.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateSearchW.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,194 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateSearchW.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "StateSearchW.h" -+#include "constants.h" -+#include "filter.h" -+#include "helpfun.h" -+ -+/*----------------------------------------------------------------* -+ * predictive noise shaping encoding of scaled start state -+ * (subrutine for StateSearchW) -+ *---------------------------------------------------------------*/ -+ -+void AbsQuantW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *in, /* (i) vector to encode */ -+ float *syntDenum, /* (i) denominator of synthesis filter */ -+ float *weightDenum, /* (i) denominator of weighting filter */ -+ int *out, /* (o) vector of quantizer indexes */ -+ int len, /* (i) length of vector to encode and -+ vector of quantizer indexes */ -+ int state_first /* (i) position of start state in the -+ 80 vec */ -+){ -+ float *syntOut; -+ float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS]; -+ float toQ, xq; -+ int n; -+ int index; -+ -+ /* initialization of buffer for filtering */ -+ -+ memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ -+ -+ /* initialization of pointer for filtering */ -+ -+ syntOut = &syntOutBuf[LPC_FILTERORDER]; -+ -+ /* synthesis and weighting filters on input */ -+ -+ if (state_first) { -+ AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER); -+ } else { -+ AllPoleFilter (in, weightDenum, -+ iLBCenc_inst->state_short_len-SUBL, -+ LPC_FILTERORDER); -+ } -+ -+ /* encoding loop */ -+ -+ for (n=0; n<len; n++) { -+ -+ /* time update of filter coefficients */ -+ -+ if ((state_first)&&(n==SUBL)){ -+ syntDenum += (LPC_FILTERORDER+1); -+ weightDenum += (LPC_FILTERORDER+1); -+ -+ /* synthesis and weighting filters on input */ -+ AllPoleFilter (&in[n], weightDenum, len-n, -+ LPC_FILTERORDER); -+ -+ } else if ((state_first==0)&& -+ (n==(iLBCenc_inst->state_short_len-SUBL))) { -+ syntDenum += (LPC_FILTERORDER+1); -+ weightDenum += (LPC_FILTERORDER+1); -+ -+ /* synthesis and weighting filters on input */ -+ AllPoleFilter (&in[n], weightDenum, len-n, -+ LPC_FILTERORDER); -+ -+ } -+ -+ /* prediction of synthesized and weighted input */ -+ -+ syntOut[n] = 0.0; -+ AllPoleFilter (&syntOut[n], weightDenum, 1, -+ LPC_FILTERORDER); -+ -+ /* quantization */ -+ -+ toQ = in[n]-syntOut[n]; -+ sort_sq(&xq, &index, toQ, state_sq3Tbl, 8); -+ out[n]=index; -+ syntOut[n] = state_sq3Tbl[out[n]]; -+ -+ /* update of the prediction filter */ -+ -+ -+ -+ AllPoleFilter(&syntOut[n], weightDenum, 1, -+ LPC_FILTERORDER); -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * encoding of start state -+ *---------------------------------------------------------------*/ -+ -+void StateSearchW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *residual,/* (i) target residual vector */ -+ float *syntDenum, /* (i) lpc synthesis filter */ -+ float *weightDenum, /* (i) weighting filter denuminator */ -+ int *idxForMax, /* (o) quantizer index for maximum -+ amplitude */ -+ int *idxVec, /* (o) vector of quantization indexes */ -+ int len, /* (i) length of all vectors */ -+ int state_first /* (i) position of start state in the -+ 80 vec */ -+){ -+ float dtmp, maxVal; -+ float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS]; -+ float *tmp, numerator[1+LPC_FILTERORDER]; -+ float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout; -+ int k; -+ float qmax, scal; -+ -+ /* initialization of buffers and filter coefficients */ -+ -+ memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float)); -+ for (k=0; k<LPC_FILTERORDER; k++) { -+ numerator[k]=syntDenum[LPC_FILTERORDER-k]; -+ } -+ numerator[LPC_FILTERORDER]=syntDenum[0]; -+ tmp = &tmpbuf[LPC_FILTERORDER]; -+ fout = &foutbuf[LPC_FILTERORDER]; -+ -+ /* circular convolution with the all-pass filter */ -+ -+ memcpy(tmp, residual, len*sizeof(float)); -+ memset(tmp+len, 0, len*sizeof(float)); -+ ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, -+ LPC_FILTERORDER, fout); -+ for (k=0; k<len; k++) { -+ fout[k] += fout[k+len]; -+ } -+ -+ /* identification of the maximum amplitude value */ -+ -+ maxVal = fout[0]; -+ -+ -+ for (k=1; k<len; k++) { -+ -+ if (fout[k]*fout[k] > maxVal*maxVal){ -+ maxVal = fout[k]; -+ } -+ } -+ maxVal=(float)fabs(maxVal); -+ -+ /* encoding of the maximum amplitude value */ -+ -+ if (maxVal < 10.0) { -+ maxVal = 10.0; -+ } -+ maxVal = (float)log10(maxVal); -+ sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64); -+ -+ /* decoding of the maximum amplitude representation value, -+ and corresponding scaling of start state */ -+ -+ maxVal=state_frgqTbl[*idxForMax]; -+ qmax = (float)pow(10,maxVal); -+ scal = (float)(4.5)/qmax; -+ for (k=0; k<len; k++){ -+ fout[k] *= scal; -+ } -+ -+ /* predictive noise shaping encoding of scaled start state */ -+ -+ AbsQuantW(iLBCenc_inst, fout,syntDenum, -+ weightDenum,idxVec, len, state_first); -+} -+ -+ -diff -druN codecs/ilbc.orig/StateSearchW.h codecs/ilbc/StateSearchW.h ---- codecs/ilbc.orig/StateSearchW.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateSearchW.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,48 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ StateSearchW.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_STATESEARCHW_H -+#define __iLBC_STATESEARCHW_H -+ -+void AbsQuantW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *in, /* (i) vector to encode */ -+ float *syntDenum, /* (i) denominator of synthesis filter */ -+ float *weightDenum, /* (i) denominator of weighting filter */ -+ int *out, /* (o) vector of quantizer indexes */ -+ int len, /* (i) length of vector to encode and -+ vector of quantizer indexes */ -+ int state_first /* (i) position of start state in the -+ 80 vec */ -+); -+ -+void StateSearchW( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) Encoder instance */ -+ float *residual,/* (i) target residual vector */ -+ float *syntDenum, /* (i) lpc synthesis filter */ -+ float *weightDenum, /* (i) weighting filter denuminator */ -+ int *idxForMax, /* (o) quantizer index for maximum -+ amplitude */ -+ int *idxVec, /* (o) vector of quantization indexes */ -+ int len, /* (i) length of all vectors */ -+ int state_first /* (i) position of start state in the -+ -+ -+ 80 vec */ -+); -+ -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/anaFilter.c codecs/ilbc/anaFilter.c ---- codecs/ilbc.orig/anaFilter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/anaFilter.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,71 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ anaFilter.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <string.h> -+#include "anaFilter.h" -+#include "iLBC_define.h" -+ -+/*----------------------------------------------------------------* -+ * LP analysis filter. -+ -+ -+ *---------------------------------------------------------------*/ -+ -+void anaFilter( -+ float *In, /* (i) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len,/* (i) Length of signal */ -+ float *Out, /* (o) Filtered signal */ -+ float *mem /* (i/o) Filter state */ -+){ -+ int i, j; -+ float *po, *pi, *pm, *pa; -+ -+ po = Out; -+ -+ /* Filter first part using memory from past */ -+ -+ for (i=0; i<LPC_FILTERORDER; i++) { -+ pi = &In[i]; -+ pm = &mem[LPC_FILTERORDER-1]; -+ pa = a; -+ *po=0.0; -+ for (j=0; j<=i; j++) { -+ *po+=(*pa++)*(*pi--); -+ } -+ for (j=i+1; j<LPC_FILTERORDER+1; j++) { -+ -+ *po+=(*pa++)*(*pm--); -+ } -+ po++; -+ } -+ -+ /* Filter last part where the state is entierly -+ in the input vector */ -+ -+ for (i=LPC_FILTERORDER; i<len; i++) { -+ pi = &In[i]; -+ pa = a; -+ *po=0.0; -+ for (j=0; j<LPC_FILTERORDER+1; j++) { -+ *po+=(*pa++)*(*pi--); -+ } -+ po++; -+ } -+ -+ /* Update state vector */ -+ -+ memcpy(mem, &In[len-LPC_FILTERORDER], -+ LPC_FILTERORDER*sizeof(float)); -+} -+ -+ -diff -druN codecs/ilbc.orig/anaFilter.h codecs/ilbc/anaFilter.h ---- codecs/ilbc.orig/anaFilter.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/anaFilter.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,26 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ anaFilter.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ANAFILTER_H -+#define __iLBC_ANAFILTER_H -+ -+void anaFilter( -+ float *In, /* (i) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len,/* (i) Length of signal */ -+ float *Out, /* (o) Filtered signal */ -+ float *mem /* (i/o) Filter state */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/constants.c codecs/ilbc/constants.c ---- codecs/ilbc.orig/constants.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/constants.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,729 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ constants.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+ -+/* ULP bit allocation */ -+ -+ /* 20 ms frame */ -+ -+const iLBC_ULP_Inst_t ULP_20msTbl = { -+ /* LSF */ -+ { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, -+ {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, -+ /* Start state location, gain and samples */ -+ {2,0,0,0,0}, -+ {1,0,0,0,0}, -+ {6,0,0,0,0}, -+ {0,1,2,0,0}, -+ /* extra CB index and extra CB gain */ -+ {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, -+ /* CB index and CB gain */ -+ { {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}, -+ { {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, -+ {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, -+ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}} -+}; -+ -+ /* 30 ms frame */ -+ -+const iLBC_ULP_Inst_t ULP_30msTbl = { -+ /* LSF */ -+ { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, -+ -+ -+ {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}}, -+ /* Start state location, gain and samples */ -+ {3,0,0,0,0}, -+ {1,0,0,0,0}, -+ {6,0,0,0,0}, -+ {0,1,2,0,0}, -+ /* extra CB index and extra CB gain */ -+ {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, -+ /* CB index and CB gain */ -+ { {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, -+ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, -+ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, -+ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}}, -+ { {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}}, -+ {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}}, -+ {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}, -+ {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}} -+}; -+ -+/* HP Filters */ -+ -+float hpi_zero_coefsTbl[3] = { -+ (float)0.92727436, (float)-1.8544941, (float)0.92727436 -+}; -+float hpi_pole_coefsTbl[3] = { -+ (float)1.0, (float)-1.9059465, (float)0.9114024 -+}; -+float hpo_zero_coefsTbl[3] = { -+ (float)0.93980581, (float)-1.8795834, (float)0.93980581 -+}; -+float hpo_pole_coefsTbl[3] = { -+ (float)1.0, (float)-1.9330735, (float)0.93589199 -+}; -+ -+/* LP Filter */ -+ -+float lpFilt_coefsTbl[FILTERORDER_DS]={ -+ (float)-0.066650, (float)0.125000, (float)0.316650, -+ (float)0.414063, (float)0.316650, -+ (float)0.125000, (float)-0.066650 -+}; -+ -+/* State quantization tables */ -+ -+float state_sq3Tbl[8] = { -+ (float)-3.719849, (float)-2.177490, (float)-1.130005, -+ (float)-0.309692, (float)0.444214, (float)1.329712, -+ (float)2.436279, (float)3.983887 -+}; -+ -+float state_frgqTbl[64] = { -+ (float)1.000085, (float)1.071695, (float)1.140395, -+ (float)1.206868, (float)1.277188, (float)1.351503, -+ -+ -+ (float)1.429380, (float)1.500727, (float)1.569049, -+ (float)1.639599, (float)1.707071, (float)1.781531, -+ (float)1.840799, (float)1.901550, (float)1.956695, -+ (float)2.006750, (float)2.055474, (float)2.102787, -+ (float)2.142819, (float)2.183592, (float)2.217962, -+ (float)2.257177, (float)2.295739, (float)2.332967, -+ (float)2.369248, (float)2.402792, (float)2.435080, -+ (float)2.468598, (float)2.503394, (float)2.539284, -+ (float)2.572944, (float)2.605036, (float)2.636331, -+ (float)2.668939, (float)2.698780, (float)2.729101, -+ (float)2.759786, (float)2.789834, (float)2.818679, -+ (float)2.848074, (float)2.877470, (float)2.906899, -+ (float)2.936655, (float)2.967804, (float)3.000115, -+ (float)3.033367, (float)3.066355, (float)3.104231, -+ (float)3.141499, (float)3.183012, (float)3.222952, -+ (float)3.265433, (float)3.308441, (float)3.350823, -+ (float)3.395275, (float)3.442793, (float)3.490801, -+ (float)3.542514, (float)3.604064, (float)3.666050, -+ (float)3.740994, (float)3.830749, (float)3.938770, -+ (float)4.101764 -+}; -+ -+/* CB tables */ -+ -+int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44}, -+ {108,108,108}, {108,108,108}, {108,108,108}}; -+int stMemLTbl=85; -+int memLfTbl[NASUB_MAX]={147,147,147,147}; -+ -+/* expansion filter(s) */ -+ -+float cbfiltersTbl[CB_FILTERLEN]={ -+ (float)-0.034180, (float)0.108887, (float)-0.184326, -+ (float)0.806152, (float)0.713379, (float)-0.144043, -+ (float)0.083740, (float)-0.033691 -+}; -+ -+/* Gain Quantization */ -+ -+float gain_sq3Tbl[8]={ -+ (float)-1.000000, (float)-0.659973, (float)-0.330017, -+ (float)0.000000, (float)0.250000, (float)0.500000, -+ (float)0.750000, (float)1.00000}; -+ -+float gain_sq4Tbl[16]={ -+ (float)-1.049988, (float)-0.900024, (float)-0.750000, -+ (float)-0.599976, (float)-0.450012, (float)-0.299988, -+ (float)-0.150024, (float)0.000000, (float)0.150024, -+ (float)0.299988, (float)0.450012, (float)0.599976, -+ (float)0.750000, (float)0.900024, (float)1.049988, -+ (float)1.200012}; -+ -+float gain_sq5Tbl[32]={ -+ (float)0.037476, (float)0.075012, (float)0.112488, -+ -+ -+ (float)0.150024, (float)0.187500, (float)0.224976, -+ (float)0.262512, (float)0.299988, (float)0.337524, -+ (float)0.375000, (float)0.412476, (float)0.450012, -+ (float)0.487488, (float)0.525024, (float)0.562500, -+ (float)0.599976, (float)0.637512, (float)0.674988, -+ (float)0.712524, (float)0.750000, (float)0.787476, -+ (float)0.825012, (float)0.862488, (float)0.900024, -+ (float)0.937500, (float)0.974976, (float)1.012512, -+ (float)1.049988, (float)1.087524, (float)1.125000, -+ (float)1.162476, (float)1.200012}; -+ -+/* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */ -+float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={ -+ (float)0.000000, (float)0.000000, (float)0.000000, -+(float)1.000000, -+ (float)0.000000, (float)0.000000, (float)0.000000, -+ (float)0.015625, (float)-0.076904, (float)0.288330, -+(float)0.862061, -+ (float)-0.106445, (float)0.018799, (float)-0.015625, -+ (float)0.023682, (float)-0.124268, (float)0.601563, -+(float)0.601563, -+ (float)-0.124268, (float)0.023682, (float)-0.023682, -+ (float)0.018799, (float)-0.106445, (float)0.862061, -+(float)0.288330, -+ (float)-0.076904, (float)0.015625, (float)-0.018799}; -+ -+float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0, -+ (float)200.0, (float)280.0, (float)360.0, -+ (float)440.0, (float)520.0, (float)600.0}; -+ -+/* LPC analysis and quantization */ -+ -+int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4}; -+int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128}; -+ -+ -+float lsfmeanTbl[LPC_FILTERORDER] = { -+ (float)0.281738, (float)0.445801, (float)0.663330, -+ (float)0.962524, (float)1.251831, (float)1.533081, -+ (float)1.850586, (float)2.137817, (float)2.481445, -+ (float)2.777344}; -+ -+float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0, -+(float)(2.0/3.0), -+ (float)(1.0/3.0), (float)0.0, (float)0.0}; -+ -+float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0), -+ (float)(1.0/4.0), (float)(0.0)}; -+ -+/* Hanning LPC window */ -+float lpc_winTbl[BLOCKL_MAX]={ -+ (float)0.000183, (float)0.000671, (float)0.001526, -+ (float)0.002716, (float)0.004242, (float)0.006104, -+ (float)0.008301, (float)0.010834, (float)0.013702, -+ -+ -+ (float)0.016907, (float)0.020416, (float)0.024261, -+ (float)0.028442, (float)0.032928, (float)0.037750, -+ (float)0.042877, (float)0.048309, (float)0.054047, -+ (float)0.060089, (float)0.066437, (float)0.073090, -+ (float)0.080017, (float)0.087219, (float)0.094727, -+ (float)0.102509, (float)0.110535, (float)0.118835, -+ (float)0.127411, (float)0.136230, (float)0.145294, -+ (float)0.154602, (float)0.164154, (float)0.173920, -+ (float)0.183899, (float)0.194122, (float)0.204529, -+ (float)0.215149, (float)0.225952, (float)0.236938, -+ (float)0.248108, (float)0.259460, (float)0.270966, -+ (float)0.282654, (float)0.294464, (float)0.306396, -+ (float)0.318481, (float)0.330688, (float)0.343018, -+ (float)0.355438, (float)0.367981, (float)0.380585, -+ (float)0.393280, (float)0.406067, (float)0.418884, -+ (float)0.431763, (float)0.444702, (float)0.457672, -+ (float)0.470673, (float)0.483704, (float)0.496735, -+ (float)0.509766, (float)0.522797, (float)0.535828, -+ (float)0.548798, (float)0.561768, (float)0.574677, -+ (float)0.587524, (float)0.600342, (float)0.613068, -+ (float)0.625732, (float)0.638306, (float)0.650787, -+ (float)0.663147, (float)0.675415, (float)0.687561, -+ (float)0.699585, (float)0.711487, (float)0.723206, -+ (float)0.734802, (float)0.746216, (float)0.757477, -+ (float)0.768585, (float)0.779480, (float)0.790192, -+ (float)0.800720, (float)0.811005, (float)0.821106, -+ (float)0.830994, (float)0.840668, (float)0.850067, -+ (float)0.859253, (float)0.868225, (float)0.876892, -+ (float)0.885345, (float)0.893524, (float)0.901428, -+ (float)0.909058, (float)0.916412, (float)0.923492, -+ (float)0.930267, (float)0.936768, (float)0.942963, -+ (float)0.948853, (float)0.954437, (float)0.959717, -+ (float)0.964691, (float)0.969360, (float)0.973694, -+ (float)0.977692, (float)0.981384, (float)0.984741, -+ (float)0.987762, (float)0.990479, (float)0.992828, -+ (float)0.994873, (float)0.996552, (float)0.997925, -+ (float)0.998932, (float)0.999603, (float)0.999969, -+ (float)0.999969, (float)0.999603, (float)0.998932, -+ (float)0.997925, (float)0.996552, (float)0.994873, -+ (float)0.992828, (float)0.990479, (float)0.987762, -+ (float)0.984741, (float)0.981384, (float)0.977692, -+ (float)0.973694, (float)0.969360, (float)0.964691, -+ (float)0.959717, (float)0.954437, (float)0.948853, -+ (float)0.942963, (float)0.936768, (float)0.930267, -+ (float)0.923492, (float)0.916412, (float)0.909058, -+ (float)0.901428, (float)0.893524, (float)0.885345, -+ (float)0.876892, (float)0.868225, (float)0.859253, -+ (float)0.850067, (float)0.840668, (float)0.830994, -+ (float)0.821106, (float)0.811005, (float)0.800720, -+ (float)0.790192, (float)0.779480, (float)0.768585, -+ (float)0.757477, (float)0.746216, (float)0.734802, -+ (float)0.723206, (float)0.711487, (float)0.699585, -+ (float)0.687561, (float)0.675415, (float)0.663147, -+ (float)0.650787, (float)0.638306, (float)0.625732, -+ -+ -+ (float)0.613068, (float)0.600342, (float)0.587524, -+ (float)0.574677, (float)0.561768, (float)0.548798, -+ (float)0.535828, (float)0.522797, (float)0.509766, -+ (float)0.496735, (float)0.483704, (float)0.470673, -+ (float)0.457672, (float)0.444702, (float)0.431763, -+ (float)0.418884, (float)0.406067, (float)0.393280, -+ (float)0.380585, (float)0.367981, (float)0.355438, -+ (float)0.343018, (float)0.330688, (float)0.318481, -+ (float)0.306396, (float)0.294464, (float)0.282654, -+ (float)0.270966, (float)0.259460, (float)0.248108, -+ (float)0.236938, (float)0.225952, (float)0.215149, -+ (float)0.204529, (float)0.194122, (float)0.183899, -+ (float)0.173920, (float)0.164154, (float)0.154602, -+ (float)0.145294, (float)0.136230, (float)0.127411, -+ (float)0.118835, (float)0.110535, (float)0.102509, -+ (float)0.094727, (float)0.087219, (float)0.080017, -+ (float)0.073090, (float)0.066437, (float)0.060089, -+ (float)0.054047, (float)0.048309, (float)0.042877, -+ (float)0.037750, (float)0.032928, (float)0.028442, -+ (float)0.024261, (float)0.020416, (float)0.016907, -+ (float)0.013702, (float)0.010834, (float)0.008301, -+ (float)0.006104, (float)0.004242, (float)0.002716, -+ (float)0.001526, (float)0.000671, (float)0.000183 -+}; -+ -+/* Asymmetric LPC window */ -+float lpc_asymwinTbl[BLOCKL_MAX]={ -+ (float)0.000061, (float)0.000214, (float)0.000458, -+ (float)0.000824, (float)0.001282, (float)0.001831, -+ (float)0.002472, (float)0.003235, (float)0.004120, -+ (float)0.005066, (float)0.006134, (float)0.007294, -+ (float)0.008545, (float)0.009918, (float)0.011383, -+ (float)0.012939, (float)0.014587, (float)0.016357, -+ (float)0.018219, (float)0.020172, (float)0.022217, -+ (float)0.024353, (float)0.026611, (float)0.028961, -+ (float)0.031372, (float)0.033905, (float)0.036530, -+ (float)0.039276, (float)0.042084, (float)0.044983, -+ (float)0.047974, (float)0.051086, (float)0.054260, -+ (float)0.057526, (float)0.060883, (float)0.064331, -+ (float)0.067871, (float)0.071503, (float)0.075226, -+ (float)0.079010, (float)0.082916, (float)0.086884, -+ (float)0.090942, (float)0.095062, (float)0.099304, -+ (float)0.103607, (float)0.107971, (float)0.112427, -+ (float)0.116974, (float)0.121582, (float)0.126282, -+ (float)0.131073, (float)0.135895, (float)0.140839, -+ (float)0.145813, (float)0.150879, (float)0.156006, -+ (float)0.161224, (float)0.166504, (float)0.171844, -+ (float)0.177246, (float)0.182709, (float)0.188263, -+ (float)0.193848, (float)0.199524, (float)0.205231, -+ (float)0.211029, (float)0.216858, (float)0.222778, -+ (float)0.228729, (float)0.234741, (float)0.240814, -+ (float)0.246918, (float)0.253082, (float)0.259308, -+ (float)0.265564, (float)0.271881, (float)0.278259, -+ (float)0.284668, (float)0.291107, (float)0.297607, -+ -+ -+ (float)0.304138, (float)0.310730, (float)0.317322, -+ (float)0.323975, (float)0.330658, (float)0.337372, -+ (float)0.344147, (float)0.350922, (float)0.357727, -+ (float)0.364594, (float)0.371460, (float)0.378357, -+ (float)0.385284, (float)0.392212, (float)0.399170, -+ (float)0.406158, (float)0.413177, (float)0.420197, -+ (float)0.427246, (float)0.434296, (float)0.441376, -+ (float)0.448456, (float)0.455536, (float)0.462646, -+ (float)0.469757, (float)0.476868, (float)0.483978, -+ (float)0.491089, (float)0.498230, (float)0.505341, -+ (float)0.512451, (float)0.519592, (float)0.526703, -+ (float)0.533813, (float)0.540924, (float)0.548004, -+ (float)0.555084, (float)0.562164, (float)0.569244, -+ (float)0.576294, (float)0.583313, (float)0.590332, -+ (float)0.597321, (float)0.604309, (float)0.611267, -+ (float)0.618195, (float)0.625092, (float)0.631989, -+ (float)0.638855, (float)0.645660, (float)0.652466, -+ (float)0.659241, (float)0.665985, (float)0.672668, -+ (float)0.679352, (float)0.685974, (float)0.692566, -+ (float)0.699127, (float)0.705658, (float)0.712128, -+ (float)0.718536, (float)0.724945, (float)0.731262, -+ (float)0.737549, (float)0.743805, (float)0.750000, -+ (float)0.756134, (float)0.762238, (float)0.768280, -+ (float)0.774261, (float)0.780182, (float)0.786072, -+ (float)0.791870, (float)0.797638, (float)0.803314, -+ (float)0.808960, (float)0.814514, (float)0.820038, -+ (float)0.825470, (float)0.830841, (float)0.836151, -+ (float)0.841400, (float)0.846558, (float)0.851654, -+ (float)0.856689, (float)0.861633, (float)0.866516, -+ (float)0.871338, (float)0.876068, (float)0.880737, -+ (float)0.885315, (float)0.889801, (float)0.894226, -+ (float)0.898560, (float)0.902832, (float)0.907013, -+ (float)0.911102, (float)0.915100, (float)0.919037, -+ (float)0.922882, (float)0.926636, (float)0.930328, -+ (float)0.933899, (float)0.937408, (float)0.940796, -+ (float)0.944122, (float)0.947357, (float)0.950470, -+ (float)0.953522, (float)0.956482, (float)0.959351, -+ (float)0.962097, (float)0.964783, (float)0.967377, -+ (float)0.969849, (float)0.972229, (float)0.974518, -+ (float)0.976715, (float)0.978821, (float)0.980835, -+ (float)0.982727, (float)0.984528, (float)0.986237, -+ (float)0.987854, (float)0.989380, (float)0.990784, -+ (float)0.992096, (float)0.993317, (float)0.994415, -+ (float)0.995422, (float)0.996338, (float)0.997162, -+ (float)0.997864, (float)0.998474, (float)0.998962, -+ (float)0.999390, (float)0.999695, (float)0.999878, -+ (float)0.999969, (float)0.999969, (float)0.996918, -+ (float)0.987701, (float)0.972382, (float)0.951050, -+ (float)0.923889, (float)0.891022, (float)0.852631, -+ (float)0.809021, (float)0.760406, (float)0.707092, -+ (float)0.649445, (float)0.587799, (float)0.522491, -+ (float)0.453979, (float)0.382690, (float)0.309021, -+ (float)0.233459, (float)0.156433, (float)0.078461 -+}; -+ -+ -+ -+/* Lag window for LPC */ -+float lpc_lagwinTbl[LPC_FILTERORDER + 1]={ -+ (float)1.000100, (float)0.998890, (float)0.995569, -+ (float)0.990057, (float)0.982392, -+ (float)0.972623, (float)0.960816, (float)0.947047, -+ (float)0.931405, (float)0.913989, (float)0.894909}; -+ -+/* LSF quantization*/ -+float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = { -+(float)0.155396, (float)0.273193, (float)0.451172, -+(float)0.390503, (float)0.648071, (float)1.002075, -+(float)0.440186, (float)0.692261, (float)0.955688, -+(float)0.343628, (float)0.642334, (float)1.071533, -+(float)0.318359, (float)0.491577, (float)0.670532, -+(float)0.193115, (float)0.375488, (float)0.725708, -+(float)0.364136, (float)0.510376, (float)0.658691, -+(float)0.297485, (float)0.527588, (float)0.842529, -+(float)0.227173, (float)0.365967, (float)0.563110, -+(float)0.244995, (float)0.396729, (float)0.636475, -+(float)0.169434, (float)0.300171, (float)0.520264, -+(float)0.312866, (float)0.464478, (float)0.643188, -+(float)0.248535, (float)0.429932, (float)0.626099, -+(float)0.236206, (float)0.491333, (float)0.817139, -+(float)0.334961, (float)0.625122, (float)0.895752, -+(float)0.343018, (float)0.518555, (float)0.698608, -+(float)0.372803, (float)0.659790, (float)0.945435, -+(float)0.176880, (float)0.316528, (float)0.581421, -+(float)0.416382, (float)0.625977, (float)0.805176, -+(float)0.303223, (float)0.568726, (float)0.915039, -+(float)0.203613, (float)0.351440, (float)0.588135, -+(float)0.221191, (float)0.375000, (float)0.614746, -+(float)0.199951, (float)0.323364, (float)0.476074, -+(float)0.300781, (float)0.433350, (float)0.566895, -+(float)0.226196, (float)0.354004, (float)0.507568, -+(float)0.300049, (float)0.508179, (float)0.711670, -+(float)0.312012, (float)0.492676, (float)0.763428, -+(float)0.329956, (float)0.541016, (float)0.795776, -+(float)0.373779, (float)0.604614, (float)0.928833, -+(float)0.210571, (float)0.452026, (float)0.755249, -+(float)0.271118, (float)0.473267, (float)0.662476, -+(float)0.285522, (float)0.436890, (float)0.634399, -+(float)0.246704, (float)0.565552, (float)0.859009, -+(float)0.270508, (float)0.406250, (float)0.553589, -+(float)0.361450, (float)0.578491, (float)0.813843, -+(float)0.342651, (float)0.482788, (float)0.622437, -+(float)0.340332, (float)0.549438, (float)0.743164, -+(float)0.200439, (float)0.336304, (float)0.540894, -+(float)0.407837, (float)0.644775, (float)0.895142, -+(float)0.294678, (float)0.454834, (float)0.699097, -+(float)0.193115, (float)0.344482, (float)0.643188, -+(float)0.275757, (float)0.420776, (float)0.598755, -+(float)0.380493, (float)0.608643, (float)0.861084, -+(float)0.222778, (float)0.426147, (float)0.676514, -+ -+ -+(float)0.407471, (float)0.700195, (float)1.053101, -+(float)0.218384, (float)0.377197, (float)0.669922, -+(float)0.313232, (float)0.454102, (float)0.600952, -+(float)0.347412, (float)0.571533, (float)0.874146, -+(float)0.238037, (float)0.405396, (float)0.729492, -+(float)0.223877, (float)0.412964, (float)0.822021, -+(float)0.395264, (float)0.582153, (float)0.743896, -+(float)0.247925, (float)0.485596, (float)0.720581, -+(float)0.229126, (float)0.496582, (float)0.907715, -+(float)0.260132, (float)0.566895, (float)1.012695, -+(float)0.337402, (float)0.611572, (float)0.978149, -+(float)0.267822, (float)0.447632, (float)0.769287, -+(float)0.250610, (float)0.381714, (float)0.530029, -+(float)0.430054, (float)0.805054, (float)1.221924, -+(float)0.382568, (float)0.544067, (float)0.701660, -+(float)0.383545, (float)0.710327, (float)1.149170, -+(float)0.271362, (float)0.529053, (float)0.775513, -+(float)0.246826, (float)0.393555, (float)0.588623, -+(float)0.266846, (float)0.422119, (float)0.676758, -+(float)0.311523, (float)0.580688, (float)0.838623, -+(float)1.331177, (float)1.576782, (float)1.779541, -+(float)1.160034, (float)1.401978, (float)1.768188, -+(float)1.161865, (float)1.525146, (float)1.715332, -+(float)0.759521, (float)0.913940, (float)1.119873, -+(float)0.947144, (float)1.121338, (float)1.282471, -+(float)1.015015, (float)1.557007, (float)1.804932, -+(float)1.172974, (float)1.402100, (float)1.692627, -+(float)1.087524, (float)1.474243, (float)1.665405, -+(float)0.899536, (float)1.105225, (float)1.406250, -+(float)1.148438, (float)1.484741, (float)1.796265, -+(float)0.785645, (float)1.209839, (float)1.567749, -+(float)0.867798, (float)1.166504, (float)1.450684, -+(float)0.922485, (float)1.229858, (float)1.420898, -+(float)0.791260, (float)1.123291, (float)1.409546, -+(float)0.788940, (float)0.966064, (float)1.340332, -+(float)1.051147, (float)1.272827, (float)1.556641, -+(float)0.866821, (float)1.181152, (float)1.538818, -+(float)0.906738, (float)1.373535, (float)1.607910, -+(float)1.244751, (float)1.581421, (float)1.933838, -+(float)0.913940, (float)1.337280, (float)1.539673, -+(float)0.680542, (float)0.959229, (float)1.662720, -+(float)0.887207, (float)1.430542, (float)1.800781, -+(float)0.912598, (float)1.433594, (float)1.683960, -+(float)0.860474, (float)1.060303, (float)1.455322, -+(float)1.005127, (float)1.381104, (float)1.706909, -+(float)0.800781, (float)1.363892, (float)1.829102, -+(float)0.781860, (float)1.124390, (float)1.505981, -+(float)1.003662, (float)1.471436, (float)1.684692, -+(float)0.981323, (float)1.309570, (float)1.618042, -+(float)1.228760, (float)1.554321, (float)1.756470, -+(float)0.734375, (float)0.895752, (float)1.225586, -+(float)0.841797, (float)1.055664, (float)1.249268, -+(float)0.920166, (float)1.119385, (float)1.486206, -+(float)0.894409, (float)1.539063, (float)1.828979, -+ -+ -+(float)1.283691, (float)1.543335, (float)1.858276, -+(float)0.676025, (float)0.933105, (float)1.490845, -+(float)0.821289, (float)1.491821, (float)1.739868, -+(float)0.923218, (float)1.144653, (float)1.580566, -+(float)1.057251, (float)1.345581, (float)1.635864, -+(float)0.888672, (float)1.074951, (float)1.353149, -+(float)0.942749, (float)1.195435, (float)1.505493, -+(float)1.492310, (float)1.788086, (float)2.039673, -+(float)1.070313, (float)1.634399, (float)1.860962, -+(float)1.253296, (float)1.488892, (float)1.686035, -+(float)0.647095, (float)0.864014, (float)1.401855, -+(float)0.866699, (float)1.254883, (float)1.453369, -+(float)1.063965, (float)1.532593, (float)1.731323, -+(float)1.167847, (float)1.521484, (float)1.884033, -+(float)0.956055, (float)1.502075, (float)1.745605, -+(float)0.928711, (float)1.288574, (float)1.479614, -+(float)1.088013, (float)1.380737, (float)1.570801, -+(float)0.905029, (float)1.186768, (float)1.371948, -+(float)1.057861, (float)1.421021, (float)1.617432, -+(float)1.108276, (float)1.312500, (float)1.501465, -+(float)0.979492, (float)1.416992, (float)1.624268, -+(float)1.276001, (float)1.661011, (float)2.007935, -+(float)0.993042, (float)1.168579, (float)1.331665, -+(float)0.778198, (float)0.944946, (float)1.235962, -+(float)1.223755, (float)1.491333, (float)1.815674, -+(float)0.852661, (float)1.350464, (float)1.722290, -+(float)1.134766, (float)1.593140, (float)1.787354, -+(float)1.051392, (float)1.339722, (float)1.531006, -+(float)0.803589, (float)1.271240, (float)1.652100, -+(float)0.755737, (float)1.143555, (float)1.639404, -+(float)0.700928, (float)0.837280, (float)1.130371, -+(float)0.942749, (float)1.197876, (float)1.669800, -+(float)0.993286, (float)1.378296, (float)1.566528, -+(float)0.801025, (float)1.095337, (float)1.298950, -+(float)0.739990, (float)1.032959, (float)1.383667, -+(float)0.845703, (float)1.072266, (float)1.543823, -+(float)0.915649, (float)1.072266, (float)1.224487, -+(float)1.021973, (float)1.226196, (float)1.481323, -+(float)0.999878, (float)1.204102, (float)1.555908, -+(float)0.722290, (float)0.913940, (float)1.340210, -+(float)0.673340, (float)0.835938, (float)1.259521, -+(float)0.832397, (float)1.208374, (float)1.394165, -+(float)0.962158, (float)1.576172, (float)1.912842, -+(float)1.166748, (float)1.370850, (float)1.556763, -+(float)0.946289, (float)1.138550, (float)1.400391, -+(float)1.035034, (float)1.218262, (float)1.386475, -+(float)1.393799, (float)1.717773, (float)2.000244, -+(float)0.972656, (float)1.260986, (float)1.760620, -+(float)1.028198, (float)1.288452, (float)1.484619, -+(float)0.773560, (float)1.258057, (float)1.756714, -+(float)1.080322, (float)1.328003, (float)1.742676, -+(float)0.823975, (float)1.450806, (float)1.917725, -+(float)0.859009, (float)1.016602, (float)1.191895, -+(float)0.843994, (float)1.131104, (float)1.645020, -+ -+ -+(float)1.189697, (float)1.702759, (float)1.894409, -+(float)1.346680, (float)1.763184, (float)2.066040, -+(float)0.980469, (float)1.253784, (float)1.441650, -+(float)1.338135, (float)1.641968, (float)1.932739, -+(float)1.223267, (float)1.424194, (float)1.626465, -+(float)0.765747, (float)1.004150, (float)1.579102, -+(float)1.042847, (float)1.269165, (float)1.647461, -+(float)0.968750, (float)1.257568, (float)1.555786, -+(float)0.826294, (float)0.993408, (float)1.275146, -+(float)0.742310, (float)0.950439, (float)1.430542, -+(float)1.054321, (float)1.439819, (float)1.828003, -+(float)1.072998, (float)1.261719, (float)1.441895, -+(float)0.859375, (float)1.036377, (float)1.314819, -+(float)0.895752, (float)1.267212, (float)1.605591, -+(float)0.805420, (float)0.962891, (float)1.142334, -+(float)0.795654, (float)1.005493, (float)1.468506, -+(float)1.105347, (float)1.313843, (float)1.584839, -+(float)0.792236, (float)1.221802, (float)1.465698, -+(float)1.170532, (float)1.467651, (float)1.664063, -+(float)0.838257, (float)1.153198, (float)1.342163, -+(float)0.968018, (float)1.198242, (float)1.391235, -+(float)1.250122, (float)1.623535, (float)1.823608, -+(float)0.711670, (float)1.058350, (float)1.512085, -+(float)1.204834, (float)1.454468, (float)1.739136, -+(float)1.137451, (float)1.421753, (float)1.620117, -+(float)0.820435, (float)1.322754, (float)1.578247, -+(float)0.798706, (float)1.005005, (float)1.213867, -+(float)0.980713, (float)1.324951, (float)1.512939, -+(float)1.112305, (float)1.438843, (float)1.735596, -+(float)1.135498, (float)1.356689, (float)1.635742, -+(float)1.101318, (float)1.387451, (float)1.686523, -+(float)0.849854, (float)1.276978, (float)1.523438, -+(float)1.377930, (float)1.627563, (float)1.858154, -+(float)0.884888, (float)1.095459, (float)1.287476, -+(float)1.289795, (float)1.505859, (float)1.756592, -+(float)0.817505, (float)1.384155, (float)1.650513, -+(float)1.446655, (float)1.702148, (float)1.931885, -+(float)0.835815, (float)1.023071, (float)1.385376, -+(float)0.916626, (float)1.139038, (float)1.335327, -+(float)0.980103, (float)1.174072, (float)1.453735, -+(float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408, -+(float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904, -+(float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477, -+(float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083, -+(float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196, -+(float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396, -+(float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854, -+(float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408, -+(float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987, -+(float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666, -+(float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434, -+(float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781, -+(float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416, -+(float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288, -+ -+ -+(float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672, -+(float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890, -+(float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508, -+(float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206, -+(float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086, -+(float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223, -+(float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101, -+(float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703, -+(float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094, -+(float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450, -+(float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704, -+(float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653, -+(float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723, -+(float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634, -+(float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494, -+(float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370, -+(float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542, -+(float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091, -+(float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346, -+(float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219, -+(float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810, -+(float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914, -+(float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198, -+(float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104, -+(float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892, -+(float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852, -+(float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199, -+(float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286, -+(float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127, -+(float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748, -+(float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676, -+(float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910, -+(float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555, -+(float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023, -+(float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851, -+(float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014, -+(float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307, -+(float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637, -+(float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643, -+(float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968, -+(float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562, -+(float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646, -+(float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818, -+(float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466, -+(float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945, -+(float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941, -+(float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618, -+(float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922, -+(float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794, -+(float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570, -+(float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595, -+(float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673, -+(float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925, -+(float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984, -+ -+ -+(float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904, -+(float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256, -+(float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279, -+(float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602, -+(float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331, -+(float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999, -+(float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096, -+(float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234, -+(float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771, -+(float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076, -+(float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058, -+(float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623, -+(float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284, -+(float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021, -+(float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693, -+(float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760, -+(float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676, -+(float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834, -+(float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058, -+(float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929, -+(float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892, -+(float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417, -+(float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149, -+(float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666, -+(float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521, -+(float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646, -+(float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247, -+(float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583, -+(float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876, -+(float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465, -+(float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253, -+(float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234, -+(float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402, -+(float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406, -+(float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807, -+(float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414, -+(float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991, -+(float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290, -+(float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414, -+(float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647, -+(float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145, -+(float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520, -+(float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117, -+(float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576, -+(float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705, -+(float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007, -+(float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964, -+(float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073, -+(float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873, -+(float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558, -+(float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791, -+(float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857, -+(float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050, -+(float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127, -+ -+ -+(float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545, -+(float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259, -+(float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993, -+(float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912, -+(float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757, -+(float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143 -+}; -+ -+ -diff -druN codecs/ilbc.orig/constants.h codecs/ilbc/constants.h ---- codecs/ilbc.orig/constants.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/constants.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,74 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ constants.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#ifndef __iLBC_CONSTANTS_H -+#define __iLBC_CONSTANTS_H -+ -+#include "iLBC_define.h" -+ -+ -+/* ULP bit allocation */ -+ -+extern const iLBC_ULP_Inst_t ULP_20msTbl; -+extern const iLBC_ULP_Inst_t ULP_30msTbl; -+ -+/* high pass filters */ -+ -+extern float hpi_zero_coefsTbl[]; -+extern float hpi_pole_coefsTbl[]; -+extern float hpo_zero_coefsTbl[]; -+extern float hpo_pole_coefsTbl[]; -+ -+/* low pass filters */ -+extern float lpFilt_coefsTbl[]; -+ -+/* LPC analysis and quantization */ -+ -+extern float lpc_winTbl[]; -+extern float lpc_asymwinTbl[]; -+extern float lpc_lagwinTbl[]; -+extern float lsfCbTbl[]; -+extern float lsfmeanTbl[]; -+extern int dim_lsfCbTbl[]; -+extern int size_lsfCbTbl[]; -+extern float lsf_weightTbl_30ms[]; -+extern float lsf_weightTbl_20ms[]; -+ -+/* state quantization tables */ -+ -+extern float state_sq3Tbl[]; -+extern float state_frgqTbl[]; -+ -+/* gain quantization tables */ -+ -+extern float gain_sq3Tbl[]; -+extern float gain_sq4Tbl[]; -+extern float gain_sq5Tbl[]; -+ -+/* adaptive codebook definitions */ -+ -+extern int search_rangeTbl[5][CB_NSTAGES]; -+extern int memLfTbl[]; -+extern int stMemLTbl; -+extern float cbfiltersTbl[CB_FILTERLEN]; -+ -+ -+ -+/* enhancer definitions */ -+ -+extern float polyphaserTbl[]; -+extern float enh_plocsTbl[]; -+ -+#endif -+ -diff -druN codecs/ilbc.orig/createCB.c codecs/ilbc/createCB.c ---- codecs/ilbc.orig/createCB.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/createCB.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,216 @@ -+ -+ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ createCB.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "createCB.h" -+#include "constants.h" -+#include <string.h> -+#include <math.h> -+ -+/*----------------------------------------------------------------* -+ * Construct an additional codebook vector by filtering the -+ * initial codebook buffer. This vector is then used to expand -+ * the codebook with an additional section. -+ *---------------------------------------------------------------*/ -+ -+void filteredCBvecs( -+ float *cbvectors, /* (o) Codebook vectors for the -+ higher section */ -+ float *mem, /* (i) Buffer to create codebook -+ vector from */ -+ int lMem /* (i) Length of buffer */ -+){ -+ int j, k; -+ float *pp, *pp1; -+ float tempbuff2[CB_MEML+CB_FILTERLEN]; -+ float *pos; -+ -+ memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float)); -+ memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float)); -+ memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0, -+ (CB_HALFFILTERLEN+1)*sizeof(float)); -+ -+ /* Create codebook vector for higher section by filtering */ -+ -+ /* do filtering */ -+ pos=cbvectors; -+ memset(pos, 0, lMem*sizeof(float)); -+ for (k=0; k<lMem; k++) { -+ pp=&tempbuff2[k]; -+ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; -+ for (j=0;j<CB_FILTERLEN;j++) { -+ (*pos)+=(*pp++)*(*pp1--); -+ } -+ pos++; -+ } -+} -+ -+ -+ -+/*----------------------------------------------------------------* -+ * Search the augmented part of the codebook to find the best -+ * measure. -+ *----------------------------------------------------------------*/ -+ -+void searchAugmentedCB( -+ int low, /* (i) Start index for the search */ -+ int high, /* (i) End index for the search */ -+ int stage, /* (i) Current stage */ -+ int startIndex, /* (i) Codebook index for the first -+ aug vector */ -+ float *target, /* (i) Target vector for encoding */ -+ float *buffer, /* (i) Pointer to the end of the buffer for -+ augmented codebook construction */ -+ float *max_measure, /* (i/o) Currently maximum measure */ -+ int *best_index,/* (o) Currently the best index */ -+ float *gain, /* (o) Currently the best gain */ -+ float *energy, /* (o) Energy of augmented codebook -+ vectors */ -+ float *invenergy/* (o) Inv energy of augmented codebook -+ vectors */ -+) { -+ int icount, ilow, j, tmpIndex; -+ float *pp, *ppo, *ppi, *ppe, crossDot, alfa; -+ float weighted, measure, nrjRecursive; -+ float ftmp; -+ -+ /* Compute the energy for the first (low-5) -+ noninterpolated samples */ -+ nrjRecursive = (float) 0.0; -+ pp = buffer - low + 1; -+ for (j=0; j<(low-5); j++) { -+ nrjRecursive += ( (*pp)*(*pp) ); -+ pp++; -+ } -+ ppe = buffer - low; -+ -+ -+ for (icount=low; icount<=high; icount++) { -+ -+ /* Index of the codebook vector used for retrieving -+ energy values */ -+ tmpIndex = startIndex+icount-20; -+ -+ ilow = icount-4; -+ -+ /* Update the energy recursively to save complexity */ -+ nrjRecursive = nrjRecursive + (*ppe)*(*ppe); -+ ppe--; -+ energy[tmpIndex] = nrjRecursive; -+ -+ /* Compute cross dot product for the first (low-5) -+ samples */ -+ crossDot = (float) 0.0; -+ -+ -+ pp = buffer-icount; -+ for (j=0; j<ilow; j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ /* interpolation */ -+ alfa = (float) 0.2; -+ ppo = buffer-4; -+ ppi = buffer-icount-4; -+ for (j=ilow; j<icount; j++) { -+ weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi); -+ ppo++; -+ ppi++; -+ energy[tmpIndex] += weighted*weighted; -+ crossDot += target[j]*weighted; -+ alfa += (float)0.2; -+ } -+ -+ /* Compute energy and cross dot product for the -+ remaining samples */ -+ pp = buffer - icount; -+ for (j=icount; j<SUBL; j++) { -+ energy[tmpIndex] += (*pp)*(*pp); -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (energy[tmpIndex]>0.0) { -+ invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS); -+ } else { -+ invenergy[tmpIndex] = (float) 0.0; -+ } -+ -+ if (stage==0) { -+ measure = (float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot*invenergy[tmpIndex]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[tmpIndex]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[tmpIndex]; -+ -+ if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ *best_index = tmpIndex; -+ *max_measure = measure; -+ *gain = ftmp; -+ } -+ } -+} -+ -+ -+ -+ -+/*----------------------------------------------------------------* -+ * Recreate a specific codebook vector from the augmented part. -+ * -+ *----------------------------------------------------------------*/ -+ -+void createAugmentedVec( -+ int index, /* (i) Index for the augmented vector -+ to be created */ -+ float *buffer, /* (i) Pointer to the end of the buffer for -+ augmented codebook construction */ -+ float *cbVec/* (o) The construced codebook vector */ -+) { -+ int ilow, j; -+ float *pp, *ppo, *ppi, alfa, alfa1, weighted; -+ -+ ilow = index-5; -+ -+ /* copy the first noninterpolated part */ -+ -+ pp = buffer-index; -+ memcpy(cbVec,pp,sizeof(float)*index); -+ -+ /* interpolation */ -+ -+ alfa1 = (float)0.2; -+ alfa = 0.0; -+ ppo = buffer-5; -+ ppi = buffer-index-5; -+ for (j=ilow; j<index; j++) { -+ weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi); -+ ppo++; -+ ppi++; -+ cbVec[j] = weighted; -+ alfa += alfa1; -+ } -+ -+ /* copy the second noninterpolated part */ -+ -+ pp = buffer - index; -+ memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index)); -+} -+ -+ -diff -druN codecs/ilbc.orig/createCB.h codecs/ilbc/createCB.h ---- codecs/ilbc.orig/createCB.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/createCB.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,56 @@ -+ -+/****************************************************************** -+ -+ -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ createCB.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_CREATECB_H -+#define __iLBC_CREATECB_H -+ -+void filteredCBvecs( -+ float *cbvectors, /* (o) Codebook vector for the -+ higher section */ -+ float *mem, /* (i) Buffer to create codebook -+ vectors from */ -+ int lMem /* (i) Length of buffer */ -+); -+ -+void searchAugmentedCB( -+ int low, /* (i) Start index for the search */ -+ int high, /* (i) End index for the search */ -+ int stage, /* (i) Current stage */ -+ int startIndex, /* (i) CB index for the first -+ augmented vector */ -+ float *target, /* (i) Target vector for encoding */ -+ float *buffer, /* (i) Pointer to the end of the -+ buffer for augmented codebook -+ construction */ -+ float *max_measure, /* (i/o) Currently maximum measure */ -+ int *best_index,/* (o) Currently the best index */ -+ float *gain, /* (o) Currently the best gain */ -+ float *energy, /* (o) Energy of augmented -+ codebook vectors */ -+ float *invenergy/* (o) Inv energy of aug codebook -+ vectors */ -+); -+ -+void createAugmentedVec( -+ int index, /* (i) Index for the aug vector -+ to be created */ -+ float *buffer, /* (i) Pointer to the end of the -+ buffer for augmented codebook -+ construction */ -+ float *cbVec /* (o) The construced codebook vector */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/doCPLC.c codecs/ilbc/doCPLC.c ---- codecs/ilbc.orig/doCPLC.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/doCPLC.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,259 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ doCPLC.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+#include <stdio.h> -+ -+#include "iLBC_define.h" -+#include "doCPLC.h" -+ -+/*----------------------------------------------------------------* -+ * Compute cross correlation and pitch gain for pitch prediction -+ * of last subframe at given lag. -+ *---------------------------------------------------------------*/ -+ -+static void compCorr( -+ float *cc, /* (o) cross correlation coefficient */ -+ float *gc, /* (o) gain */ -+ float *pm, -+ float *buffer, /* (i) signal buffer */ -+ int lag, /* (i) pitch lag */ -+ int bLen, /* (i) length of buffer */ -+ int sRange /* (i) correlation search length */ -+){ -+ -+ -+ int i; -+ float ftmp1, ftmp2, ftmp3; -+ -+ /* Guard against getting outside buffer */ -+ if ((bLen-sRange-lag)<0) { -+ sRange=bLen-lag; -+ } -+ -+ ftmp1 = 0.0; -+ ftmp2 = 0.0; -+ ftmp3 = 0.0; -+ for (i=0; i<sRange; i++) { -+ ftmp1 += buffer[bLen-sRange+i] * -+ buffer[bLen-sRange+i-lag]; -+ ftmp2 += buffer[bLen-sRange+i-lag] * -+ buffer[bLen-sRange+i-lag]; -+ ftmp3 += buffer[bLen-sRange+i] * -+ buffer[bLen-sRange+i]; -+ } -+ -+ if (ftmp2 > 0.0) { -+ *cc = ftmp1*ftmp1/ftmp2; -+ *gc = (float)fabs(ftmp1/ftmp2); -+ *pm=(float)fabs(ftmp1)/ -+ ((float)sqrt(ftmp2)*(float)sqrt(ftmp3)); -+ } -+ else { -+ *cc = 0.0; -+ *gc = 0.0; -+ *pm=0.0; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * Packet loss concealment routine. Conceals a residual signal -+ * and LP parameters. If no packet loss, update state. -+ *---------------------------------------------------------------*/ -+ -+void doThePLC( -+ float *PLCresidual, /* (o) concealed residual */ -+ float *PLClpc, /* (o) concealed LP parameters */ -+ int PLI, /* (i) packet loss indicator -+ 0 - no PL, 1 = PL */ -+ float *decresidual, /* (i) decoded residual */ -+ float *lpc, /* (i) decoded LPC (only used for no PL) */ -+ int inlag, /* (i) pitch lag */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i/o) decoder instance */ -+){ -+ int lag=20, randlag; -+ float gain, maxcc; -+ float use_gain; -+ float gain_comp, maxcc_comp, per, max_per; -+ int i, pick, use_lag; -+ -+ -+ float ftmp, randvec[BLOCKL_MAX], pitchfact, energy; -+ -+ /* Packet Loss */ -+ -+ if (PLI == 1) { -+ -+ iLBCdec_inst->consPLICount += 1; -+ -+ /* if previous frame not lost, -+ determine pitch pred. gain */ -+ -+ if (iLBCdec_inst->prevPLI != 1) { -+ -+ /* Search around the previous lag to find the -+ best pitch period */ -+ -+ lag=inlag-3; -+ compCorr(&maxcc, &gain, &max_per, -+ iLBCdec_inst->prevResidual, -+ lag, iLBCdec_inst->blockl, 60); -+ for (i=inlag-2;i<=inlag+3;i++) { -+ compCorr(&maxcc_comp, &gain_comp, &per, -+ iLBCdec_inst->prevResidual, -+ i, iLBCdec_inst->blockl, 60); -+ -+ if (maxcc_comp>maxcc) { -+ maxcc=maxcc_comp; -+ gain=gain_comp; -+ lag=i; -+ max_per=per; -+ } -+ } -+ -+ } -+ -+ /* previous frame lost, use recorded lag and periodicity */ -+ -+ else { -+ lag=iLBCdec_inst->prevLag; -+ max_per=iLBCdec_inst->per; -+ } -+ -+ /* downscaling */ -+ -+ use_gain=1.0; -+ if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320) -+ use_gain=(float)0.9; -+ else if (iLBCdec_inst->consPLICount* -+ iLBCdec_inst->blockl>2*320) -+ use_gain=(float)0.7; -+ else if (iLBCdec_inst->consPLICount* -+ iLBCdec_inst->blockl>3*320) -+ use_gain=(float)0.5; -+ else if (iLBCdec_inst->consPLICount* -+ -+ -+ iLBCdec_inst->blockl>4*320) -+ use_gain=(float)0.0; -+ -+ /* mix noise and pitch repeatition */ -+ ftmp=(float)sqrt(max_per); -+ if (ftmp>(float)0.7) -+ pitchfact=(float)1.0; -+ else if (ftmp>(float)0.4) -+ pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4); -+ else -+ pitchfact=0.0; -+ -+ -+ /* avoid repetition of same pitch cycle */ -+ use_lag=lag; -+ if (lag<80) { -+ use_lag=2*lag; -+ } -+ -+ /* compute concealed residual */ -+ -+ energy = 0.0; -+ for (i=0; i<iLBCdec_inst->blockl; i++) { -+ -+ /* noise component */ -+ -+ iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) & -+ (0x80000000L-1); -+ randlag = 50 + ((signed long) iLBCdec_inst->seed)%70; -+ pick = i - randlag; -+ -+ if (pick < 0) { -+ randvec[i] = -+ iLBCdec_inst->prevResidual[ -+ iLBCdec_inst->blockl+pick]; -+ } else { -+ randvec[i] = randvec[pick]; -+ } -+ -+ /* pitch repeatition component */ -+ pick = i - use_lag; -+ -+ if (pick < 0) { -+ PLCresidual[i] = -+ iLBCdec_inst->prevResidual[ -+ iLBCdec_inst->blockl+pick]; -+ } else { -+ PLCresidual[i] = PLCresidual[pick]; -+ } -+ -+ /* mix random and periodicity component */ -+ -+ if (i<80) -+ PLCresidual[i] = use_gain*(pitchfact * -+ -+ -+ PLCresidual[i] + -+ ((float)1.0 - pitchfact) * randvec[i]); -+ else if (i<160) -+ PLCresidual[i] = (float)0.95*use_gain*(pitchfact * -+ PLCresidual[i] + -+ ((float)1.0 - pitchfact) * randvec[i]); -+ else -+ PLCresidual[i] = (float)0.9*use_gain*(pitchfact * -+ PLCresidual[i] + -+ ((float)1.0 - pitchfact) * randvec[i]); -+ -+ energy += PLCresidual[i] * PLCresidual[i]; -+ } -+ -+ /* less than 30 dB, use only noise */ -+ -+ if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) { -+ gain=0.0; -+ for (i=0; i<iLBCdec_inst->blockl; i++) { -+ PLCresidual[i] = randvec[i]; -+ } -+ } -+ -+ /* use old LPC */ -+ -+ memcpy(PLClpc,iLBCdec_inst->prevLpc, -+ (LPC_FILTERORDER+1)*sizeof(float)); -+ -+ } -+ -+ /* no packet loss, copy input */ -+ -+ else { -+ memcpy(PLCresidual, decresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float)); -+ iLBCdec_inst->consPLICount = 0; -+ } -+ -+ /* update state */ -+ -+ if (PLI) { -+ iLBCdec_inst->prevLag = lag; -+ iLBCdec_inst->per=max_per; -+ } -+ -+ iLBCdec_inst->prevPLI = PLI; -+ memcpy(iLBCdec_inst->prevLpc, PLClpc, -+ (LPC_FILTERORDER+1)*sizeof(float)); -+ memcpy(iLBCdec_inst->prevResidual, PLCresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+} -+ -+ -+ -+ -diff -druN codecs/ilbc.orig/doCPLC.h codecs/ilbc/doCPLC.h ---- codecs/ilbc.orig/doCPLC.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/doCPLC.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,32 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ doCPLC.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#ifndef __iLBC_DOLPC_H -+#define __iLBC_DOLPC_H -+ -+void doThePLC( -+ float *PLCresidual, /* (o) concealed residual */ -+ float *PLClpc, /* (o) concealed LP parameters */ -+ int PLI, /* (i) packet loss indicator -+ 0 - no PL, 1 = PL */ -+ float *decresidual, /* (i) decoded residual */ -+ float *lpc, /* (i) decoded LPC (only used for no PL) */ -+ int inlag, /* (i) pitch lag */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i/o) decoder instance */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/enhancer.c codecs/ilbc/enhancer.c ---- codecs/ilbc.orig/enhancer.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/enhancer.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,665 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ enhancer.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+#include "iLBC_define.h" -+#include "enhancer.h" -+#include "constants.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ -+ -+ * Find index in array such that the array element with said -+ * index is the element of said array closest to "value" -+ * according to the squared-error criterion -+ *---------------------------------------------------------------*/ -+ -+static void NearestNeighbor( -+ int *index, /* (o) index of array element closest -+ to value */ -+ float *array, /* (i) data array */ -+ float value,/* (i) value */ -+ int arlength/* (i) dimension of data array */ -+){ -+ int i; -+ float bestcrit,crit; -+ -+ crit=array[0]-value; -+ bestcrit=crit*crit; -+ *index=0; -+ for (i=1; i<arlength; i++) { -+ crit=array[i]-value; -+ crit=crit*crit; -+ -+ if (crit<bestcrit) { -+ bestcrit=crit; -+ *index=i; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * compute cross correlation between sequences -+ *---------------------------------------------------------------*/ -+ -+static void mycorr1( -+ float* corr, /* (o) correlation of seq1 and seq2 */ -+ float* seq1, /* (i) first sequence */ -+ int dim1, /* (i) dimension first seq1 */ -+ const float *seq2, /* (i) second sequence */ -+ int dim2 /* (i) dimension seq2 */ -+){ -+ int i,j; -+ -+ for (i=0; i<=dim1-dim2; i++) { -+ corr[i]=0.0; -+ for (j=0; j<dim2; j++) { -+ corr[i] += seq1[i+j] * seq2[j]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * upsample finite array assuming zeros outside bounds -+ *---------------------------------------------------------------*/ -+ -+ -+ -+static void enh_upsample( -+ float* useq1, /* (o) upsampled output sequence */ -+ float* seq1,/* (i) unupsampled sequence */ -+ int dim1, /* (i) dimension seq1 */ -+ int hfl /* (i) polyphase filter length=2*hfl+1 */ -+){ -+ float *pu,*ps; -+ int i,j,k,q,filterlength,hfl2; -+ const float *polyp[ENH_UPS0]; /* pointers to -+ polyphase columns */ -+ const float *pp; -+ -+ /* define pointers for filter */ -+ -+ filterlength=2*hfl+1; -+ -+ if ( filterlength > dim1 ) { -+ hfl2=(int) (dim1/2); -+ for (j=0; j<ENH_UPS0; j++) { -+ polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2; -+ } -+ hfl=hfl2; -+ filterlength=2*hfl+1; -+ } -+ else { -+ for (j=0; j<ENH_UPS0; j++) { -+ polyp[j]=polyphaserTbl+j*filterlength; -+ } -+ } -+ -+ /* filtering: filter overhangs left side of sequence */ -+ -+ pu=useq1; -+ for (i=hfl; i<filterlength; i++) { -+ for (j=0; j<ENH_UPS0; j++) { -+ *pu=0.0; -+ pp = polyp[j]; -+ ps = seq1+i; -+ for (k=0; k<=i; k++) { -+ *pu += *ps-- * *pp++; -+ } -+ pu++; -+ } -+ } -+ -+ /* filtering: simple convolution=inner products */ -+ -+ for (i=filterlength; i<dim1; i++) { -+ for (j=0;j<ENH_UPS0; j++){ -+ *pu=0.0; -+ pp = polyp[j]; -+ ps = seq1+i; -+ for (k=0; k<filterlength; k++) { -+ *pu += *ps-- * *pp++; -+ -+ -+ } -+ pu++; -+ } -+ } -+ -+ /* filtering: filter overhangs right side of sequence */ -+ -+ for (q=1; q<=hfl; q++) { -+ for (j=0; j<ENH_UPS0; j++) { -+ *pu=0.0; -+ pp = polyp[j]+q; -+ ps = seq1+dim1-1; -+ for (k=0; k<filterlength-q; k++) { -+ *pu += *ps-- * *pp++; -+ } -+ pu++; -+ } -+ } -+} -+ -+ -+/*----------------------------------------------------------------* -+ * find segment starting near idata+estSegPos that has highest -+ * correlation with idata+centerStartPos through -+ * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a -+ * resolution of ENH_UPSO times the original of the original -+ * sampling rate -+ *---------------------------------------------------------------*/ -+ -+static void refiner( -+ float *seg, /* (o) segment array */ -+ float *updStartPos, /* (o) updated start point */ -+ float* idata, /* (i) original data buffer */ -+ int idatal, /* (i) dimension of idata */ -+ int centerStartPos, /* (i) beginning center segment */ -+ float estSegPos,/* (i) estimated beginning other segment */ -+ float period /* (i) estimated pitch period */ -+){ -+ int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim; -+ int tloc,tloc2,i,st,en,fraction; -+ float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv; -+ float corrVecUps[ENH_CORRDIM*ENH_UPS0]; -+ -+ /* defining array bounds */ -+ -+ estSegPosRounded=(int)(estSegPos - 0.5); -+ -+ searchSegStartPos=estSegPosRounded-ENH_SLOP; -+ -+ if (searchSegStartPos<0) { -+ searchSegStartPos=0; -+ } -+ searchSegEndPos=estSegPosRounded+ENH_SLOP; -+ -+ -+ -+ if (searchSegEndPos+ENH_BLOCKL >= idatal) { -+ searchSegEndPos=idatal-ENH_BLOCKL-1; -+ } -+ corrdim=searchSegEndPos-searchSegStartPos+1; -+ -+ /* compute upsampled correlation (corr33) and find -+ location of max */ -+ -+ mycorr1(corrVec,idata+searchSegStartPos, -+ corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL); -+ enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0); -+ tloc=0; maxv=corrVecUps[0]; -+ for (i=1; i<ENH_UPS0*corrdim; i++) { -+ -+ if (corrVecUps[i]>maxv) { -+ tloc=i; -+ maxv=corrVecUps[i]; -+ } -+ } -+ -+ /* make vector can be upsampled without ever running outside -+ bounds */ -+ -+ *updStartPos= (float)searchSegStartPos + -+ (float)tloc/(float)ENH_UPS0+(float)1.0; -+ tloc2=(int)(tloc/ENH_UPS0); -+ -+ if (tloc>tloc2*ENH_UPS0) { -+ tloc2++; -+ } -+ st=searchSegStartPos+tloc2-ENH_FL0; -+ -+ if (st<0) { -+ memset(vect,0,-st*sizeof(float)); -+ memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float)); -+ } -+ else { -+ en=st+ENH_VECTL; -+ -+ if (en>idatal) { -+ memcpy(vect, &idata[st], -+ (ENH_VECTL-(en-idatal))*sizeof(float)); -+ memset(&vect[ENH_VECTL-(en-idatal)], 0, -+ (en-idatal)*sizeof(float)); -+ } -+ else { -+ memcpy(vect, &idata[st], ENH_VECTL*sizeof(float)); -+ } -+ } -+ fraction=tloc2*ENH_UPS0-tloc; -+ -+ /* compute the segment (this is actually a convolution) */ -+ -+ mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction, -+ -+ -+ 2*ENH_FL0+1); -+} -+ -+/*----------------------------------------------------------------* -+ * find the smoothed output data -+ *---------------------------------------------------------------*/ -+ -+static void smath( -+ float *odata, /* (o) smoothed output */ -+ float *sseq,/* (i) said second sequence of waveforms */ -+ int hl, /* (i) 2*hl+1 is sseq dimension */ -+ float alpha0/* (i) max smoothing energy fraction */ -+){ -+ int i,k; -+ float w00,w10,w11,A,B,C,*psseq,err,errs; -+ float surround[BLOCKL_MAX]; /* shape contributed by other than -+ current */ -+ float wt[2*ENH_HL+1]; /* waveform weighting to get -+ surround shape */ -+ float denom; -+ -+ /* create shape of contribution from all waveforms except the -+ current one */ -+ -+ for (i=1; i<=2*hl+1; i++) { -+ wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2))); -+ } -+ wt[hl]=0.0; /* for clarity, not used */ -+ for (i=0; i<ENH_BLOCKL; i++) { -+ surround[i]=sseq[i]*wt[0]; -+ } -+ for (k=1; k<hl; k++) { -+ psseq=sseq+k*ENH_BLOCKL; -+ for(i=0;i<ENH_BLOCKL; i++) { -+ surround[i]+=psseq[i]*wt[k]; -+ } -+ } -+ for (k=hl+1; k<=2*hl; k++) { -+ psseq=sseq+k*ENH_BLOCKL; -+ for(i=0;i<ENH_BLOCKL; i++) { -+ surround[i]+=psseq[i]*wt[k]; -+ } -+ } -+ -+ /* compute some inner products */ -+ -+ w00 = w10 = w11 = 0.0; -+ psseq=sseq+hl*ENH_BLOCKL; /* current block */ -+ for (i=0; i<ENH_BLOCKL;i++) { -+ w00+=psseq[i]*psseq[i]; -+ w11+=surround[i]*surround[i]; -+ w10+=surround[i]*psseq[i]; -+ } -+ -+ -+ -+ if (fabs(w11) < 1.0) { -+ w11=1.0; -+ } -+ C = (float)sqrt( w00/w11); -+ -+ /* first try enhancement without power-constraint */ -+ -+ errs=0.0; -+ psseq=sseq+hl*ENH_BLOCKL; -+ for (i=0; i<ENH_BLOCKL; i++) { -+ odata[i]=C*surround[i]; -+ err=psseq[i]-odata[i]; -+ errs+=err*err; -+ } -+ -+ /* if constraint violated by first try, add constraint */ -+ -+ if (errs > alpha0 * w00) { -+ if ( w00 < 1) { -+ w00=1; -+ } -+ denom = (w11*w00-w10*w10)/(w00*w00); -+ -+ if (denom > 0.0001) { /* eliminates numerical problems -+ for if smooth */ -+ A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom); -+ B = -alpha0/2 - A * w10/w00; -+ B = B+1; -+ } -+ else { /* essentially no difference between cycles; -+ smoothing not needed */ -+ A= 0.0; -+ B= 1.0; -+ } -+ -+ /* create smoothed sequence */ -+ -+ psseq=sseq+hl*ENH_BLOCKL; -+ for (i=0; i<ENH_BLOCKL; i++) { -+ odata[i]=A*surround[i]+B*psseq[i]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * get the pitch-synchronous sample sequence -+ *---------------------------------------------------------------*/ -+ -+static void getsseq( -+ float *sseq, /* (o) the pitch-synchronous sequence */ -+ float *idata, /* (i) original data */ -+ int idatal, /* (i) dimension of data */ -+ int centerStartPos, /* (i) where current block starts */ -+ float *period, /* (i) rough-pitch-period array */ -+ -+ -+ float *plocs, /* (i) where periods of period array -+ are taken */ -+ int periodl, /* (i) dimension period array */ -+ int hl /* (i) 2*hl+1 is the number of sequences */ -+){ -+ int i,centerEndPos,q; -+ float blockStartPos[2*ENH_HL+1]; -+ int lagBlock[2*ENH_HL+1]; -+ float plocs2[ENH_PLOCSL]; -+ float *psseq; -+ -+ centerEndPos=centerStartPos+ENH_BLOCKL-1; -+ -+ /* present */ -+ -+ NearestNeighbor(lagBlock+hl,plocs, -+ (float)0.5*(centerStartPos+centerEndPos),periodl); -+ -+ blockStartPos[hl]=(float)centerStartPos; -+ psseq=sseq+ENH_BLOCKL*hl; -+ memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float)); -+ -+ /* past */ -+ -+ for (q=hl-1; q>=0; q--) { -+ blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]]; -+ NearestNeighbor(lagBlock+q,plocs, -+ blockStartPos[q]+ -+ ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl); -+ -+ -+ if (blockStartPos[q]-ENH_OVERHANG>=0) { -+ refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata, -+ idatal, centerStartPos, blockStartPos[q], -+ period[lagBlock[q+1]]); -+ } else { -+ psseq=sseq+q*ENH_BLOCKL; -+ memset(psseq, 0, ENH_BLOCKL*sizeof(float)); -+ } -+ } -+ -+ /* future */ -+ -+ for (i=0; i<periodl; i++) { -+ plocs2[i]=plocs[i]-period[i]; -+ } -+ for (q=hl+1; q<=2*hl; q++) { -+ NearestNeighbor(lagBlock+q,plocs2, -+ blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl); -+ -+ blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]]; -+ if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) { -+ refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata, -+ idatal, centerStartPos, blockStartPos[q], -+ -+ -+ period[lagBlock[q]]); -+ } -+ else { -+ psseq=sseq+q*ENH_BLOCKL; -+ memset(psseq, 0, ENH_BLOCKL*sizeof(float)); -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * perform enhancement on idata+centerStartPos through -+ * idata+centerStartPos+ENH_BLOCKL-1 -+ *---------------------------------------------------------------*/ -+ -+static void enhancer( -+ float *odata, /* (o) smoothed block, dimension blockl */ -+ float *idata, /* (i) data buffer used for enhancing */ -+ int idatal, /* (i) dimension idata */ -+ int centerStartPos, /* (i) first sample current block -+ within idata */ -+ float alpha0, /* (i) max correction-energy-fraction -+ (in [0,1]) */ -+ float *period, /* (i) pitch period array */ -+ float *plocs, /* (i) locations where period array -+ values valid */ -+ int periodl /* (i) dimension of period and plocs */ -+){ -+ float sseq[(2*ENH_HL+1)*ENH_BLOCKL]; -+ -+ /* get said second sequence of segments */ -+ -+ getsseq(sseq,idata,idatal,centerStartPos,period, -+ plocs,periodl,ENH_HL); -+ -+ /* compute the smoothed output from said second sequence */ -+ -+ smath(odata,sseq,ENH_HL,alpha0); -+ -+} -+ -+/*----------------------------------------------------------------* -+ * cross correlation -+ *---------------------------------------------------------------*/ -+ -+float xCorrCoef( -+ float *target, /* (i) first array */ -+ float *regressor, /* (i) second array */ -+ int subl /* (i) dimension arrays */ -+){ -+ int i; -+ float ftmp1, ftmp2; -+ -+ ftmp1 = 0.0; -+ ftmp2 = 0.0; -+ -+ -+ for (i=0; i<subl; i++) { -+ ftmp1 += target[i]*regressor[i]; -+ ftmp2 += regressor[i]*regressor[i]; -+ } -+ -+ if (ftmp1 > 0.0) { -+ return (float)(ftmp1*ftmp1/ftmp2); -+ } -+ else { -+ return (float)0.0; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * interface for enhancer -+ *---------------------------------------------------------------*/ -+ -+int enhancerInterface( -+ float *out, /* (o) enhanced signal */ -+ float *in, /* (i) unenhanced signal */ -+ iLBC_Dec_Inst_t *iLBCdec_inst /* (i) buffers etc */ -+){ -+ float *enh_buf, *enh_period; -+ int iblock, isample; -+ int lag=0, ilag, i, ioffset; -+ float cc, maxcc; -+ float ftmp1, ftmp2; -+ float *inPtr, *enh_bufPtr1, *enh_bufPtr2; -+ float plc_pred[ENH_BLOCKL]; -+ -+ float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2]; -+ int inLen=ENH_NBLOCKS*ENH_BLOCKL+120; -+ int start, plc_blockl, inlag; -+ -+ enh_buf=iLBCdec_inst->enh_buf; -+ enh_period=iLBCdec_inst->enh_period; -+ -+ memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl], -+ (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float)); -+ -+ memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in, -+ iLBCdec_inst->blockl*sizeof(float)); -+ -+ if (iLBCdec_inst->mode==30) -+ plc_blockl=ENH_BLOCKL; -+ else -+ plc_blockl=40; -+ -+ /* when 20 ms frame, move processing one block */ -+ ioffset=0; -+ if (iLBCdec_inst->mode==20) ioffset=1; -+ -+ i=3-ioffset; -+ memmove(enh_period, &enh_period[i], -+ -+ -+ (ENH_NBLOCKS_TOT-i)*sizeof(float)); -+ -+ /* Set state information to the 6 samples right before -+ the samples to be downsampled. */ -+ -+ memcpy(lpState, -+ enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126, -+ 6*sizeof(float)); -+ -+ /* Down sample a factor 2 to save computations */ -+ -+ DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120, -+ lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL, -+ lpState, downsampled); -+ -+ /* Estimate the pitch in the down sampled domain. */ -+ for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) { -+ -+ lag = 10; -+ maxcc = xCorrCoef(downsampled+60+iblock* -+ ENH_BLOCKL_HALF, downsampled+60+iblock* -+ ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF); -+ for (ilag=11; ilag<60; ilag++) { -+ cc = xCorrCoef(downsampled+60+iblock* -+ ENH_BLOCKL_HALF, downsampled+60+iblock* -+ ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF); -+ -+ if (cc > maxcc) { -+ maxcc = cc; -+ lag = ilag; -+ } -+ } -+ -+ /* Store the estimated lag in the non-downsampled domain */ -+ enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2; -+ -+ -+ } -+ -+ -+ /* PLC was performed on the previous packet */ -+ if (iLBCdec_inst->prev_enh_pl==1) { -+ -+ inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset]; -+ -+ lag = inlag-1; -+ maxcc = xCorrCoef(in, in+lag, plc_blockl); -+ for (ilag=inlag; ilag<=inlag+1; ilag++) { -+ cc = xCorrCoef(in, in+ilag, plc_blockl); -+ -+ if (cc > maxcc) { -+ maxcc = cc; -+ lag = ilag; -+ } -+ } -+ -+ -+ -+ enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag; -+ -+ /* compute new concealed residual for the old lookahead, -+ mix the forward PLC with a backward PLC from -+ the new frame */ -+ -+ inPtr=&in[lag-1]; -+ -+ enh_bufPtr1=&plc_pred[plc_blockl-1]; -+ -+ if (lag>plc_blockl) { -+ start=plc_blockl; -+ } else { -+ start=lag; -+ } -+ -+ for (isample = start; isample>0; isample--) { -+ *enh_bufPtr1-- = *inPtr--; -+ } -+ -+ enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl]; -+ for (isample = (plc_blockl-1-lag); isample>=0; isample--) -+{ -+ *enh_bufPtr1-- = *enh_bufPtr2--; -+ } -+ -+ /* limit energy change */ -+ ftmp2=0.0; -+ ftmp1=0.0; -+ for (i=0;i<plc_blockl;i++) { -+ ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]* -+ enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]; -+ ftmp1+=plc_pred[i]*plc_pred[i]; -+ } -+ ftmp1=(float)sqrt(ftmp1/(float)plc_blockl); -+ ftmp2=(float)sqrt(ftmp2/(float)plc_blockl); -+ if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) { -+ for (i=0;i<plc_blockl-10;i++) { -+ plc_pred[i]*=(float)2.0*ftmp2/ftmp1; -+ } -+ for (i=plc_blockl-10;i<plc_blockl;i++) { -+ plc_pred[i]*=(float)(i-plc_blockl+10)* -+ ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+ -+ (float)2.0*ftmp2/ftmp1; -+ } -+ } -+ -+ enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl]; -+ for (i=0; i<plc_blockl; i++) { -+ ftmp1 = (float) (i+1) / (float) (plc_blockl+1); -+ *enh_bufPtr1 *= ftmp1; -+ *enh_bufPtr1 += ((float)1.0-ftmp1)* -+ plc_pred[plc_blockl-1-i]; -+ enh_bufPtr1--; -+ } -+ -+ -+ } -+ -+ if (iLBCdec_inst->mode==20) { -+ /* Enhancer with 40 samples delay */ -+ for (iblock = 0; iblock<2; iblock++) { -+ enhancer(out+iblock*ENH_BLOCKL, enh_buf, -+ ENH_BUFL, (5+iblock)*ENH_BLOCKL+40, -+ ENH_ALPHA0, enh_period, enh_plocsTbl, -+ ENH_NBLOCKS_TOT); -+ } -+ } else if (iLBCdec_inst->mode==30) { -+ /* Enhancer with 80 samples delay */ -+ for (iblock = 0; iblock<3; iblock++) { -+ enhancer(out+iblock*ENH_BLOCKL, enh_buf, -+ ENH_BUFL, (4+iblock)*ENH_BLOCKL, -+ ENH_ALPHA0, enh_period, enh_plocsTbl, -+ ENH_NBLOCKS_TOT); -+ } -+ } -+ -+ return (lag*2); -+} -+ -+ -diff -druN codecs/ilbc.orig/enhancer.h codecs/ilbc/enhancer.h ---- codecs/ilbc.orig/enhancer.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/enhancer.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,33 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ enhancer.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __ENHANCER_H -+#define __ENHANCER_H -+ -+#include "iLBC_define.h" -+ -+float xCorrCoef( -+ float *target, /* (i) first array */ -+ float *regressor, /* (i) second array */ -+ int subl /* (i) dimension arrays */ -+); -+ -+int enhancerInterface( -+ float *out, /* (o) the enhanced recidual signal */ -+ float *in, /* (i) the recidual signal to enhance */ -+ iLBC_Dec_Inst_t *iLBCdec_inst -+ /* (i/o) the decoder state structure */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/filter.c codecs/ilbc/filter.c ---- codecs/ilbc.orig/filter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/filter.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,168 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ filter.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+ -+ -+#include "iLBC_define.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ * all-pole filter -+ *---------------------------------------------------------------*/ -+ -+void AllPoleFilter( -+ float *InOut, /* (i/o) on entrance InOut[-orderCoef] to -+ InOut[-1] contain the state of the -+ filter (delayed samples). InOut[0] to -+ InOut[lengthInOut-1] contain the filter -+ input, on en exit InOut[-orderCoef] to -+ InOut[-1] is unchanged and InOut[0] to -+ InOut[lengthInOut-1] contain filtered -+ samples */ -+ float *Coef,/* (i) filter coefficients, Coef[0] is assumed -+ to be 1.0 */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef /* (i) number of filter coefficients */ -+){ -+ int n,k; -+ -+ for(n=0;n<lengthInOut;n++){ -+ for(k=1;k<=orderCoef;k++){ -+ *InOut -= Coef[k]*InOut[-k]; -+ } -+ InOut++; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * all-zero filter -+ *---------------------------------------------------------------*/ -+ -+void AllZeroFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain -+ filter input samples */ -+ float *Coef,/* (i) filter coefficients (Coef[0] is assumed -+ to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain the filter state, on exit Out[0] -+ to Out[lengthInOut-1] contain filtered -+ samples */ -+){ -+ int n,k; -+ -+ for(n=0;n<lengthInOut;n++){ -+ *Out = Coef[0]*In[0]; -+ for(k=1;k<=orderCoef;k++){ -+ *Out += Coef[k]*In[-k]; -+ } -+ -+ -+ Out++; -+ In++; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * pole-zero filter -+ *---------------------------------------------------------------*/ -+ -+void ZeroPoleFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain -+ filter input samples In[-orderCoef] to -+ In[-1] contain state of all-zero -+ section */ -+ float *ZeroCoef,/* (i) filter coefficients for all-zero -+ section (ZeroCoef[0] is assumed to -+ be 1.0) */ -+ float *PoleCoef,/* (i) filter coefficients for all-pole section -+ (ZeroCoef[0] is assumed to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain state of all-pole section. On -+ exit Out[0] to Out[lengthInOut-1] -+ contain filtered samples */ -+){ -+ AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out); -+ AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef); -+} -+ -+/*----------------------------------------------------------------* -+ * downsample (LP filter and decimation) -+ *---------------------------------------------------------------*/ -+ -+void DownSample ( -+ float *In, /* (i) input samples */ -+ float *Coef, /* (i) filter coefficients */ -+ int lengthIn, /* (i) number of input samples */ -+ float *state, /* (i) filter state */ -+ float *Out /* (o) downsampled output */ -+){ -+ float o; -+ float *Out_ptr = Out; -+ float *Coef_ptr, *In_ptr; -+ float *state_ptr; -+ int i, j, stop; -+ -+ /* LP filter and decimate at the same time */ -+ -+ for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS) -+ { -+ Coef_ptr = &Coef[0]; -+ In_ptr = &In[i]; -+ state_ptr = &state[FILTERORDER_DS-2]; -+ -+ -+ -+ o = (float)0.0; -+ -+ stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS; -+ -+ for (j = 0; j < stop; j++) -+ { -+ o += *Coef_ptr++ * (*In_ptr--); -+ } -+ for (j = i + 1; j < FILTERORDER_DS; j++) -+ { -+ o += *Coef_ptr++ * (*state_ptr--); -+ } -+ -+ *Out_ptr++ = o; -+ } -+ -+ /* Get the last part (use zeros as input for the future) */ -+ -+ for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS); -+ i+=FACTOR_DS) { -+ -+ o=(float)0.0; -+ -+ if (i<lengthIn) { -+ Coef_ptr = &Coef[0]; -+ In_ptr = &In[i]; -+ for (j=0; j<FILTERORDER_DS; j++) { -+ o += *Coef_ptr++ * (*Out_ptr--); -+ } -+ } else { -+ Coef_ptr = &Coef[i-lengthIn]; -+ In_ptr = &In[lengthIn-1]; -+ for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) { -+ o += *Coef_ptr++ * (*In_ptr--); -+ } -+ } -+ *Out_ptr++ = o; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/filter.h codecs/ilbc/filter.h ---- codecs/ilbc.orig/filter.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/filter.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,73 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ filter.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_FILTER_H -+#define __iLBC_FILTER_H -+ -+void AllPoleFilter( -+ float *InOut, /* (i/o) on entrance InOut[-orderCoef] to -+ InOut[-1] contain the state of the -+ filter (delayed samples). InOut[0] to -+ InOut[lengthInOut-1] contain the filter -+ input, on en exit InOut[-orderCoef] to -+ InOut[-1] is unchanged and InOut[0] to -+ InOut[lengthInOut-1] contain filtered -+ samples */ -+ float *Coef,/* (i) filter coefficients, Coef[0] is assumed -+ to be 1.0 */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef /* (i) number of filter coefficients */ -+); -+ -+ -+ -+void AllZeroFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain -+ filter input samples */ -+ float *Coef,/* (i) filter coefficients (Coef[0] is assumed -+ to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain the filter state, on exit Out[0] -+ to Out[lengthInOut-1] contain filtered -+ samples */ -+); -+ -+void ZeroPoleFilter( -+ float *In, /* (i) In[0] to In[lengthInOut-1] contain filter -+ input samples In[-orderCoef] to In[-1] -+ contain state of all-zero section */ -+ float *ZeroCoef,/* (i) filter coefficients for all-zero -+ section (ZeroCoef[0] is assumed to -+ be 1.0) */ -+ float *PoleCoef,/* (i) filter coefficients for all-pole section -+ (ZeroCoef[0] is assumed to be 1.0) */ -+ int lengthInOut,/* (i) number of input/output samples */ -+ int orderCoef, /* (i) number of filter coefficients */ -+ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] -+ contain state of all-pole section. On -+ exit Out[0] to Out[lengthInOut-1] -+ contain filtered samples */ -+); -+ -+void DownSample ( -+ float *In, /* (i) input samples */ -+ float *Coef, /* (i) filter coefficients */ -+ int lengthIn, /* (i) number of input samples */ -+ float *state, /* (i) filter state */ -+ float *Out /* (o) downsampled output */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/gainquant.c codecs/ilbc/gainquant.c ---- codecs/ilbc.orig/gainquant.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/gainquant.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,107 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ gainquant.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#include <string.h> -+#include <math.h> -+#include "constants.h" -+#include "gainquant.h" -+#include "filter.h" -+ -+/*----------------------------------------------------------------* -+ * quantizer for the gain in the gain-shape coding of residual -+ *---------------------------------------------------------------*/ -+ -+float gainquant(/* (o) quantized gain value */ -+ float in, /* (i) gain value */ -+ float maxIn,/* (i) maximum of gain value */ -+ int cblen, /* (i) number of quantization indices */ -+ int *index /* (o) quantization index */ -+){ -+ int i, tindex; -+ float minmeasure,measure, *cb, scale; -+ -+ /* ensure a lower bound on the scaling factor */ -+ -+ scale=maxIn; -+ -+ if (scale<0.1) { -+ scale=(float)0.1; -+ } -+ -+ /* select the quantization table */ -+ -+ if (cblen == 8) { -+ cb = gain_sq3Tbl; -+ } else if (cblen == 16) { -+ cb = gain_sq4Tbl; -+ } else { -+ cb = gain_sq5Tbl; -+ } -+ -+ /* select the best index in the quantization table */ -+ -+ minmeasure=10000000.0; -+ tindex=0; -+ for (i=0; i<cblen; i++) { -+ measure=(in-scale*cb[i])*(in-scale*cb[i]); -+ -+ if (measure<minmeasure) { -+ tindex=i; -+ minmeasure=measure; -+ } -+ } -+ *index=tindex; -+ -+ /* return the quantized value */ -+ -+ -+ -+ return scale*cb[tindex]; -+} -+ -+/*----------------------------------------------------------------* -+ * decoder for quantized gains in the gain-shape coding of -+ * residual -+ *---------------------------------------------------------------*/ -+ -+float gaindequant( /* (o) quantized gain value */ -+ int index, /* (i) quantization index */ -+ float maxIn,/* (i) maximum of unquantized gain */ -+ int cblen /* (i) number of quantization indices */ -+){ -+ float scale; -+ -+ /* obtain correct scale factor */ -+ -+ scale=(float)fabs(maxIn); -+ -+ if (scale<0.1) { -+ scale=(float)0.1; -+ } -+ -+ /* select the quantization table and return the decoded value */ -+ -+ if (cblen==8) { -+ return scale*gain_sq3Tbl[index]; -+ } else if (cblen==16) { -+ return scale*gain_sq4Tbl[index]; -+ } -+ else if (cblen==32) { -+ return scale*gain_sq5Tbl[index]; -+ } -+ -+ return 0.0; -+} -+ -+ -diff -druN codecs/ilbc.orig/gainquant.h codecs/ilbc/gainquant.h ---- codecs/ilbc.orig/gainquant.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/gainquant.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,31 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ gainquant.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_GAINQUANT_H -+#define __iLBC_GAINQUANT_H -+ -+float gainquant(/* (o) quantized gain value */ -+ float in, /* (i) gain value */ -+ float maxIn,/* (i) maximum of gain value */ -+ int cblen, /* (i) number of quantization indices */ -+ int *index /* (o) quantization index */ -+); -+ -+float gaindequant( /* (o) quantized gain value */ -+ int index, /* (i) quantization index */ -+ float maxIn,/* (i) maximum of unquantized gain */ -+ int cblen /* (i) number of quantization indices */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/getCBvec.c codecs/ilbc/getCBvec.c ---- codecs/ilbc.orig/getCBvec.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/getCBvec.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,181 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ getCBvec.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "getCBvec.h" -+#include "constants.h" -+#include <string.h> -+ -+/*----------------------------------------------------------------* -+ * Construct codebook vector for given index. -+ *---------------------------------------------------------------*/ -+ -+void getCBvec( -+ float *cbvec, /* (o) Constructed codebook vector */ -+ float *mem, /* (i) Codebook buffer */ -+ int index, /* (i) Codebook index */ -+ int lMem, /* (i) Length of codebook buffer */ -+ int cbveclen/* (i) Codebook vector length */ -+){ -+ int j, k, n, memInd, sFilt; -+ float tmpbuf[CB_MEML]; -+ int base_size; -+ int ilow, ihigh; -+ float alfa, alfa1; -+ -+ /* Determine size of codebook sections */ -+ -+ base_size=lMem-cbveclen+1; -+ -+ if (cbveclen==SUBL) { -+ base_size+=cbveclen/2; -+ } -+ -+ /* No filter -> First codebook section */ -+ -+ -+ -+ if (index<lMem-cbveclen+1) { -+ -+ /* first non-interpolated vectors */ -+ -+ k=index+cbveclen; -+ /* get vector */ -+ memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float)); -+ -+ } else if (index < base_size) { -+ -+ k=2*(index-(lMem-cbveclen+1))+cbveclen; -+ -+ ihigh=k/2; -+ ilow=ihigh-5; -+ -+ /* Copy first noninterpolated part */ -+ -+ memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float)); -+ -+ /* interpolation */ -+ -+ alfa1=(float)0.2; -+ alfa=0.0; -+ for (j=ilow; j<ihigh; j++) { -+ cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+ -+ alfa*mem[lMem-k+j]; -+ alfa+=alfa1; -+ } -+ -+ /* Copy second noninterpolated part */ -+ -+ memcpy(cbvec+ihigh, mem+lMem-k+ihigh, -+ (cbveclen-ihigh)*sizeof(float)); -+ -+ } -+ -+ /* Higher codebbok section based on filtering */ -+ -+ else { -+ -+ /* first non-interpolated vectors */ -+ -+ if (index-base_size<lMem-cbveclen+1) { -+ float tempbuff2[CB_MEML+CB_FILTERLEN+1]; -+ float *pos; -+ float *pp, *pp1; -+ -+ memset(tempbuff2, 0, -+ CB_HALFFILTERLEN*sizeof(float)); -+ memcpy(&tempbuff2[CB_HALFFILTERLEN], mem, -+ lMem*sizeof(float)); -+ memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0, -+ (CB_HALFFILTERLEN+1)*sizeof(float)); -+ -+ -+ -+ k=index-base_size+cbveclen; -+ sFilt=lMem-k; -+ memInd=sFilt+1-CB_HALFFILTERLEN; -+ -+ /* do filtering */ -+ pos=cbvec; -+ memset(pos, 0, cbveclen*sizeof(float)); -+ for (n=0; n<cbveclen; n++) { -+ pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN]; -+ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; -+ for (j=0; j<CB_FILTERLEN; j++) { -+ (*pos)+=(*pp++)*(*pp1--); -+ } -+ pos++; -+ } -+ } -+ -+ /* interpolated vectors */ -+ -+ else { -+ float tempbuff2[CB_MEML+CB_FILTERLEN+1]; -+ -+ float *pos; -+ float *pp, *pp1; -+ int i; -+ -+ memset(tempbuff2, 0, -+ CB_HALFFILTERLEN*sizeof(float)); -+ memcpy(&tempbuff2[CB_HALFFILTERLEN], mem, -+ lMem*sizeof(float)); -+ memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0, -+ (CB_HALFFILTERLEN+1)*sizeof(float)); -+ -+ k=2*(index-base_size- -+ (lMem-cbveclen+1))+cbveclen; -+ sFilt=lMem-k; -+ memInd=sFilt+1-CB_HALFFILTERLEN; -+ -+ /* do filtering */ -+ pos=&tmpbuf[sFilt]; -+ memset(pos, 0, k*sizeof(float)); -+ for (i=0; i<k; i++) { -+ pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN]; -+ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; -+ for (j=0; j<CB_FILTERLEN; j++) { -+ (*pos)+=(*pp++)*(*pp1--); -+ } -+ pos++; -+ } -+ -+ ihigh=k/2; -+ ilow=ihigh-5; -+ -+ -+ -+ /* Copy first noninterpolated part */ -+ -+ memcpy(cbvec, tmpbuf+lMem-k/2, -+ ilow*sizeof(float)); -+ -+ /* interpolation */ -+ -+ alfa1=(float)0.2; -+ alfa=0.0; -+ for (j=ilow; j<ihigh; j++) { -+ cbvec[j]=((float)1.0-alfa)* -+ tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j]; -+ alfa+=alfa1; -+ } -+ -+ /* Copy second noninterpolated part */ -+ -+ memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh, -+ (cbveclen-ihigh)*sizeof(float)); -+ } -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/getCBvec.h codecs/ilbc/getCBvec.h ---- codecs/ilbc.orig/getCBvec.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/getCBvec.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,28 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ getCBvec.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_GETCBVEC_H -+#define __iLBC_GETCBVEC_H -+ -+ -+ -+void getCBvec( -+ float *cbvec, /* (o) Constructed codebook vector */ -+ float *mem, /* (i) Codebook buffer */ -+ int index, /* (i) Codebook index */ -+ int lMem, /* (i) Length of codebook buffer */ -+ int cbveclen/* (i) Codebook vector length */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/helpfun.c codecs/ilbc/helpfun.c ---- codecs/ilbc.orig/helpfun.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/helpfun.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,308 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ helpfun.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+ -+#include "iLBC_define.h" -+#include "helpfun.h" -+#include "constants.h" -+ -+/*----------------------------------------------------------------* -+ * calculation of auto correlation -+ *---------------------------------------------------------------*/ -+ -+void autocorr( -+ float *r, /* (o) autocorrelation vector */ -+ const float *x, /* (i) data vector */ -+ int N, /* (i) length of data vector */ -+ int order /* largest lag for calculated -+ autocorrelations */ -+){ -+ int lag, n; -+ float sum; -+ -+ for (lag = 0; lag <= order; lag++) { -+ sum = 0; -+ for (n = 0; n < N - lag; n++) { -+ sum += x[n] * x[n+lag]; -+ } -+ r[lag] = sum; -+ } -+} -+ -+ -+ -+/*----------------------------------------------------------------* -+ * window multiplication -+ *---------------------------------------------------------------*/ -+ -+void window( -+ float *z, /* (o) the windowed data */ -+ const float *x, /* (i) the original data vector */ -+ const float *y, /* (i) the window */ -+ int N /* (i) length of all vectors */ -+){ -+ int i; -+ -+ for (i = 0; i < N; i++) { -+ z[i] = x[i] * y[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * levinson-durbin solution for lpc coefficients -+ *---------------------------------------------------------------*/ -+ -+void levdurb( -+ float *a, /* (o) lpc coefficient vector starting -+ with 1.0 */ -+ float *k, /* (o) reflection coefficients */ -+ float *r, /* (i) autocorrelation vector */ -+ int order /* (i) order of lpc filter */ -+){ -+ float sum, alpha; -+ int m, m_h, i; -+ -+ a[0] = 1.0; -+ -+ if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */ -+ for (i = 0; i < order; i++) { -+ k[i] = 0; -+ a[i+1] = 0; -+ } -+ } else { -+ a[1] = k[0] = -r[1]/r[0]; -+ alpha = r[0] + r[1] * k[0]; -+ for (m = 1; m < order; m++){ -+ sum = r[m + 1]; -+ for (i = 0; i < m; i++){ -+ sum += a[i+1] * r[m - i]; -+ } -+ k[m] = -sum / alpha; -+ alpha += k[m] * sum; -+ m_h = (m + 1) >> 1; -+ for (i = 0; i < m_h; i++){ -+ sum = a[i+1] + k[m] * a[m - i]; -+ a[m - i] += k[m] * a[i+1]; -+ a[i+1] = sum; -+ -+ -+ } -+ a[m+1] = k[m]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * interpolation between vectors -+ *---------------------------------------------------------------*/ -+ -+void interpolate( -+ float *out, /* (o) the interpolated vector */ -+ float *in1, /* (i) the first vector for the -+ interpolation */ -+ float *in2, /* (i) the second vector for the -+ interpolation */ -+ float coef, /* (i) interpolation weights */ -+ int length /* (i) length of all vectors */ -+){ -+ int i; -+ float invcoef; -+ -+ invcoef = (float)1.0 - coef; -+ for (i = 0; i < length; i++) { -+ out[i] = coef * in1[i] + invcoef * in2[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * lpc bandwidth expansion -+ *---------------------------------------------------------------*/ -+ -+void bwexpand( -+ float *out, /* (o) the bandwidth expanded lpc -+ coefficients */ -+ float *in, /* (i) the lpc coefficients before bandwidth -+ expansion */ -+ float coef, /* (i) the bandwidth expansion factor */ -+ int length /* (i) the length of lpc coefficient vectors */ -+){ -+ int i; -+ float chirp; -+ -+ chirp = coef; -+ -+ out[0] = in[0]; -+ for (i = 1; i < length; i++) { -+ out[i] = chirp * in[i]; -+ chirp *= coef; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * vector quantization -+ -+ -+ *---------------------------------------------------------------*/ -+ -+void vq( -+ float *Xq, /* (o) the quantized vector */ -+ int *index, /* (o) the quantization index */ -+ const float *CB,/* (i) the vector quantization codebook */ -+ float *X, /* (i) the vector to quantize */ -+ int n_cb, /* (i) the number of vectors in the codebook */ -+ int dim /* (i) the dimension of all vectors */ -+){ -+ int i, j; -+ int pos, minindex; -+ float dist, tmp, mindist; -+ -+ pos = 0; -+ mindist = FLOAT_MAX; -+ minindex = 0; -+ for (j = 0; j < n_cb; j++) { -+ dist = X[0] - CB[pos]; -+ dist *= dist; -+ for (i = 1; i < dim; i++) { -+ tmp = X[i] - CB[pos + i]; -+ dist += tmp*tmp; -+ } -+ -+ if (dist < mindist) { -+ mindist = dist; -+ minindex = j; -+ } -+ pos += dim; -+ } -+ for (i = 0; i < dim; i++) { -+ Xq[i] = CB[minindex*dim + i]; -+ } -+ *index = minindex; -+} -+ -+/*----------------------------------------------------------------* -+ * split vector quantization -+ *---------------------------------------------------------------*/ -+ -+void SplitVQ( -+ float *qX, /* (o) the quantized vector */ -+ int *index, /* (o) a vector of indexes for all vector -+ codebooks in the split */ -+ float *X, /* (i) the vector to quantize */ -+ const float *CB,/* (i) the quantizer codebook */ -+ int nsplit, /* the number of vector splits */ -+ const int *dim, /* the dimension of X and qX */ -+ const int *cbsize /* the number of vectors in the codebook */ -+){ -+ int cb_pos, X_pos, i; -+ -+ cb_pos = 0; -+ -+ -+ X_pos= 0; -+ for (i = 0; i < nsplit; i++) { -+ vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos, -+ cbsize[i], dim[i]); -+ X_pos += dim[i]; -+ cb_pos += dim[i] * cbsize[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * scalar quantization -+ *---------------------------------------------------------------*/ -+ -+void sort_sq( -+ float *xq, /* (o) the quantized value */ -+ int *index, /* (o) the quantization index */ -+ float x, /* (i) the value to quantize */ -+ const float *cb,/* (i) the quantization codebook */ -+ int cb_size /* (i) the size of the quantization codebook */ -+){ -+ int i; -+ -+ if (x <= cb[0]) { -+ *index = 0; -+ *xq = cb[0]; -+ } else { -+ i = 0; -+ while ((x > cb[i]) && i < cb_size - 1) { -+ i++; -+ } -+ -+ if (x > ((cb[i] + cb[i - 1])/2)) { -+ *index = i; -+ *xq = cb[i]; -+ } else { -+ *index = i - 1; -+ *xq = cb[i - 1]; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * check for stability of lsf coefficients -+ *---------------------------------------------------------------*/ -+ -+int LSF_check( /* (o) 1 for stable lsf vectors and 0 for -+ nonstable ones */ -+ float *lsf, /* (i) a table of lsf vectors */ -+ int dim, /* (i) the dimension of each lsf vector */ -+ int NoAn /* (i) the number of lsf vectors in the -+ table */ -+){ -+ int k,n,m, Nit=2, change=0,pos; -+ float tmp; -+ -+ -+ static float eps=(float)0.039; /* 50 Hz */ -+ static float eps2=(float)0.0195; -+ static float maxlsf=(float)3.14; /* 4000 Hz */ -+ static float minlsf=(float)0.01; /* 0 Hz */ -+ -+ /* LSF separation check*/ -+ -+ for (n=0; n<Nit; n++) { /* Run through a couple of times */ -+ for (m=0; m<NoAn; m++) { /* Number of analyses per frame */ -+ for (k=0; k<(dim-1); k++) { -+ pos=m*dim+k; -+ -+ if ((lsf[pos+1]-lsf[pos])<eps) { -+ -+ if (lsf[pos+1]<lsf[pos]) { -+ tmp=lsf[pos+1]; -+ lsf[pos+1]= lsf[pos]+eps2; -+ lsf[pos]= lsf[pos+1]-eps2; -+ } else { -+ lsf[pos]-=eps2; -+ lsf[pos+1]+=eps2; -+ } -+ change=1; -+ } -+ -+ if (lsf[pos]<minlsf) { -+ lsf[pos]=minlsf; -+ change=1; -+ } -+ -+ if (lsf[pos]>maxlsf) { -+ lsf[pos]=maxlsf; -+ change=1; -+ } -+ } -+ } -+ } -+ -+ return change; -+} -+ -+ -diff -druN codecs/ilbc.orig/helpfun.h codecs/ilbc/helpfun.h ---- codecs/ilbc.orig/helpfun.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/helpfun.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,101 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ helpfun.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_HELPFUN_H -+#define __iLBC_HELPFUN_H -+ -+void autocorr( -+ float *r, /* (o) autocorrelation vector */ -+ const float *x, /* (i) data vector */ -+ int N, /* (i) length of data vector */ -+ int order /* largest lag for calculated -+ autocorrelations */ -+); -+ -+void window( -+ float *z, /* (o) the windowed data */ -+ const float *x, /* (i) the original data vector */ -+ const float *y, /* (i) the window */ -+ int N /* (i) length of all vectors */ -+); -+ -+ -+ -+void levdurb( -+ float *a, /* (o) lpc coefficient vector starting -+ with 1.0 */ -+ float *k, /* (o) reflection coefficients */ -+ float *r, /* (i) autocorrelation vector */ -+ int order /* (i) order of lpc filter */ -+); -+ -+void interpolate( -+ float *out, /* (o) the interpolated vector */ -+ float *in1, /* (i) the first vector for the -+ interpolation */ -+ float *in2, /* (i) the second vector for the -+ interpolation */ -+ float coef, /* (i) interpolation weights */ -+ int length /* (i) length of all vectors */ -+); -+ -+void bwexpand( -+ float *out, /* (o) the bandwidth expanded lpc -+ coefficients */ -+ float *in, /* (i) the lpc coefficients before bandwidth -+ expansion */ -+ float coef, /* (i) the bandwidth expansion factor */ -+ int length /* (i) the length of lpc coefficient vectors */ -+); -+ -+void vq( -+ float *Xq, /* (o) the quantized vector */ -+ int *index, /* (o) the quantization index */ -+ const float *CB,/* (i) the vector quantization codebook */ -+ float *X, /* (i) the vector to quantize */ -+ int n_cb, /* (i) the number of vectors in the codebook */ -+ int dim /* (i) the dimension of all vectors */ -+); -+ -+void SplitVQ( -+ float *qX, /* (o) the quantized vector */ -+ int *index, /* (o) a vector of indexes for all vector -+ codebooks in the split */ -+ float *X, /* (i) the vector to quantize */ -+ const float *CB,/* (i) the quantizer codebook */ -+ int nsplit, /* the number of vector splits */ -+ const int *dim, /* the dimension of X and qX */ -+ const int *cbsize /* the number of vectors in the codebook */ -+); -+ -+ -+void sort_sq( -+ float *xq, /* (o) the quantized value */ -+ int *index, /* (o) the quantization index */ -+ float x, /* (i) the value to quantize */ -+ const float *cb,/* (i) the quantization codebook */ -+ -+ -+ int cb_size /* (i) the size of the quantization codebook */ -+); -+ -+int LSF_check( /* (o) 1 for stable lsf vectors and 0 for -+ nonstable ones */ -+ float *lsf, /* (i) a table of lsf vectors */ -+ int dim, /* (i) the dimension of each lsf vector */ -+ int NoAn /* (i) the number of lsf vectors in the -+ table */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/hpInput.c codecs/ilbc/hpInput.c ---- codecs/ilbc.orig/hpInput.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpInput.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,60 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpInput.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "constants.h" -+#include "hpInput.h" -+ -+/*----------------------------------------------------------------* -+ * Input high-pass filter -+ *---------------------------------------------------------------*/ -+ -+void hpInput( -+ float *In, /* (i) vector to filter */ -+ int len, /* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+){ -+ int i; -+ float *pi, *po; -+ -+ /* all-zero section*/ -+ -+ pi = &In[0]; -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po = hpi_zero_coefsTbl[0] * (*pi); -+ *po += hpi_zero_coefsTbl[1] * mem[0]; -+ *po += hpi_zero_coefsTbl[2] * mem[1]; -+ -+ mem[1] = mem[0]; -+ mem[0] = *pi; -+ po++; -+ -+ -+ pi++; -+ -+ } -+ -+ /* all-pole section*/ -+ -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po -= hpi_pole_coefsTbl[1] * mem[2]; -+ *po -= hpi_pole_coefsTbl[2] * mem[3]; -+ -+ mem[3] = mem[2]; -+ mem[2] = *po; -+ po++; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/hpInput.h codecs/ilbc/hpInput.h ---- codecs/ilbc.orig/hpInput.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpInput.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,27 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpInput.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+ -+ -+#ifndef __iLBC_HPINPUT_H -+#define __iLBC_HPINPUT_H -+ -+void hpInput( -+ float *In, /* (i) vector to filter */ -+ int len, /* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/hpOutput.c codecs/ilbc/hpOutput.c ---- codecs/ilbc.orig/hpOutput.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpOutput.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,59 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpOutput.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#include "constants.h" -+#include "hpOutput.h" -+/*----------------------------------------------------------------* -+ * Output high-pass filter -+ *---------------------------------------------------------------*/ -+ -+void hpOutput( -+ float *In, /* (i) vector to filter */ -+ int len,/* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+){ -+ int i; -+ float *pi, *po; -+ -+ /* all-zero section*/ -+ -+ pi = &In[0]; -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po = hpo_zero_coefsTbl[0] * (*pi); -+ *po += hpo_zero_coefsTbl[1] * mem[0]; -+ *po += hpo_zero_coefsTbl[2] * mem[1]; -+ -+ mem[1] = mem[0]; -+ mem[0] = *pi; -+ po++; -+ pi++; -+ -+ } -+ -+ /* all-pole section*/ -+ -+ po = &Out[0]; -+ for (i=0; i<len; i++) { -+ *po -= hpo_pole_coefsTbl[1] * mem[2]; -+ *po -= hpo_pole_coefsTbl[2] * mem[3]; -+ -+ mem[3] = mem[2]; -+ mem[2] = *po; -+ po++; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/hpOutput.h codecs/ilbc/hpOutput.h ---- codecs/ilbc.orig/hpOutput.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpOutput.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,25 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ hpOutput.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_HPOUTPUT_H -+#define __iLBC_HPOUTPUT_H -+ -+void hpOutput( -+ float *In, /* (i) vector to filter */ -+ int len,/* (i) length of vector to filter */ -+ float *Out, /* (o) the resulting filtered vector */ -+ float *mem /* (i/o) the filter state */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iCBConstruct.c codecs/ilbc/iCBConstruct.c ---- codecs/ilbc.orig/iCBConstruct.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBConstruct.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,108 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iCBConstruct.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+ -+#include "iLBC_define.h" -+#include "iCBConstruct.h" -+#include "gainquant.h" -+#include "getCBvec.h" -+ -+/*----------------------------------------------------------------* -+ * Convert the codebook indexes to make the search easier -+ *---------------------------------------------------------------*/ -+ -+ -+ -+void index_conv_enc( -+ int *index /* (i/o) Codebook indexes */ -+){ -+ int k; -+ -+ for (k=1; k<CB_NSTAGES; k++) { -+ -+ if ((index[k]>=108)&&(index[k]<172)) { -+ index[k]-=64; -+ } else if (index[k]>=236) { -+ index[k]-=128; -+ } else { -+ /* ERROR */ -+ } -+ } -+} -+ -+void index_conv_dec( -+ int *index /* (i/o) Codebook indexes */ -+){ -+ int k; -+ -+ for (k=1; k<CB_NSTAGES; k++) { -+ -+ if ((index[k]>=44)&&(index[k]<108)) { -+ index[k]+=64; -+ } else if ((index[k]>=108)&&(index[k]<128)) { -+ index[k]+=128; -+ } else { -+ /* ERROR */ -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * Construct decoded vector from codebook and gains. -+ *---------------------------------------------------------------*/ -+ -+void iCBConstruct( -+ float *decvector, /* (o) Decoded vector */ -+ int *index, /* (i) Codebook indices */ -+ int *gain_index,/* (i) Gain quantization indices */ -+ float *mem, /* (i) Buffer for codevector construction */ -+ int lMem, /* (i) Length of buffer */ -+ int veclen, /* (i) Length of vector */ -+ int nStages /* (i) Number of codebook stages */ -+){ -+ int j,k; -+ float gain[CB_NSTAGES]; -+ float cbvec[SUBL]; -+ -+ /* gain de-quantization */ -+ -+ gain[0] = gaindequant(gain_index[0], 1.0, 32); -+ -+ -+ if (nStages > 1) { -+ gain[1] = gaindequant(gain_index[1], -+ (float)fabs(gain[0]), 16); -+ } -+ if (nStages > 2) { -+ gain[2] = gaindequant(gain_index[2], -+ (float)fabs(gain[1]), 8); -+ } -+ -+ /* codebook vector construction and construction of -+ total vector */ -+ -+ getCBvec(cbvec, mem, index[0], lMem, veclen); -+ for (j=0;j<veclen;j++){ -+ decvector[j] = gain[0]*cbvec[j]; -+ } -+ if (nStages > 1) { -+ for (k=1; k<nStages; k++) { -+ getCBvec(cbvec, mem, index[k], lMem, veclen); -+ for (j=0;j<veclen;j++) { -+ decvector[j] += gain[k]*cbvec[j]; -+ } -+ } -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/iCBConstruct.h codecs/ilbc/iCBConstruct.h ---- codecs/ilbc.orig/iCBConstruct.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBConstruct.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,38 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ -+ -+ iCBConstruct.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ICBCONSTRUCT_H -+#define __iLBC_ICBCONSTRUCT_H -+ -+void index_conv_enc( -+ int *index /* (i/o) Codebook indexes */ -+); -+ -+void index_conv_dec( -+ int *index /* (i/o) Codebook indexes */ -+); -+ -+void iCBConstruct( -+ float *decvector, /* (o) Decoded vector */ -+ int *index, /* (i) Codebook indices */ -+ int *gain_index,/* (i) Gain quantization indices */ -+ float *mem, /* (i) Buffer for codevector construction */ -+ int lMem, /* (i) Length of buffer */ -+ int veclen, /* (i) Length of vector */ -+ int nStages /* (i) Number of codebook stages */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iCBSearch.c codecs/ilbc/iCBSearch.c ---- codecs/ilbc.orig/iCBSearch.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBSearch.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,480 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iCBSearch.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "iCBSearch.h" -+#include "gainquant.h" -+#include "createCB.h" -+#include "filter.h" -+#include "constants.h" -+ -+/*----------------------------------------------------------------* -+ * Search routine for codebook encoding and gain quantization. -+ *---------------------------------------------------------------*/ -+ -+void iCBSearch( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) the encoder state structure */ -+ int *index, /* (o) Codebook indices */ -+ int *gain_index,/* (o) Gain quantization indices */ -+ float *intarget,/* (i) Target vector for encoding */ -+ float *mem, /* (i) Buffer for codebook construction */ -+ int lMem, /* (i) Length of buffer */ -+ int lTarget, /* (i) Length of vector */ -+ int nStages, /* (i) Number of codebook stages */ -+ float *weightDenum, /* (i) weighting filter coefficients */ -+ float *weightState, /* (i) weighting filter state */ -+ int block /* (i) the sub-block number */ -+){ -+ int i, j, icount, stage, best_index, range, counter; -+ float max_measure, gain, measure, crossDot, ftmp; -+ float gains[CB_NSTAGES]; -+ float target[SUBL]; -+ int base_index, sInd, eInd, base_size; -+ int sIndAug=0, eIndAug=0; -+ float buf[CB_MEML+SUBL+2*LPC_FILTERORDER]; -+ -+ -+ float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128]; -+ float *pp, *ppi=0, *ppo=0, *ppe=0; -+ float cbvectors[CB_MEML]; -+ float tene, cene, cvec[SUBL]; -+ float aug_vec[SUBL]; -+ -+ memset(cvec,0,SUBL*sizeof(float)); -+ -+ /* Determine size of codebook sections */ -+ -+ base_size=lMem-lTarget+1; -+ -+ if (lTarget==SUBL) { -+ base_size=lMem-lTarget+1+lTarget/2; -+ } -+ -+ /* setup buffer for weighting */ -+ -+ memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER); -+ memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float)); -+ memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float)); -+ -+ /* weighting */ -+ -+ AllPoleFilter(buf+LPC_FILTERORDER, weightDenum, -+ lMem+lTarget, LPC_FILTERORDER); -+ -+ /* Construct the codebook and target needed */ -+ -+ memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float)); -+ -+ tene=0.0; -+ for (i=0; i<lTarget; i++) { -+ tene+=target[i]*target[i]; -+ } -+ -+ /* Prepare search over one more codebook section. This section -+ is created by filtering the original buffer with a filter. */ -+ -+ filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem); -+ -+ /* The Main Loop over stages */ -+ -+ for (stage=0; stage<nStages; stage++) { -+ -+ range = search_rangeTbl[block][stage]; -+ -+ /* initialize search measure */ -+ -+ max_measure = (float)-10000000.0; -+ gain = (float)0.0; -+ best_index = 0; -+ -+ /* Compute cross dot product between the target -+ -+ -+ and the CB memory */ -+ -+ crossDot=0.0; -+ pp=buf+LPC_FILTERORDER+lMem-lTarget; -+ for (j=0; j<lTarget; j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (stage==0) { -+ -+ /* Calculate energy in the first block of -+ 'lTarget' sampels. */ -+ ppe = energy; -+ ppi = buf+LPC_FILTERORDER+lMem-lTarget-1; -+ ppo = buf+LPC_FILTERORDER+lMem-1; -+ -+ *ppe=0.0; -+ pp=buf+LPC_FILTERORDER+lMem-lTarget; -+ for (j=0; j<lTarget; j++) { -+ *ppe+=(*pp)*(*pp); -+ pp++; -+ } -+ -+ if (*ppe>0.0) { -+ invenergy[0] = (float) 1.0 / (*ppe + EPS); -+ } else { -+ invenergy[0] = (float) 0.0; -+ } -+ ppe++; -+ -+ measure=(float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot*invenergy[0]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[0]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[0]; -+ -+ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ best_index = 0; -+ max_measure = measure; -+ gain = ftmp; -+ } -+ -+ /* loop over the main first codebook section, -+ full search */ -+ -+ for (icount=1; icount<range; icount++) { -+ -+ /* calculate measure */ -+ -+ -+ -+ crossDot=0.0; -+ pp = buf+LPC_FILTERORDER+lMem-lTarget-icount; -+ -+ for (j=0; j<lTarget; j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (stage==0) { -+ *ppe++ = energy[icount-1] + (*ppi)*(*ppi) - -+ (*ppo)*(*ppo); -+ ppo--; -+ ppi--; -+ -+ if (energy[icount]>0.0) { -+ invenergy[icount] = -+ (float)1.0/(energy[icount]+EPS); -+ } else { -+ invenergy[icount] = (float) 0.0; -+ } -+ -+ measure=(float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot*invenergy[icount]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[icount]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[icount]; -+ -+ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ best_index = icount; -+ max_measure = measure; -+ gain = ftmp; -+ } -+ } -+ -+ /* Loop over augmented part in the first codebook -+ * section, full search. -+ * The vectors are interpolated. -+ */ -+ -+ if (lTarget==SUBL) { -+ -+ /* Search for best possible cb vector and -+ compute the CB-vectors' energy. */ -+ searchAugmentedCB(20, 39, stage, base_size-lTarget/2, -+ target, buf+LPC_FILTERORDER+lMem, -+ &max_measure, &best_index, &gain, energy, -+ invenergy); -+ -+ -+ } -+ -+ /* set search range for following codebook sections */ -+ -+ base_index=best_index; -+ -+ /* unrestricted search */ -+ -+ if (CB_RESRANGE == -1) { -+ sInd=0; -+ eInd=range-1; -+ sIndAug=20; -+ eIndAug=39; -+ } -+ -+ /* restriced search around best index from first -+ codebook section */ -+ -+ else { -+ /* Initialize search indices */ -+ sIndAug=0; -+ eIndAug=0; -+ sInd=base_index-CB_RESRANGE/2; -+ eInd=sInd+CB_RESRANGE; -+ -+ if (lTarget==SUBL) { -+ -+ if (sInd<0) { -+ -+ sIndAug = 40 + sInd; -+ eIndAug = 39; -+ sInd=0; -+ -+ } else if ( base_index < (base_size-20) ) { -+ -+ if (eInd > range) { -+ sInd -= (eInd-range); -+ eInd = range; -+ } -+ } else { /* base_index >= (base_size-20) */ -+ -+ if (sInd < (base_size-20)) { -+ sIndAug = 20; -+ sInd = 0; -+ eInd = 0; -+ eIndAug = 19 + CB_RESRANGE; -+ -+ if(eIndAug > 39) { -+ eInd = eIndAug-39; -+ eIndAug = 39; -+ } -+ } else { -+ sIndAug = 20 + sInd - (base_size-20); -+ eIndAug = 39; -+ -+ -+ sInd = 0; -+ eInd = CB_RESRANGE - (eIndAug-sIndAug+1); -+ } -+ } -+ -+ } else { /* lTarget = 22 or 23 */ -+ -+ if (sInd < 0) { -+ eInd -= sInd; -+ sInd = 0; -+ } -+ -+ if(eInd > range) { -+ sInd -= (eInd - range); -+ eInd = range; -+ } -+ } -+ } -+ -+ /* search of higher codebook section */ -+ -+ /* index search range */ -+ counter = sInd; -+ sInd += base_size; -+ eInd += base_size; -+ -+ -+ if (stage==0) { -+ ppe = energy+base_size; -+ *ppe=0.0; -+ -+ pp=cbvectors+lMem-lTarget; -+ for (j=0; j<lTarget; j++) { -+ *ppe+=(*pp)*(*pp); -+ pp++; -+ } -+ -+ ppi = cbvectors + lMem - 1 - lTarget; -+ ppo = cbvectors + lMem - 1; -+ -+ for (j=0; j<(range-1); j++) { -+ *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo); -+ ppo--; -+ ppi--; -+ ppe++; -+ } -+ } -+ -+ /* loop over search range */ -+ -+ for (icount=sInd; icount<eInd; icount++) { -+ -+ /* calculate measure */ -+ -+ crossDot=0.0; -+ -+ -+ pp=cbvectors + lMem - (counter++) - lTarget; -+ -+ for (j=0;j<lTarget;j++) { -+ crossDot += target[j]*(*pp++); -+ } -+ -+ if (energy[icount]>0.0) { -+ invenergy[icount] =(float)1.0/(energy[icount]+EPS); -+ } else { -+ invenergy[icount] =(float)0.0; -+ } -+ -+ if (stage==0) { -+ -+ measure=(float)-10000000.0; -+ -+ if (crossDot > 0.0) { -+ measure = crossDot*crossDot* -+ invenergy[icount]; -+ } -+ } -+ else { -+ measure = crossDot*crossDot*invenergy[icount]; -+ } -+ -+ /* check if measure is better */ -+ ftmp = crossDot*invenergy[icount]; -+ -+ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { -+ best_index = icount; -+ max_measure = measure; -+ gain = ftmp; -+ } -+ } -+ -+ /* Search the augmented CB inside the limited range. */ -+ -+ if ((lTarget==SUBL)&&(sIndAug!=0)) { -+ searchAugmentedCB(sIndAug, eIndAug, stage, -+ 2*base_size-20, target, cbvectors+lMem, -+ &max_measure, &best_index, &gain, energy, -+ invenergy); -+ } -+ -+ /* record best index */ -+ -+ index[stage] = best_index; -+ -+ /* gain quantization */ -+ -+ if (stage==0){ -+ -+ if (gain<0.0){ -+ gain = 0.0; -+ -+ -+ } -+ -+ if (gain>CB_MAXGAIN) { -+ gain = (float)CB_MAXGAIN; -+ } -+ gain = gainquant(gain, 1.0, 32, &gain_index[stage]); -+ } -+ else { -+ if (stage==1) { -+ gain = gainquant(gain, (float)fabs(gains[stage-1]), -+ 16, &gain_index[stage]); -+ } else { -+ gain = gainquant(gain, (float)fabs(gains[stage-1]), -+ 8, &gain_index[stage]); -+ } -+ } -+ -+ /* Extract the best (according to measure) -+ codebook vector */ -+ -+ if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) { -+ -+ if (index[stage]<base_size) { -+ pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage]; -+ } else { -+ pp=cbvectors+lMem-lTarget- -+ index[stage]+base_size; -+ } -+ } else { -+ -+ if (index[stage]<base_size) { -+ if (index[stage]<(base_size-20)) { -+ pp=buf+LPC_FILTERORDER+lMem- -+ lTarget-index[stage]; -+ } else { -+ createAugmentedVec(index[stage]-base_size+40, -+ buf+LPC_FILTERORDER+lMem,aug_vec); -+ pp=aug_vec; -+ } -+ } else { -+ int filterno, position; -+ -+ filterno=index[stage]/base_size; -+ position=index[stage]-filterno*base_size; -+ -+ -+ if (position<(base_size-20)) { -+ pp=cbvectors+filterno*lMem-lTarget- -+ index[stage]+filterno*base_size; -+ } else { -+ createAugmentedVec( -+ index[stage]-(filterno+1)*base_size+40, -+ cbvectors+filterno*lMem,aug_vec); -+ pp=aug_vec; -+ -+ -+ } -+ } -+ } -+ -+ /* Subtract the best codebook vector, according -+ to measure, from the target vector */ -+ -+ for (j=0;j<lTarget;j++) { -+ cvec[j] += gain*(*pp); -+ target[j] -= gain*(*pp++); -+ } -+ -+ /* record quantized gain */ -+ -+ gains[stage]=gain; -+ -+ }/* end of Main Loop. for (stage=0;... */ -+ -+ /* Gain adjustment for energy matching */ -+ cene=0.0; -+ for (i=0; i<lTarget; i++) { -+ cene+=cvec[i]*cvec[i]; -+ } -+ j=gain_index[0]; -+ -+ for (i=gain_index[0]; i<32; i++) { -+ ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i]; -+ -+ if ((ftmp<(tene*gains[0]*gains[0])) && -+ (gain_sq5Tbl[j]<(2.0*gains[0]))) { -+ j=i; -+ } -+ } -+ gain_index[0]=j; -+} -+ -+ -diff -druN codecs/ilbc.orig/iCBSearch.h codecs/ilbc/iCBSearch.h ---- codecs/ilbc.orig/iCBSearch.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iCBSearch.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,35 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iCBSearch.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ICBSEARCH_H -+#define __iLBC_ICBSEARCH_H -+ -+void iCBSearch( -+ iLBC_Enc_Inst_t *iLBCenc_inst, -+ /* (i) the encoder state structure */ -+ int *index, /* (o) Codebook indices */ -+ int *gain_index,/* (o) Gain quantization indices */ -+ float *intarget,/* (i) Target vector for encoding */ -+ float *mem, /* (i) Buffer for codebook construction */ -+ int lMem, /* (i) Length of buffer */ -+ int lTarget, /* (i) Length of vector */ -+ int nStages, /* (i) Number of codebook stages */ -+ float *weightDenum, /* (i) weighting filter coefficients */ -+ -+ -+ float *weightState, /* (i) weighting filter state */ -+ int block /* (i) the sub-block number */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iLBC_decode.c codecs/ilbc/iLBC_decode.c ---- codecs/ilbc.orig/iLBC_decode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_decode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,619 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_decode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <stdlib.h> -+ -+#include "iLBC_define.h" -+#include "iLBC_decode.h" -+#include "StateConstructW.h" -+#include "LPCdecode.h" -+#include "iCBConstruct.h" -+#include "doCPLC.h" -+#include "helpfun.h" -+#include "constants.h" -+#include "packing.h" -+#include "string.h" -+#include "enhancer.h" -+#include "hpOutput.h" -+#include "syntFilter.h" -+ -+/*----------------------------------------------------------------* -+ * Initiation of decoder instance. -+ *---------------------------------------------------------------*/ -+ -+short initDecode( /* (o) Number of decoded -+ samples */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */ -+ int mode, /* (i) frame size mode */ -+ int use_enhancer /* (i) 1 to use enhancer -+ 0 to run without -+ enhancer */ -+){ -+ int i; -+ -+ iLBCdec_inst->mode = mode; -+ -+ if (mode==30) { -+ iLBCdec_inst->blockl = BLOCKL_30MS; -+ iLBCdec_inst->nsub = NSUB_30MS; -+ iLBCdec_inst->nasub = NASUB_30MS; -+ iLBCdec_inst->lpc_n = LPC_N_30MS; -+ -+ -+ iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS; -+ iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS; -+ iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS; -+ /* ULP init */ -+ iLBCdec_inst->ULP_inst=&ULP_30msTbl; -+ } -+ else if (mode==20) { -+ iLBCdec_inst->blockl = BLOCKL_20MS; -+ iLBCdec_inst->nsub = NSUB_20MS; -+ iLBCdec_inst->nasub = NASUB_20MS; -+ iLBCdec_inst->lpc_n = LPC_N_20MS; -+ iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS; -+ iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS; -+ iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS; -+ /* ULP init */ -+ iLBCdec_inst->ULP_inst=&ULP_20msTbl; -+ } -+ else { -+ exit(2); -+ } -+ -+ memset(iLBCdec_inst->syntMem, 0, -+ LPC_FILTERORDER*sizeof(float)); -+ memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl, -+ LPC_FILTERORDER*sizeof(float)); -+ -+ memset(iLBCdec_inst->old_syntdenum, 0, -+ ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float)); -+ for (i=0; i<NSUB_MAX; i++) -+ iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0; -+ -+ iLBCdec_inst->last_lag = 20; -+ -+ iLBCdec_inst->prevLag = 120; -+ iLBCdec_inst->per = 0.0; -+ iLBCdec_inst->consPLICount = 0; -+ iLBCdec_inst->prevPLI = 0; -+ iLBCdec_inst->prevLpc[0] = 1.0; -+ memset(iLBCdec_inst->prevLpc+1,0, -+ LPC_FILTERORDER*sizeof(float)); -+ memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float)); -+ iLBCdec_inst->seed=777; -+ -+ memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float)); -+ -+ iLBCdec_inst->use_enhancer = use_enhancer; -+ memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float)); -+ for (i=0;i<ENH_NBLOCKS_TOT;i++) -+ iLBCdec_inst->enh_period[i]=(float)40.0; -+ -+ iLBCdec_inst->prev_enh_pl = 0; -+ -+ return (iLBCdec_inst->blockl); -+} -+ -+ -+ -+/*----------------------------------------------------------------* -+ * frame residual decoder function (subrutine to iLBC_decode) -+ *---------------------------------------------------------------*/ -+ -+static void Decode( -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state -+ structure */ -+ float *decresidual, /* (o) decoded residual frame */ -+ int start, /* (i) location of start -+ state */ -+ int idxForMax, /* (i) codebook index for the -+ maximum value */ -+ int *idxVec, /* (i) codebook indexes for the -+ samples in the start -+ state */ -+ float *syntdenum, /* (i) the decoded synthesis -+ filter coefficients */ -+ int *cb_index, /* (i) the indexes for the -+ adaptive codebook */ -+ int *gain_index, /* (i) the indexes for the -+ corresponding gains */ -+ int *extra_cb_index, /* (i) the indexes for the -+ adaptive codebook part -+ of start state */ -+ int *extra_gain_index, /* (i) the indexes for the -+ corresponding gains */ -+ int state_first /* (i) 1 if non adaptive part -+ of start state comes -+ first 0 if that part -+ comes last */ -+){ -+ float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML]; -+ int k, meml_gotten, Nfor, Nback, i; -+ int diff, start_pos; -+ int subcount, subframe; -+ -+ diff = STATE_LEN - iLBCdec_inst->state_short_len; -+ -+ if (state_first == 1) { -+ start_pos = (start-1)*SUBL; -+ } else { -+ start_pos = (start-1)*SUBL + diff; -+ } -+ -+ /* decode scalar part of start state */ -+ -+ StateConstructW(idxForMax, idxVec, -+ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], -+ &decresidual[start_pos], iLBCdec_inst->state_short_len); -+ -+ -+ if (state_first) { /* put adaptive part in the end */ -+ -+ -+ -+ /* setup memory */ -+ -+ memset(mem, 0, -+ (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float)); -+ memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len, -+ decresidual+start_pos, -+ iLBCdec_inst->state_short_len*sizeof(float)); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct( -+ &decresidual[start_pos+iLBCdec_inst->state_short_len], -+ extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl, -+ stMemLTbl, diff, CB_NSTAGES); -+ -+ } -+ else {/* put adaptive part in the beginning */ -+ -+ /* create reversed vectors for prediction */ -+ -+ for (k=0; k<diff; k++) { -+ reverseDecresidual[k] = -+ decresidual[(start+1)*SUBL-1- -+ (k+iLBCdec_inst->state_short_len)]; -+ } -+ -+ /* setup memory */ -+ -+ meml_gotten = iLBCdec_inst->state_short_len; -+ for (k=0; k<meml_gotten; k++){ -+ mem[CB_MEML-1-k] = decresidual[start_pos + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(reverseDecresidual, extra_cb_index, -+ extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl, -+ diff, CB_NSTAGES); -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (k=0; k<diff; k++) { -+ decresidual[start_pos-1-k] = reverseDecresidual[k]; -+ } -+ } -+ -+ /* counter for predicted sub-frames */ -+ -+ subcount=0; -+ -+ /* forward prediction of sub-frames */ -+ -+ Nfor = iLBCdec_inst->nsub-start-1; -+ -+ -+ -+ if ( Nfor > 0 ){ -+ -+ /* setup memory */ -+ -+ memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); -+ memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL, -+ STATE_LEN*sizeof(float)); -+ -+ /* loop over sub-frames to encode */ -+ -+ for (subframe=0; subframe<Nfor; subframe++) { -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&decresidual[(start+1+subframe)*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &decresidual[(start+1+subframe)*SUBL], -+ SUBL*sizeof(float)); -+ -+ subcount++; -+ -+ } -+ -+ } -+ -+ /* backward prediction of sub-frames */ -+ -+ Nback = start-1; -+ -+ if ( Nback > 0 ) { -+ -+ /* setup memory */ -+ -+ meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start); -+ -+ if ( meml_gotten > CB_MEML ) { -+ meml_gotten=CB_MEML; -+ } -+ for (k=0; k<meml_gotten; k++) { -+ mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ -+ /* loop over subframes to decode */ -+ -+ -+ -+ for (subframe=0; subframe<Nback; subframe++) { -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&reverseDecresidual[subframe*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount], -+ SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &reverseDecresidual[subframe*SUBL], -+ SUBL*sizeof(float)); -+ -+ subcount++; -+ } -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (i=0; i<SUBL*Nback; i++) -+ decresidual[SUBL*Nback - i - 1] = -+ reverseDecresidual[i]; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * main decoder function -+ *---------------------------------------------------------------*/ -+ -+void iLBC_decode( -+ float *decblock, /* (o) decoded signal block */ -+ unsigned char *bytes, /* (i) encoded signal bits */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state -+ structure */ -+ int mode /* (i) 0: bad packet, PLC, -+ 1: normal */ -+){ -+ float data[BLOCKL_MAX]; -+ float lsfdeq[LPC_FILTERORDER*LPC_N_MAX]; -+ float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1]; -+ float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1]; -+ int k, i, start, idxForMax, pos, lastpart, ulp; -+ int lag, ilag; -+ float cc, maxcc; -+ int idxVec[STATE_LEN]; -+ int check; -+ int gain_index[NASUB_MAX*CB_NSTAGES], -+ extra_gain_index[CB_NSTAGES]; -+ int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES]; -+ int lsf_i[LSF_NSPLIT*LPC_N_MAX]; -+ int state_first; -+ -+ -+ int last_bit; -+ unsigned char *pbytes; -+ float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX]; -+ int order_plus_one; -+ float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; -+ float decresidual[BLOCKL_MAX]; -+ -+ if (mode>0) { /* the data are good */ -+ -+ /* decode data */ -+ -+ pbytes=bytes; -+ pos=0; -+ -+ /* Set everything to zero before decoding */ -+ -+ for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) { -+ lsf_i[k]=0; -+ } -+ start=0; -+ state_first=0; -+ idxForMax=0; -+ for (k=0; k<iLBCdec_inst->state_short_len; k++) { -+ idxVec[k]=0; -+ } -+ for (k=0; k<CB_NSTAGES; k++) { -+ extra_cb_index[k]=0; -+ } -+ for (k=0; k<CB_NSTAGES; k++) { -+ extra_gain_index[k]=0; -+ } -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ cb_index[i*CB_NSTAGES+k]=0; -+ } -+ } -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ gain_index[i*CB_NSTAGES+k]=0; -+ } -+ } -+ -+ /* loop over ULP classes */ -+ -+ for (ulp=0; ulp<3; ulp++) { -+ -+ /* LSF */ -+ for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos); -+ packcombine(&lsf_i[k], lastpart, -+ iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]); -+ } -+ -+ -+ -+ /* Start block info */ -+ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->start_bits[ulp], &pos); -+ packcombine(&start, lastpart, -+ iLBCdec_inst->ULP_inst->start_bits[ulp]); -+ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos); -+ packcombine(&state_first, lastpart, -+ iLBCdec_inst->ULP_inst->startfirst_bits[ulp]); -+ -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos); -+ packcombine(&idxForMax, lastpart, -+ iLBCdec_inst->ULP_inst->scale_bits[ulp]); -+ -+ for (k=0; k<iLBCdec_inst->state_short_len; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->state_bits[ulp], &pos); -+ packcombine(idxVec+k, lastpart, -+ iLBCdec_inst->ULP_inst->state_bits[ulp]); -+ } -+ -+ /* 23/22 (20ms/30ms) sample block */ -+ -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp], -+ &pos); -+ packcombine(extra_cb_index+k, lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]); -+ } -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp], -+ &pos); -+ packcombine(extra_gain_index+k, lastpart, -+ iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]); -+ } -+ -+ /* The two/four (20ms/30ms) 40 sample sub-blocks */ -+ -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ iLBCdec_inst->ULP_inst->cb_index[i][k][ulp], -+ &pos); -+ packcombine(cb_index+i*CB_NSTAGES+k, lastpart, -+ iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]); -+ } -+ } -+ -+ for (i=0; i<iLBCdec_inst->nasub; i++) { -+ -+ -+ for (k=0; k<CB_NSTAGES; k++) { -+ unpack( &pbytes, &lastpart, -+ -+ iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp], -+ &pos); -+ packcombine(gain_index+i*CB_NSTAGES+k, lastpart, -+ iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]); -+ } -+ } -+ } -+ /* Extract last bit. If it is 1 this indicates an -+ empty/lost frame */ -+ unpack( &pbytes, &last_bit, 1, &pos); -+ -+ /* Check for bit errors or empty/lost frames */ -+ if (start<1) -+ mode = 0; -+ if (iLBCdec_inst->mode==20 && start>3) -+ mode = 0; -+ if (iLBCdec_inst->mode==30 && start>5) -+ mode = 0; -+ if (last_bit==1) -+ mode = 0; -+ -+ if (mode==1) { /* No bit errors was detected, -+ continue decoding */ -+ -+ /* adjust index */ -+ index_conv_dec(cb_index); -+ -+ /* decode the lsf */ -+ -+ SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n); -+ check=LSF_check(lsfdeq, LPC_FILTERORDER, -+ iLBCdec_inst->lpc_n); -+ DecoderInterpolateLSF(syntdenum, weightdenum, -+ lsfdeq, LPC_FILTERORDER, iLBCdec_inst); -+ -+ Decode(iLBCdec_inst, decresidual, start, idxForMax, -+ idxVec, syntdenum, cb_index, gain_index, -+ extra_cb_index, extra_gain_index, -+ state_first); -+ -+ /* preparing the plc for a future loss! */ -+ -+ doThePLC(PLCresidual, PLClpc, 0, decresidual, -+ syntdenum + -+ (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1), -+ (*iLBCdec_inst).last_lag, iLBCdec_inst); -+ -+ -+ memcpy(decresidual, PLCresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ } -+ -+ -+ -+ } -+ -+ if (mode == 0) { -+ /* the data is bad (either a PLC call -+ * was made or a severe bit error was detected) -+ */ -+ -+ /* packet loss conceal */ -+ -+ memset(zeros, 0, BLOCKL_MAX*sizeof(float)); -+ -+ one[0] = 1; -+ memset(one+1, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ start=0; -+ -+ doThePLC(PLCresidual, PLClpc, 1, zeros, one, -+ (*iLBCdec_inst).last_lag, iLBCdec_inst); -+ memcpy(decresidual, PLCresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ -+ order_plus_one = LPC_FILTERORDER + 1; -+ for (i = 0; i < iLBCdec_inst->nsub; i++) { -+ memcpy(syntdenum+(i*order_plus_one), PLClpc, -+ order_plus_one*sizeof(float)); -+ } -+ } -+ -+ if (iLBCdec_inst->use_enhancer == 1) { -+ -+ /* post filtering */ -+ -+ iLBCdec_inst->last_lag = -+ enhancerInterface(data, decresidual, iLBCdec_inst); -+ -+ /* synthesis filtering */ -+ -+ if (iLBCdec_inst->mode==20) { -+ /* Enhancer has 40 samples delay */ -+ i=0; -+ syntFilter(data + i*SUBL, -+ iLBCdec_inst->old_syntdenum + -+ (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1), -+ SUBL, iLBCdec_inst->syntMem); -+ for (i=1; i < iLBCdec_inst->nsub; i++) { -+ syntFilter(data + i*SUBL, -+ syntdenum + (i-1)*(LPC_FILTERORDER+1), -+ SUBL, iLBCdec_inst->syntMem); -+ } -+ } else if (iLBCdec_inst->mode==30) { -+ /* Enhancer has 80 samples delay */ -+ for (i=0; i < 2; i++) { -+ syntFilter(data + i*SUBL, -+ -+ -+ iLBCdec_inst->old_syntdenum + -+ (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1), -+ SUBL, iLBCdec_inst->syntMem); -+ } -+ for (i=2; i < iLBCdec_inst->nsub; i++) { -+ syntFilter(data + i*SUBL, -+ syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL, -+ iLBCdec_inst->syntMem); -+ } -+ } -+ -+ } else { -+ -+ /* Find last lag */ -+ lag = 20; -+ maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], -+ &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL); -+ -+ for (ilag=21; ilag<120; ilag++) { -+ cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], -+ &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag], -+ ENH_BLOCKL); -+ -+ if (cc > maxcc) { -+ maxcc = cc; -+ lag = ilag; -+ } -+ } -+ iLBCdec_inst->last_lag = lag; -+ -+ /* copy data and run synthesis filter */ -+ -+ memcpy(data, decresidual, -+ iLBCdec_inst->blockl*sizeof(float)); -+ for (i=0; i < iLBCdec_inst->nsub; i++) { -+ syntFilter(data + i*SUBL, -+ syntdenum + i*(LPC_FILTERORDER+1), SUBL, -+ iLBCdec_inst->syntMem); -+ } -+ } -+ -+ /* high pass filtering on output if desired, otherwise -+ copy to out */ -+ -+ hpOutput(data, iLBCdec_inst->blockl, -+ decblock,iLBCdec_inst->hpomem); -+ -+ /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/ -+ -+ memcpy(iLBCdec_inst->old_syntdenum, syntdenum, -+ -+ iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float)); -+ -+ iLBCdec_inst->prev_enh_pl=0; -+ -+ -+ -+ if (mode==0) { /* PLC was used */ -+ iLBCdec_inst->prev_enh_pl=1; -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/iLBC_decode.h codecs/ilbc/iLBC_decode.h ---- codecs/ilbc.orig/iLBC_decode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_decode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,40 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_decode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ILBCDECODE_H -+#define __iLBC_ILBCDECODE_H -+ -+#include "iLBC_define.h" -+ -+short initDecode( /* (o) Number of decoded -+ samples */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */ -+ int mode, /* (i) frame size mode */ -+ int use_enhancer /* (i) 1 to use enhancer -+ 0 to run without -+ enhancer */ -+); -+ -+void iLBC_decode( -+ float *decblock, /* (o) decoded signal block */ -+ unsigned char *bytes, /* (i) encoded signal bits */ -+ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state -+ structure */ -+ int mode /* (i) 0: bad packet, PLC, -+ 1: normal */ -+); -+ -+ -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iLBC_define.h codecs/ilbc/iLBC_define.h ---- codecs/ilbc.orig/iLBC_define.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_define.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,201 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_define.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+#include <string.h> -+ -+#ifndef __iLBC_ILBCDEFINE_H -+#define __iLBC_ILBCDEFINE_H -+ -+/* general codec settings */ -+ -+#define FS (float)8000.0 -+#define BLOCKL_20MS 160 -+#define BLOCKL_30MS 240 -+#define BLOCKL_MAX 240 -+#define NSUB_20MS 4 -+#define NSUB_30MS 6 -+#define NSUB_MAX 6 -+#define NASUB_20MS 2 -+#define NASUB_30MS 4 -+#define NASUB_MAX 4 -+#define SUBL 40 -+#define STATE_LEN 80 -+#define STATE_SHORT_LEN_30MS 58 -+#define STATE_SHORT_LEN_20MS 57 -+ -+/* LPC settings */ -+ -+#define LPC_FILTERORDER 10 -+#define LPC_CHIRP_SYNTDENUM (float)0.9025 -+#define LPC_CHIRP_WEIGHTDENUM (float)0.4222 -+#define LPC_LOOKBACK 60 -+#define LPC_N_20MS 1 -+#define LPC_N_30MS 2 -+#define LPC_N_MAX 2 -+#define LPC_ASYMDIFF 20 -+#define LPC_BW (float)60.0 -+#define LPC_WN (float)1.0001 -+#define LSF_NSPLIT 3 -+ -+#define LSF_NUMBER_OF_STEPS 4 -+#define LPC_HALFORDER (LPC_FILTERORDER/2) -+ -+/* cb settings */ -+ -+#define CB_NSTAGES 3 -+#define CB_EXPAND 2 -+#define CB_MEML 147 -+#define CB_FILTERLEN 2*4 -+#define CB_HALFFILTERLEN 4 -+#define CB_RESRANGE 34 -+#define CB_MAXGAIN (float)1.3 -+ -+/* enhancer */ -+ -+#define ENH_BLOCKL 80 /* block length */ -+#define ENH_BLOCKL_HALF (ENH_BLOCKL/2) -+#define ENH_HL 3 /* 2*ENH_HL+1 is number blocks -+ in said second sequence */ -+#define ENH_SLOP 2 /* max difference estimated and -+ correct pitch period */ -+#define ENH_PLOCSL 20 /* pitch-estimates and pitch- -+ locations buffer length */ -+#define ENH_OVERHANG 2 -+#define ENH_UPS0 4 /* upsampling rate */ -+#define ENH_FL0 3 /* 2*FLO+1 is the length of -+ each filter */ -+#define ENH_VECTL (ENH_BLOCKL+2*ENH_FL0) -+#define ENH_CORRDIM (2*ENH_SLOP+1) -+#define ENH_NBLOCKS (BLOCKL_MAX/ENH_BLOCKL) -+#define ENH_NBLOCKS_EXTRA 5 -+#define ENH_NBLOCKS_TOT 8 /* ENH_NBLOCKS + -+ ENH_NBLOCKS_EXTRA */ -+#define ENH_BUFL (ENH_NBLOCKS_TOT)*ENH_BLOCKL -+#define ENH_ALPHA0 (float)0.05 -+ -+/* Down sampling */ -+ -+#define FILTERORDER_DS 7 -+#define DELAY_DS 3 -+#define FACTOR_DS 2 -+ -+/* bit stream defs */ -+ -+#define NO_OF_BYTES_20MS 38 -+#define NO_OF_BYTES_30MS 50 -+#define NO_OF_WORDS_20MS 19 -+#define NO_OF_WORDS_30MS 25 -+#define STATE_BITS 3 -+#define BYTE_LEN 8 -+#define ULP_CLASSES 3 -+ -+/* help parameters */ -+ -+ -+#define FLOAT_MAX (float)1.0e37 -+#define EPS (float)2.220446049250313e-016 -+#define PI (float)3.14159265358979323846 -+#define MIN_SAMPLE -32768 -+#define MAX_SAMPLE 32767 -+#define TWO_PI (float)6.283185307 -+#define PI2 (float)0.159154943 -+ -+/* type definition encoder instance */ -+typedef struct iLBC_ULP_Inst_t_ { -+ int lsf_bits[6][ULP_CLASSES+2]; -+ int start_bits[ULP_CLASSES+2]; -+ int startfirst_bits[ULP_CLASSES+2]; -+ int scale_bits[ULP_CLASSES+2]; -+ int state_bits[ULP_CLASSES+2]; -+ int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2]; -+ int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2]; -+ int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2]; -+ int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2]; -+} iLBC_ULP_Inst_t; -+ -+/* type definition encoder instance */ -+typedef struct iLBC_Enc_Inst_t_ { -+ -+ /* flag for frame size mode */ -+ int mode; -+ -+ /* basic parameters for different frame sizes */ -+ int blockl; -+ int nsub; -+ int nasub; -+ int no_of_bytes, no_of_words; -+ int lpc_n; -+ int state_short_len; -+ const iLBC_ULP_Inst_t *ULP_inst; -+ -+ /* analysis filter state */ -+ float anaMem[LPC_FILTERORDER]; -+ -+ /* old lsf parameters for interpolation */ -+ float lsfold[LPC_FILTERORDER]; -+ float lsfdeqold[LPC_FILTERORDER]; -+ -+ /* signal buffer for LP analysis */ -+ float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX]; -+ -+ /* state of input HP filter */ -+ float hpimem[4]; -+ -+} iLBC_Enc_Inst_t; -+ -+/* type definition decoder instance */ -+typedef struct iLBC_Dec_Inst_t_ { -+ -+ -+ /* flag for frame size mode */ -+ int mode; -+ -+ /* basic parameters for different frame sizes */ -+ int blockl; -+ int nsub; -+ int nasub; -+ int no_of_bytes, no_of_words; -+ int lpc_n; -+ int state_short_len; -+ const iLBC_ULP_Inst_t *ULP_inst; -+ -+ /* synthesis filter state */ -+ float syntMem[LPC_FILTERORDER]; -+ -+ /* old LSF for interpolation */ -+ float lsfdeqold[LPC_FILTERORDER]; -+ -+ /* pitch lag estimated in enhancer and used in PLC */ -+ int last_lag; -+ -+ /* PLC state information */ -+ int prevLag, consPLICount, prevPLI, prev_enh_pl; -+ float prevLpc[LPC_FILTERORDER+1]; -+ float prevResidual[NSUB_MAX*SUBL]; -+ float per; -+ unsigned long seed; -+ -+ /* previous synthesis filter parameters */ -+ float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX]; -+ -+ /* state of output HP filter */ -+ float hpomem[4]; -+ -+ /* enhancer state information */ -+ int use_enhancer; -+ float enh_buf[ENH_BUFL]; -+ float enh_period[ENH_NBLOCKS_TOT]; -+ -+} iLBC_Dec_Inst_t; -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/iLBC_encode.c codecs/ilbc/iLBC_encode.c ---- codecs/ilbc.orig/iLBC_encode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_encode.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,514 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_encode.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <stdlib.h> -+#include <string.h> -+ -+#include "iLBC_define.h" -+#include "iLBC_encode.h" -+#include "LPCencode.h" -+#include "FrameClassify.h" -+#include "StateSearchW.h" -+#include "StateConstructW.h" -+#include "helpfun.h" -+#include "constants.h" -+#include "packing.h" -+#include "iCBSearch.h" -+#include "iCBConstruct.h" -+#include "hpInput.h" -+#include "anaFilter.h" -+#include "syntFilter.h" -+ -+/*----------------------------------------------------------------* -+ * Initiation of encoder instance. -+ *---------------------------------------------------------------*/ -+ -+short initEncode( /* (o) Number of bytes -+ encoded */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */ -+ int mode /* (i) frame size mode */ -+){ -+ iLBCenc_inst->mode = mode; -+ if (mode==30) { -+ iLBCenc_inst->blockl = BLOCKL_30MS; -+ iLBCenc_inst->nsub = NSUB_30MS; -+ -+ -+ iLBCenc_inst->nasub = NASUB_30MS; -+ iLBCenc_inst->lpc_n = LPC_N_30MS; -+ iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS; -+ iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS; -+ iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS; -+ /* ULP init */ -+ iLBCenc_inst->ULP_inst=&ULP_30msTbl; -+ } -+ else if (mode==20) { -+ iLBCenc_inst->blockl = BLOCKL_20MS; -+ iLBCenc_inst->nsub = NSUB_20MS; -+ iLBCenc_inst->nasub = NASUB_20MS; -+ iLBCenc_inst->lpc_n = LPC_N_20MS; -+ iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS; -+ iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS; -+ iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS; -+ /* ULP init */ -+ iLBCenc_inst->ULP_inst=&ULP_20msTbl; -+ } -+ else { -+ exit(2); -+ } -+ -+ memset((*iLBCenc_inst).anaMem, 0, -+ LPC_FILTERORDER*sizeof(float)); -+ memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl, -+ LPC_FILTERORDER*sizeof(float)); -+ memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl, -+ LPC_FILTERORDER*sizeof(float)); -+ memset((*iLBCenc_inst).lpc_buffer, 0, -+ (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float)); -+ memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float)); -+ -+ return (iLBCenc_inst->no_of_bytes); -+} -+ -+/*----------------------------------------------------------------* -+ * main encoder function -+ *---------------------------------------------------------------*/ -+ -+void iLBC_encode( -+ unsigned char *bytes, /* (o) encoded data bits iLBC */ -+ float *block, /* (o) speech vector to -+ encode */ -+ iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder -+ state */ -+){ -+ -+ float data[BLOCKL_MAX]; -+ float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX]; -+ -+ int start, idxForMax, idxVec[STATE_LEN]; -+ float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML]; -+ int n, k, meml_gotten, Nfor, Nback, i, pos; -+ -+ -+ int gain_index[CB_NSTAGES*NASUB_MAX], -+ extra_gain_index[CB_NSTAGES]; -+ int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES]; -+ int lsf_i[LSF_NSPLIT*LPC_N_MAX]; -+ unsigned char *pbytes; -+ int diff, start_pos, state_first; -+ float en1, en2; -+ int index, ulp, firstpart; -+ int subcount, subframe; -+ float weightState[LPC_FILTERORDER]; -+ float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; -+ float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; -+ float decresidual[BLOCKL_MAX]; -+ -+ /* high pass filtering of input signal if such is not done -+ prior to calling this function */ -+ -+ hpInput(block, iLBCenc_inst->blockl, -+ data, (*iLBCenc_inst).hpimem); -+ -+ /* otherwise simply copy */ -+ -+ /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/ -+ -+ /* LPC of hp filtered input data */ -+ -+ LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst); -+ -+ -+ /* inverse filter to get residual */ -+ -+ for (n=0; n<iLBCenc_inst->nsub; n++) { -+ anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)], -+ SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem); -+ } -+ -+ /* find state location */ -+ -+ start = FrameClassify(iLBCenc_inst, residual); -+ -+ /* check if state should be in first or last part of the -+ two subframes */ -+ -+ diff = STATE_LEN - iLBCenc_inst->state_short_len; -+ en1 = 0; -+ index = (start-1)*SUBL; -+ for (i = 0; i < iLBCenc_inst->state_short_len; i++) { -+ en1 += residual[index+i]*residual[index+i]; -+ } -+ en2 = 0; -+ index = (start-1)*SUBL+diff; -+ for (i = 0; i < iLBCenc_inst->state_short_len; i++) { -+ en2 += residual[index+i]*residual[index+i]; -+ } -+ -+ -+ -+ -+ if (en1 > en2) { -+ state_first = 1; -+ start_pos = (start-1)*SUBL; -+ } else { -+ state_first = 0; -+ start_pos = (start-1)*SUBL + diff; -+ } -+ -+ /* scalar quantization of state */ -+ -+ StateSearchW(iLBCenc_inst, &residual[start_pos], -+ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], -+ &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax, -+ idxVec, iLBCenc_inst->state_short_len, state_first); -+ -+ StateConstructW(idxForMax, idxVec, -+ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], -+ &decresidual[start_pos], iLBCenc_inst->state_short_len); -+ -+ /* predictive quantization in state */ -+ -+ if (state_first) { /* put adaptive part in the end */ -+ -+ /* setup memory */ -+ -+ memset(mem, 0, -+ (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float)); -+ memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len, -+ decresidual+start_pos, -+ iLBCenc_inst->state_short_len*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ /* encode sub-frames */ -+ -+ iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, -+ &residual[start_pos+iLBCenc_inst->state_short_len], -+ mem+CB_MEML-stMemLTbl, -+ stMemLTbl, diff, CB_NSTAGES, -+ &weightdenum[start*(LPC_FILTERORDER+1)], -+ weightState, 0); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct( -+ &decresidual[start_pos+iLBCenc_inst->state_short_len], -+ extra_cb_index, extra_gain_index, -+ mem+CB_MEML-stMemLTbl, -+ stMemLTbl, diff, CB_NSTAGES); -+ -+ } -+ else { /* put adaptive part in the beginning */ -+ -+ -+ -+ /* create reversed vectors for prediction */ -+ -+ for (k=0; k<diff; k++) { -+ reverseResidual[k] = residual[(start+1)*SUBL-1 -+ -(k+iLBCenc_inst->state_short_len)]; -+ } -+ -+ /* setup memory */ -+ -+ meml_gotten = iLBCenc_inst->state_short_len; -+ for (k=0; k<meml_gotten; k++) { -+ mem[CB_MEML-1-k] = decresidual[start_pos + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ /* encode sub-frames */ -+ -+ iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, -+ reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl, -+ diff, CB_NSTAGES, -+ &weightdenum[(start-1)*(LPC_FILTERORDER+1)], -+ weightState, 0); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(reverseDecresidual, extra_cb_index, -+ extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl, -+ diff, CB_NSTAGES); -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (k=0; k<diff; k++) { -+ decresidual[start_pos-1-k] = reverseDecresidual[k]; -+ } -+ } -+ -+ /* counter for predicted sub-frames */ -+ -+ subcount=0; -+ -+ /* forward prediction of sub-frames */ -+ -+ Nfor = iLBCenc_inst->nsub-start-1; -+ -+ -+ if ( Nfor > 0 ) { -+ -+ /* setup memory */ -+ -+ memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); -+ memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL, -+ STATE_LEN*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ -+ -+ /* loop over sub-frames to encode */ -+ -+ for (subframe=0; subframe<Nfor; subframe++) { -+ -+ /* encode sub-frame */ -+ -+ iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ &residual[(start+1+subframe)*SUBL], -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES, -+ &weightdenum[(start+1+subframe)* -+ (LPC_FILTERORDER+1)], -+ weightState, subcount+1); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&decresidual[(start+1+subframe)*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &decresidual[(start+1+subframe)*SUBL], -+ SUBL*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ subcount++; -+ } -+ } -+ -+ -+ /* backward prediction of sub-frames */ -+ -+ Nback = start-1; -+ -+ -+ if ( Nback > 0 ) { -+ -+ /* create reverse order vectors */ -+ -+ for (n=0; n<Nback; n++) { -+ for (k=0; k<SUBL; k++) { -+ reverseResidual[n*SUBL+k] = -+ residual[(start-1)*SUBL-1-n*SUBL-k]; -+ reverseDecresidual[n*SUBL+k] = -+ decresidual[(start-1)*SUBL-1-n*SUBL-k]; -+ } -+ } -+ -+ -+ -+ /* setup memory */ -+ -+ meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start); -+ -+ -+ if ( meml_gotten > CB_MEML ) { -+ meml_gotten=CB_MEML; -+ } -+ for (k=0; k<meml_gotten; k++) { -+ mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k]; -+ } -+ memset(mem, 0, (CB_MEML-k)*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ /* loop over sub-frames to encode */ -+ -+ for (subframe=0; subframe<Nback; subframe++) { -+ -+ /* encode sub-frame */ -+ -+ iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ &reverseResidual[subframe*SUBL], -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES, -+ &weightdenum[(start-2-subframe)* -+ (LPC_FILTERORDER+1)], -+ weightState, subcount+1); -+ -+ /* construct decoded vector */ -+ -+ iCBConstruct(&reverseDecresidual[subframe*SUBL], -+ cb_index+subcount*CB_NSTAGES, -+ gain_index+subcount*CB_NSTAGES, -+ mem+CB_MEML-memLfTbl[subcount], -+ memLfTbl[subcount], SUBL, CB_NSTAGES); -+ -+ /* update memory */ -+ -+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); -+ memcpy(mem+CB_MEML-SUBL, -+ &reverseDecresidual[subframe*SUBL], -+ SUBL*sizeof(float)); -+ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); -+ -+ subcount++; -+ -+ } -+ -+ /* get decoded residual from reversed vector */ -+ -+ for (i=0; i<SUBL*Nback; i++) { -+ decresidual[SUBL*Nback - i - 1] = -+ -+ -+ reverseDecresidual[i]; -+ } -+ } -+ /* end encoding part */ -+ -+ /* adjust index */ -+ index_conv_enc(cb_index); -+ -+ /* pack bytes */ -+ -+ pbytes=bytes; -+ pos=0; -+ -+ /* loop over the 3 ULP classes */ -+ -+ for (ulp=0; ulp<3; ulp++) { -+ -+ /* LSF */ -+ for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) { -+ packsplit(&lsf_i[k], &firstpart, &lsf_i[k], -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+ -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos); -+ } -+ -+ /* Start block info */ -+ -+ packsplit(&start, &firstpart, &start, -+ iLBCenc_inst->ULP_inst->start_bits[ulp], -+ iLBCenc_inst->ULP_inst->start_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->start_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->start_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->start_bits[ulp], &pos); -+ -+ packsplit(&state_first, &firstpart, &state_first, -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp], -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos); -+ -+ packsplit(&idxForMax, &firstpart, &idxForMax, -+ iLBCenc_inst->ULP_inst->scale_bits[ulp], -+ iLBCenc_inst->ULP_inst->scale_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->scale_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos); -+ -+ -+ -+ for (k=0; k<iLBCenc_inst->state_short_len; k++) { -+ packsplit(idxVec+k, &firstpart, idxVec+k, -+ iLBCenc_inst->ULP_inst->state_bits[ulp], -+ iLBCenc_inst->ULP_inst->state_bits[ulp]+ -+ iLBCenc_inst->ULP_inst->state_bits[ulp+1]+ -+ iLBCenc_inst->ULP_inst->state_bits[ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->state_bits[ulp], &pos); -+ } -+ -+ /* 23/22 (20ms/30ms) sample block */ -+ -+ for (k=0;k<CB_NSTAGES;k++) { -+ packsplit(extra_cb_index+k, &firstpart, -+ extra_cb_index+k, -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+ -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], -+ &pos); -+ } -+ -+ for (k=0;k<CB_NSTAGES;k++) { -+ packsplit(extra_gain_index+k, &firstpart, -+ extra_gain_index+k, -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+ -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], -+ &pos); -+ } -+ -+ /* The two/four (20ms/30ms) 40 sample sub-blocks */ -+ -+ for (i=0; i<iLBCenc_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ packsplit(cb_index+i*CB_NSTAGES+k, &firstpart, -+ cb_index+i*CB_NSTAGES+k, -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+ -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], -+ &pos); -+ } -+ } -+ -+ for (i=0; i<iLBCenc_inst->nasub; i++) { -+ for (k=0; k<CB_NSTAGES; k++) { -+ -+ -+ packsplit(gain_index+i*CB_NSTAGES+k, &firstpart, -+ gain_index+i*CB_NSTAGES+k, -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+ -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+ -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]); -+ dopack( &pbytes, firstpart, -+ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], -+ &pos); -+ } -+ } -+ } -+ -+ /* set the last bit to zero (otherwise the decoder -+ will treat it as a lost frame) */ -+ dopack( &pbytes, 0, 1, &pos); -+} -+ -+ -+ -diff -druN codecs/ilbc.orig/iLBC_encode.h codecs/ilbc/iLBC_encode.h ---- codecs/ilbc.orig/iLBC_encode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_encode.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,37 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ iLBC_encode.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_ILBCENCODE_H -+#define __iLBC_ILBCENCODE_H -+ -+#include "iLBC_define.h" -+ -+short initEncode( /* (o) Number of bytes -+ encoded */ -+ iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */ -+ int mode /* (i) frame size mode */ -+); -+ -+void iLBC_encode( -+ -+ -+ unsigned char *bytes, /* (o) encoded data bits iLBC */ -+ float *block, /* (o) speech vector to -+ encode */ -+ iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder -+ state */ -+); -+ -+#endif -+ -+ -+ -Files codecs/ilbc.orig/libilbc.a and codecs/ilbc/libilbc.a differ -diff -druN codecs/ilbc.orig/libilbc.vcproj codecs/ilbc/libilbc.vcproj ---- codecs/ilbc.orig/libilbc.vcproj 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/libilbc.vcproj 2006-03-20 13:25:50.000000000 -0800 -@@ -0,0 +1,353 @@ -+<?xml version="1.0" encoding="Windows-1252"?> -+<VisualStudioProject -+ ProjectType="Visual C++" -+ Version="8.00" -+ Name="libilbc" -+ ProjectGUID="{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" -+ RootNamespace="libilbc" -+ Keyword="Win32Proj" -+ > -+ <Platforms> -+ <Platform -+ Name="Win32" -+ /> -+ </Platforms> -+ <ToolFiles> -+ </ToolFiles> -+ <Configurations> -+ <Configuration -+ Name="Debug|Win32" -+ OutputDirectory="$(SolutionDir)$(ConfigurationName)" -+ IntermediateDirectory="$(ConfigurationName)" -+ ConfigurationType="4" -+ CharacterSet="1" -+ > -+ <Tool -+ Name="VCPreBuildEventTool" -+ /> -+ <Tool -+ Name="VCCustomBuildTool" -+ /> -+ <Tool -+ Name="VCXMLDataGeneratorTool" -+ /> -+ <Tool -+ Name="VCWebServiceProxyGeneratorTool" -+ /> -+ <Tool -+ Name="VCMIDLTool" -+ /> -+ <Tool -+ Name="VCCLCompilerTool" -+ Optimization="0" -+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB" -+ MinimalRebuild="true" -+ BasicRuntimeChecks="3" -+ RuntimeLibrary="3" -+ UsePrecompiledHeader="0" -+ WarningLevel="3" -+ Detect64BitPortabilityProblems="true" -+ DebugInformationFormat="4" -+ /> -+ <Tool -+ Name="VCManagedResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCPreLinkEventTool" -+ /> -+ <Tool -+ Name="VCLibrarianTool" -+ /> -+ <Tool -+ Name="VCALinkTool" -+ /> -+ <Tool -+ Name="VCXDCMakeTool" -+ /> -+ <Tool -+ Name="VCBscMakeTool" -+ /> -+ <Tool -+ Name="VCFxCopTool" -+ /> -+ <Tool -+ Name="VCPostBuildEventTool" -+ /> -+ </Configuration> -+ <Configuration -+ Name="Release|Win32" -+ OutputDirectory="$(SolutionDir)$(ConfigurationName)" -+ IntermediateDirectory="$(ConfigurationName)" -+ ConfigurationType="4" -+ CharacterSet="1" -+ WholeProgramOptimization="1" -+ > -+ <Tool -+ Name="VCPreBuildEventTool" -+ /> -+ <Tool -+ Name="VCCustomBuildTool" -+ /> -+ <Tool -+ Name="VCXMLDataGeneratorTool" -+ /> -+ <Tool -+ Name="VCWebServiceProxyGeneratorTool" -+ /> -+ <Tool -+ Name="VCMIDLTool" -+ /> -+ <Tool -+ Name="VCCLCompilerTool" -+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB" -+ RuntimeLibrary="2" -+ UsePrecompiledHeader="0" -+ WarningLevel="3" -+ Detect64BitPortabilityProblems="true" -+ DebugInformationFormat="3" -+ /> -+ <Tool -+ Name="VCManagedResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCResourceCompilerTool" -+ /> -+ <Tool -+ Name="VCPreLinkEventTool" -+ /> -+ <Tool -+ Name="VCLibrarianTool" -+ /> -+ <Tool -+ Name="VCALinkTool" -+ /> -+ <Tool -+ Name="VCXDCMakeTool" -+ /> -+ <Tool -+ Name="VCBscMakeTool" -+ /> -+ <Tool -+ Name="VCFxCopTool" -+ /> -+ <Tool -+ Name="VCPostBuildEventTool" -+ /> -+ </Configuration> -+ </Configurations> -+ <References> -+ </References> -+ <Files> -+ <Filter -+ Name="Source Files" -+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" -+ > -+ <File -+ RelativePath=".\anaFilter.c" -+ > -+ </File> -+ <File -+ RelativePath=".\constants.c" -+ > -+ </File> -+ <File -+ RelativePath=".\createCB.c" -+ > -+ </File> -+ <File -+ RelativePath=".\doCPLC.c" -+ > -+ </File> -+ <File -+ RelativePath=".\enhancer.c" -+ > -+ </File> -+ <File -+ RelativePath=".\filter.c" -+ > -+ </File> -+ <File -+ RelativePath=".\FrameClassify.c" -+ > -+ </File> -+ <File -+ RelativePath=".\gainquant.c" -+ > -+ </File> -+ <File -+ RelativePath=".\getCBvec.c" -+ > -+ </File> -+ <File -+ RelativePath=".\helpfun.c" -+ > -+ </File> -+ <File -+ RelativePath=".\hpInput.c" -+ > -+ </File> -+ <File -+ RelativePath=".\hpOutput.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBConstruct.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBSearch.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_decode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_encode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCdecode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCencode.c" -+ > -+ </File> -+ <File -+ RelativePath=".\lsf.c" -+ > -+ </File> -+ <File -+ RelativePath=".\packing.c" -+ > -+ </File> -+ <File -+ RelativePath=".\StateConstructW.c" -+ > -+ </File> -+ <File -+ RelativePath=".\StateSearchW.c" -+ > -+ </File> -+ <File -+ RelativePath=".\syntFilter.c" -+ > -+ </File> -+ </Filter> -+ <Filter -+ Name="Header Files" -+ Filter="h;hpp;hxx;hm;inl;inc;xsd" -+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" -+ > -+ <File -+ RelativePath=".\anaFilter.h" -+ > -+ </File> -+ <File -+ RelativePath=".\constants.h" -+ > -+ </File> -+ <File -+ RelativePath=".\createCB.h" -+ > -+ </File> -+ <File -+ RelativePath=".\doCPLC.h" -+ > -+ </File> -+ <File -+ RelativePath=".\enhancer.h" -+ > -+ </File> -+ <File -+ RelativePath=".\filter.h" -+ > -+ </File> -+ <File -+ RelativePath=".\FrameClassify.h" -+ > -+ </File> -+ <File -+ RelativePath=".\gainquant.h" -+ > -+ </File> -+ <File -+ RelativePath=".\getCBvec.h" -+ > -+ </File> -+ <File -+ RelativePath=".\helpfun.h" -+ > -+ </File> -+ <File -+ RelativePath=".\hpInput.h" -+ > -+ </File> -+ <File -+ RelativePath=".\hpOutput.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBConstruct.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iCBSearch.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_decode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_define.h" -+ > -+ </File> -+ <File -+ RelativePath=".\iLBC_encode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCdecode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\LPCencode.h" -+ > -+ </File> -+ <File -+ RelativePath=".\lsf.h" -+ > -+ </File> -+ <File -+ RelativePath=".\packing.h" -+ > -+ </File> -+ <File -+ RelativePath=".\StateConstructW.h" -+ > -+ </File> -+ <File -+ RelativePath=".\StateSearchW.h" -+ > -+ </File> -+ <File -+ RelativePath=".\syntFilter.h" -+ > -+ </File> -+ </Filter> -+ <Filter -+ Name="Resource Files" -+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" -+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" -+ > -+ </Filter> -+ </Files> -+ <Globals> -+ </Globals> -+</VisualStudioProject> -diff -druN codecs/ilbc.orig/lsf.c codecs/ilbc/lsf.c ---- codecs/ilbc.orig/lsf.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/lsf.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,264 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ lsf.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <string.h> -+#include <math.h> -+ -+#include "iLBC_define.h" -+#include "lsf.h" -+ -+/*----------------------------------------------------------------* -+ * conversion from lpc coefficients to lsf coefficients -+ *---------------------------------------------------------------*/ -+ -+void a2lsf( -+ float *freq,/* (o) lsf coefficients */ -+ float *a /* (i) lpc coefficients */ -+){ -+ float steps[LSF_NUMBER_OF_STEPS] = -+ {(float)0.00635, (float)0.003175, (float)0.0015875, -+ (float)0.00079375}; -+ float step; -+ int step_idx; -+ int lsp_index; -+ float p[LPC_HALFORDER]; -+ float q[LPC_HALFORDER]; -+ float p_pre[LPC_HALFORDER]; -+ -+ -+ float q_pre[LPC_HALFORDER]; -+ float old_p, old_q, *old; -+ float *pq_coef; -+ float omega, old_omega; -+ int i; -+ float hlp, hlp1, hlp2, hlp3, hlp4, hlp5; -+ -+ for (i=0; i<LPC_HALFORDER; i++) { -+ p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]); -+ q[i] = a[LPC_FILTERORDER - i] - a[i + 1]; -+ } -+ -+ p_pre[0] = (float)-1.0 - p[0]; -+ p_pre[1] = - p_pre[0] - p[1]; -+ p_pre[2] = - p_pre[1] - p[2]; -+ p_pre[3] = - p_pre[2] - p[3]; -+ p_pre[4] = - p_pre[3] - p[4]; -+ p_pre[4] = p_pre[4] / 2; -+ -+ q_pre[0] = (float)1.0 - q[0]; -+ q_pre[1] = q_pre[0] - q[1]; -+ q_pre[2] = q_pre[1] - q[2]; -+ q_pre[3] = q_pre[2] - q[3]; -+ q_pre[4] = q_pre[3] - q[4]; -+ q_pre[4] = q_pre[4] / 2; -+ -+ omega = 0.0; -+ old_omega = 0.0; -+ -+ old_p = FLOAT_MAX; -+ old_q = FLOAT_MAX; -+ -+ /* Here we loop through lsp_index to find all the -+ LPC_FILTERORDER roots for omega. */ -+ -+ for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) { -+ -+ /* Depending on lsp_index being even or odd, we -+ alternatively solve the roots for the two LSP equations. */ -+ -+ -+ if ((lsp_index & 0x1) == 0) { -+ pq_coef = p_pre; -+ old = &old_p; -+ } else { -+ pq_coef = q_pre; -+ old = &old_q; -+ } -+ -+ /* Start with low resolution grid */ -+ -+ for (step_idx = 0, step = steps[step_idx]; -+ step_idx < LSF_NUMBER_OF_STEPS;){ -+ -+ -+ -+ /* cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) + -+ pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */ -+ -+ hlp = (float)cos(omega * TWO_PI); -+ hlp1 = (float)2.0 * hlp + pq_coef[0]; -+ hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 + -+ pq_coef[1]; -+ hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2]; -+ hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3]; -+ hlp5 = hlp * hlp4 - hlp3 + pq_coef[4]; -+ -+ -+ if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){ -+ -+ if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){ -+ -+ if (fabs(hlp5) >= fabs(*old)) { -+ freq[lsp_index] = omega - step; -+ } else { -+ freq[lsp_index] = omega; -+ } -+ -+ -+ if ((*old) >= 0.0){ -+ *old = (float)-1.0 * FLOAT_MAX; -+ } else { -+ *old = FLOAT_MAX; -+ } -+ -+ omega = old_omega; -+ step_idx = 0; -+ -+ step_idx = LSF_NUMBER_OF_STEPS; -+ } else { -+ -+ if (step_idx == 0) { -+ old_omega = omega; -+ } -+ -+ step_idx++; -+ omega -= steps[step_idx]; -+ -+ /* Go back one grid step */ -+ -+ step = steps[step_idx]; -+ } -+ } else { -+ -+ /* increment omega until they are of different sign, -+ and we know there is at least one root between omega -+ and old_omega */ -+ *old = hlp5; -+ omega += step; -+ } -+ -+ -+ } -+ } -+ -+ for (i = 0; i<LPC_FILTERORDER; i++) { -+ freq[i] = freq[i] * TWO_PI; -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * conversion from lsf coefficients to lpc coefficients -+ *---------------------------------------------------------------*/ -+ -+void lsf2a( -+ float *a_coef, /* (o) lpc coefficients */ -+ float *freq /* (i) lsf coefficients */ -+){ -+ int i, j; -+ float hlp; -+ float p[LPC_HALFORDER], q[LPC_HALFORDER]; -+ float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER], -+ a2[LPC_HALFORDER]; -+ float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER], -+ b2[LPC_HALFORDER]; -+ -+ for (i=0; i<LPC_FILTERORDER; i++) { -+ freq[i] = freq[i] * PI2; -+ } -+ -+ /* Check input for ill-conditioned cases. This part is not -+ found in the TIA standard. It involves the following 2 IF -+ blocks. If "freq" is judged ill-conditioned, then we first -+ modify freq[0] and freq[LPC_HALFORDER-1] (normally -+ LPC_HALFORDER = 10 for LPC applications), then we adjust -+ the other "freq" values slightly */ -+ -+ -+ if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){ -+ -+ -+ if (freq[0] <= 0.0) { -+ freq[0] = (float)0.022; -+ } -+ -+ -+ if (freq[LPC_FILTERORDER - 1] >= 0.5) { -+ freq[LPC_FILTERORDER - 1] = (float)0.499; -+ } -+ -+ hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) / -+ (float) (LPC_FILTERORDER - 1); -+ -+ for (i=1; i<LPC_FILTERORDER; i++) { -+ freq[i] = freq[i - 1] + hlp; -+ } -+ -+ -+ } -+ -+ memset(a1, 0, LPC_HALFORDER*sizeof(float)); -+ memset(a2, 0, LPC_HALFORDER*sizeof(float)); -+ memset(b1, 0, LPC_HALFORDER*sizeof(float)); -+ memset(b2, 0, LPC_HALFORDER*sizeof(float)); -+ memset(a, 0, (LPC_HALFORDER+1)*sizeof(float)); -+ memset(b, 0, (LPC_HALFORDER+1)*sizeof(float)); -+ -+ /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and -+ cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2. -+ Note that for this code p[i] specifies the coefficients -+ used in .Q_A(z) while q[i] specifies the coefficients used -+ in .P_A(z) */ -+ -+ for (i=0; i<LPC_HALFORDER; i++) { -+ p[i] = (float)cos(TWO_PI * freq[2 * i]); -+ q[i] = (float)cos(TWO_PI * freq[2 * i + 1]); -+ } -+ -+ a[0] = 0.25; -+ b[0] = 0.25; -+ -+ for (i= 0; i<LPC_HALFORDER; i++) { -+ a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i]; -+ b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i]; -+ a2[i] = a1[i]; -+ a1[i] = a[i]; -+ b2[i] = b1[i]; -+ b1[i] = b[i]; -+ } -+ -+ for (j=0; j<LPC_FILTERORDER; j++) { -+ -+ if (j == 0) { -+ a[0] = 0.25; -+ b[0] = -0.25; -+ } else { -+ a[0] = b[0] = 0.0; -+ } -+ -+ for (i=0; i<LPC_HALFORDER; i++) { -+ a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i]; -+ b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i]; -+ a2[i] = a1[i]; -+ a1[i] = a[i]; -+ b2[i] = b1[i]; -+ b1[i] = b[i]; -+ } -+ -+ a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]); -+ } -+ -+ a_coef[0] = 1.0; -+ -+ -+} -+ -+ -diff -druN codecs/ilbc.orig/lsf.h codecs/ilbc/lsf.h ---- codecs/ilbc.orig/lsf.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/lsf.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,30 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ lsf.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+ -+ -+******************************************************************/ -+ -+#ifndef __iLBC_LSF_H -+#define __iLBC_LSF_H -+ -+void a2lsf( -+ float *freq,/* (o) lsf coefficients */ -+ float *a /* (i) lpc coefficients */ -+); -+ -+void lsf2a( -+ float *a_coef, /* (o) lpc coefficients */ -+ float *freq /* (i) lsf coefficients */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/packing.c codecs/ilbc/packing.c ---- codecs/ilbc.orig/packing.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/packing.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,175 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ packing.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include <math.h> -+#include <stdlib.h> -+ -+#include "iLBC_define.h" -+#include "constants.h" -+#include "helpfun.h" -+#include "packing.h" -+#include "string.h" -+ -+/*----------------------------------------------------------------* -+ * splitting an integer into first most significant bits and -+ * remaining least significant bits -+ *---------------------------------------------------------------*/ -+ -+void packsplit( -+ int *index, /* (i) the value to split */ -+ int *firstpart, /* (o) the value specified by most -+ significant bits */ -+ int *rest, /* (o) the value specified by least -+ significant bits */ -+ int bitno_firstpart, /* (i) number of bits in most -+ significant part */ -+ int bitno_total /* (i) number of bits in full range -+ of value */ -+){ -+ int bitno_rest = bitno_total-bitno_firstpart; -+ -+ -+ -+ *firstpart = *index>>(bitno_rest); -+ *rest = *index-(*firstpart<<(bitno_rest)); -+} -+ -+/*----------------------------------------------------------------* -+ * combining a value corresponding to msb's with a value -+ * corresponding to lsb's -+ *---------------------------------------------------------------*/ -+ -+void packcombine( -+ int *index, /* (i/o) the msb value in the -+ combined value out */ -+ int rest, /* (i) the lsb value */ -+ int bitno_rest /* (i) the number of bits in the -+ lsb part */ -+){ -+ *index = *index<<bitno_rest; -+ *index += rest; -+} -+ -+/*----------------------------------------------------------------* -+ * packing of bits into bitstream, i.e., vector of bytes -+ *---------------------------------------------------------------*/ -+ -+void dopack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ place in bitstream to pack -+ new data, on exit pointer -+ to place in bitstream to -+ pack future data */ -+ int index, /* (i) the value to pack */ -+ int bitno, /* (i) the number of bits that the -+ value will fit within */ -+ int *pos /* (i/o) write position in the -+ current byte */ -+){ -+ int posLeft; -+ -+ /* Clear the bits before starting in a new byte */ -+ -+ if ((*pos)==0) { -+ **bitstream=0; -+ } -+ -+ while (bitno>0) { -+ -+ /* Jump to the next byte if end of this byte is reached*/ -+ -+ if (*pos==8) { -+ *pos=0; -+ (*bitstream)++; -+ **bitstream=0; -+ } -+ -+ -+ -+ posLeft=8-(*pos); -+ -+ /* Insert index into the bitstream */ -+ -+ if (bitno <= posLeft) { -+ **bitstream |= (unsigned char)(index<<(posLeft-bitno)); -+ *pos+=bitno; -+ bitno=0; -+ } else { -+ **bitstream |= (unsigned char)(index>>(bitno-posLeft)); -+ -+ *pos=8; -+ index-=((index>>(bitno-posLeft))<<(bitno-posLeft)); -+ -+ bitno-=posLeft; -+ } -+ } -+} -+ -+/*----------------------------------------------------------------* -+ * unpacking of bits from bitstream, i.e., vector of bytes -+ *---------------------------------------------------------------*/ -+ -+void unpack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ place in bitstream to -+ unpack new data from, on -+ exit pointer to place in -+ bitstream to unpack future -+ data from */ -+ int *index, /* (o) resulting value */ -+ int bitno, /* (i) number of bits used to -+ represent the value */ -+ int *pos /* (i/o) read position in the -+ current byte */ -+){ -+ int BitsLeft; -+ -+ *index=0; -+ -+ while (bitno>0) { -+ -+ /* move forward in bitstream when the end of the -+ byte is reached */ -+ -+ if (*pos==8) { -+ *pos=0; -+ (*bitstream)++; -+ } -+ -+ BitsLeft=8-(*pos); -+ -+ /* Extract bits to index */ -+ -+ -+ -+ if (BitsLeft>=bitno) { -+ *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno)); -+ -+ *pos+=bitno; -+ bitno=0; -+ } else { -+ -+ if ((8-bitno)>0) { -+ *index+=((((**bitstream)<<(*pos)) & 0xFF)>> -+ (8-bitno)); -+ *pos=8; -+ } else { -+ *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<< -+ (bitno-8)); -+ *pos=8; -+ } -+ bitno-=BitsLeft; -+ } -+ } -+} -+ -+ -diff -druN codecs/ilbc.orig/packing.h codecs/ilbc/packing.h ---- codecs/ilbc.orig/packing.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/packing.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,67 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ packing.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __PACKING_H -+#define __PACKING_H -+ -+void packsplit( -+ int *index, /* (i) the value to split */ -+ int *firstpart, /* (o) the value specified by most -+ significant bits */ -+ int *rest, /* (o) the value specified by least -+ significant bits */ -+ int bitno_firstpart, /* (i) number of bits in most -+ significant part */ -+ int bitno_total /* (i) number of bits in full range -+ of value */ -+); -+ -+void packcombine( -+ int *index, /* (i/o) the msb value in the -+ combined value out */ -+ int rest, /* (i) the lsb value */ -+ int bitno_rest /* (i) the number of bits in the -+ lsb part */ -+); -+ -+void dopack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ place in bitstream to pack -+ new data, on exit pointer -+ to place in bitstream to -+ pack future data */ -+ int index, /* (i) the value to pack */ -+ int bitno, /* (i) the number of bits that the -+ value will fit within */ -+ int *pos /* (i/o) write position in the -+ current byte */ -+); -+ -+void unpack( -+ unsigned char **bitstream, /* (i/o) on entrance pointer to -+ -+ -+ place in bitstream to -+ unpack new data from, on -+ exit pointer to place in -+ bitstream to unpack future -+ data from */ -+ int *index, /* (o) resulting value */ -+ int bitno, /* (i) number of bits used to -+ represent the value */ -+ int *pos /* (i/o) read position in the -+ current byte */ -+); -+ -+#endif -+ -+ -diff -druN codecs/ilbc.orig/syntFilter.c codecs/ilbc/syntFilter.c ---- codecs/ilbc.orig/syntFilter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/syntFilter.c 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,108 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ syntFilter.c -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#include "iLBC_define.h" -+#include "syntFilter.h" -+ -+/*----------------------------------------------------------------* -+ * LP synthesis filter. -+ *---------------------------------------------------------------*/ -+ -+void syntFilter( -+ float *Out, /* (i/o) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len, /* (i) Length of signal */ -+ float *mem /* (i/o) Filter state */ -+){ -+ int i, j; -+ float *po, *pi, *pa, *pm; -+ -+ po=Out; -+ -+ /* Filter first part using memory from past */ -+ -+ for (i=0; i<LPC_FILTERORDER; i++) { -+ pi=&Out[i-1]; -+ pa=&a[1]; -+ pm=&mem[LPC_FILTERORDER-1]; -+ for (j=1; j<=i; j++) { -+ *po-=(*pa++)*(*pi--); -+ } -+ for (j=i+1; j<LPC_FILTERORDER+1; j++) { -+ *po-=(*pa++)*(*pm--); -+ } -+ po++; -+ } -+ -+ /* Filter last part where the state is entierly in -+ the output vector */ -+ -+ for (i=LPC_FILTERORDER; i<len; i++) { -+ -+ -+ pi=&Out[i-1]; -+ pa=&a[1]; -+ for (j=1; j<LPC_FILTERORDER+1; j++) { -+ *po-=(*pa++)*(*pi--); -+ } -+ po++; -+ } -+ -+ /* Update state vector */ -+ -+ memcpy(mem, &Out[len-LPC_FILTERORDER], -+ LPC_FILTERORDER*sizeof(float)); -+} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -druN codecs/ilbc.orig/syntFilter.h codecs/ilbc/syntFilter.h ---- codecs/ilbc.orig/syntFilter.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/syntFilter.h 2006-02-14 11:14:15.000000000 -0800 -@@ -0,0 +1,27 @@ -+ -+/****************************************************************** -+ -+ iLBC Speech Coder ANSI-C Source Code -+ -+ syntFilter.h -+ -+ Copyright (C) The Internet Society (2004). -+ All Rights Reserved. -+ -+******************************************************************/ -+ -+#ifndef __iLBC_SYNTFILTER_H -+#define __iLBC_SYNTFILTER_H -+ -+void syntFilter( -+ float *Out, /* (i/o) Signal to be filtered */ -+ float *a, /* (i) LP parameters */ -+ int len, /* (i) Length of signal */ -+ float *mem /* (i/o) Filter state */ -+ -+ -+); -+ -+#endif -+ -+ ---- codecs/.moduleinfo 2008/08/20 23:00:58 1.1 -+++ codecs/.moduleinfo 2008/08/20 23:01:12 -@@ -11,7 +11,6 @@ - <depend>gsm</depend> - </member> - <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so"> -- <defaultenabled>no</defaultenabled> - </member> - <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so"> - </member> diff --git a/net/asterisk14/files/nocodecnego-patch-Makefile b/net/asterisk14/files/nocodecnego-patch-Makefile deleted file mode 100644 index c5df459f1b2c..000000000000 --- a/net/asterisk14/files/nocodecnego-patch-Makefile +++ /dev/null @@ -1,228 +0,0 @@ ---- Makefile.orig 2009-10-23 17:00:01.000000000 +0300 -+++ Makefile 2009-11-23 16:44:36.000000000 +0200 -@@ -101,7 +101,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - # Staging directory - # Files are copied here temporarily during the install process -@@ -135,7 +135,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk - endif -@@ -225,9 +225,11 @@ - _ASTLDFLAGS+=-L/usr/local/lib - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char -@@ -235,7 +237,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - endif -@@ -410,21 +412,21 @@ - rm -f build_tools/menuselect-deps - - datafiles: _all -- if [ `$(ID) -u` = 0 ]; then \ -- CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \ -- fi -+ #if [ `$(ID) -u` = 0 ]; then \ -+ # CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \ -+ #fi - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -445,47 +447,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -521,7 +523,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -559,31 +561,23 @@ - upgrade: bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ - if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ - done -- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ if true; then \ - ( \ - echo "[directories]" ; \ - echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -629,20 +623,23 @@ - echo ";astctlowner = root" ; \ - echo ";astctlgroup = apache" ; \ - echo ";astctl = asterisk.ctl" ; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" diff --git a/net/asterisk14/files/patch-Makefile.rules b/net/asterisk14/files/patch-Makefile.rules deleted file mode 100644 index f90430ec9ddd..000000000000 --- a/net/asterisk14/files/patch-Makefile.rules +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.rules.orig 2009-09-28 22:09:25.000000000 +0300 -+++ Makefile.rules 2009-11-23 16:15:23.000000000 +0200 -@@ -37,11 +37,13 @@ - - OPTIMIZE?=-O6 - -+ifneq ($(OSARCH),FreeBSD) - ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) - _ASTCFLAGS+=$(OPTIMIZE) - else - _ASTCFLAGS+=-O0 - endif -+endif - - # shortcuts for common combinations of flags; these must be recursively expanded so that - # per-target settings will be applied diff --git a/net/asterisk14/files/patch-agi::Makefile b/net/asterisk14/files/patch-agi::Makefile deleted file mode 100644 index f9910fe96dd6..000000000000 --- a/net/asterisk14/files/patch-agi::Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- agi/Makefile.orig Sat Dec 16 23:14:34 2006 -+++ agi/Makefile Wed Mar 28 11:13:21 2007 -@@ -13,7 +13,9 @@ - - .PHONY: clean all uninstall - --AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi jukebox.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - ifeq ($(OSARCH),SunOS) - LIBS+=-lsocket -lnsl -@@ -31,8 +33,9 @@ eagi-test: eagi-test.o strcompat.o - eagi-sphinx-test: eagi-sphinx-test.o - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - uninstall: - for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile deleted file mode 100644 index bb9d20047899..000000000000 --- a/net/asterisk14/files/patch-channels::Makefile +++ /dev/null @@ -1,48 +0,0 @@ ---- channels/Makefile.orig 2009-07-21 16:04:44.000000000 +0300 -+++ channels/Makefile 2009-11-20 18:05:45.000000000 +0200 -@@ -32,9 +32,10 @@ - endif - - ifeq ($(OSARCH),FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -+ PTLIB=-lpt_r -+ H323LIB=-lh323_r - CHANH323LIB=-pthread -+ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) - endif - - ifeq ($(OSARCH),NetBSD) -@@ -78,12 +79,13 @@ - h323/libchanh323.a h323/Makefile.ast: - $(CMD_PREFIX) $(MAKE) -C h323 - $(CMD_PREFIX) rm -f ../main/asterisk -- $(CMD_PREFIX) echo "***************************************************************" -- $(CMD_PREFIX) echo -- $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" -- $(CMD_PREFIX) echo -- $(CMD_PREFIX) echo "***************************************************************" -- $(CMD_PREFIX) exit 1 -+ $(CMD_PREFIX) $(MAKE) -C . chan_h323.so -+# $(CMD_PREFIX) echo "***************************************************************" -+# $(CMD_PREFIX) echo -+# $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" -+# $(CMD_PREFIX) echo -+# $(CMD_PREFIX) echo "***************************************************************" -+# $(CMD_PREFIX) exit 1 - endif - - dist-clean:: -@@ -111,8 +113,12 @@ - else - chan_h323.so: chan_h323.o h323/libchanh323.a - $(ECHO_PREFIX) echo " [LD] $^ -> $@" -+ifeq ($(OSARCH),FreeBSD) -+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) -+else - $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat $(ASTLDFLAGS) - endif -+endif - - chan_misdn.o: _ASTCFLAGS+=-Imisdn - diff --git a/net/asterisk14/files/patch-channels::chan_sip.c b/net/asterisk14/files/patch-channels::chan_sip.c deleted file mode 100644 index 9bb8267ffcc5..000000000000 --- a/net/asterisk14/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,11 +0,0 @@ ---- channels/chan_sip.c.orig 2008-06-10 00:46:46.000000000 -0700 -+++ channels/chan_sip.c 2008-06-10 00:46:46.000000000 -0700 -@@ -496,7 +496,7 @@ - #define DEFAULT_MOHINTERPRET "default" - #define DEFAULT_MOHSUGGEST "" - #define DEFAULT_VMEXTEN "asterisk" --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - #define DEFAULT_NOTIFYMIME "application/simple-message-summary" - #define DEFAULT_MWITIME 10 - #define DEFAULT_ALLOWGUEST TRUE diff --git a/net/asterisk14/files/patch-channels_h323_Makefile.in b/net/asterisk14/files/patch-channels_h323_Makefile.in deleted file mode 100644 index 105eb3c41547..000000000000 --- a/net/asterisk14/files/patch-channels_h323_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.in -+++ channels/h323/Makefile.in -@@ -13,7 +13,7 @@ - STDCCFLAGS += -I../../include -include ../../include/asterisk/autoconfig.h - STDCCFLAGS += -fPIC - #OPTCCFLAGS += --CFLAGS = -pipe -+CFLAGS = -pipe @CXXFLAGS@ - TARGET = libchanh323.a - TARGET += Makefile.ast - SOURCES = ast_h323.cxx compat_h323.cxx cisco-h225.cxx caps_h323.cxx diff --git a/net/asterisk14/files/patch-configure b/net/asterisk14/files/patch-configure deleted file mode 100644 index 93432489e415..000000000000 --- a/net/asterisk14/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- configure.orig -+++ configure -@@ -4308,8 +4308,6 @@ - case "${host_os}" in - freebsd*) - ac_default_prefix=/usr/local -- CPPFLAGS=-I/usr/local/include -- LDFLAGS=-L/usr/local/lib - ;; - darwin*) - -@@ -16837,7 +16835,7 @@ - - fi - -- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}" -+ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" - - if test "${HAS_OPENH323:-unset}" != "unset"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 diff --git a/net/asterisk14/files/patch-include::asterisk::utils.h b/net/asterisk14/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk14/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk14/files/patch-main::Makefile b/net/asterisk14/files/patch-main::Makefile deleted file mode 100644 index a4758b78bdc9..000000000000 --- a/net/asterisk14/files/patch-main::Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- main/Makefile.orig 2009-08-01 03:52:00.000000000 +0300 -+++ main/Makefile 2009-11-20 18:09:06.000000000 +0200 -@@ -92,8 +92,8 @@ - cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=)) $(ASTCFLAGS)" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: -- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a -+#db1-ast/libdb1.a: -+# _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a - - ast_expr2.c ast_expr2.h: - bison -o $@ -d --name-prefix=ast_yy ast_expr2.y -@@ -127,18 +127,18 @@ - H323LDLIBS= - endif - --asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) asterisk.exports -+asterisk: $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) asterisk.exports - @$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp - @if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \ - mv $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; \ - fi - @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp - @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) -- $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@" -+ $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) -> $@" - ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) -- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS) -+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS) - else -- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS) -+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS) - endif - - clean:: diff --git a/net/asterisk14/files/patch-main::db.c b/net/asterisk14/files/patch-main::db.c deleted file mode 100644 index 0b26f3b2cca6..000000000000 --- a/net/asterisk14/files/patch-main::db.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- main/db.c.orig Fri Jan 13 11:05:32 2006 -+++ main/db.c Fri Jan 13 11:06:55 2006 -@@ -35,6 +35,7 @@ - #include <errno.h> - #include <unistd.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk14/files/patch-main::frame.c b/net/asterisk14/files/patch-main::frame.c deleted file mode 100644 index 232de08a9e21..000000000000 --- a/net/asterisk14/files/patch-main::frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- main/frame.c.orig Wed Jan 25 13:22:43 2006 -+++ main/frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk14/files/patch-main::utils.c b/net/asterisk14/files/patch-main::utils.c deleted file mode 100644 index 7f2f1495d714..000000000000 --- a/net/asterisk14/files/patch-main::utils.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- main/utils.c.orig -+++ main/utils.c -@@ -914,8 +914,8 @@ - pthread_attr_init(attr); - } - --#ifdef __linux__ -- /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, -+#if defined(__linux__) || defined(__FreeBSD__) -+ /* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, - which is kind of useless. Change this here to - PTHREAD_INHERIT_SCHED; that way the -p option to set realtime - priority will propagate down to new threads by default. diff --git a/net/asterisk14/files/patch-rtp_timeout b/net/asterisk14/files/patch-rtp_timeout deleted file mode 100644 index 6f60c74cff41..000000000000 --- a/net/asterisk14/files/patch-rtp_timeout +++ /dev/null @@ -1,25 +0,0 @@ ---- channels/chan_sip.c.orig 2009-04-14 08:58:13.000000000 +0100 -+++ channels/chan_sip.c 2009-04-14 09:00:58.000000000 +0100 -@@ -16287,7 +16287,6 @@ - restartsearch: - /* Check for interfaces needing to be killed */ - ast_mutex_lock(&iflock); -- t = time(NULL); - /* don't scan the interface list if it hasn't been a reasonable period - of time since the last time we did it (when MWI is being sent, we can - get back to this point every millisecond or less) -@@ -16306,12 +16305,14 @@ - (sip->owner->_state == AST_STATE_UP) && - !sip->redirip.sin_addr.s_addr && - sip->t38.state != T38_ENABLED) { -+ t = time(NULL); - if (sip->lastrtptx && - ast_rtp_get_rtpkeepalive(sip->rtp) && - (t > sip->lastrtptx + ast_rtp_get_rtpkeepalive(sip->rtp))) { - /* Need to send an empty RTP packet */ - sip->lastrtptx = time(NULL); - ast_rtp_sendcng(sip->rtp, 0); -+ t = time(NULL); - } - if (sip->lastrtprx && - (ast_rtp_get_rtptimeout(sip->rtp) || ast_rtp_get_rtpholdtimeout(sip->rtp)) && diff --git a/net/asterisk14/files/patch-suppress_log_dups.diff b/net/asterisk14/files/patch-suppress_log_dups.diff deleted file mode 100644 index 115b69f21ca1..000000000000 --- a/net/asterisk14/files/patch-suppress_log_dups.diff +++ /dev/null @@ -1,270 +0,0 @@ -Index: main/logger.c -=================================================================== ---- main/logger.c (revision 188505) -+++ main/logger.c (working copy) -@@ -140,6 +140,17 @@ - AST_THREADSTORAGE(log_buf, log_buf_init); - #define LOG_BUF_INIT_SIZE 128 - -+/* -+ * Storage for previous log message to prevent log storms -+ */ -+static int stored_log_level; -+static int stored_log_dup_count = 0; -+static char *stored_log_msg = NULL; -+static const char *stored_log_file; -+static int stored_log_line; -+static const char *stored_log_function; -+static ast_mutex_t stored_log_msg_lock; -+ - static int make_components(char *s, int lineno) - { - char *w; -@@ -591,6 +602,8 @@ - char tmp[256]; - int res = 0; - -+ ast_mutex_init(&stored_log_msg_lock); -+ - /* auto rotate if sig SIGXFSZ comes a-knockin */ - (void) signal(SIGXFSZ,(void *) handle_SIGXFSZ); - -@@ -655,14 +668,14 @@ - return; - } - --static void __attribute__((format(printf, 5, 0))) ast_log_vsyslog(int level, const char *file, int line, const char *function, const char *fmt, va_list args) -+static void ast_log_syslog(int level, const char *file, int line, const char *function, const char *msg) - { - char buf[BUFSIZ]; - char *s; - - if (level >= SYSLOG_NLEVELS) { - /* we are locked here, so cannot ast_log() */ -- fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", level); -+ fprintf(stderr, "ast_log_syslog called with bogus level: %d\n", level); - return; - } - if (level == __LOG_VERBOSE) { -@@ -676,27 +689,20 @@ - levels[level], (long)GETTID(), file, line, function); - } - s = buf + strlen(buf); -- vsnprintf(s, sizeof(buf) - strlen(buf), fmt, args); -+ snprintf(s, sizeof(buf) - strlen(buf), "%s", msg); - term_strip(s, s, strlen(s) + 1); - syslog(syslog_level_map[level], "%s", buf); - } - --/*! -- * \brief send log messages to syslog and/or the console -- */ --void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) -+static void __ast_log(int level, const char *file, int line, const char *function, char *msg, int msglen) - { - struct logchannel *chan; -- struct ast_dynamic_str *buf; - time_t t; - struct tm tm; - char date[256]; -+ char buf[2048]; -+ int res; - -- va_list ap; -- -- if (!(buf = ast_dynamic_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE))) -- return; -- - if (AST_LIST_EMPTY(&logchannels)) - { - /* -@@ -704,35 +710,12 @@ - * so just log to stdout - */ - if (level != __LOG_VERBOSE) { -- int res; -- va_start(ap, fmt); -- res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -- va_end(ap); -- if (res != AST_DYNSTR_BUILD_FAILED) { -- term_filter_escapes(buf->str); -- fputs(buf->str, stdout); -- } -+ term_filter_escapes(msg); -+ fputs(msg, stdout); - } - return; - } - -- /* don't display LOG_DEBUG messages unless option_verbose _or_ option_debug -- are non-zero; LOG_DEBUG messages can still be displayed if option_debug -- is zero, if option_verbose is non-zero (this allows for 'level zero' -- LOG_DEBUG messages to be displayed, if the logmask on any channel -- allows it) -- */ -- if (!option_verbose && !option_debug && (level == __LOG_DEBUG)) -- return; -- -- /* Ignore anything that never gets logged anywhere */ -- if (!(global_logmask & (1 << level))) -- return; -- -- /* Ignore anything other than the currently debugged file if there is one */ -- if ((level == __LOG_DEBUG) && !ast_strlen_zero(debug_filename) && strcasecmp(debug_filename, file)) -- return; -- - time(&t); - ast_localtime(&t, &tm, NULL); - strftime(date, sizeof(date), dateformat, &tm); -@@ -740,13 +723,8 @@ - AST_LIST_LOCK(&logchannels); - - if (logfiles.event_log && level == __LOG_EVENT) { -- va_start(ap, fmt); -- -- fprintf(eventlog, "%s asterisk[%ld]: ", date, (long)getpid()); -- vfprintf(eventlog, fmt, ap); -+ fprintf(eventlog, "%s asterisk[%ld]: %s", date, (long)getpid(), msg); - fflush(eventlog); -- -- va_end(ap); - AST_LIST_UNLOCK(&logchannels); - return; - } -@@ -756,18 +734,15 @@ - break; - /* Check syslog channels */ - if (chan->type == LOGTYPE_SYSLOG && (chan->logmask & (1 << level))) { -- va_start(ap, fmt); -- ast_log_vsyslog(level, file, line, function, fmt, ap); -- va_end(ap); -+ ast_log_syslog(level, file, line, function, msg); - /* Console channels */ - } else if ((chan->logmask & (1 << level)) && (chan->type == LOGTYPE_CONSOLE)) { - char linestr[128]; - char tmp1[80], tmp2[80], tmp3[80], tmp4[80]; - - if (level != __LOG_VERBOSE) { -- int res; - sprintf(linestr, "%d", line); -- ast_dynamic_str_thread_set(&buf, BUFSIZ, &log_buf, -+ snprintf(buf, sizeof(buf), - "[%s] %s[%ld]: %s:%s %s: ", - date, - term_color(tmp1, levels[level], colors[level], 0, sizeof(tmp1)), -@@ -776,23 +751,17 @@ - term_color(tmp3, linestr, COLOR_BRWHITE, 0, sizeof(tmp3)), - term_color(tmp4, function, COLOR_BRWHITE, 0, sizeof(tmp4))); - /*filter to the console!*/ -- term_filter_escapes(buf->str); -- ast_console_puts_mutable(buf->str); -- -- va_start(ap, fmt); -- res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -- va_end(ap); -- if (res != AST_DYNSTR_BUILD_FAILED) -- ast_console_puts_mutable(buf->str); -+ term_filter_escapes(buf); -+ ast_console_puts_mutable(buf); -+ ast_console_puts_mutable(msg); - } - /* File channels */ - } else if ((chan->logmask & (1 << level)) && (chan->fileptr)) { -- int res; -- ast_dynamic_str_thread_set(&buf, BUFSIZ, &log_buf, -+ snprintf(buf, sizeof(buf), - "[%s] %s[%ld] %s: ", - date, levels[level], (long)GETTID(), file); -- res = fprintf(chan->fileptr, "%s", buf->str); -- if (res <= 0 && !ast_strlen_zero(buf->str)) { /* Error, no characters printed */ -+ res = fprintf(chan->fileptr, "%s", buf); -+ if (res <= 0 && !ast_strlen_zero(buf)) { /* Error, no characters printed */ - fprintf(stderr,"**** Asterisk Logging Error: ***********\n"); - if (errno == ENOMEM || errno == ENOSPC) { - fprintf(stderr, "Asterisk logging error: Out of disk space, can't log to log file %s\n", chan->filename); -@@ -801,16 +770,10 @@ - manager_event(EVENT_FLAG_SYSTEM, "LogChannel", "Channel: %s\r\nEnabled: No\r\nReason: %d - %s\r\n", chan->filename, errno, strerror(errno)); - chan->disabled = 1; - } else { -- int res; - /* No error message, continue printing */ -- va_start(ap, fmt); -- res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -- va_end(ap); -- if (res != AST_DYNSTR_BUILD_FAILED) { -- term_strip(buf->str, buf->str, buf->len); -- fputs(buf->str, chan->fileptr); -- fflush(chan->fileptr); -- } -+ term_strip(msg, msg, msglen); -+ fputs(msg, chan->fileptr); -+ fflush(chan->fileptr); - } - } - } -@@ -825,6 +788,65 @@ - } - } - -+/*! -+ * \brief send log messages to syslog and/or the console -+ */ -+void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) -+{ -+ struct ast_dynamic_str *buf; -+ int res; -+ va_list ap; -+ -+ if (!(buf = ast_dynamic_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE))) -+ return; -+ -+ va_start(ap, fmt); -+ res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap); -+ va_end(ap); -+ if (res == AST_DYNSTR_BUILD_FAILED) -+ return; -+ -+ /* don't display LOG_DEBUG messages unless option_verbose _or_ option_debug -+ are non-zero; LOG_DEBUG messages can still be displayed if option_debug -+ is zero, if option_verbose is non-zero (this allows for 'level zero' -+ LOG_DEBUG messages to be displayed, if the logmask on any channel -+ allows it) -+ */ -+ if (!option_verbose && !option_debug && (level == __LOG_DEBUG)) -+ return; -+ -+ /* Ignore anything that never gets logged anywhere */ -+ if (!(global_logmask & (1 << level))) -+ return; -+ -+ /* Ignore anything other than the currently debugged file if there is one */ -+ if ((level == __LOG_DEBUG) && !ast_strlen_zero(debug_filename) && strcasecmp(debug_filename, file)) -+ return; -+ -+ ast_mutex_lock(&stored_log_msg_lock); -+ if (stored_log_msg == NULL || stored_log_level != level || strcmp(buf->str, stored_log_msg) != 0) { -+ if (stored_log_dup_count > 0) { -+ char buf2[1024]; -+ -+ snprintf(buf2, sizeof(buf2), "Last message repeated %d times\n", stored_log_dup_count); -+ __ast_log(stored_log_level, stored_log_file, stored_log_line, stored_log_function, buf2, strlen(buf2)); -+ } -+ if (stored_log_msg != NULL) -+ ast_free(stored_log_msg); -+ stored_log_msg = ast_strdup(buf->str); -+ stored_log_level = level; -+ stored_log_dup_count = 0; -+ stored_log_file = file; -+ stored_log_line = line; -+ stored_log_function = function; -+ __ast_log(level, file, line, function, buf->str, buf->len); -+ } -+ else -+ ++stored_log_dup_count; -+ -+ ast_mutex_unlock(&stored_log_msg_lock); -+} -+ - void ast_backtrace(void) - { - #ifdef linux diff --git a/net/asterisk14/files/rtp_force_dtmf-codecnego.diff b/net/asterisk14/files/rtp_force_dtmf-codecnego.diff deleted file mode 100644 index a670364ba603..000000000000 --- a/net/asterisk14/files/rtp_force_dtmf-codecnego.diff +++ /dev/null @@ -1,86 +0,0 @@ ---- channels/chan_sip.c.orig 2009-11-20 17:56:30.000000000 +0200 -+++ channels/chan_sip.c 2009-11-20 17:59:43.000000000 +0200 -@@ -565,6 +565,9 @@ - static unsigned int global_tos_sip; /*!< IP type of service for SIP packets */ - static unsigned int global_tos_audio; /*!< IP type of service for audio RTP packets */ - static unsigned int global_tos_video; /*!< IP type of service for video RTP packets */ -+static int global_force_dtmf_relay = 0; -+static int global_force_dtmf_relay_pt = 101; -+ - static int compactheaders; /*!< send compact sip headers */ - static int recordhistory; /*!< Record SIP history. Off by default */ - static int dumphistory; /*!< Dump history to verbose before destroying SIP dialog */ -@@ -5329,6 +5332,7 @@ - int x; - int codec_index = 0; - int codec_pt_order[256]; -+ int dtmf_present = 0; - - /* Host information */ - struct ast_hostent audiohp; -@@ -5600,12 +5604,21 @@ - for (x = 0; x < codec_index; ++x) { - struct rtpPayloadType pt; - pt = ast_rtp_lookup_pt(p->rtp, codec_pt_order[x]); -+ if (pt.code == AST_RTP_DTMF) -+ dtmf_present = 1; - if (!pt.isAstFormat && !pt.code && p->vrtp) - pt = ast_rtp_lookup_pt(p->vrtp, codec_pt_order[x]); - if (pt.isAstFormat) - ast_codec_pref_append(&p->formats, pt.code); - } - ast_codec_pref_remove2(&p->formats, ~p->usercapability); -+ if (!dtmf_present && global_force_dtmf_relay) { -+ newnoncodeccapability |= AST_RTP_DTMF; -+ ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt); -+ codec_pt_order[codec_index++] = global_force_dtmf_relay_pt; -+ ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0); -+ } -+ - - /* Now gather all of the codecs that we are asked for: */ - ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability); -@@ -18369,6 +18382,9 @@ - - global_matchexterniplocally = FALSE; - -+ global_force_dtmf_relay = 0; -+ global_force_dtmf_relay_pt = 101; -+ - /* Copy the default jb config over global_jbconf */ - memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); - -@@ -18431,6 +18447,18 @@ - } - } else if (!strcasecmp(v->name, "vmexten")) { - ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten)); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) { -+ if ((global_force_dtmf_relay = ast_true(v->value))) -+ ast_verbose("RTP DTMF relaying will be enforced\n"); -+ else -+ ast_verbose("RTP DTMF relaying will not be enforced\n"); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) { -+ sscanf(v->value, "%d", &global_force_dtmf_relay_pt); -+ if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) { -+ ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt); -+ global_force_dtmf_relay_pt = 101; -+ } else -+ ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt); - } else if (!strcasecmp(v->name, "rtptimeout")) { - if ((sscanf(v->value, "%30d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) { - ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d. Using default.\n", v->value, v->lineno); ---- configs/sip.conf.sample.orig 2008-04-25 08:53:52.000000000 -0700 -+++ configs/sip.conf.sample 2008-06-10 00:45:37.000000000 -0700 -@@ -53,6 +53,12 @@ - ; and multiline formatted headers for strict - ; SIP compatibility (defaults to "no") - -+;rtp_force_dtmf_relay=no ; Enable RFC2833 DTMFs to be sent even if peer -+ ; hasn't announced support for it. Default: no -+ -+;rtp_force_dtmf_relay_pt=101 ; RTP payload type value for enforced RFC2833 -+ ; DTMFs. Default: 101 -+ - ; See doc/ip-tos.txt for a description of these parameters. - ;tos_sip=cs3 ; Sets TOS for SIP packets. - ;tos_audio=ef ; Sets TOS for RTP audio packets. diff --git a/net/asterisk14/files/rtp_force_dtmf-nocodecnego.diff b/net/asterisk14/files/rtp_force_dtmf-nocodecnego.diff deleted file mode 100644 index 9dcb7d8b134f..000000000000 --- a/net/asterisk14/files/rtp_force_dtmf-nocodecnego.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- channels/chan_sip.c.orig 2009-11-23 17:28:47.000000000 +0200 -+++ channels/chan_sip.c 2009-11-23 17:29:29.000000000 +0200 -@@ -565,6 +565,9 @@ - static unsigned int global_tos_sip; /*!< IP type of service for SIP packets */ - static unsigned int global_tos_audio; /*!< IP type of service for audio RTP packets */ - static unsigned int global_tos_video; /*!< IP type of service for video RTP packets */ -+static int global_force_dtmf_relay = 0; -+static int global_force_dtmf_relay_pt = 101; -+ - static int compactheaders; /*!< send compact sip headers */ - static int recordhistory; /*!< Record SIP history. Off by default */ - static int dumphistory; /*!< Dump history to verbose before destroying SIP dialog */ -@@ -5593,6 +5596,12 @@ - - /* Now gather all of the codecs that we are asked for: */ - ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability); -+ /* Add telephone-event */ -+ if (global_force_dtmf_relay && !(peernoncodeccapability & AST_RTP_DTMF)) { -+ ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt); -+ ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0); -+ peernoncodeccapability |= AST_RTP_DTMF; -+ } - ast_rtp_get_current_formats(newvideortp, &vpeercapability, &vpeernoncodeccapability); - - newjointcapability = p->capability & (peercapability | vpeercapability); -@@ -18366,6 +18375,9 @@ - - global_matchexterniplocally = FALSE; - -+ global_force_dtmf_relay = 0; -+ global_force_dtmf_relay_pt = 101; -+ - /* Copy the default jb config over global_jbconf */ - memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); - -@@ -18428,6 +18440,18 @@ - } - } else if (!strcasecmp(v->name, "vmexten")) { - ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten)); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) { -+ if ((global_force_dtmf_relay = ast_true(v->value))) -+ ast_verbose("RTP DTMF relaying will be enforced\n"); -+ else -+ ast_verbose("RTP DTMF relaying will not be enforced\n"); -+ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) { -+ sscanf(v->value, "%d", &global_force_dtmf_relay_pt); -+ if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) { -+ ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt); -+ global_force_dtmf_relay_pt = 101; -+ } else -+ ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt); - } else if (!strcasecmp(v->name, "rtptimeout")) { - if ((sscanf(v->value, "%30d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) { - ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d. Using default.\n", v->value, v->lineno); ---- configs/sip.conf.sample.orig 2008-08-16 01:33:42.000000000 +0300 -+++ configs/sip.conf.sample 2008-12-12 17:03:11.000000000 +0200 -@@ -49,6 +49,12 @@ - ; and multiline formatted headers for strict - ; SIP compatibility (defaults to "no") - -+;rtp_force_dtmf_relay=no ; Enable RFC2833 DTMFs to be sent even if peer -+ ; hasn't announced support for it. Default: no -+ -+;rtp_force_dtmf_relay_pt=101 ; RTP payload type value for enforced RFC2833 -+ ; DTMFs. Default: 101 -+ - ; See doc/ip-tos.txt for a description of these parameters. - ;tos_sip=cs3 ; Sets TOS for SIP packets. - ;tos_audio=ef ; Sets TOS for RTP audio packets. diff --git a/net/asterisk14/files/sip_force_callid.diff b/net/asterisk14/files/sip_force_callid.diff deleted file mode 100644 index 09cf274581d1..000000000000 --- a/net/asterisk14/files/sip_force_callid.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- channels/chan_sip.c.orig 2009-05-12 21:18:44.000000000 +0300 -+++ channels/chan_sip.c 2009-05-26 12:58:10.000000000 +0300 -@@ -3061,6 +3061,8 @@ - } else if (!strcasecmp(ast_var_name(current), "SIPTRANSFER_REPLACES")) { - /* We're replacing a call. */ - p->options->replaces = ast_var_value(current); -+ } else if (!strcasecmp(ast_var_name(current), "SIP_FORCE_CALLID")) { -+ ast_string_field_set(p, callid, ast_var_value(current)); - } - } - diff --git a/net/asterisk14/files/sip_set_auth.diff b/net/asterisk14/files/sip_set_auth.diff deleted file mode 100644 index 1addc4f48add..000000000000 --- a/net/asterisk14/files/sip_set_auth.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- channels/chan_sip.c.orig 2008-04-29 08:21:05.000000000 -0400 -+++ channels/chan_sip.c 2008-05-28 18:41:48.000000000 -0400 -@@ -15962,6 +15978,9 @@ - char *ext, *host; - char tmp[256]; - char *dest = data; -+ char *secret = NULL; -+ char *md5secret = NULL; -+ char *authname = NULL; - - if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE))) { - ast_log(LOG_ERROR, "Unable to build sip pvt data for '%s' (Out of memory or socket error)\n", (char *)data); -@@ -15983,6 +16002,17 @@ - if (host) { - *host++ = '\0'; - ext = tmp; -+ secret = strchr(ext, ':'); -+ if (secret) { -+ *secret++ = '\0'; -+ md5secret = strchr(secret, ':'); -+ if (md5secret) { -+ *md5secret++ = '\0'; -+ authname = strchr(md5secret, ':'); -+ if (authname) -+ *authname++ = '\0'; -+ } -+ } - } else { - ext = strchr(tmp, '/'); - if (ext) -@@ -16015,6 +16045,14 @@ - ast_string_field_set(p, username, ext); - ast_string_field_free(p, fullcontact); - } -+ if (secret && !ast_strlen_zero(secret)) -+ ast_string_field_set(p, peersecret, secret); -+ -+ if (md5secret && !ast_strlen_zero(md5secret)) -+ ast_string_field_set(p, peermd5secret, md5secret); -+ -+ if (authname && !ast_strlen_zero(authname)) -+ ast_string_field_set(p, authname, authname); - #if 0 - printf("Setting up to call extension '%s' at '%s'\n", ext ? ext : "<none>", host); - #endif diff --git a/net/asterisk14/pkg-descr b/net/asterisk14/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk14/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist deleted file mode 100644 index fa747b6e8a6e..000000000000 --- a/net/asterisk14/pkg-plist +++ /dev/null @@ -1,950 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_pgsql.conf %D/etc/asterisk/res_pgsql.conf-dist; then rm -f %D/etc/asterisk/res_pgsql.conf; fi -etc/asterisk/res_pgsql.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@unexec if cmp -s %D/etc/asterisk/chan_dahdi.conf %D/etc/asterisk/chan_dahdi.conf-dist; then rm -f %D/etc/asterisk/chan_dahdi.conf; fi -etc/asterisk/chan_dahdi.conf-dist -@unexec if cmp -s %D/etc/asterisk/udptl.conf %D/etc/asterisk/udptl.conf-dist; then rm -f %D/etc/asterisk/udptl.conf; fi -etc/asterisk/udptl.conf-dist -@unexec if cmp -s %D/etc/asterisk/users.conf %D/etc/asterisk/users.conf-dist; then rm -f %D/etc/asterisk/users.conf; fi -etc/asterisk/users.conf-dist -@unexec if cmp -s %D/etc/asterisk/smdi.conf %D/etc/asterisk/smdi.conf-dist; then rm -f %D/etc/asterisk/smdi.conf; fi -etc/asterisk/smdi.conf-dist -@unexec if cmp -s %D/etc/asterisk/sla.conf %D/etc/asterisk/sla.conf-dist; then rm -f %D/etc/asterisk/sla.conf; fi -etc/asterisk/sla.conf-dist -@unexec if cmp -s %D/etc/asterisk/say.conf %D/etc/asterisk/say.conf-dist; then rm -f %D/etc/asterisk/say.conf; fi -etc/asterisk/say.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_snmp.conf %D/etc/asterisk/res_snmp.conf-dist; then rm -f %D/etc/asterisk/res_snmp.conf; fi -etc/asterisk/res_snmp.conf-dist -@unexec if cmp -s %D/etc/asterisk/muted.conf %D/etc/asterisk/muted.conf-dist; then rm -f %D/etc/asterisk/muted.conf; fi -etc/asterisk/muted.conf-dist -@unexec if cmp -s %D/etc/asterisk/jabber.conf %D/etc/asterisk/jabber.conf-dist; then rm -f %D/etc/asterisk/jabber.conf; fi -etc/asterisk/jabber.conf-dist -@unexec if cmp -s %D/etc/asterisk/http.conf %D/etc/asterisk/http.conf-dist; then rm -f %D/etc/asterisk/http.conf; fi -etc/asterisk/http.conf-dist -@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@unexec if cmp -s %D/etc/asterisk/gtalk.conf %D/etc/asterisk/gtalk.conf-dist; then rm -f %D/etc/asterisk/gtalk.conf; fi -etc/asterisk/gtalk.conf-dist -@unexec if cmp -s %D/etc/asterisk/func_odbc.conf %D/etc/asterisk/func_odbc.conf-dist; then rm -f %D/etc/asterisk/func_odbc.conf; fi -etc/asterisk/func_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/followme.conf %D/etc/asterisk/followme.conf-dist; then rm -f %D/etc/asterisk/followme.conf; fi -etc/asterisk/followme.conf-dist -@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi -etc/asterisk/amd.conf-dist -@exec if test ! -e %D/etc/asterisk/adsi.conf; then cp -p %D/etc/asterisk/adsi.conf-dist %D/etc/asterisk/adsi.conf; fi -@exec if test ! -e %D/etc/asterisk/adtranvofr.conf; then cp -p %D/etc/asterisk/adtranvofr.conf-dist %D/etc/asterisk/adtranvofr.conf; fi -@exec if test ! -e %D/etc/asterisk/agents.conf; then cp -p %D/etc/asterisk/agents.conf-dist %D/etc/asterisk/agents.conf; fi -@exec if test ! -e %D/etc/asterisk/alarmreceiver.conf; then cp -p %D/etc/asterisk/alarmreceiver.conf-dist %D/etc/asterisk/alarmreceiver.conf; fi -@exec if test ! -e %D/etc/asterisk/alsa.conf; then cp -p %D/etc/asterisk/alsa.conf-dist %D/etc/asterisk/alsa.conf; fi -@exec if test ! -e %D/etc/asterisk/asterisk.adsi; then cp -p %D/etc/asterisk/asterisk.adsi-dist %D/etc/asterisk/asterisk.adsi; fi -@exec if test ! -e %D/etc/asterisk/asterisk.conf; then cp -p %D/etc/asterisk/asterisk.conf-dist %D/etc/asterisk/asterisk.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr.conf; then cp -p %D/etc/asterisk/cdr.conf-dist %D/etc/asterisk/cdr.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_custom.conf; then cp -p %D/etc/asterisk/cdr_custom.conf-dist %D/etc/asterisk/cdr_custom.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_manager.conf; then cp -p %D/etc/asterisk/cdr_manager.conf-dist %D/etc/asterisk/cdr_manager.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_odbc.conf; then cp -p %D/etc/asterisk/cdr_odbc.conf-dist %D/etc/asterisk/cdr_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_pgsql.conf; then cp -p %D/etc/asterisk/cdr_pgsql.conf-dist %D/etc/asterisk/cdr_pgsql.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_tds.conf; then cp -p %D/etc/asterisk/cdr_tds.conf-dist %D/etc/asterisk/cdr_tds.conf; fi -@exec if test ! -e %D/etc/asterisk/codecs.conf; then cp -p %D/etc/asterisk/codecs.conf-dist %D/etc/asterisk/codecs.conf; fi -@exec if test ! -e %D/etc/asterisk/dnsmgr.conf; then cp -p %D/etc/asterisk/dnsmgr.conf-dist %D/etc/asterisk/dnsmgr.conf; fi -@exec if test ! -e %D/etc/asterisk/dundi.conf; then cp -p %D/etc/asterisk/dundi.conf-dist %D/etc/asterisk/dundi.conf; fi -@exec if test ! -e %D/etc/asterisk/enum.conf; then cp -p %D/etc/asterisk/enum.conf-dist %D/etc/asterisk/enum.conf; fi -@exec if test ! -e %D/etc/asterisk/extconfig.conf; then cp -p %D/etc/asterisk/extconfig.conf-dist %D/etc/asterisk/extconfig.conf; fi -@exec if test ! -e %D/etc/asterisk/extensions.ael; then cp -p %D/etc/asterisk/extensions.ael-dist %D/etc/asterisk/extensions.ael; fi -@exec if test ! -e %D/etc/asterisk/extensions.conf; then cp -p %D/etc/asterisk/extensions.conf-dist %D/etc/asterisk/extensions.conf; fi -@exec if test ! -e %D/etc/asterisk/features.conf; then cp -p %D/etc/asterisk/features.conf-dist %D/etc/asterisk/features.conf; fi -@exec if test ! -e %D/etc/asterisk/festival.conf; then cp -p %D/etc/asterisk/festival.conf-dist %D/etc/asterisk/festival.conf; fi -@exec if test ! -e %D/etc/asterisk/iax.conf; then cp -p %D/etc/asterisk/iax.conf-dist %D/etc/asterisk/iax.conf; fi -@exec if test ! -e %D/etc/asterisk/iaxprov.conf; then cp -p %D/etc/asterisk/iaxprov.conf-dist %D/etc/asterisk/iaxprov.conf; fi -@exec if test ! -e %D/etc/asterisk/indications.conf; then cp -p %D/etc/asterisk/indications.conf-dist %D/etc/asterisk/indications.conf; fi -@exec if test ! -e %D/etc/asterisk/logger.conf; then cp -p %D/etc/asterisk/logger.conf-dist %D/etc/asterisk/logger.conf; fi -@exec if test ! -e %D/etc/asterisk/manager.conf; then cp -p %D/etc/asterisk/manager.conf-dist %D/etc/asterisk/manager.conf; fi -@exec if test ! -e %D/etc/asterisk/meetme.conf; then cp -p %D/etc/asterisk/meetme.conf-dist %D/etc/asterisk/meetme.conf; fi -@exec if test ! -e %D/etc/asterisk/mgcp.conf; then cp -p %D/etc/asterisk/mgcp.conf-dist %D/etc/asterisk/mgcp.conf; fi -@exec if test ! -e %D/etc/asterisk/misdn.conf; then cp -p %D/etc/asterisk/misdn.conf-dist %D/etc/asterisk/misdn.conf; fi -@exec if test ! -e %D/etc/asterisk/modules.conf; then cp -p %D/etc/asterisk/modules.conf-dist %D/etc/asterisk/modules.conf; fi -@exec if test ! -e %D/etc/asterisk/musiconhold.conf; then cp -p %D/etc/asterisk/musiconhold.conf-dist %D/etc/asterisk/musiconhold.conf; fi -@exec if test ! -e %D/etc/asterisk/osp.conf; then cp -p %D/etc/asterisk/osp.conf-dist %D/etc/asterisk/osp.conf; fi -@exec if test ! -e %D/etc/asterisk/oss.conf; then cp -p %D/etc/asterisk/oss.conf-dist %D/etc/asterisk/oss.conf; fi -@exec if test ! -e %D/etc/asterisk/phone.conf; then cp -p %D/etc/asterisk/phone.conf-dist %D/etc/asterisk/phone.conf; fi -@exec if test ! -e %D/etc/asterisk/privacy.conf; then cp -p %D/etc/asterisk/privacy.conf-dist %D/etc/asterisk/privacy.conf; fi -@exec if test ! -e %D/etc/asterisk/queues.conf; then cp -p %D/etc/asterisk/queues.conf-dist %D/etc/asterisk/queues.conf; fi -@exec if test ! -e %D/etc/asterisk/res_pgsql.conf; then cp -p %D/etc/asterisk/res_pgsql.conf-dist %D/etc/asterisk/res_pgsql.conf; fi -@exec if test ! -e %D/etc/asterisk/res_odbc.conf; then cp -p %D/etc/asterisk/res_odbc.conf-dist %D/etc/asterisk/res_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/rpt.conf; then cp -p %D/etc/asterisk/rpt.conf-dist %D/etc/asterisk/rpt.conf; fi -@exec if test ! -e %D/etc/asterisk/rtp.conf; then cp -p %D/etc/asterisk/rtp.conf-dist %D/etc/asterisk/rtp.conf; fi -@exec if test ! -e %D/etc/asterisk/sip.conf; then cp -p %D/etc/asterisk/sip.conf-dist %D/etc/asterisk/sip.conf; fi -@exec if test ! -e %D/etc/asterisk/sip_notify.conf; then cp -p %D/etc/asterisk/sip_notify.conf-dist %D/etc/asterisk/sip_notify.conf; fi -@exec if test ! -e %D/etc/asterisk/skinny.conf; then cp -p %D/etc/asterisk/skinny.conf-dist %D/etc/asterisk/skinny.conf; fi -@exec if test ! -e %D/etc/asterisk/telcordia-1.adsi; then cp -p %D/etc/asterisk/telcordia-1.adsi-dist %D/etc/asterisk/telcordia-1.adsi; fi -@exec if test ! -e %D/etc/asterisk/voicemail.conf; then cp -p %D/etc/asterisk/voicemail.conf-dist %D/etc/asterisk/voicemail.conf; fi -@exec if test ! -e %D/etc/asterisk/vpb.conf; then cp -p %D/etc/asterisk/vpb.conf-dist %D/etc/asterisk/vpb.conf; fi -@exec if test ! -e %D/etc/asterisk/chan_dahdi.conf; then cp -p %D/etc/asterisk/chan_dahdi.conf-dist %D/etc/asterisk/chan_dahdi.conf; fi -@exec if test ! -e %D/etc/asterisk/udptl.conf; then cp -p %D/etc/asterisk/udptl.conf-dist %D/etc/asterisk/udptl.conf; fi -@exec if test ! -e %D/etc/asterisk/users.conf; then cp -p %D/etc/asterisk/users.conf-dist %D/etc/asterisk/users.conf; fi -@exec if test ! -e %D/etc/asterisk/smdi.conf; then cp -p %D/etc/asterisk/smdi.conf-dist %D/etc/asterisk/smdi.conf; fi -@exec if test ! -e %D/etc/asterisk/sla.conf; then cp -p %D/etc/asterisk/sla.conf-dist %D/etc/asterisk/sla.conf; fi -@exec if test ! -e %D/etc/asterisk/say.conf; then cp -p %D/etc/asterisk/say.conf-dist %D/etc/asterisk/say.conf; fi -@exec if test ! -e %D/etc/asterisk/res_snmp.conf; then cp -p %D/etc/asterisk/res_snmp.conf-dist %D/etc/asterisk/res_snmp.conf; fi -@exec if test ! -e %D/etc/asterisk/muted.conf; then cp -p %D/etc/asterisk/muted.conf-dist %D/etc/asterisk/muted.conf; fi -@exec if test ! -e %D/etc/asterisk/jabber.conf; then cp -p %D/etc/asterisk/jabber.conf-dist %D/etc/asterisk/jabber.conf; fi -@exec if test ! -e %D/etc/asterisk/http.conf; then cp -p %D/etc/asterisk/http.conf-dist %D/etc/asterisk/http.conf; fi -@exec if test ! -e %D/etc/asterisk/h323.conf; then cp -p %D/etc/asterisk/h323.conf-dist %D/etc/asterisk/h323.conf; fi -@exec if test ! -e %D/etc/asterisk/gtalk.conf; then cp -p %D/etc/asterisk/gtalk.conf-dist %D/etc/asterisk/gtalk.conf; fi -@exec if test ! -e %D/etc/asterisk/func_odbc.conf; then cp -p %D/etc/asterisk/func_odbc.conf-dist %D/etc/asterisk/func_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/followme.conf; then cp -p %D/etc/asterisk/followme.conf-dist %D/etc/asterisk/followme.conf; fi -@exec if test ! -e %D/etc/asterisk/amd.conf; then cp -p %D/etc/asterisk/amd.conf-dist %D/etc/asterisk/amd.conf; fi -include/asterisk.h -include/asterisk/abstract_jb.h -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/ael_structs.h -include/asterisk/aes.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -include/asterisk/ast_expr.h -include/asterisk/astdb.h -include/asterisk/astmm.h -include/asterisk/astobj.h -include/asterisk/astobj2.h -include/asterisk/astosp.h -include/asterisk/audiohook.h -include/asterisk/autoconfig.h -include/asterisk/build.h -include/asterisk/buildopts.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/compiler.h -include/asterisk/config.h -include/asterisk/crypto.h -include/asterisk/dahdi_compat.h -include/asterisk/devicestate.h -include/asterisk/dial.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/endian.h -include/asterisk/enum.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/global_datastores.h -include/asterisk/http.h -include/asterisk/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.h -include/asterisk/jabber.h -include/asterisk/jingle.h -include/asterisk/linkedlists.h -include/asterisk/localtime.h -include/asterisk/lock.h -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -include/asterisk/monitor.h -include/asterisk/musiconhold.h -include/asterisk/netsock.h -include/asterisk/options.h -include/asterisk/paths.h -include/asterisk/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/sha1.h -include/asterisk/slinfactory.h -include/asterisk/smdi.h -include/asterisk/speech.h -include/asterisk/srv.h -include/asterisk/stringfields.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/threadstorage.h -include/asterisk/time.h -include/asterisk/tonezone_compat.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/udptl.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_amd.so -lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_channelredirect.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.so -lib/asterisk/modules/app_dumpchan.so -lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -lib/asterisk/modules/app_followme.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_morsecode.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_speech_utils.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so -%%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so -%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so -lib/asterisk/modules/chan_agent.so -%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -%%WITH_ILBC%%lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_g723.so -lib/asterisk/modules/format_g726.so -lib/asterisk/modules/format_g729.so -lib/asterisk/modules/format_gsm.so -lib/asterisk/modules/format_h263.so -lib/asterisk/modules/format_h264.so -lib/asterisk/modules/format_ilbc.so -lib/asterisk/modules/format_jpeg.so -%%WITH_OGGVORBIS%%lib/asterisk/modules/format_ogg_vorbis.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_audiohookinherit.so -lib/asterisk/modules/func_base64.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_cdr.so -lib/asterisk/modules/func_channel.so -lib/asterisk/modules/func_curl.so -lib/asterisk/modules/func_cut.so -lib/asterisk/modules/func_db.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_env.so -lib/asterisk/modules/func_global.so -lib/asterisk/modules/func_groupcount.so -lib/asterisk/modules/func_language.so -lib/asterisk/modules/func_logic.so -lib/asterisk/modules/func_math.so -lib/asterisk/modules/func_md5.so -lib/asterisk/modules/func_moh.so -%%WITH_ODBC%%lib/asterisk/modules/func_odbc.so -lib/asterisk/modules/func_rand.so -lib/asterisk/modules/func_realtime.so -lib/asterisk/modules/func_sha1.so -lib/asterisk/modules/func_strings.so -lib/asterisk/modules/func_timeout.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -lib/asterisk/modules/res_clioriginate.so -%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so -lib/asterisk/modules/res_convert.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_musiconhold.so -lib/asterisk/modules/res_smdi.so -%%WITH_SNMP%%lib/asterisk/modules/res_snmp.so -lib/asterisk/modules/res_speech.so -sbin/aelparse -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/muted -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/agi-bin/jukebox.agi -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/moh/.asterisk-moh-opsound-wav -share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav -share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav -share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav -share/asterisk/moh/macroform-cold_day.wav -share/asterisk/moh/macroform-robot_dity.wav -share/asterisk/moh/macroform-the_simplicity.wav -share/asterisk/moh/manolo_camp-morning_coffee.wav -share/asterisk/moh/reno_project-system.wav -share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17 -share/asterisk/sounds/CHANGES-asterisk-core-en-1.4.17 -share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.17 -share/asterisk/sounds/LICENSE-asterisk-core-en-1.4.17 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/beeperr.gsm -share/asterisk/sounds/conf-nonextended.gsm -share/asterisk/sounds/conf-usermenu-162.gsm -share/asterisk/sounds/dir-usingkeypad.gsm -share/asterisk/sounds/dir-welcome.gsm -share/asterisk/sounds/spy-dahdi.gsm -share/asterisk/sounds/vm-Urgent.gsm -share/asterisk/sounds/vm-forward-multiple.gsm -share/asterisk/sounds/vm-invalid-password.gsm -share/asterisk/sounds/vm-marked-nonurgent.gsm -share/asterisk/sounds/vm-marked-urgent.gsm -share/asterisk/sounds/vm-record-prepend.gsm -share/asterisk/sounds/vm-review-nonurgent.gsm -share/asterisk/sounds/vm-review-urgent.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-adminmenu-162.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-extended.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-hasjoin.gsm -share/asterisk/sounds/conf-hasleft.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-leaderhasleft.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyone.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-otherinparty.gsm -share/asterisk/sounds/conf-placeintoconf.gsm -share/asterisk/sounds/conf-thereare.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/conf-userswilljoin.gsm -share/asterisk/sounds/conf-userwilljoin.gsm -share/asterisk/sounds/conf-waitforleader.gsm -share/asterisk/sounds/core-sounds-en.txt -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/dictate/both_help.gsm -share/asterisk/sounds/dictate/enter_filename.gsm -share/asterisk/sounds/dictate/forhelp.gsm -share/asterisk/sounds/dictate/pause.gsm -share/asterisk/sounds/dictate/paused.gsm -share/asterisk/sounds/dictate/play_help.gsm -share/asterisk/sounds/dictate/playback.gsm -share/asterisk/sounds/dictate/playback_mode.gsm -share/asterisk/sounds/dictate/record.gsm -share/asterisk/sounds/dictate/record_help.gsm -share/asterisk/sounds/dictate/record_mode.gsm -share/asterisk/sounds/dictate/truncating_audio.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/minus.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-first.gsm -share/asterisk/sounds/dir-firstlast.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-last.gsm -share/asterisk/sounds/dir-multi1.gsm -share/asterisk/sounds/dir-multi2.gsm -share/asterisk/sounds/dir-multi3.gsm -share/asterisk/sounds/dir-multi9.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/dir-pls-enter.gsm -share/asterisk/sounds/followme/call-from.gsm -share/asterisk/sounds/followme/no-recording.gsm -share/asterisk/sounds/followme/options.gsm -share/asterisk/sounds/followme/pls-hold-while-try.gsm -share/asterisk/sounds/followme/sorry.gsm -share/asterisk/sounds/followme/status.gsm -share/asterisk/sounds/hello-world.gsm -share/asterisk/sounds/hours.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/ascii123.gsm -share/asterisk/sounds/letters/ascii124.gsm -share/asterisk/sounds/letters/ascii125.gsm -share/asterisk/sounds/letters/ascii126.gsm -share/asterisk/sounds/letters/ascii34.gsm -share/asterisk/sounds/letters/ascii36.gsm -share/asterisk/sounds/letters/ascii37.gsm -share/asterisk/sounds/letters/ascii38.gsm -share/asterisk/sounds/letters/ascii39.gsm -share/asterisk/sounds/letters/ascii40.gsm -share/asterisk/sounds/letters/ascii41.gsm -share/asterisk/sounds/letters/ascii42.gsm -share/asterisk/sounds/letters/ascii44.gsm -share/asterisk/sounds/letters/ascii58.gsm -share/asterisk/sounds/letters/ascii59.gsm -share/asterisk/sounds/letters/ascii60.gsm -share/asterisk/sounds/letters/ascii62.gsm -share/asterisk/sounds/letters/ascii63.gsm -share/asterisk/sounds/letters/ascii91.gsm -share/asterisk/sounds/letters/ascii92.gsm -share/asterisk/sounds/letters/ascii93.gsm -share/asterisk/sounds/letters/ascii94.gsm -share/asterisk/sounds/letters/ascii95.gsm -share/asterisk/sounds/letters/ascii96.gsm -share/asterisk/sounds/letters/asterisk.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/minutes.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/priv-callee-options.gsm -share/asterisk/sounds/priv-callpending.gsm -share/asterisk/sounds/priv-introsaved.gsm -share/asterisk/sounds/priv-recordintro.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-periodic-announce.gsm -share/asterisk/sounds/queue-quantity1.gsm -share/asterisk/sounds/queue-quantity2.gsm -share/asterisk/sounds/queue-reporthold.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/screen-callee-options.gsm -share/asterisk/sounds/seconds.gsm -share/asterisk/sounds/silence/1.gsm -share/asterisk/sounds/silence/10.gsm -share/asterisk/sounds/silence/2.gsm -share/asterisk/sounds/silence/3.gsm -share/asterisk/sounds/silence/4.gsm -share/asterisk/sounds/silence/5.gsm -share/asterisk/sounds/silence/6.gsm -share/asterisk/sounds/silence/7.gsm -share/asterisk/sounds/silence/8.gsm -share/asterisk/sounds/silence/9.gsm -share/asterisk/sounds/spy-agent.gsm -share/asterisk/sounds/spy-console.gsm -share/asterisk/sounds/spy-h323.gsm -share/asterisk/sounds/spy-iax.gsm -share/asterisk/sounds/spy-iax2.gsm -share/asterisk/sounds/spy-jingle.gsm -share/asterisk/sounds/spy-local.gsm -share/asterisk/sounds/spy-mgcp.gsm -share/asterisk/sounds/spy-misdn.gsm -share/asterisk/sounds/spy-mobile.gsm -share/asterisk/sounds/spy-nbs.gsm -share/asterisk/sounds/spy-sip.gsm -share/asterisk/sounds/spy-skinny.gsm -share/asterisk/sounds/spy-unistim.gsm -share/asterisk/sounds/spy-usbradio.gsm -share/asterisk/sounds/spy-zap.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-duration.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forward.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-invalidpassword.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-minutes.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-newuser.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-onefor-full.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-opts-full.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-pls-try-again.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-temp.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-saveoper.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-tempgreetactive.gsm -share/asterisk/sounds/vm-tempgreeting.gsm -share/asterisk/sounds/vm-tempgreeting2.gsm -share/asterisk/sounds/vm-tempremoved.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tmpexists.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -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_ZAPTEL%%lib/asterisk/modules/codec_dahdi.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_ODBC%%lib/asterisk/modules/res_config_odbc.so -%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so -@dirrm share/asterisk/static-http -@dirrm share/asterisk/sounds/silence -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/fr -@dirrm share/asterisk/sounds/followme -@dirrm share/asterisk/sounds/es -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds/dictate -@dirrm share/asterisk/sounds -@dirrm share/asterisk/moh -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrmtry etc/asterisk -@exec mkdir -p %D/share/asterisk/sounds/fr -@exec mkdir -p %D/share/asterisk/sounds/es -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/log/asterisk/cdr-custom -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@exec mkdir -p %D/spool/asterisk/dictate -@exec mkdir -p %D/spool/asterisk/meetme -@exec mkdir -p %D/spool/asterisk/monitor -@exec mkdir -p %D/spool/asterisk/system -@exec mkdir -p %D/spool/asterisk/tmp -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk diff --git a/net/imm/Makefile b/net/imm/Makefile deleted file mode 100644 index 7ad7149eed3c..000000000000 --- a/net/imm/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: imm -# Date created: 13 October 1994 -# Whom: wollman -# -# $FreeBSD$ -# - -PORTNAME= imm -PORTVERSION= 3.5a1 -PORTREVISION= 3 -CATEGORIES= mbone tk -MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/ -DISTNAME= imm.source -EXTRACT_SUFX= .tar.Z - -MAINTAINER= ports@FreeBSD.org -COMMENT= Internet Image(or other data) Multicaster (and receiver) - -USE_TK= 84 -WRKSRC= ${WRKDIR}/mnm - -PORTDOCS= README imm_readme.txt - -.include <bsd.port.pre.mk> - -post-extract: - @${MKDIR} ${WRKSRC}/freebsd - @${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src - -# The included makefile doesn't have an "install" target. -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/imm ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/immserv ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/lscomp ${PREFIX}/bin -# and no man pages at all yet. -# But include the very limited documentation -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/imm_readme.txt ${DOCSDIR} -.endif -# The sdr plugin is pretty much required. - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/sdr2.plugin.S53.image.imm ${DATADIR} - -.include <bsd.port.post.mk> diff --git a/net/imm/distinfo b/net/imm/distinfo deleted file mode 100644 index 090e9df901b5..000000000000 --- a/net/imm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667 -SHA256 (imm.source.tar.Z) = be66dc74b955cf51de1575662d700b87cb423e3562f163d2f0dc70878b73270b -SIZE (imm.source.tar.Z) = 106067 diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd deleted file mode 100644 index 379dae4d11a3..000000000000 --- a/net/imm/files/Makefile.freebsd +++ /dev/null @@ -1,77 +0,0 @@ -# Some versions of make, like SGI's, use the following variable to -# determine which shell to use for executing commands: -SHELL = /bin/sh -INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include -# Libraries to use when linking: -LIBS = -lm - -TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 - -TARGET = ../freebsd - -CFLAGS = -g -DSIG_T=void -DMULTICAST -I. -DERROR_TEST - -CC ?= gcc -CC_SWITCHES = ${CFLAGS} - -ROBJS = protocol.o utils.o - -SOBJS = protocol.o immserv.o sorttree.o utils.o - -MOBJS = protocol.o mnmserver.o sorttree.o utils.o - -all: $(TARGET)/imm $(TARGET)/immserv $(TARGET)/lscomp - -$(TARGET)/mnm: $(ROBJS) main.o xlopen.o mcl.o - $(CC) $(CFLAGS) main.o xlopen.o mcl.o $(ROBJS) $(LIBS) -o $(TARGET)/mnm - -$(TARGET)/imm: $(ROBJS) tkAppInit.o imm_init.o imm.o xlopen_imm.o - $(CC) $(CFLAGS) tkAppInit.o imm_init.o imm.o xlopen_imm.o $(ROBJS) $(TKLIBS) $(LIBS) -o $(TARGET)/imm - -$(TARGET)/immserv: $(SOBJS) - $(CC) $(CFLAGS) $(SOBJS) $(LIBS) -o $(TARGET)/immserv - -$(TARGET)/lscomp: lscomp.o protocol.o sorttree.o utils.o - $(CC) $(CFLAGS) lscomp.o protocol.o sorttree.o utils.o $(LIBS) -o $(TARGET)/lscomp - -clean: - rm -f *.o tcl2c $(TARGET)/mnm $(TARGET)/lscomp $(TARGET)/imm $(TARGET)/immserv - -tcl2c: tcl2c.c - $(CC) $(CFLAGS) tcl2c.c $(LIBS) -o tcl2c - -imm_init.c: tcl2c imm_def.tcl mcl.tcl Radio.tcl Listbox.tcl viewbox.tcl filebox.tcl mkHostname.tcl - ./tcl2c IMM_Init < imm_def.tcl > imm_init.c - ./tcl2c MCL < mcl.tcl >> imm_init.c - ./tcl2c RADIO < Radio.tcl >> imm_init.c - ./tcl2c LISTBOX < Listbox.tcl >> imm_init.c - ./tcl2c VIEWBOX < viewbox.tcl >> imm_init.c - ./tcl2c FILEBOX < filebox.tcl >> imm_init.c - ./tcl2c HOSTBOX < mkHostname.tcl >> imm_init.c - ./tcl2c SERVERBOX < mnmserv.tcl >> imm_init.c - -imm_init.o: imm_init.c - -main.o: main.c - -mcl.o: mcl.c - -imm.o: mcl.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c mcl.c -o imm.o - -xlopen_imm.o: xlopen.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c xlopen.c -o xlopen_imm.o - -tkAppInit.o: tkAppInit.c - gcc $(CFLAGS) $(INCLUDE_DIR) tkAppInit.c -c - -protocol.o: protocol.c - -utils.o: utils.c - -lscomp.o: lscomp.c - -sorttree.o: sorttree.c immserv.h - -immserv.o: immserv.c immserv.h - diff --git a/net/imm/files/Makefile.work b/net/imm/files/Makefile.work deleted file mode 100644 index cb876d343f9e..000000000000 --- a/net/imm/files/Makefile.work +++ /dev/null @@ -1,2 +0,0 @@ -all install: - cd src; ${MAKE} -f Makefile.freebsd $@ diff --git a/net/imm/files/patch-aa b/net/imm/files/patch-aa deleted file mode 100644 index f7cb9a9cefc8..000000000000 --- a/net/imm/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mcl.c.orig Tue Nov 19 12:33:49 1996 -+++ src/mcl.c Tue Nov 19 12:34:23 1996 -@@ -25,7 +25,7 @@ - - #define MAIN - #include "protocol.h" --#include <malloc.h> -+#include <stdlib.h> - #include <fcntl.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/net/imm/files/patch-ab b/net/imm/files/patch-ab deleted file mode 100644 index 4b1f038304da..000000000000 --- a/net/imm/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xlopen.c.orig Tue Nov 19 12:33:53 1996 -+++ src/xlopen.c Tue Nov 19 12:35:01 1996 -@@ -34,7 +34,7 @@ - extern int optind, opterr; - extern int useimageloader; - extern struct hosttype *hosts_tail; --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - extern char *sys_errlist[]; - #endif - extern unsigned int total; diff --git a/net/imm/files/patch-ac b/net/imm/files/patch-ac deleted file mode 100644 index 2da9e3a99e12..000000000000 --- a/net/imm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- src/immserv.c.orig Tue Nov 19 12:36:41 1996 -+++ src/immserv.c Tue Nov 19 12:37:32 1996 -@@ -1407,7 +1407,7 @@ - /******************************************************************************/ - void setackalarm(int nop) {} - /******************************************************************************/ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - /* routine to put process to sleep */ - int usleep( wait) - u_int wait; diff --git a/net/imm/files/patch-src-tkAppInit.c b/net/imm/files/patch-src-tkAppInit.c deleted file mode 100644 index 8dacd5fa95aa..000000000000 --- a/net/imm/files/patch-src-tkAppInit.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/tkAppInit.c.orig Thu Mar 15 10:00:05 2007 -+++ src/tkAppInit.c Thu Mar 15 10:00:12 2007 -@@ -97,9 +97,6 @@ - * Sun shared libraries to be used for Tcl. - */ - --extern int matherr(); --void GetDspStatus(); --int *tclDummyMathPtr = (int *) matherr; - - /***************************************************************************/ - /* fork and initiate server process */ diff --git a/net/imm/files/patch-src::utils.c b/net/imm/files/patch-src::utils.c deleted file mode 100644 index a7db5d4e2d04..000000000000 --- a/net/imm/files/patch-src::utils.c +++ /dev/null @@ -1,200 +0,0 @@ ---- src/utils.c.orig Thu Jul 15 12:37:25 2004 -+++ src/utils.c Thu Jul 15 13:36:09 2004 -@@ -20,7 +20,7 @@ - * These notices must be retained in any copies of any part of this software. - ******************************************************************************/ - #include <stdio.h> --#include <varargs.h> -+#include <stdarg.h> - #include <stdlib.h> - #include <string.h> - #ifdef __NetBSD__ -@@ -40,47 +40,118 @@ - - /*----------------------------------------------------------------------------*/ - --void warn( va_alist ) --va_dcl -+/* Allocate memory for format string buffers */ -+int -+vfsalloc(char *fmt, va_list ap) - { -- va_list args; -- char *fmt; -+ char *s; -+ int i, n = 0, len = 0; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Warning: " ); -- vfprintf( stderr, fmt, args ); -- va_end( args ); -+ if (!fmt) -+ return 0; -+ -+ s = strchr(fmt, '%'); -+ -+ while (s) { -+ ++s; -+ ++n; -+ -+ switch (*s) { -+ case 'd': -+ i = va_arg(ap, int); -+ len += 1 + sizeof(int)<<1; -+ break; -+ case 's': -+ len += strlen(va_arg(ap, char *)); -+ break; -+ } -+ s = strchr(s, '%'); -+ } -+ -+ len += strlen(fmt) - (2 * n); -+ -+ return len; -+} -+ -+void warn( char *fmt, ... ) -+{ -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Warning: %s\n", buf); -+ free(buf); - } - - /*----------------------------------------------------------------------------*/ - --void die( va_alist ) --va_dcl -+void die(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 1 ); -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Error: %s\n", buf); -+ free(buf); -+ exit(1); - } - - /*----------------------------------------------------------------------------*/ - --void fatal( va_alist ) --va_dcl -+void fatal(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Internal Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 2 ); -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Internal error: %s\n", buf); -+ free(buf); -+ exit(2); - } - - /*----------------------------------------------------------------------------*/ -@@ -142,21 +213,34 @@ - - /*----------------------------------------------------------------------------*/ - --void mailmessage( va_alist ) --va_dcl -+void mailmessage(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, s; -+ int len; - FILE *popen(), *fp; - char cmdline[80]; - if (whome == NULL) whome = getlogin(); - sprintf(cmdline,"%s %s",mailprog,whome); - fp = popen(cmdline,"w"); -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( fp, "MNM Warning: " ); -- vfprintf( fp, fmt, args ); -- va_end( args ); -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(fp, "MNM Warning: %s", buf); -+ free(buf); - pclose(fp); - } diff --git a/net/imm/pkg-descr b/net/imm/pkg-descr deleted file mode 100644 index 339f05932750..000000000000 --- a/net/imm/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -IMM has been designed to efficiently replicate files/file directories -using a reliable dissemination protocol framework and provide archiving -and post processing features. The default mode of operation is for imm -to receive and display compressed imagery files (e.g., jpg,gif) using -xv or xloadimage as a post processor. - -This release includes an sdr plug-in, named sdr2.plugin.S53.image.imm, -which must be installed to participate in MBone alpha testing of imm sessions. -Usually in a directory called ~home/.sdr/plugins to be found by sdr. -See the sdr help pages for information on installing plugins. diff --git a/net/imm/pkg-plist b/net/imm/pkg-plist deleted file mode 100644 index 726b2b167e2a..000000000000 --- a/net/imm/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/imm -bin/immserv -bin/lscomp -%%DATADIR%%/sdr2.plugin.S53.image.imm -@dirrm %%DATADIR%% diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile deleted file mode 100644 index 583dd37c714f..000000000000 --- a/net/knemo-kde4/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: knemo -# Date created: Sat Jan 22 00:20:26 CET 2005 -# Whom: Markus Brueffer <markus@FreeBSD.org> -# -# $FreeBSD$ - -PORTNAME= knemo -PORTVERSION= 0.4.1 -PORTREVISION= 5 -CATEGORIES= net kde -MASTER_SITES= http://www.eris23.de/knemo/ - -MAINTAINER= markus@FreeBSD.org -COMMENT= Network monitor for KDE - -USE_BZIP2= yes -USE_KDELIBS_VER=3 -USE_GMAKE= yes -USE_AUTOTOOLS= libtool:22 - -post-patch: - @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net/knemo-kde4/distinfo b/net/knemo-kde4/distinfo deleted file mode 100644 index 4f0538c48338..000000000000 --- a/net/knemo-kde4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (knemo-0.4.1.tar.bz2) = 93ee976ba6bad9a8a726f46021e5c344 -SHA256 (knemo-0.4.1.tar.bz2) = 3362e90e606bc3028dd010ad305852f3dfd7eb5b6488e0783c2db393e3f1d114 -SIZE (knemo-0.4.1.tar.bz2) = 592925 diff --git a/net/knemo-kde4/files/patch-kcm-configdialog.cpp b/net/knemo-kde4/files/patch-kcm-configdialog.cpp deleted file mode 100644 index 32a00999bf67..000000000000 --- a/net/knemo-kde4/files/patch-kcm-configdialog.cpp +++ /dev/null @@ -1,78 +0,0 @@ ---- src/kcm/configdialog.cpp.orig Sat Apr 1 21:44:21 2006 -+++ src/kcm/configdialog.cpp Sun Apr 2 19:14:11 2006 -@@ -17,6 +17,16 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <net/if.h> -+#include <net/if_mib.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <net/route.h> -+#endif -+ - #include <qfile.h> - #include <qdict.h> - #include <qlabel.h> -@@ -363,6 +373,39 @@ - void ConfigDialog::defaults() - { - // Default interfaces -+#ifdef Q_OS_FREEBSD -+ /* Determine number of interfaces */ -+ u_int n = 0; -+ size_t nlen = 0; -+ nlen = sizeof(n); -+ -+ if ( sysctlbyname("net.link.generic.system.ifcount", &n, &nlen, NULL, 0) != -1 ) -+ { -+ mSettingsDict.clear(); -+ mDlg->listBoxInterfaces->clear(); -+ -+ ifmibdata ifmd; -+ size_t len = 0; -+ len = sizeof(ifmd); -+ static int name[] = { CTL_NET, -+ PF_LINK, -+ NETLINK_GENERIC, -+ IFMIB_IFDATA, -+ 0, -+ IFDATA_GENERAL }; -+ -+ for (int i = 1; i <= n; ++i) -+ { -+ name[4] = i; -+ /* Get data for iface-number i */ -+ if ( sysctl(name, 6, (void*)&ifmd, (size_t*)&len, (void*)NULL, (size_t)0) == -1 ) -+ continue; -+ -+ QString interface = QString::fromLatin1(ifmd.ifmd_name); -+ -+ if ( ifmd.ifmd_flags & IFF_LOOPBACK) -+ continue; -+#else - QFile proc( "/proc/net/dev" ); - if ( proc.open( IO_ReadOnly ) ) - { -@@ -380,6 +423,7 @@ - if ( interface == "lo" ) - continue; - -+#endif - InterfaceSettings* settings = new InterfaceSettings(); - settings->customCommands = false; - settings->hideWhenNotAvailable = false; -@@ -401,8 +445,10 @@ - mDlg->checkBoxStatistics->setChecked( false ); - mDlg->checkBoxCustom->setChecked( false ); - } -+#ifndef __FreeBSD__ - } - proc.close(); -+#endif - } - - // Default tool tips diff --git a/net/knemo-kde4/files/patch-knemod-global.h b/net/knemo-kde4/files/patch-knemod-global.h deleted file mode 100644 index b20cda0a6a99..000000000000 --- a/net/knemo-kde4/files/patch-knemod-global.h +++ /dev/null @@ -1,35 +0,0 @@ ---- src/knemod/global.h.orig Sat Apr 1 21:44:22 2006 -+++ src/knemod/global.h Sun Apr 2 21:33:36 2006 -@@ -22,6 +22,7 @@ - - #include <qpair.h> - #include <qcolor.h> -+#include <qdict.h> - #include <qstring.h> - - /** -@@ -36,6 +37,11 @@ - int toolTipContent; - }; - -+struct AddrData { -+ QString subnetMask; -+ QString broadcastAddress; -+}; -+ - struct InterfaceData - { - InterfaceData() -@@ -59,11 +65,9 @@ - unsigned long prevTxBytes; - unsigned long incomingBytes; - unsigned long outgoingBytes; -- QString ipAddress; -- QString subnetMask; -+ QDict<AddrData> addrData; - QString hwAddress; - QString ptpAddress; -- QString broadcastAddress; - QString defaultGateway; - QString rxString; - QString txString; diff --git a/net/knemo-kde4/files/patch-knemod-interfacestatusdialog.cpp b/net/knemo-kde4/files/patch-knemod-interfacestatusdialog.cpp deleted file mode 100644 index 217998e0b9f2..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfacestatusdialog.cpp +++ /dev/null @@ -1,50 +0,0 @@ ---- src/knemod/interfacestatusdialog.cpp.orig Sat Apr 1 21:44:22 2006 -+++ src/knemod/interfacestatusdialog.cpp Sun Apr 2 21:34:55 2006 -@@ -24,6 +24,7 @@ - #include <qtabwidget.h> - - #include <kdebug.h> -+#include <kcombobox.h> - #include <kconfig.h> - #include <klocale.h> - #include <kglobal.h> -@@ -92,6 +93,10 @@ - mTimer = new QTimer(); - connect( mTimer, SIGNAL( timeout() ), this, SLOT( updateDialog() ) ); - mTimer->start( 1000 ); -+ -+#ifdef Q_OS_FREEBSD -+ connect( comboBoxIP, SIGNAL( activated(int) ), this, SLOT( updateDialog() ) ); -+#endif - } - - InterfaceStatusDialog::~InterfaceStatusDialog() -@@ -201,12 +206,28 @@ - if ( data.available ) - { - // ip tab -+#ifdef Q_OS_FREEBSD -+ if ( data.addrData.count() != comboBoxIP->count() ) -+ comboBoxIP->clear(); -+ -+ QDictIterator<AddrData> it( data.addrData ); -+ for( ; it.current(); ++it ) -+ if (!comboBoxIP->contains(it.currentKey())) -+ comboBoxIP->insertItem( it.currentKey() ); -+ -+ textLabelSubnet->setText(data.addrData[ comboBoxIP->currentText() ]->subnetMask); -+#else - textLabelIP->setText( data.ipAddress ); - textLabelSubnet->setText( data.subnetMask ); -+#endif - if ( mInterface->getType() == Interface::ETHERNET ) - { - variableLabel1->setText( i18n( "Broadcast Address:" ) ); -+#ifdef Q_OS_FREEBSD -+ variableText1->setText( data.addrData[ comboBoxIP->currentText() ]->broadcastAddress); -+#else - variableText1->setText( data.broadcastAddress ); -+#endif - variableLabel2->setText( i18n( "Default Gateway:" ) ); - variableText2->setText( data.defaultGateway ); - variableLabel3->setText( i18n( "HW-Address:" ) ); diff --git a/net/knemo-kde4/files/patch-knemod-interfacestatusdlg.ui b/net/knemo-kde4/files/patch-knemod-interfacestatusdlg.ui deleted file mode 100644 index 073ca19a3734..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfacestatusdlg.ui +++ /dev/null @@ -1,262 +0,0 @@ ---- src/knemod/interfacestatusdlg.ui.orig Sat Apr 1 21:44:22 2006 -+++ src/knemod/interfacestatusdlg.ui Sun Apr 2 21:28:01 2006 -@@ -145,7 +145,7 @@ - </property> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout3</cstring> -+ <cstring>layout7</cstring> - </property> - <hbox> - <property name="name"> -@@ -171,18 +171,18 @@ - </property> - <property name="sizeHint"> - <size> -- <width>20</width> -+ <width>40</width> - <height>20</height> - </size> - </property> - </spacer> -- <widget class="KActiveLabel"> -+ <widget class="KComboBox"> - <property name="name"> -- <cstring>textLabelIP</cstring> -+ <cstring>comboBoxIP</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -+ <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> -@@ -193,7 +193,7 @@ - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout4</cstring> -+ <cstring>layout8</cstring> - </property> - <hbox> - <property name="name"> -@@ -207,41 +207,30 @@ - <string>Subnet Mask:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_2</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>textLabelSubnet</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -+ <hsizetype>7</hsizetype> -+ <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> -+ </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout5</cstring> -+ <cstring>layout9</cstring> - </property> - <hbox> - <property name="name"> -@@ -255,41 +244,22 @@ - <string>Broadcast Address:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_3</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>variableText1</cstring> - </property> -- <property name="sizePolicy"> -- <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -- <horstretch>0</horstretch> -- <verstretch>0</verstretch> -- </sizepolicy> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> - </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout6</cstring> -+ <cstring>layout10</cstring> - </property> - <hbox> - <property name="name"> -@@ -303,41 +273,30 @@ - <string>Default Gateway:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_4</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>variableText2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -+ <hsizetype>7</hsizetype> -+ <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> -+ </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout7</cstring> -+ <cstring>layout11</cstring> - </property> - <hbox> - <property name="name"> -@@ -351,35 +310,24 @@ - <string>HW-Address:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_5</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>variableText3</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -+ <hsizetype>7</hsizetype> -+ <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> -+ </property> - </widget> - </hbox> - </widget> -@@ -893,8 +841,6 @@ - </widget> - </vbox> - </widget> --<customwidgets> --</customwidgets> - <connections> - <connection> - <sender>buttonClose</sender> -@@ -905,10 +851,6 @@ - </connections> - <layoutdefaults spacing="6" margin="11"/> - <includehints> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -+ <includehint>kcombobox.h</includehint> - </includehints> - </UI> diff --git a/net/knemo-kde4/files/patch-knemod-interfacetooltip.cpp b/net/knemo-kde4/files/patch-knemod-interfacetooltip.cpp deleted file mode 100644 index 9dce92066cf6..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfacetooltip.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- src/knemod/interfacetooltip.cpp.orig Sat Apr 1 21:44:22 2006 -+++ src/knemod/interfacetooltip.cpp Sun Apr 2 21:30:52 2006 -@@ -101,6 +101,23 @@ - - if ( data.available ) - { -+#ifdef Q_OS_FREEBSD -+ QDictIterator<AddrData> it( data.addrData ); -+ for( ; it.current(); ++it ) -+ { -+ if ( toolTipContent & IP_ADDRESS ) -+ text += "<tr><td>" + mToolTips[4].first + "</td><td>" + it.currentKey() + "</td></tr>"; -+ if ( toolTipContent & SUBNET_MASK ) -+ text += "<tr><td>" + mToolTips[5].first + "</td><td>" + it.current()->subnetMask + "</td></tr>"; -+ if ( mInterface->getType() == Interface::ETHERNET ) -+ { -+ if ( toolTipContent & BCAST_ADDRESS ) -+ text += "<tr><td>" + mToolTips[18].first + "</td><td>" + it.current()->broadcastAddress + "</td></tr>"; -+ } -+ } -+ if ( mInterface->getType() == Interface::ETHERNET ) -+ { -+#else - if ( toolTipContent & IP_ADDRESS ) - text += "<tr><td>" + mToolTips[4].first + "</td><td>" + data.ipAddress + "</td></tr>"; - if ( toolTipContent & SUBNET_MASK ) -@@ -109,6 +126,7 @@ - { - if ( toolTipContent & BCAST_ADDRESS ) - text += "<tr><td>" + mToolTips[18].first + "</td><td>" + data.broadcastAddress + "</td></tr>"; -+#endif - if ( toolTipContent & GATEWAY ) - text += "<tr><td>" + mToolTips[19].first + "</td><td>" + data.defaultGateway + "</td></tr>"; - if ( toolTipContent & HW_ADDRESS ) diff --git a/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp b/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp deleted file mode 100644 index 09ad62f0543f..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp +++ /dev/null @@ -1,291 +0,0 @@ ---- src/knemod/interfaceupdater.cpp.orig Mon Jun 12 13:20:13 2006 -+++ src/knemod/interfaceupdater.cpp Mon Jun 12 14:43:02 2006 -@@ -17,6 +17,24 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/sysctl.h> -+#include <sys/time.h> -+#include <sys/ioctl.h> -+#include <net/ethernet.h> -+#include <net/if_media.h> -+#include <net/if_types.h> -+#include <net/if.h> -+#include <net/if_dl.h> -+#include <net/if_mib.h> -+#include <netdb.h> -+#include <ifaddrs.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#endif -+ - #include <qmap.h> - #include <qregexp.h> - #include <qstringlist.h> -@@ -40,6 +58,7 @@ - - InterfaceUpdater::~InterfaceUpdater() - { -+#ifndef Q_OS_FREEBSD - if ( mRouteProcess ) - { - mRouteProcess->kill(); -@@ -55,10 +74,12 @@ - mIwconfigProcess->kill(); - delete mIwconfigProcess; - } -+#endif - } - - void InterfaceUpdater::checkConfig() - { -+#ifndef Q_OS_FREEBSD - if ( !mIfconfigProcess ) - { - mIfconfigStdout = QString::null; -@@ -100,6 +121,7 @@ - } - } - #endif -+#endif // Q_OS_FREEBSD - - #ifdef PATH_ROUTE - if ( !mRouteProcess ) -@@ -108,7 +130,11 @@ - mRouteProcess = new KProcess(); - mRouteProcess->setEnvironment( "LANG", "C" ); - mRouteProcess->setEnvironment( "LC_ALL", "C" ); -+#ifdef Q_OS_FREEBSD -+ *mRouteProcess << PATH_ROUTE << "-n" << "get" << "default"; -+#else - *mRouteProcess << PATH_ROUTE << "-n"; -+#endif - connect( mRouteProcess, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT( routeProcessStdout( KProcess*, char*, int ) ) ); - connect( mRouteProcess, SIGNAL( receivedStderr( KProcess*, char*, int ) ), -@@ -123,6 +149,140 @@ - } - } - #endif -+ -+#ifdef Q_OS_FREEBSD -+ // Check interfaces and update accordingly -+ -+ Interface* interface = 0; -+ InterfaceData* data = 0; -+ -+ struct if_data* ifd; -+ struct ifaddrs *ifap; -+ char buf[NI_MAXHOST]; -+ -+ // Reset all devices first -+ QDictIterator<Interface> ifIt( mInterfaceDict ); -+ for ( ; ifIt.current(); ++ifIt ) -+ { -+ interface = ifIt.current(); -+ interface->getData().existing = false; -+ interface->getData().available = false; -+ interface->getData().addrData.clear(); -+ } -+ -+ // Get IP address and related information -+ if ( getifaddrs(&ifap) == 0 ) { -+ for ( ifaddrs *ifa = ifap; ifa; ifa = ifa->ifa_next ) { -+ switch ( ifa->ifa_addr->sa_family ) { -+ case AF_INET6: -+ case AF_INET: -+ interface = mInterfaceDict[QString::fromLatin1(ifa->ifa_name)]; -+ if ( interface ) { -+ data = &interface->getData(); -+ -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ AddrData *addrData = new AddrData; -+ data->addrData.insert( QString::fromLatin1(buf), addrData); -+ -+ if ( ifa->ifa_netmask != NULL ) { -+ if (ifa->ifa_addr->sa_family == AF_INET6 ) { -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ addrData->subnetMask = QString::fromLatin1( buf ); -+ } else { -+ struct sockaddr_in *sin = (struct sockaddr_in *)ifa->ifa_netmask; -+ addrData->subnetMask = QString::fromLatin1( inet_ntoa(sin->sin_addr) ); -+ } -+ } -+ -+ if ( ifa->ifa_broadaddr != NULL ) { -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_broadaddr, ifa->ifa_broadaddr->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ addrData->broadcastAddress = QString::fromLatin1(buf); -+ } -+ -+ if ( ifa->ifa_dstaddr != NULL ) { -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_dstaddr, ifa->ifa_dstaddr->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ data->ptpAddress = QString::fromLatin1(buf); -+ } -+ -+ data->existing = true; -+ interface->setType((ifa->ifa_flags & IFF_POINTOPOINT ) ? Interface::PPP : Interface::ETHERNET ); -+ -+ // Get media status -+ int s; -+ if ((s = socket(ifa->ifa_addr->sa_family, SOCK_DGRAM, 0)) >= 0) { -+ struct ifmediareq ifmr; -+ (void) memset(&ifmr, 0, sizeof(ifmr)); -+ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name)); -+ -+ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0) { -+ if (ifmr.ifm_status & IFM_AVALID) -+ /* -+ * The interface is marked available, if the interface is up -+ * and if it is has carrier (LAN) or is associated (WLAN) -+ */ -+ data->available = (ifa->ifa_flags & IFF_UP) && (ifmr.ifm_status & IFM_ACTIVE); -+ } -+ else -+ data->available = (ifa->ifa_flags & IFF_UP); -+ -+ close(s); -+ } -+ } -+ break; -+ -+ case AF_LINK: -+ interface = mInterfaceDict[QString::fromLatin1(ifa->ifa_name)]; -+ if ( interface ) { -+ data = &interface->getData(); -+ -+ // get MAC address -+ struct sockaddr_dl* sdl = (struct sockaddr_dl*)ifa->ifa_addr; -+ if (sdl->sdl_type == IFT_ETHER && sdl->sdl_alen == ETHER_ADDR_LEN) -+ data->hwAddress = QString::fromLatin1(ether_ntoa((struct ether_addr*)LLADDR(sdl))); -+ else -+ data->hwAddress = ""; -+ -+ // Get traffic statistics -+ if (ifa->ifa_data != NULL) { -+ ifd = (if_data *)ifa->ifa_data; -+ -+ data->rxPackets = ifd->ifi_ipackets; -+ data->txPackets = ifd->ifi_opackets; -+ -+ if ( data->prevRxBytes == 0L ) -+ data->prevRxBytes = ifd->ifi_ibytes; -+ else -+ data->prevRxBytes = data->rxBytes; -+ -+ data->rxBytes = ifd->ifi_ibytes; -+ data->incomingBytes = data->rxBytes - data->prevRxBytes; -+ data->rxString = KIO::convertSize( data->rxBytes ); -+ -+ if ( data->prevTxBytes == 0L ) -+ data->prevTxBytes = ifd->ifi_obytes; -+ else -+ data->prevTxBytes = data->txBytes; -+ -+ data->txBytes = ifd->ifi_obytes; -+ data->outgoingBytes = data->txBytes - data->prevTxBytes; -+ data->txString = KIO::convertSize( data->txBytes ); -+ } -+ } -+ break; -+ } -+ } -+ freeifaddrs(ifap); -+ } -+ -+ // Update the display -+ for ( ifIt.toFirst(); ifIt.current(); ++ifIt ) -+ ifIt.current()->activateMonitor(); -+ -+#endif // Q_OS_FREEBSD - } - - void InterfaceUpdater::routeProcessExited( KProcess* process ) -@@ -172,6 +332,7 @@ - - void InterfaceUpdater::parseIfconfigOutput() - { -+#ifndef Q_OS_FREEBSD - /* mIfconfigStdout contains the complete output of 'ifconfig' which we - * are going to parse here. - */ -@@ -228,10 +389,12 @@ - } - interface->activateMonitor(); - } -+#endif - } - - void InterfaceUpdater::updateInterfaceData( QString& config, InterfaceData& data, int type ) - { -+#ifndef Q_OS_FREEBSD - QRegExp regExp( ".*RX.*:(\\d+).*:\\d+.*:\\d+.*:\\d+" ); - if ( regExp.search( config ) > -1 ) - data.rxPackets = regExp.cap( 1 ).toULong(); -@@ -321,10 +484,12 @@ - if ( regExp.search( config ) > -1 ) - data.ptpAddress = regExp.cap( 2 ); - } -+#endif - } - - void InterfaceUpdater::parseIwconfigOutput() - { -+#ifndef Q_OS_FREEBSD - /* mIwconfigStdout contains the complete output of 'iwconfig' which we - * are going to parse here. - */ -@@ -367,10 +532,12 @@ - updateWirelessData( configs[key], interface->getWirelessData() ); - } - } -+#endif - } - - void InterfaceUpdater::updateWirelessData( QString& config, WirelessData& data ) - { -+#ifndef Q_OS_FREEBSD - QRegExp regExp( "ESSID:\"?([^\"]*)\"?" ); - if ( regExp.search( config ) > -1 ) - data.essid = regExp.cap( 1 ); -@@ -404,6 +571,7 @@ - regExp.setPattern( "Link Quality[=:]([\\d/]*)" ); - if ( regExp.search( config ) > -1 ) - data.linkQuality = regExp.cap( 1 ); -+#endif - } - - void InterfaceUpdater::parseRouteOutput() -@@ -412,16 +580,25 @@ - * are going to parse here. - */ - QMap<QString, QStringList> configs; -- QStringList routeList = QStringList::split( "\n", mRouteStdout ); -+ QStringList gateway, routeList = QStringList::split( "\n", mRouteStdout ); - QStringList::Iterator it; - for ( it = routeList.begin(); it != routeList.end(); ++it ) - { - QStringList routeParameter = QStringList::split( " ", *it ); -+#ifdef Q_OS_FREEBSD -+ if ( routeParameter.count() != 2 ) -+ continue; -+ if ( routeParameter[0] == "gateway:" ) -+ gateway = routeParameter; -+ if ( routeParameter[0] == "interface:" ) -+ configs[routeParameter[1]] = gateway; -+#else - if ( routeParameter.count() < 8 ) // no routing entry - continue; - if ( routeParameter[0] != "0.0.0.0" ) // no default route - continue; - configs[routeParameter[7]] = routeParameter; -+#endif - } - - /* We loop over the interfaces the user wishs to monitor. diff --git a/net/knemo-kde4/files/patch-knemod-knemodaemon.cpp b/net/knemo-kde4/files/patch-knemod-knemodaemon.cpp deleted file mode 100644 index 11f2cc3e39fe..000000000000 --- a/net/knemo-kde4/files/patch-knemod-knemodaemon.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/knemod/knemodaemon.cpp.orig Mon Jun 12 15:47:54 2006 -+++ src/knemod/knemodaemon.cpp Mon Jun 12 16:30:45 2006 -@@ -306,6 +306,8 @@ - - // needed to calculate the current speed - mGeneralData.secondsSinceLastUpdate = mLastUpdateTime.secsTo( QDateTime::currentDateTime() ); -+ if (mGeneralData.secondsSinceLastUpdate == 0) -+ mGeneralData.secondsSinceLastUpdate = 1; - mLastUpdateTime.setDate( QDate::currentDate() ); - mLastUpdateTime.setTime( QTime::currentTime() ); - diff --git a/net/knemo-kde4/pkg-descr b/net/knemo-kde4/pkg-descr deleted file mode 100644 index 1fe12fcb83a0..000000000000 --- a/net/knemo-kde4/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -KNemo - the KDE Network Monitor - -KNemo offers a network monitor similar to the one found in Windows. -For every network interface it displays an icon in the systray. - -WWW: http://extragear.kde.org/apps/knemo/ diff --git a/net/knemo-kde4/pkg-message b/net/knemo-kde4/pkg-message deleted file mode 100644 index e0a417e2f008..000000000000 --- a/net/knemo-kde4/pkg-message +++ /dev/null @@ -1,4 +0,0 @@ ------------------------------------------------------------------------------ - IMPORTANT: KNemo is not an executable but an KDED service. Therefore - it has to be started using Control Center/KDE Components/Service Manager. ------------------------------------------------------------------------------ diff --git a/net/knemo-kde4/pkg-plist b/net/knemo-kde4/pkg-plist deleted file mode 100644 index 27dbcca320c4..000000000000 --- a/net/knemo-kde4/pkg-plist +++ /dev/null @@ -1,88 +0,0 @@ -lib/kde3/kcm_knemo.a -lib/kde3/kcm_knemo.la -lib/kde3/kcm_knemo.so -lib/kde3/kded_knemod.a -lib/kde3/kded_knemod.la -lib/kde3/kded_knemod.so -share/applications/kde/kcm_knemo.desktop -share/apps/knemo/eventsrc -share/icons/crystalsvg/16x16/apps/knemo.png -share/icons/crystalsvg/22x22/actions/network_connected.png -share/icons/crystalsvg/22x22/actions/network_connected_lan.png -share/icons/crystalsvg/22x22/actions/network_connected_ppp.png -share/icons/crystalsvg/22x22/actions/network_connected_wlan.png -share/icons/crystalsvg/22x22/actions/network_disconnected.png -share/icons/crystalsvg/22x22/actions/network_disconnected_lan.png -share/icons/crystalsvg/22x22/actions/network_disconnected_ppp.png -share/icons/crystalsvg/22x22/actions/network_disconnected_wlan.png -share/icons/crystalsvg/22x22/actions/network_incoming.png -share/icons/crystalsvg/22x22/actions/network_incoming_lan.png -share/icons/crystalsvg/22x22/actions/network_incoming_ppp.png -share/icons/crystalsvg/22x22/actions/network_incoming_wlan.png -share/icons/crystalsvg/22x22/actions/network_outgoing.png -share/icons/crystalsvg/22x22/actions/network_outgoing_lan.png -share/icons/crystalsvg/22x22/actions/network_outgoing_ppp.png -share/icons/crystalsvg/22x22/actions/network_outgoing_wlan.png -share/icons/crystalsvg/22x22/actions/network_traffic.png -share/icons/crystalsvg/22x22/actions/network_traffic_lan.png -share/icons/crystalsvg/22x22/actions/network_traffic_ppp.png -share/icons/crystalsvg/22x22/actions/network_traffic_wlan.png -share/icons/crystalsvg/32x32/apps/knemo.png -share/locale/bg/LC_MESSAGES/kcm_knemo.mo -share/locale/bg/LC_MESSAGES/knemod.mo -share/locale/br/LC_MESSAGES/kcm_knemo.mo -share/locale/br/LC_MESSAGES/knemod.mo -share/locale/cs/LC_MESSAGES/kcm_knemo.mo -share/locale/cs/LC_MESSAGES/knemod.mo -share/locale/cy/LC_MESSAGES/kcm_knemo.mo -share/locale/cy/LC_MESSAGES/knemod.mo -share/locale/da/LC_MESSAGES/kcm_knemo.mo -share/locale/da/LC_MESSAGES/knemod.mo -share/locale/de/LC_MESSAGES/kcm_knemo.mo -share/locale/de/LC_MESSAGES/knemod.mo -share/locale/el/LC_MESSAGES/kcm_knemo.mo -share/locale/el/LC_MESSAGES/knemod.mo -share/locale/en_GB/LC_MESSAGES/kcm_knemo.mo -share/locale/en_GB/LC_MESSAGES/knemod.mo -share/locale/es/LC_MESSAGES/kcm_knemo.mo -share/locale/es/LC_MESSAGES/knemod.mo -share/locale/et/LC_MESSAGES/kcm_knemo.mo -share/locale/et/LC_MESSAGES/knemod.mo -share/locale/fr/LC_MESSAGES/kcm_knemo.mo -share/locale/fr/LC_MESSAGES/knemod.mo -share/locale/ga/LC_MESSAGES/kcm_knemo.mo -share/locale/ga/LC_MESSAGES/knemod.mo -share/locale/hu/LC_MESSAGES/kcm_knemo.mo -share/locale/hu/LC_MESSAGES/knemod.mo -share/locale/it/LC_MESSAGES/kcm_knemo.mo -share/locale/it/LC_MESSAGES/knemod.mo -share/locale/ka/LC_MESSAGES/kcm_knemo.mo -share/locale/ka/LC_MESSAGES/knemod.mo -share/locale/lt/LC_MESSAGES/kcm_knemo.mo -share/locale/lt/LC_MESSAGES/knemod.mo -share/locale/nl/LC_MESSAGES/kcm_knemo.mo -share/locale/nl/LC_MESSAGES/knemod.mo -share/locale/pl/LC_MESSAGES/kcm_knemo.mo -share/locale/pl/LC_MESSAGES/knemod.mo -share/locale/pt/LC_MESSAGES/kcm_knemo.mo -share/locale/pt/LC_MESSAGES/knemod.mo -share/locale/pt_BR/LC_MESSAGES/kcm_knemo.mo -share/locale/pt_BR/LC_MESSAGES/knemod.mo -share/locale/ru/LC_MESSAGES/kcm_knemo.mo -share/locale/ru/LC_MESSAGES/knemod.mo -share/locale/rw/LC_MESSAGES/kcm_knemo.mo -share/locale/rw/LC_MESSAGES/knemod.mo -share/locale/sr/LC_MESSAGES/kcm_knemo.mo -share/locale/sr/LC_MESSAGES/knemod.mo -share/locale/sr@Latn/LC_MESSAGES/kcm_knemo.mo -share/locale/sr@Latn/LC_MESSAGES/knemod.mo -share/locale/sv/LC_MESSAGES/kcm_knemo.mo -share/locale/sv/LC_MESSAGES/knemod.mo -share/locale/tr/LC_MESSAGES/kcm_knemo.mo -share/locale/tr/LC_MESSAGES/knemod.mo -share/services/kded/knemod.desktop -@dirrmtry share/services/kded -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrm share/apps/knemo -@dirrmtry share/applications/kde diff --git a/net/mcl/Makefile b/net/mcl/Makefile deleted file mode 100644 index d087695902d6..000000000000 --- a/net/mcl/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# New ports collection makefile for: mcl -# Date created: 29 October 2003 -# Whom: past@noc.ntua.gr -# -# $FreeBSD$ -# - -PORTNAME= mcl -PORTVERSION= 2.99.1 -PORTREVISION= 1 -CATEGORIES= mbone net -MASTER_SITES= http://www.inrialpes.fr/planete/people/roca/mcl/bin/ -DISTNAME= mcl_v2.99.1 -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols - -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - gdome-config:${PORTSDIR}/textproc/gdome2 \ - glib-gettextize:${PORTSDIR}/devel/glib20 - -USE_LDCONFIG= yes -USE_GMAKE= yes -MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1 -MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \ - mcl_send.2 mcl_wait_event.2 - -pre-patch: - @cd ${WRKSRC} && \ - ${MKDIR} bin/freebsd - -post-patch: - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/src/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/check/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/fcast/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/flute/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/mclftp/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/robcast/Makefile - -pre-install: - @${REINPLACE_CMD} -Ee 's#../alc/#alc/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - @${REINPLACE_CMD} -Ee 's#../norm/#norm/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/fcast ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/flute ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_client ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_server ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/bin/freebsd/libmclalc.a ${PREFIX}/lib - @${INSTALL_DATA} ${WRKSRC}/src/common/mcl_lib_api.h ${PREFIX}/include - @${INSTALL_DATA} -d ${PREFIX}/include/alc - @${INSTALL_DATA} ${WRKSRC}/src/alc/mcl_lib_api_alc.h \ - ${PREFIX}/include/alc - @${INSTALL_MAN} ${WRKSRC}/man/fcast.man.1 ${PREFIX}/man/man1/fcast.1 - @${INSTALL_MAN} ${WRKSRC}/man/fcastn.man.1 ${PREFIX}/man/man1/fcastn.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclrecv2.man.1 \ - ${PREFIX}/man/man1/mclrecv2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclsend2.man.1 \ - ${PREFIX}/man/man1/mclsend2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_abort.man.2 \ - ${PREFIX}/man/man2/mcl_abort.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_close.man.2 \ - ${PREFIX}/man/man2/mcl_close.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_ctl.man.2 ${PREFIX}/man/man2/mcl_ctl.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_open.man.2 \ - ${PREFIX}/man/man2/mcl_open.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_recv.man.2 \ - ${PREFIX}/man/man2/mcl_recv.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_send.man.2 \ - ${PREFIX}/man/man2/mcl_send.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_wait_event.man.2 \ - ${PREFIX}/man/man2/mcl_wait_event.2 - -.include <bsd.port.mk> diff --git a/net/mcl/distinfo b/net/mcl/distinfo deleted file mode 100644 index c2499bb901b5..000000000000 --- a/net/mcl/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mcl_v2.99.1.tgz) = d4a5c0c384d45dfa6c2a3dcbdcb3a81e -SHA256 (mcl_v2.99.1.tgz) = 141966bf922c2995a29eeb73a536ee3f83438835b0f29f99afb626048decdc35 -SIZE (mcl_v2.99.1.tgz) = 368784 diff --git a/net/mcl/files/patch-Makefile b/net/mcl/files/patch-Makefile deleted file mode 100644 index 8c38fb03e633..000000000000 --- a/net/mcl/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig Sun Dec 7 18:35:07 2003 -+++ Makefile Sun Dec 7 18:35:20 2003 -@@ -5,8 +5,8 @@ - # We need the GNU make tool, on some systems it is called - # gmake, on others make is an alias to gmake. Choose one... - # --MAKE = make --#MAKE = gmake -+#MAKE = make -+MAKE = gmake - - - # A phony target is one that is not really the name of a file. diff --git a/net/mcl/files/patch-Makefile.common b/net/mcl/files/patch-Makefile.common deleted file mode 100644 index 4cb001289885..000000000000 --- a/net/mcl/files/patch-Makefile.common +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.common.orig Sun Dec 7 18:36:25 2003 -+++ Makefile.common Sun Dec 7 18:38:10 2003 -@@ -24,11 +24,15 @@ - ifeq (${SYSTEM},SunOS) - OS = solaris - endif -+ifeq (${SYSTEM},FreeBSD) -+ OS = freebsd -+endif - # - # and the old way (e.g. if the above lines do not work!) - # - #OS = linux - #OS = solaris -+#OS = freebsd - - - # Do you want/need extended memory debugging? -@@ -59,6 +63,14 @@ - # - CC = /opt/SUNWspro/bin/CC - LD = /opt/SUNWspro/bin/CC -+endif -+ifeq (${OS},freebsd) -+ OSFLAGS = -DFREEBSD -I${LOCALBASE}/g++ -I${LOCALBASE}/c++/3.3 -+ # Which compiler? -+ # NB: use -Wall for compilation warnings with gcc -+ # -+ CC = g++ -Wall -+ LD = g++ -Wall - endif - - diff --git a/net/mcl/files/patch-alc-Makefile b/net/mcl/files/patch-alc-Makefile deleted file mode 100644 index b38cb525c35f..000000000000 --- a/net/mcl/files/patch-alc-Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- src/alc/Makefile.orig Tue Jul 22 19:42:18 2003 -+++ src/alc/Makefile Wed Oct 15 17:21:25 2003 -@@ -36,6 +36,13 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other Variables ###### - diff --git a/net/mcl/files/patch-check-alc-Makefile b/net/mcl/files/patch-check-alc-Makefile deleted file mode 100644 index 65fa32515984..000000000000 --- a/net/mcl/files/patch-check-alc-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- check/alc/Makefile.orig Wed Oct 15 18:02:27 2003 -+++ check/alc/Makefile Wed Oct 15 17:24:04 2003 -@@ -35,6 +35,18 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -mt -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # Linux version -+ # -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ # Edit the following two lines as appropriate, according to the FEC -+ # codec in use: if LDPC is used, then add the libbdpc.a library. -+ # -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/net/mcl/files/patch-display.c b/net/mcl/files/patch-display.c deleted file mode 100644 index 44ff013dd66f..000000000000 --- a/net/mcl/files/patch-display.c +++ /dev/null @@ -1,14 +0,0 @@ ---- flute/display.c.orig Wed Jan 7 12:08:23 2004 -+++ flute/display.c Wed Jan 7 12:07:24 2004 -@@ -65,7 +65,11 @@ - signal (SIGTERM, sig_catcher); - sigaction (SIGTERM, (struct sigaction *) 0, &sa); - sa.sa_flags |= SA_RESTART; -+#if defined(FREEBSD) -+ sa.sa_flags &= ~SA_NOCLDSTOP; -+#else - sa.sa_flags &= ~SA_INTERRUPT; -+#endif - sigaction (SIGTERM, &sa, (struct sigaction *) 0); - sigaction (SIGINT, &sa, (struct sigaction *) 0); - tcsetattr(0, TCSANOW, &new_settings); diff --git a/net/mcl/files/patch-fcast-Makefile b/net/mcl/files/patch-fcast-Makefile deleted file mode 100644 index dce7b64a9811..000000000000 --- a/net/mcl/files/patch-fcast-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- fcast/Makefile.orig Tue Jul 22 19:43:25 2003 -+++ fcast/Makefile Wed Oct 15 17:20:46 2003 -@@ -39,6 +39,14 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other variables ###### - -@@ -76,8 +84,8 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FCAST = ${BINDIR}/fcast - #alc: all - diff --git a/net/mcl/files/patch-fcast.h b/net/mcl/files/patch-fcast.h deleted file mode 100644 index bd50c0f41eb7..000000000000 --- a/net/mcl/files/patch-fcast.h +++ /dev/null @@ -1,20 +0,0 @@ ---- fcast/fcast.h.orig Tue Jul 22 19:37:39 2003 -+++ fcast/fcast.h Wed Oct 15 16:59:13 2003 -@@ -62,12 +62,16 @@ - #include "frecv.h" - - -+ - #if defined(LINUX) /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) -- - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/net/mcl/files/patch-flute-Makefile b/net/mcl/files/patch-flute-Makefile deleted file mode 100644 index 159fef2f7960..000000000000 --- a/net/mcl/files/patch-flute-Makefile +++ /dev/null @@ -1,52 +0,0 @@ ---- flute/Makefile.orig Wed Nov 26 17:18:21 2003 -+++ flute/Makefile Wed Jan 7 12:38:28 2004 -@@ -36,6 +36,18 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version: -+ # CC requires: -mt -lpthread for multithreaded applications -+ # NB: mpatrol not installed ! -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -lglib-2.0 -lgdome -lxml2 -L${LOCALBASE}/lib -+ # added -I/usr/local/include for libgdome header files -+ ADD_INCLUDES = -I${LOCALBASE}/include/ -I${LOCALBASE}/include/glib-2.0/ -I${LOCALBASE}/include/libgdome/ -+endif -+ - - ###### Other variables ###### - -@@ -73,24 +85,24 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FLUTE = ${BINDIR}/flute - #alc: all - - alc_pure: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_pure: TARGET_FLUTE = ${BINDIR}/flute - alc_pure: pure - - alc_quantify: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_quantify: TARGET_FLUTE = ${BINDIR}/flute - alc_quantify: quantify - diff --git a/net/mcl/files/patch-flute.h b/net/mcl/files/patch-flute.h deleted file mode 100644 index c38ad033f34c..000000000000 --- a/net/mcl/files/patch-flute.h +++ /dev/null @@ -1,13 +0,0 @@ ---- flute/flute.h.orig Wed Jan 7 11:13:20 2004 -+++ flute/flute.h Wed Jan 7 11:15:28 2004 -@@ -69,6 +69,10 @@ - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) - - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/net/mcl/files/patch-mcl_debug.cpp b/net/mcl/files/patch-mcl_debug.cpp deleted file mode 100644 index 982503f326c9..000000000000 --- a/net/mcl/files/patch-mcl_debug.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/mcl_debug.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/common/mcl_debug.cpp Wed Oct 15 17:55:58 2003 -@@ -73,7 +73,7 @@ - PRINT_OUT((mcl_stdout, "\tDUMP %d first bytes...\n\t", i * sizeof(int))) - for (ptr = (int*)buf; i > 0; i--, ptr++) { - /* convert to big endian format to be sure of byte order */ -- PRINT_OUT((mcl_stdout, "%08x ", htonl(*ptr))) -+ PRINT_OUT((mcl_stdout, "%08lx ", htonl(*ptr))) - if (++j == 8) { - j = 0; - PRINT_OUT((mcl_stdout, "\n\t")) diff --git a/net/mcl/files/patch-mcl_includes.h b/net/mcl/files/patch-mcl_includes.h deleted file mode 100644 index d68a50637331..000000000000 --- a/net/mcl/files/patch-mcl_includes.h +++ /dev/null @@ -1,36 +0,0 @@ ---- src/alc/mcl_includes.h.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_includes.h Tue Oct 14 15:23:54 2003 -@@ -40,11 +40,13 @@ - #include <sys/types.h> - #include <math.h> - -+#ifndef FREEBSD - #if defined(DEBUG) && defined(MPATROL) && !defined(WIN32) - #include <mpatrol.h> - #else - #include <malloc.h> - #endif -+#endif - #include <new> // required by _set_new_handler on linux - - -@@ -58,14 +60,18 @@ - #else /* UNIX Systems */ - - #include <unistd.h> -+ -+#ifndef FREEBSD - #include <values.h> /* for MAXINT */ -+#endif -+ - #include <strings.h> - #include <sys/time.h> - #include <sys/wait.h> - #include <pthread.h> - #include <sys/uio.h> - --#ifdef SOLARIS -+#if defined(SOLARIS) || defined(FREEBSD) - #include <netinet/in_systm.h> - #endif /* SOLARIS */ - diff --git a/net/mcl/files/patch-mcl_lib.cpp b/net/mcl/files/patch-mcl_lib.cpp deleted file mode 100644 index d40dbe58584c..000000000000 --- a/net/mcl/files/patch-mcl_lib.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- src/alc/mcl_lib.cpp.orig Wed Nov 26 15:38:14 2003 -+++ src/alc/mcl_lib.cpp Tue Dec 16 23:58:46 2003 -@@ -1384,8 +1384,10 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - saddr_len)); - } -@@ -1520,8 +1522,11 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) -+ - #endif - saddr_len)); - } diff --git a/net/mcl/files/patch-mcl_network.cpp b/net/mcl/files/patch-mcl_network.cpp deleted file mode 100644 index 6e5a8cfaebfe..000000000000 --- a/net/mcl/files/patch-mcl_network.cpp +++ /dev/null @@ -1,48 +0,0 @@ ---- src/alc/mcl_network.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_network.cpp Tue Oct 14 15:47:45 2003 -@@ -414,8 +414,10 @@ - pkt->pkt_len = recvfrom(mg->ses_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -483,8 +485,10 @@ - pkt->pkt_len = recvfrom(mg->priv_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -663,8 +667,10 @@ - err = setsockopt(fd, SOL_SOCKET, buf, (char*)&val, sizeof(val)); - else - err = getsockopt(fd, SOL_SOCKET, buf, (char*)&val, --#ifdef LINUX -- (size_t*) /* linux => uint, solaris => int */ -+#if defined(LINUX) -+ (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &len); - if (err < 0) { -@@ -938,7 +944,7 @@ - - if (mcl_is_valid_sock(mg->priv_sock) && - getsockname(mg->priv_sock, (struct sockaddr *)&tmp_addr, --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - (socklen_t*) - #endif - &tmp_len) < 0) { diff --git a/net/mcl/files/patch-mcl_osdep.h b/net/mcl/files/patch-mcl_osdep.h deleted file mode 100644 index 1effff377a98..000000000000 --- a/net/mcl/files/patch-mcl_osdep.h +++ /dev/null @@ -1,32 +0,0 @@ ---- src/common/mcl_osdep.h.orig Sun Dec 7 18:58:22 2003 -+++ src/common/mcl_osdep.h Sun Dec 7 19:00:39 2003 -@@ -44,7 +44,7 @@ - * bit field order is compiler/OS dependant - * With linux, see the above LINUX_XXX defines... - */ --#if defined(LINUX_I386) || defined(WIN32) -+#if defined(LINUX_I386) || defined(WIN32) || defined (FREEBSD) - #define _BIT_FIELDS_LTOH - #undef _BIT_FIELDS_HTOL - -@@ -58,7 +58,7 @@ - /* - * sighandler - */ --#if defined(LINUX) -+#if defined(LINUX) || defined (FREEBSD) - /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - -@@ -77,9 +77,9 @@ - #define u_int16_t ushort_t /* or uint16_t */ - #define u_int32_t uint_t /* or uint32_t */ - --#elif defined (WIN32) -+#elif defined (WIN32) || defined (FREEBSD) - --/* u_xxx absent from WIN32! */ -+/* u_xxx absent from WIN32 and ulong absent from FreeBSD! */ - #define u_int8_t unsigned char /* or uint8_t */ - #define u_int16_t unsigned short /* or uint16_t */ - #define u_int32_t unsigned int /* or uint32_t */ diff --git a/net/mcl/files/patch-mcl_profile.h b/net/mcl/files/patch-mcl_profile.h deleted file mode 100644 index 24408a4ddbfe..000000000000 --- a/net/mcl/files/patch-mcl_profile.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/alc/mcl_profile.h.orig Tue Dec 16 23:47:58 2003 -+++ src/alc/mcl_profile.h Tue Dec 16 23:48:09 2003 -@@ -130,7 +130,7 @@ - /* - * Do you want to use LDPC large block Forward Error Correction (FEC) ? - */ --#define LDPC_FEC -+//#define LDPC_FEC - - #if defined(RSE_FEC) || defined(LDPC_FEC) - #define FEC diff --git a/net/mcl/files/patch-mclftp-Makefile b/net/mcl/files/patch-mclftp-Makefile deleted file mode 100644 index 0ddac0210fa9..000000000000 --- a/net/mcl/files/patch-mclftp-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- mclftp/Makefile.orig Wed Dec 17 00:13:34 2003 -+++ mclftp/Makefile Wed Dec 17 00:15:56 2003 -@@ -36,6 +36,14 @@ - LIBRARIES = -lc -lm -lsocket -lnsl /usr/ucblib/libucb.a -lposix4 -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - - ###### Other variables ###### diff --git a/net/mcl/files/patch-robcast-Makefile b/net/mcl/files/patch-robcast-Makefile deleted file mode 100644 index f6f4a21f0e42..000000000000 --- a/net/mcl/files/patch-robcast-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- robcast/Makefile.orig Wed Oct 15 18:03:36 2003 -+++ robcast/Makefile Wed Oct 15 17:33:36 2003 -@@ -29,6 +29,16 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/net/mcl/files/patch-rse_fec.cpp b/net/mcl/files/patch-rse_fec.cpp deleted file mode 100644 index 70ea7a5e9790..000000000000 --- a/net/mcl/files/patch-rse_fec.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/common/rse_fec.cpp.orig 2007-08-03 13:59:09.000000000 +0200 -+++ src/common/rse_fec.cpp 2007-08-03 14:00:41.000000000 +0200 -@@ -679,7 +679,7 @@ - struct fec_parms *p = (struct fec_parms *)p_vp; /* VR */ - #endif /* CPLUSPLUS_COMPATIBLE */ - if (p==NULL || -- p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (int)(p->enc_matrix)) ) { -+ p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (intptr_t)(p->enc_matrix)) ) { - PRINT_ERR((mcl_stderr, "bad parameters to fec_free\n")) - return ; - } -@@ -715,7 +715,7 @@ - retval->k = k ; - retval->n = n ; - retval->enc_matrix = NEW_GF_MATRIX(n, k); -- retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (int)(retval->enc_matrix) ; -+ retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (intptr_t)(retval->enc_matrix) ; - tmp_m = NEW_GF_MATRIX(n, k); - /* - * fill the matrix with powers of field elements, starting from 0. diff --git a/net/mcl/files/patch-test_abort.c b/net/mcl/files/patch-test_abort.c deleted file mode 100644 index ad1116943ab0..000000000000 --- a/net/mcl/files/patch-test_abort.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_abort.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_abort.c Wed Oct 15 17:10:42 2003 -@@ -26,6 +26,10 @@ - #include <stdio.h> - #include <stdlib.h> /* for exit */ - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/net/mcl/files/patch-test_demux_label1_rx.c b/net/mcl/files/patch-test_demux_label1_rx.c deleted file mode 100644 index d172c016a3b0..000000000000 --- a/net/mcl/files/patch-test_demux_label1_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_rx.c Wed Oct 15 17:13:17 2003 -@@ -26,6 +26,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_demux_label1_tx.c b/net/mcl/files/patch-test_demux_label1_tx.c deleted file mode 100644 index 57e1efe5f915..000000000000 --- a/net/mcl/files/patch-test_demux_label1_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_tx.c Wed Oct 15 17:12:56 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_dyn_tsi.c b/net/mcl/files/patch-test_dyn_tsi.c deleted file mode 100644 index bf09722b074f..000000000000 --- a/net/mcl/files/patch-test_dyn_tsi.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_dyn_tsi.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_dyn_tsi.c Wed Oct 15 17:13:37 2003 -@@ -30,6 +30,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_multi_sessions1.c b/net/mcl/files/patch-test_multi_sessions1.c deleted file mode 100644 index 0b0af22dd2b1..000000000000 --- a/net/mcl/files/patch-test_multi_sessions1.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions1.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions1.c Wed Oct 15 17:11:53 2003 -@@ -24,6 +24,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_multi_sessions2.c b/net/mcl/files/patch-test_multi_sessions2.c deleted file mode 100644 index 0033a72b5a86..000000000000 --- a/net/mcl/files/patch-test_multi_sessions2.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions2.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions2.c Wed Oct 15 17:12:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/net/mcl/files/patch-test_no_tx.c b/net/mcl/files/patch-test_no_tx.c deleted file mode 100644 index e6f1e0b90d83..000000000000 --- a/net/mcl/files/patch-test_no_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_no_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_no_tx.c Wed Oct 15 17:10:20 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_rebootable_client.c b/net/mcl/files/patch-test_rebootable_client.c deleted file mode 100644 index 9ee9725b77a9..000000000000 --- a/net/mcl/files/patch-test_rebootable_client.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_rebootable_client.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_rebootable_client.c Wed Oct 15 17:18:38 2003 -@@ -35,6 +35,10 @@ - #include <stdio.h> - #include <string.h> - -+#ifdef FREEBSD -+#include <sys/time.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_seq_of_tx_sessions.c b/net/mcl/files/patch-test_seq_of_tx_sessions.c deleted file mode 100644 index 31d967ca431e..000000000000 --- a/net/mcl/files/patch-test_seq_of_tx_sessions.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_seq_of_tx_sessions.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_seq_of_tx_sessions.c Wed Oct 15 17:11:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_several_fec_codecs.c b/net/mcl/files/patch-test_several_fec_codecs.c deleted file mode 100644 index 34da7be64644..000000000000 --- a/net/mcl/files/patch-test_several_fec_codecs.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_several_fec_codecs.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_several_fec_codecs.c Wed Oct 15 17:05:40 2003 -@@ -28,6 +28,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_vtm_rx.c b/net/mcl/files/patch-test_vtm_rx.c deleted file mode 100644 index a0cf05b33306..000000000000 --- a/net/mcl/files/patch-test_vtm_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_rx.c Wed Oct 15 17:14:28 2003 -@@ -27,6 +27,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_vtm_tx.c b/net/mcl/files/patch-test_vtm_tx.c deleted file mode 100644 index 8d26b0f60d2d..000000000000 --- a/net/mcl/files/patch-test_vtm_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_tx.c Wed Oct 15 17:14:02 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_wait_rx_receiver.c b/net/mcl/files/patch-test_wait_rx_receiver.c deleted file mode 100644 index c03c4a4be206..000000000000 --- a/net/mcl/files/patch-test_wait_rx_receiver.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_receiver.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_receiver.c Wed Oct 15 17:09:56 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/net/mcl/files/patch-test_wait_rx_sender.c b/net/mcl/files/patch-test_wait_rx_sender.c deleted file mode 100644 index 694af55beed3..000000000000 --- a/net/mcl/files/patch-test_wait_rx_sender.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_sender.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_sender.c Wed Oct 15 17:09:33 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/net/mcl/files/patch-test_wait_tx.c b/net/mcl/files/patch-test_wait_tx.c deleted file mode 100644 index b0b816cc8cd8..000000000000 --- a/net/mcl/files/patch-test_wait_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_wait_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_tx.c Wed Oct 15 17:09:00 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/pkg-descr b/net/mcl/pkg-descr deleted file mode 100644 index d3de44a68c11..000000000000 --- a/net/mcl/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -This is a port of MCLv3, an open source implementation of the ALC and -NORM Reliable Multicast Protocols. - -The MCLv3 project is an Open-Source GNU/GPL, multi-platform -implementation of the two major reliable multicast protocols being -standardized by the RMT IETF working group: ALC/LCT and NORM. It is -composed of a C/C++ library and several applications built on top of it -and provides an easy-to-use and integrated solution for reliable and -highly scalable multicast delivery of data. - -WWW: http://www.inrialpes.fr/planete/people/roca/mcl/mcl.html diff --git a/net/mcl/pkg-plist b/net/mcl/pkg-plist deleted file mode 100644 index 2e3b802a574e..000000000000 --- a/net/mcl/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/fcast -bin/flute -bin/robcast_client -bin/robcast_server -lib/libmclalc.a -include/mcl_lib_api.h -include/alc/mcl_lib_api_alc.h -@dirrm include/alc diff --git a/net/ns2/Makefile b/net/ns2/Makefile deleted file mode 100644 index 3496a940136e..000000000000 --- a/net/ns2/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# New ports collection makefile for: ns-2 -# Date created: 26 April 1999 -# Whom: obonilla -# -# $FreeBSD$ -# - -PORTNAME= ns -PORTVERSION= 2.33 -CATEGORIES= net -MASTER_SITES= SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION} - -MAINTAINER= lstewart@FreeBSD.org -COMMENT= Discrete event simulator for networking research - -BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl - -MAN1= ns.1 -MANCOMPRESSED= no - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include -USE_GMAKE= yes -USE_TK= 84 - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/src/local/Tcl-1.0 \\|${LOCALBASE}/include/tclcl \\|g' \ - -e 's|/usr/src/local/Tcl-1.0\"|${LOCALBASE}/lib\"|g' \ - ${WRKSRC}/configure - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1 - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR} - -.include <bsd.port.mk> diff --git a/net/ns2/distinfo b/net/ns2/distinfo deleted file mode 100644 index d09fdef5e002..000000000000 --- a/net/ns2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (ns-2.33.tar.gz) = f12472a4e388572bf0c71354b4bc1898 -SHA256 (ns-2.33.tar.gz) = 2cdd803bc5afec9a60d514e619a1a9c3eaea4ae35e882891519f088ae7d2472b -SIZE (ns-2.33.tar.gz) = 41649114 diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr deleted file mode 100644 index 8fa42f66b1cd..000000000000 --- a/net/ns2/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -NS is a discrete event simulator targeted at networking research. -NS provides substantial support for simulation of TCP, routing, -and multicast protocols. - -WWW: http://www.isi.edu/nsnam/ns/ diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist deleted file mode 100644 index 0e884a07c452..000000000000 --- a/net/ns2/pkg-plist +++ /dev/null @@ -1,122 +0,0 @@ -bin/ns -%%EXAMPLESDIR%%/agent-gen-script.tcl -%%EXAMPLESDIR%%/agent-gen.tcl -%%EXAMPLESDIR%%/callback_demo.tcl -%%EXAMPLESDIR%%/diffusion-prob-run.tcl -%%EXAMPLESDIR%%/diffusion-rate-run.tcl -%%EXAMPLESDIR%%/dumbbell.tcl -%%EXAMPLESDIR%%/example.tcl -%%EXAMPLESDIR%%/flooding-run.tcl -%%EXAMPLESDIR%%/flooding.tcl -%%EXAMPLESDIR%%/fq-cbr.tcl -%%EXAMPLESDIR%%/fq.tcl -%%EXAMPLESDIR%%/grid2.tcl -%%EXAMPLESDIR%%/gridkeeper.tcl -%%EXAMPLESDIR%%/hier-rtg-10.tcl -%%EXAMPLESDIR%%/hier-rtg-100.tcl -%%EXAMPLESDIR%%/hts100-0.tcl -%%EXAMPLESDIR%%/lantest.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic-old.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic.tcl -%%EXAMPLESDIR%%/large-sim.tcl -%%EXAMPLESDIR%%/mac-test.tcl -%%EXAMPLESDIR%%/many_tcp.tcl -%%EXAMPLESDIR%%/manytcp_trmodel.tcl -%%EXAMPLESDIR%%/mcast.tcl -%%EXAMPLESDIR%%/miptest.tcl -%%EXAMPLESDIR%%/nam-example-em.tcl -%%EXAMPLESDIR%%/nam-example.tcl -%%EXAMPLESDIR%%/nam-large-flowid.tcl -%%EXAMPLESDIR%%/nam-separate-trace.tcl -%%EXAMPLESDIR%%/nam-simplexlink.tcl -%%EXAMPLESDIR%%/omni-run.tcl -%%EXAMPLESDIR%%/pkts.tcl -%%EXAMPLESDIR%%/ranvar.tcl -%%EXAMPLESDIR%%/rbp_demo.tcl -%%EXAMPLESDIR%%/rc.tcl -%%EXAMPLESDIR%%/redlight.tcl -%%EXAMPLESDIR%%/rng-test.tcl -%%EXAMPLESDIR%%/rng-test2.tcl -%%EXAMPLESDIR%%/route-gen.tcl -%%EXAMPLESDIR%%/sat-aloha.tcl -%%EXAMPLESDIR%%/sat-iridium-links.tcl -%%EXAMPLESDIR%%/sat-iridium-nodes.tcl -%%EXAMPLESDIR%%/sat-iridium.tcl -%%EXAMPLESDIR%%/sat-mixed.tcl -%%EXAMPLESDIR%%/sat-repeater.tcl -%%EXAMPLESDIR%%/sat-teledesic-links.tcl -%%EXAMPLESDIR%%/sat-teledesic-nodes.tcl -%%EXAMPLESDIR%%/sat-teledesic.tcl -%%EXAMPLESDIR%%/sat-wired.tcl -%%EXAMPLESDIR%%/shuttle-mcast.tcl -%%EXAMPLESDIR%%/shuttle.tcl -%%EXAMPLESDIR%%/simple-dyn.tcl -%%EXAMPLESDIR%%/simple-eqp.tcl -%%EXAMPLESDIR%%/simple-eqp1.tcl -%%EXAMPLESDIR%%/simple-fsm-tcp.tcl -%%EXAMPLESDIR%%/simple-heap.tcl -%%EXAMPLESDIR%%/simple-plm.tcl -%%EXAMPLESDIR%%/simple-rtg.tcl -%%EXAMPLESDIR%%/simple-rtp.tcl -%%EXAMPLESDIR%%/simple-tcp.tcl -%%EXAMPLESDIR%%/simple-webcache-comp.tcl -%%EXAMPLESDIR%%/simple-webcache-trace.tcl -%%EXAMPLESDIR%%/simple-webcache.tcl -%%EXAMPLESDIR%%/simple-wireless.tcl -%%EXAMPLESDIR%%/simple.tcl -%%EXAMPLESDIR%%/src_test.tcl -%%EXAMPLESDIR%%/srm-adapt-rep-session.tcl -%%EXAMPLESDIR%%/srm-adapt-rep.tcl -%%EXAMPLESDIR%%/srm-adapt-req-session.tcl -%%EXAMPLESDIR%%/srm-adapt-req.tcl -%%EXAMPLESDIR%%/srm-chain-session.tcl -%%EXAMPLESDIR%%/srm-chain.tcl -%%EXAMPLESDIR%%/srm-demo.tcl -%%EXAMPLESDIR%%/srm-session.tcl -%%EXAMPLESDIR%%/srm-star-session.tcl -%%EXAMPLESDIR%%/srm-star.tcl -%%EXAMPLESDIR%%/srm.tcl -%%EXAMPLESDIR%%/ss.tcl -%%EXAMPLESDIR%%/swp.tcl -%%EXAMPLESDIR%%/t1000.tcl -%%EXAMPLESDIR%%/tcp-et.tcl -%%EXAMPLESDIR%%/tcp-int.tcl -%%EXAMPLESDIR%%/tcpapp.tcl -%%EXAMPLESDIR%%/tcpecn.tcl -%%EXAMPLESDIR%%/tcpsrm.tcl -%%EXAMPLESDIR%%/test-drr.tcl -%%EXAMPLESDIR%%/test-emulator.tcl -%%EXAMPLESDIR%%/test-rcvr.tcl -%%EXAMPLESDIR%%/test-rlm.tcl -%%EXAMPLESDIR%%/test-suite-intserv.tcl -%%EXAMPLESDIR%%/test-suite.tcl -%%EXAMPLESDIR%%/test-tbf.tcl -%%EXAMPLESDIR%%/tg.tcl -%%EXAMPLESDIR%%/topo-gen-script.tcl -%%EXAMPLESDIR%%/topo-gen.tcl -%%EXAMPLESDIR%%/topo-view.tcl -%%EXAMPLESDIR%%/trace-driven.tcl -%%EXAMPLESDIR%%/udpdata.tcl -%%EXAMPLESDIR%%/varybell.tcl -%%EXAMPLESDIR%%/virtual-classifier.tcl -%%EXAMPLESDIR%%/vlantest-flat.tcl -%%EXAMPLESDIR%%/vlantest-hier.tcl -%%EXAMPLESDIR%%/vlantest-mcst.tcl -%%EXAMPLESDIR%%/web-traffic-embobj.tcl -%%EXAMPLESDIR%%/web-traffic.tcl -%%EXAMPLESDIR%%/wired-cum-wireless-sim.tcl -%%EXAMPLESDIR%%/wireless-demo-csci694.tcl -%%EXAMPLESDIR%%/wireless-dsdv-newnode.tcl -%%EXAMPLESDIR%%/wireless-flooding.tcl -%%EXAMPLESDIR%%/wireless-landmark.tcl -%%EXAMPLESDIR%%/wireless-mip-test.tcl -%%EXAMPLESDIR%%/wireless-mitf.tcl -%%EXAMPLESDIR%%/wireless-newnode-energy.tcl -%%EXAMPLESDIR%%/wireless-pkt-demo.tcl -%%EXAMPLESDIR%%/wireless-shadowing-test.tcl -%%EXAMPLESDIR%%/wireless-shadowing-vis-test.tcl -%%EXAMPLESDIR%%/wireless-simple-mac.tcl -%%EXAMPLESDIR%%/wireless-test.tcl -%%EXAMPLESDIR%%/wireless.tcl -%%EXAMPLESDIR%%/worm.tcl -@dirrm %%EXAMPLESDIR%% diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile deleted file mode 100644 index aafc9e8305c4..000000000000 --- a/net/nss-pam-ldapd/Makefile +++ /dev/null @@ -1,127 +0,0 @@ -# Ports collection Makefile for: nss_ldapd -# Date created: 23/7/2009 -# Whom: melifaro@ipfw.ru -# -# $FreeBSD$ -# - -PORTNAME= nss_ldapd -PORTVERSION= 0.7.3 -CATEGORIES= net -MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \ - http://static.ipfw.ru/files/ -DISTNAME= nss-pam-ldapd-${PORTVERSION} - -MAINTAINER= melifaro@ipfw.ru -COMMENT= Advanced fork of nss_ldap - -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_LDCONFIG= yes -USE_OPENLDAP= yes -USE_RC_SUBR= nslcd - -NSLCD_PIDFILE?= /var/run/nslcd.pid -NSLCD_SOCKET?= /var/run/nslcd.ctl - -OPTIONS= NSS_COMPAT "Enable nss_ldap compatibility" on \ - SASL "Enable SASL" off \ - PAM "Build pam_ldap" on - -USERS= nslcd -GROUPS= nslcd - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= problems with nss/libc TLS -.endif - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -CONFIGURE_ARGS+= --with-nslcd-pidfile=${NSLCD_PIDFILE} \ - --with-nslcd-socket=${NSLCD_SOCKET} \ - --with-ldap-lib=openldap --disable-kerberos - -.if defined(WITHOUT_NSS) -.undef NSS_COMPAT -.endif - -.if defined(WITH_NSS_COMPAT) -CONFIGURE_ARGS+= --enable-nss_compat --disable-configfile-checking --with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf -PLIST_SUB+= CONFIG="nss_ldap" -.else -CONFIGURE_ARGS+= --with-ldap-conf-file=${PREFIX}/etc/nss_ldapd.conf -PLIST_SUB+= CONFIG="nss_ldapd" -.endif - -.if defined(WITH_SASL) -WANT_OPENLDAP_SASL= yes -CONFIGURE_ARGS+= --enable-sasl -.else -CONFIGURE_ARGS+= --disable-sasl -.endif - -.if defined(WITH_PAM) -CONFIGURE_ARGS+= --enable-pam -MAN8+= pam_ldap.8 -CONFLICTS+= pam_ldap-1.* -PLIST_SUB+= PAM="" -.else -CONFIGURE_ARGS+= --disable-pam -PLIST_SUB+= PAM="@comment " -.endif - -.if defined(WITHOUT_NSS) -CONFIGURE_ARGS+= --disable-nss -PLIST_SUB+= NSS="@comment " -.else -CONFIGURE_ARGS+= --enable-nss -CONFLICTS+= nss_ldap-1.* -PLIST_SUB+= NSS="" -.endif - -.if defined(WITHOUT_NSLCD) -CONFIGURE_ARGS+= --disable-nslcd -PLIST_SUB+= NSLCD="@comment " -.else -CONFIGURE_ARGS+= --enable-nslcd -PLIST_SUB+= NSLCD="" -MAN5+= nslcd.conf.5 -MAN8+= nslcd.8 -.endif - -post-extract: - @${REINPLACE_CMD} -e 's/\(INSTALL_\)\(.*\)) -D /\1\2) /' ${WRKSRC}/Makefile.in ${WRKSRC}/nss/Makefile.in - @${REINPLACE_CMD} -e 's/shadow.$$(OBJEXT)/shadow.$$(OBJEXT) bsdnss.$$(OBJEXT)/;s/shadow\.c/shadow.c bsdnss.c/;s/exports\.linux/exports.freebsd/' ${WRKSRC}/nss/Makefile.in - @${REINPLACE_CMD} -e 's/^NSS_VERS = .*/NSS_VERS = 1/;s/libnss_ldap\.so/nss_ldap.so/' ${WRKSRC}/nss/Makefile.in - @${REINPLACE_CMD} -e 's/$$(DESTDIR)$$(NSS_LDAP_PATH_CONF)/$$(DESTDIR)$$(NSS_LDAP_PATH_CONF).sample/' ${WRKSRC}/Makefile.in - -post-install: - @${ECHO_MSG} - @${ECHO_MSG} ===================================================================== - @${ECHO_MSG} -.if defined(WITH_NSS_COMPAT) - @${ECHO_MSG} " NSS_LDAP compatibility ENABLED." - @${ECHO_MSG} - @${ECHO_MSG} " LDAP configuration: ${PREFIX}/etc/nss_ldap.conf" - @${ECHO_MSG} " Secret file: ${PREFIX}/etc/nss_ldap.secret" - @${ECHO_MSG} " Sample configuration: ${PREFIX}/etc/nss_ldap.conf.sample" - @${ECHO_MSG} - @${ECHO_MSG} " Check if you need to adjust reconnect_* parameters" - @${ECHO_MSG} " WARNING: nss_ldapd will use ONLY rootbinddn to access LDAP data" -.else - @${ECHO_MSG} " LDAP configuration: ${PREFIX}/etc/nss_ldapd.conf" - @${ECHO_MSG} " Sample configuration: ${PREFIX}/etc/nss_ldapd.conf.sample" - @${ECHO_MSG} -.endif -.if !defined(WITHOUT_NSS) - @${ECHO_MSG} " WARNING: Be sure to set uid and gid configuration parameters" - @${ECHO_MSG} " WARNING: to make nslcd run under unprivileged user" -.endif - @${ECHO_MSG} - @${ECHO_MSG} ===================================================================== - @${ECHO_MSG} - -.include <bsd.port.post.mk> diff --git a/net/nss-pam-ldapd/distinfo b/net/nss-pam-ldapd/distinfo deleted file mode 100644 index b066d6e5d9da..000000000000 --- a/net/nss-pam-ldapd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (nss-pam-ldapd-0.7.3.tar.gz) = 688833d959f1878a139d484e980d160e -SHA256 (nss-pam-ldapd-0.7.3.tar.gz) = db300db75fdf7ab74fae8fcb7cfecb5adace49ecf715d308581b22575bc128da -SIZE (nss-pam-ldapd-0.7.3.tar.gz) = 443042 diff --git a/net/nss-pam-ldapd/files/nslcd.in b/net/nss-pam-ldapd/files/nslcd.in deleted file mode 100644 index 5daab7ba603f..000000000000 --- a/net/nss-pam-ldapd/files/nslcd.in +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: nslcd -# REQUIRE: DAEMON ldconfig resolv -# -# Add the following line to /etc/rc.conf to enable the nslcd daemon: -# -# nslcd_enable="YES" -# - -nslcd_enable=${nslcd_enable-"NO"} - -. /etc/rc.subr - -name=nslcd -rcvar=$(set_rcvar) - -command="%%PREFIX%%/sbin/${name}" -pidfile="/var/run/${name}.pid" - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net/nss-pam-ldapd/files/nss_patch.diff b/net/nss-pam-ldapd/files/nss_patch.diff deleted file mode 100644 index 1bf8bbdcf14d..000000000000 --- a/net/nss-pam-ldapd/files/nss_patch.diff +++ /dev/null @@ -1,83 +0,0 @@ ---- configure.ac.orig 2009-10-17 20:09:01.000000000 +0400 -+++ configure.ac 2009-12-20 19:58:24.000000000 +0300 -@@ -160,6 +160,20 @@ - AC_DEFINE(ENABLE_CONFIGFILE_CHECKING,1,[Whether to check configfile options.]) - fi - -+# check whether nss_compat options should be checked -+AC_MSG_CHECKING([whether to check nss_compat option]) -+AC_ARG_ENABLE(nss_compat_checking, -+ AS_HELP_STRING([--enable-nss_compat], -+ [check nss_compat option [[default=no]]]), -+ [nss_compat_checking=$enableval], -+ [nss_compat_checking="no"]) -+AC_MSG_RESULT($nss_compat_checking) -+if test "x$nss_compat_checking" = "xyes" -+then -+ AC_CHECK_HEADERS([libgen.h], [], [AC_MSG_ERROR([libgen.h is required for nss_compat])]) -+ AC_DEFINE(ENABLE_NSS_COMPAT,1,[Whether to check nss_compat options.]) -+fi -+ - # check the name of the configuration file - AC_ARG_WITH(ldap-conf-file, - AS_HELP_STRING([--with-ldap-conf-file=PATH], ---- nslcd/cfg.c.orig 2009-10-05 21:47:47.000000000 +0400 -+++ nslcd/cfg.c 2009-12-20 18:10:37.000000000 +0300 -@@ -33,6 +33,9 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> -+#ifdef ENABLE_NSS_COMPAT -+#include <libgen.h> -+#endif - #include <errno.h> - #include <netdb.h> - #include <sys/socket.h> -@@ -665,6 +668,25 @@ - int rc; - char *value; - #endif -+#ifdef ENABLE_NSS_COMPAT -+ /* get secret password */ -+ snprintf(linebuf, sizeof(linebuf), "%s/nss_ldap.secret", dirname(filename)); -+ if ((fp=fopen(linebuf,"r"))==NULL) -+ { -+ log_log(LOG_ERR,"cannot open secret file (%s): %s",linebuf,strerror(errno)); -+ /* exit(EXIT_FAILURE); */ -+ } -+ else if (fgets(linebuf,MAX_LINE_LENGTH,fp)!=NULL) -+ { -+ i=strlen(linebuf); -+ if (i>0) -+ linebuf[i-1]='\0'; -+ cfg->ldc_bindpw=strdup(linebuf); -+ } -+ if (fp!=NULL) -+ fclose(fp); -+#endif -+ - /* open config file */ - if ((fp=fopen(filename,"r"))==NULL) - { -@@ -733,13 +755,20 @@ - get_int(filename,lnr,keyword,&line,&cfg->ldc_version); - get_eol(filename,lnr,keyword,&line); - } -+#ifdef ENABLE_NSS_COMPAT -+ else if (strcasecmp(keyword,"rootbinddn")==0) -+#else - else if (strcasecmp(keyword,"binddn")==0) -+#endif - { - get_restdup(filename,lnr,keyword,&line,&cfg->ldc_binddn); - } - else if (strcasecmp(keyword,"bindpw")==0) - { -- get_restdup(filename,lnr,keyword,&line,&cfg->ldc_bindpw); -+#ifdef ENABLE_NSS_COMPAT -+ if (cfg->ldc_bindpw == NULL) -+#endif -+ get_restdup(filename,lnr,keyword,&line,&cfg->ldc_bindpw); - } - /* SASL authentication options */ - else if (strcasecmp(keyword,"sasl_authcid")==0) diff --git a/net/nss-pam-ldapd/files/patch-configure b/net/nss-pam-ldapd/files/patch-configure deleted file mode 100644 index adbb1e557776..000000000000 --- a/net/nss-pam-ldapd/files/patch-configure +++ /dev/null @@ -1,212 +0,0 @@ ---- config.h.in.orig 2009-12-20 17:49:41.000000000 +0300 -+++ config.h.in 2009-12-20 17:41:46.000000000 +0300 -@@ -3,6 +3,9 @@ - /* Whether to check configfile options. */ - #undef ENABLE_CONFIGFILE_CHECKING - -+/* Whether to check nss_compat options. */ -+#undef ENABLE_NSS_COMPAT -+ - /* Define to 1 if you have the <aliases.h> header file. */ - #undef HAVE_ALIASES_H - ---- configure.orig 2010-02-27 09:17:45.000000000 -0600 -+++ configure 2010-04-29 07:28:11.044647697 -0500 -@@ -738,6 +738,7 @@ - enable_sasl - enable_kerberos - enable_configfile_checking -+enable_nss_compat - with_ldap_conf_file - with_bindpw_file - with_nslcd_pidfile -@@ -1386,6 +1387,7 @@ - --disable-kerberos disable Kerberos support [[default=enabled]] - --disable-configfile-checking - check configfile options [[default=enabled]] -+ --enable-nss_compat check nss_compat option [[default=disabled]] - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -4782,6 +4784,181 @@ - - fi - -+# check whether nss_compat options should be checked -+{ $as_echo "$as_me:$LINENO: checking whether to check nss_compat option" >&5 -+$as_echo_n "checking whether to check nss_compat option... " >&6; } -+# Check whether --enable-nss_compat was given. -+if test "${enable_nss_compat+set}" = set; then -+ enableval=$enable_nss_compat; nss_compat=$enableval -+else -+ nss_compat="no" -+fi -+ -+{ $as_echo "$as_me:$LINENO: result: $nss_compat" >&5 -+$as_echo "$nss_compat" >&6; } -+if test "x$nss_compat" = "xyes" -+then -+ -+for ac_header in libgen.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## -------------------------------------- ## -+## Report this to arthur@arthurdejong.org ## -+## -------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+else -+ { { $as_echo "$as_me:$LINENO: error: libgen.h is required for nss_compat" >&5 -+$as_echo "$as_me: error: libgen.h is required for nss_compat" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+done -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define ENABLE_NSS_COMPAT 1 -+_ACEOF -+ -+fi -+ - # check the name of the configuration file - - # Check whether --with-ldap-conf-file was given. diff --git a/net/nss-pam-ldapd/files/patch-nslcd.conf b/net/nss-pam-ldapd/files/patch-nslcd.conf deleted file mode 100644 index 4c2a5b05b461..000000000000 --- a/net/nss-pam-ldapd/files/patch-nslcd.conf +++ /dev/null @@ -1,13 +0,0 @@ ---- nslcd.conf.orig 2010-04-29 07:44:58.355014955 -0500 -+++ nslcd.conf 2010-04-29 07:45:10.741047860 -0500 -@@ -4,6 +4,10 @@ - # information in the directory. - # See the manual page nslcd.conf(5) for more information. - -+# The underprivileged user and group used for running the daemon. -+uid nslcd -+gid nslcd -+ - # The uri pointing to the LDAP server to use for name lookups. - # Multiple entries may be specified. The address that is used - # here should be resolvable without using LDAP (obviously). diff --git a/net/nss-pam-ldapd/files/patch-nslcd__cfg.c b/net/nss-pam-ldapd/files/patch-nslcd__cfg.c deleted file mode 100644 index 4b1f9586c47d..000000000000 --- a/net/nss-pam-ldapd/files/patch-nslcd__cfg.c +++ /dev/null @@ -1,60 +0,0 @@ ---- nslcd/cfg.c.orig 2009-10-05 21:47:47.000000000 +0400 -+++ nslcd/cfg.c 2009-12-20 18:10:37.000000000 +0300 -@@ -33,6 +33,9 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> -+#ifdef ENABLE_NSS_COMPAT -+#include <libgen.h> -+#endif - #include <errno.h> - #include <netdb.h> - #include <sys/socket.h> -@@ -665,6 +668,25 @@ - int rc; - char *value; - #endif -+#ifdef ENABLE_NSS_COMPAT -+ /* get secret password */ -+ snprintf(linebuf, sizeof(linebuf), "%s/nss_ldap.secret", dirname(filename)); -+ if ((fp=fopen(linebuf,"r"))==NULL) -+ { -+ log_log(LOG_ERR,"cannot open secret file (%s): %s",linebuf,strerror(errno)); -+ /* exit(EXIT_FAILURE); */ -+ } -+ else if (fgets(linebuf,MAX_LINE_LENGTH,fp)!=NULL) -+ { -+ i=strlen(linebuf); -+ if (i>0) -+ linebuf[i-1]='\0'; -+ cfg->ldc_bindpw=strdup(linebuf); -+ } -+ if (fp!=NULL) -+ fclose(fp); -+#endif -+ - /* open config file */ - if ((fp=fopen(filename,"r"))==NULL) - { -@@ -733,13 +755,20 @@ - get_int(filename,lnr,keyword,&line,&cfg->ldc_version); - get_eol(filename,lnr,keyword,&line); - } -+#ifdef ENABLE_NSS_COMPAT -+ else if (strcasecmp(keyword,"rootbinddn")==0) -+#else - else if (strcasecmp(keyword,"binddn")==0) -+#endif - { - get_restdup(filename,lnr,keyword,&line,&cfg->ldc_binddn); - } - else if (strcasecmp(keyword,"bindpw")==0) - { -- get_restdup(filename,lnr,keyword,&line,&cfg->ldc_bindpw); -+#ifdef ENABLE_NSS_COMPAT -+ if (cfg->ldc_bindpw == NULL) -+#endif -+ get_restdup(filename,lnr,keyword,&line,&cfg->ldc_bindpw); - } - /* SASL authentication options */ - else if (strcasecmp(keyword,"sasl_authcid")==0) diff --git a/net/nss-pam-ldapd/files/patch-nss__bsdnss.c b/net/nss-pam-ldapd/files/patch-nss__bsdnss.c deleted file mode 100644 index 1781ffc3f727..000000000000 --- a/net/nss-pam-ldapd/files/patch-nss__bsdnss.c +++ /dev/null @@ -1,160 +0,0 @@ ---- nss/bsdnss.c.orig 2009-08-10 16:06:22.000000000 +0000 -+++ nss/bsdnss.c 2009-08-10 15:58:04.000000000 +0000 -@@ -0,0 +1,157 @@ -+#include <errno.h> -+#include <sys/param.h> -+#include <netinet/in.h> -+#include <pwd.h> -+#include <grp.h> -+#include <nss.h> -+#include <netdb.h> -+ -+#define BUFFER_SIZE 1024 -+ -+extern enum nss_status _nss_ldap_getgrent_r(struct group *, char *, size_t, -+ int *); -+extern enum nss_status _nss_ldap_getgrnam_r(const char *, struct group *, -+ char *, size_t, int *); -+extern enum nss_status _nss_ldap_getgrgid_r(gid_t gid, struct group *, char *, -+ size_t, int *); -+extern enum nss_status _nss_ldap_setgrent(void); -+extern enum nss_status _nss_ldap_endgrent(void); -+ -+extern enum nss_status _nss_ldap_getpwent_r(struct passwd *, char *, size_t, -+ int *); -+extern enum nss_status _nss_ldap_getpwnam_r(const char *, struct passwd *, -+ char *, size_t, int *); -+extern enum nss_status _nss_ldap_getpwuid_r(gid_t gid, struct passwd *, char *, -+ size_t, int *); -+extern enum nss_status _nss_ldap_setpwent(void); -+extern enum nss_status _nss_ldap_endpwent(void); -+ -+extern enum nss_status _nss_ldap_gethostbyname_r (const char *name, struct hostent * result, -+ char *buffer, size_t buflen, int *errnop, -+ int *h_errnop); -+ -+extern enum nss_status _nss_ldap_gethostbyname2_r (const char *name, int af, struct hostent * result, -+ char *buffer, size_t buflen, int *errnop, -+ int *h_errnop); -+extern enum nss_status _nss_ldap_gethostbyaddr_r (struct in_addr * addr, int len, int type, -+ struct hostent * result, char *buffer, -+ size_t buflen, int *errnop, int *h_errnop); -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_setgrent); -+NSS_METHOD_PROTOTYPE(__nss_compat_endgrent); -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); -+NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyname); -+NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyname2); -+NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyaddr); -+ -+static ns_mtab methods[] = { -+{ NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_ldap_getgrnam_r }, -+{ NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_ldap_getgrgid_r }, -+{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_ldap_getgrent_r }, -+{ NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_ldap_setgrent }, -+{ NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_ldap_endgrent }, -+ -+{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_ldap_getpwnam_r }, -+{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_ldap_getpwuid_r }, -+{ NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_ldap_getpwent_r }, -+{ NSDB_PASSWD, "setpwent", __nss_compat_setpwent, _nss_ldap_setpwent }, -+{ NSDB_PASSWD, "endpwent", __nss_compat_endpwent, _nss_ldap_endpwent }, -+ -+{ NSDB_HOSTS, "gethostbyname", __nss_compat_gethostbyname, _nss_ldap_gethostbyname_r }, -+{ NSDB_HOSTS, "gethostbyaddr", __nss_compat_gethostbyaddr, _nss_ldap_gethostbyaddr_r }, -+{ NSDB_HOSTS, "gethostbyname2", __nss_compat_gethostbyname2, _nss_ldap_gethostbyname2_r }, -+ -+{ NSDB_GROUP_COMPAT, "getgrnam_r", __nss_compat_getgrnam_r, _nss_ldap_getgrnam_r }, -+{ NSDB_GROUP_COMPAT, "getgrgid_r", __nss_compat_getgrgid_r, _nss_ldap_getgrgid_r }, -+{ NSDB_GROUP_COMPAT, "getgrent_r", __nss_compat_getgrent_r, _nss_ldap_getgrent_r }, -+{ NSDB_GROUP_COMPAT, "setgrent", __nss_compat_setgrent, _nss_ldap_setgrent }, -+{ NSDB_GROUP_COMPAT, "endgrent", __nss_compat_endgrent, _nss_ldap_endgrent }, -+ -+{ NSDB_PASSWD_COMPAT, "getpwnam_r", __nss_compat_getpwnam_r, _nss_ldap_getpwnam_r }, -+{ NSDB_PASSWD_COMPAT, "getpwuid_r", __nss_compat_getpwuid_r, _nss_ldap_getpwuid_r }, -+{ NSDB_PASSWD_COMPAT, "getpwent_r", __nss_compat_getpwent_r, _nss_ldap_getpwent_r }, -+{ NSDB_PASSWD_COMPAT, "setpwent", __nss_compat_setpwent, _nss_ldap_setpwent }, -+{ NSDB_PASSWD_COMPAT, "endpwent", __nss_compat_endpwent, _nss_ldap_endpwent }, -+ -+}; -+ -+ -+int __nss_compat_gethostbyname(void *retval, void *mdata, va_list ap) -+{ -+ enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); -+ const char *name; -+ struct hostent *result; -+ char buffer[BUFFER_SIZE]; -+ int errnop; -+ int h_errnop; -+ int af; -+ enum nss_status status; -+ fn = mdata; -+ name = va_arg(ap, const char*); -+ af = va_arg(ap,int); -+ result = va_arg(ap,struct hostent *); -+ status = fn(name, result, buffer, sizeof(buffer), &errnop, &h_errnop); -+ status = __nss_compat_result(status,errnop); -+ h_errno = h_errnop; -+ return (status); -+} -+ -+int __nss_compat_gethostbyname2(void *retval, void *mdata, va_list ap) -+{ -+ enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); -+ const char *name; -+ struct hostent *result; -+ char buffer[BUFFER_SIZE]; -+ int errnop; -+ int h_errnop; -+ int af; -+ enum nss_status status; -+ fn = mdata; -+ name = va_arg(ap, const char*); -+ af = va_arg(ap,int); -+ result = va_arg(ap,struct hostent *); -+ status = fn(name, result, buffer, sizeof(buffer), &errnop, &h_errnop); -+ status = __nss_compat_result(status,errnop); -+ h_errno = h_errnop; -+ return (status); -+} -+ -+int __nss_compat_gethostbyaddr(void *retval, void *mdata, va_list ap) -+{ -+ struct in_addr *addr; -+ int len; -+ int type; -+ struct hostent *result; -+ char buffer[BUFFER_SIZE]; -+ int errnop; -+ int h_errnop; -+ enum nss_status (*fn)(struct in_addr *, int, int, struct hostent *, char *, size_t, int *, int *); -+ enum nss_status status; -+ fn = mdata; -+ addr = va_arg(ap, struct in_addr*); -+ len = va_arg(ap,int); -+ type = va_arg(ap,int); -+ result = va_arg(ap, struct hostent*); -+ status = fn(addr, len, type, result, buffer, sizeof(buffer), &errnop, &h_errnop); -+ status = __nss_compat_result(status,errnop); -+ h_errno = h_errnop; -+ return (status); -+} -+ -+ns_mtab * -+nss_module_register(const char *source, unsigned int *mtabsize, -+ nss_module_unregister_fn *unreg) -+{ -+ *mtabsize = sizeof(methods)/sizeof(methods[0]); -+ *unreg = NULL; -+ return (methods); -+} diff --git a/net/nss-pam-ldapd/files/patch-nss__exports.freebsd b/net/nss-pam-ldapd/files/patch-nss__exports.freebsd deleted file mode 100644 index a8cd82e46cd4..000000000000 --- a/net/nss-pam-ldapd/files/patch-nss__exports.freebsd +++ /dev/null @@ -1,109 +0,0 @@ ---- nss/exports.freebsd.orig 2009-12-20 15:58:25.000000000 +0300 -+++ nss/exports.freebsd 2009-12-20 15:57:47.000000000 +0300 -@@ -0,0 +1,106 @@ -+EXPORTED { -+ -+ # published NSS service functions -+ global: -+ -+ # aliases - mail aliases -+ _nss_ldap_getaliasbyname_r; -+ _nss_ldap_setaliasent; -+ _nss_ldap_getaliasent_r; -+ _nss_ldap_endaliasent; -+ -+ # ethers - ethernet numbers -+ _nss_ldap_gethostton_r; -+ _nss_ldap_getntohost_r; -+ _nss_ldap_setetherent; -+ _nss_ldap_getetherent_r; -+ _nss_ldap_endetherent; -+ -+ # group - groups of users -+ _nss_ldap_getgrnam_r; -+ _nss_ldap_getgrgid_r; -+ _nss_ldap_initgroups_dyn; -+ _nss_ldap_setgrent; -+ _nss_ldap_getgrent_r; -+ _nss_ldap_endgrent; -+ -+ # hosts - host names and numbers -+ _nss_ldap_gethostbyname_r; -+ _nss_ldap_gethostbyname2_r; -+ _nss_ldap_gethostbyaddr_r; -+ _nss_ldap_sethostent; -+ _nss_ldap_gethostent_r; -+ _nss_ldap_endhostent; -+ -+ # netgroup - list of host and users -+ _nss_ldap_setnetgrent; -+ _nss_ldap_getnetgrent_r; -+ _nss_ldap_endnetgrent; -+ -+ # networks - network names and numbers -+ _nss_ldap_getnetbyname_r; -+ _nss_ldap_getnetbyaddr_r; -+ _nss_ldap_setnetent; -+ _nss_ldap_getnetent_r; -+ _nss_ldap_endnetent; -+ -+ # passwd - user database and passwords -+ _nss_ldap_getpwnam_r; -+ _nss_ldap_getpwuid_r; -+ _nss_ldap_setpwent; -+ _nss_ldap_getpwent_r; -+ _nss_ldap_endpwent; -+ -+ # protocols - network protocols -+ _nss_ldap_getprotobyname_r; -+ _nss_ldap_getprotobynumber_r; -+ _nss_ldap_setprotoent; -+ _nss_ldap_getprotoent_r; -+ _nss_ldap_endprotoent; -+ -+ # rpc - remote procedure call names and numbers -+ _nss_ldap_getrpcbyname_r; -+ _nss_ldap_getrpcbynumber_r; -+ _nss_ldap_setrpcent; -+ _nss_ldap_getrpcent_r; -+ _nss_ldap_endrpcent; -+ -+ # services - network services -+ _nss_ldap_getservbyname_r; -+ _nss_ldap_getservbyport_r; -+ _nss_ldap_setservent; -+ _nss_ldap_getservent_r; -+ _nss_ldap_endservent; -+ -+ # shadow - extended user information -+ _nss_ldap_getspnam_r; -+ _nss_ldap_setspent; -+ _nss_ldap_getspent_r; -+ _nss_ldap_endspent; -+ -+ # compat 4 bsd -+ __nss_compat_getgrnam_r; -+ __nss_compat_getgrgid_r; -+ __nss_compat_getgrent_r; -+ __nss_compat_setgrent; -+ __nss_compat_endgrent; -+ -+ __nss_compat_getpwnam_r; -+ __nss_compat_getpwuid_r; -+ __nss_compat_getpwent_r; -+ __nss_compat_setpwent; -+ __nss_compat_endpwent; -+ -+ __nss_compat_gethostbyname; -+ __nss_compat_gethostbyname2; -+ __nss_compat_gethostbyaddr; -+ -+ # module init -+ nss_module_register; -+ -+ -+ # everything else should not be exported -+ local: -+ *; -+ -+}; diff --git a/net/nss-pam-ldapd/files/patch-nss__prototypes.h b/net/nss-pam-ldapd/files/patch-nss__prototypes.h deleted file mode 100644 index 53003f014ae2..000000000000 --- a/net/nss-pam-ldapd/files/patch-nss__prototypes.h +++ /dev/null @@ -1,43 +0,0 @@ ---- nss/prototypes.h.orig 2009-09-04 15:55:35.000000000 +0400 -+++ nss/prototypes.h 2009-12-20 15:37:57.000000000 +0300 -@@ -84,6 +86,27 @@ - void *nip; /* changed from `service_user *nip' */ - }; - -+#ifdef __FreeBSD__ -+/* -+ * Import from aliases.h -+ */ -+struct aliasent -+ { -+ char *alias_name; -+ size_t alias_members_len; -+ char **alias_members; -+ int alias_local; -+ }; -+ -+struct rpcent -+{ -+ char *r_name; /* Name of server for this rpc program. */ -+ char **r_aliases; /* Alias list. */ -+ int r_number; /* RPC program number. */ -+}; -+ -+#endif -+ - /* - These are prototypes for functions exported from the ldap NSS module. - For more complete definitions of these functions check the GLIBC -@@ -166,10 +189,12 @@ - enum nss_status _nss_ldap_getservent_r(struct servent *result,char *buffer,size_t buflen,int *errnop); - enum nss_status _nss_ldap_endservent(void); - -+#ifdef HAVE_SHADOW_H - /* shadow - extended user information */ - enum nss_status _nss_ldap_getspnam_r(const char *name,struct spwd *result,char *buffer,size_t buflen,int *errnop); - enum nss_status _nss_ldap_setspent(int stayopen); - enum nss_status _nss_ldap_getspent_r(struct spwd *result,char *buffer,size_t buflen,int *errnop); - enum nss_status _nss_ldap_endspent(void); -+#endif - - #endif /* not NSS_EXPORTS */ diff --git a/net/nss-pam-ldapd/files/patch-nss__shadow.c b/net/nss-pam-ldapd/files/patch-nss__shadow.c deleted file mode 100644 index 7ffbc189957d..000000000000 --- a/net/nss-pam-ldapd/files/patch-nss__shadow.c +++ /dev/null @@ -1,17 +0,0 @@ ---- nss/shadow.c.orig 2009-05-29 21:23:03.000000000 +0000 -+++ nss/shadow.c 2009-08-02 22:32:27.000000000 +0000 -@@ -22,6 +22,7 @@ - - #include "config.h" - -+#ifdef HAVE_SHADOW_H - #include <string.h> - #include <nss.h> - #include <errno.h> -@@ -73,3 +74,6 @@ - { - NSS_ENDENT(spentfp); - } -+ -+#endif -+ diff --git a/net/nss-pam-ldapd/files/patch-pam__makefile.in b/net/nss-pam-ldapd/files/patch-pam__makefile.in deleted file mode 100644 index 864e4123288c..000000000000 --- a/net/nss-pam-ldapd/files/patch-pam__makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- pam/Makefile.in.orig 2009-12-20 20:47:00.000000000 +0300 -+++ pam/Makefile.in 2009-12-20 20:48:30.000000000 +0300 -@@ -470,7 +470,8 @@ - - # install pam_ldap.so - install-pam_ldap_so: pam_ldap.so -- $(INSTALL_PROGRAM) -D pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so -+ $(INSTALL_PROGRAM) pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so.1 -+ ln -s $(DESTDIR)$(libdir)/pam_ldap.so.1 $(DESTDIR)$(libdir)/pam_ldap.so - uninstall-pam_ldap_so: - -rm -f $(DESTDIR)$(libdir)/security/pam_ldap.so - diff --git a/net/nss-pam-ldapd/pkg-descr b/net/nss-pam-ldapd/pkg-descr deleted file mode 100644 index 7534ff69d43c..000000000000 --- a/net/nss-pam-ldapd/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -nss_ldapd is a NSS module which provides an LDAP backend for C library -functions such as getpwnam(3), getgrnam(3), and gethostbyname(3). It -is compliant with RFC 2307, ``An Approach for Using LDAP as a Network -Information Service''. - -Key differences from nss_ldap: -* lighter nss library (no ldap* dependings) -* server-side connection caching - - -WWW: http://arthurdejong.org/nss-ldapd/ diff --git a/net/nss-pam-ldapd/pkg-plist b/net/nss-pam-ldapd/pkg-plist deleted file mode 100644 index 5280a2fe6e0d..000000000000 --- a/net/nss-pam-ldapd/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -etc/%%CONFIG%%.conf -%%NSS%%lib/nss_ldap.so.1 -%%NSLCD%%sbin/nslcd -%%PAM%%lib/pam_ldap.so -%%PAM%%lib/pam_ldap.so.1 diff --git a/net/openistgt/Makefile b/net/openistgt/Makefile deleted file mode 100644 index f2af3188490b..000000000000 --- a/net/openistgt/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# New ports collection makefile for: istgt -# Date created: 2009-02-23 -# Whom: Daisuke Aoyama <aoyama@peach.ne.jp> -# -# $FreeBSD$ -# - -PORTNAME= istgt -PORTVERSION= 20100525 -CATEGORIES= net -MASTER_SITES= http://www.peach.ne.jp/archives/istgt/ - -MAINTAINER= aoyama@peach.ne.jp -COMMENT= An iSCSI target for FreeBSD 7.x - -SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -GNU_CONFIGURE= yes - -MAN1= istgt.1 -MANCOMPRESSED= yes - -PORTDOCS= README ChangeLog.jp QUICKSTART QUICKSTART.jp - -post-extract: - @${MV} ${WRKSRC}/doc/Makefile.in ${WRKSRC}/doc/Makefile.tmp - @${SED} -e '/\/doc\/istgt/d' < ${WRKSRC}/doc/Makefile.tmp \ - > ${WRKSRC}/doc/Makefile.in - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/ChangeLog.jp ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/QUICKSTART ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/QUICKSTART.jp ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net/openistgt/distinfo b/net/openistgt/distinfo deleted file mode 100644 index 3fab92b357ac..000000000000 --- a/net/openistgt/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (istgt-20100525.tar.gz) = ccdc37cb3d9b1dc6b8fe9411e824f015 -SHA256 (istgt-20100525.tar.gz) = 3445d1b68b49535d849b83f4b542d05bd2fed32d2066836e39b8ab8dff8a66c1 -SIZE (istgt-20100525.tar.gz) = 217417 diff --git a/net/openistgt/files/pkg-message.in b/net/openistgt/files/pkg-message.in deleted file mode 100644 index 8466449434f3..000000000000 --- a/net/openistgt/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -************************************************************************* - -To run istgt at startup, add istgt_enable="YES" to /etc/rc.conf. -Create configuration files manually. -Sample configuration files can be found in %%PREFIX%%/etc/istgt. -QUICKSTART in %%DOCSDIR%% shows you how to configure. - -************************************************************************* diff --git a/net/openistgt/pkg-descr b/net/openistgt/pkg-descr deleted file mode 100644 index 2dd62b807687..000000000000 --- a/net/openistgt/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This is an iSCSI target, it serves iSCSI protocol and provides -SCSI devices to the initiator (client). - -WWW: http://shell.peach.ne.jp/aoyama/ diff --git a/net/openistgt/pkg-plist b/net/openistgt/pkg-plist deleted file mode 100644 index 3123f2b1d70e..000000000000 --- a/net/openistgt/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -@comment $FreeBSD$ -bin/istgt -bin/istgtcontrol -etc/rc.d/istgt -etc/istgt/istgt.conf.sample -etc/istgt/istgt.large.conf.sample -etc/istgt/auth.conf.sample -etc/istgt/istgtcontrol.conf.sample -@dirrm etc/istgt diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile deleted file mode 100644 index d3475ab2330b..000000000000 --- a/net/p5-IO-Socket-INET6/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: p5-IO-INET6 -# Date created: 02 July 2003 -# Whom: Janos.Mohacsi@bsd.hu -# -# $FreeBSD$ -# - -PORTNAME= IO-Socket-INET6 -PORTVERSION= 2.63 -CATEGORIES= net perl5 ipv6 -MASTER_SITES= CPAN -PKGNAMEPREFIX= p5- - -MAINTAINER= janos.mohacsi@bsd.hu -COMMENT= Perl module with object interface to AF_INET6 domain sockets - -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6 -RUN_DEPENDS= ${BUILD_DEPENDS} - -MAN3= IO::Socket::INET6.3 - -PERL_CONFIGURE= yes - -.include <bsd.port.mk> diff --git a/net/p5-IO-Socket-INET6/distinfo b/net/p5-IO-Socket-INET6/distinfo deleted file mode 100644 index 53b1c2fc4443..000000000000 --- a/net/p5-IO-Socket-INET6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (IO-Socket-INET6-2.63.tar.gz) = 732e4cf40d6342ad35c3f74231b1178a -SHA256 (IO-Socket-INET6-2.63.tar.gz) = c49ae638aabe292ccd3bf9b74b57bff32f68871a7977e0f42ff8b9031f5f898f -SIZE (IO-Socket-INET6-2.63.tar.gz) = 17393 diff --git a/net/p5-IO-Socket-INET6/pkg-descr b/net/p5-IO-Socket-INET6/pkg-descr deleted file mode 100644 index 714ad2896191..000000000000 --- a/net/p5-IO-Socket-INET6/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -IO::Socket::INET6 provides an object interface to creating and using sockets -in the AF_INET6 domain. It is built upon the IO::Socket interface and -inherits all the methods defined by IO::Socket. As a consequence, this module -is protocol independent, it can run both IPv6 & IPv4, when DNS names are -passed. - -WWW: http://search.cpan.org/dist/IO-INET6/ diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist deleted file mode 100644 index aea89e1b2ff9..000000000000 --- a/net/p5-IO-Socket-INET6/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -%%SITE_PERL%%/IO/Socket/INET6.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6 -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO -@dirrmtry %%SITE_PERL%%/IO/Socket -@dirrmtry %%SITE_PERL%%/IO diff --git a/net/py-zope.proxy/Makefile b/net/py-zope.proxy/Makefile deleted file mode 100644 index 6603ed32e0d8..000000000000 --- a/net/py-zope.proxy/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: py-zopeproxy -# Date created: 22 Nov, 2008 -# Whom: Wen Heping <wenheping@gmail.com> -# -# $FreeBSD$ -# - -PORTNAME= zopeproxy -PORTVERSION= 3.6.0 -CATEGORIES= net python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= zope.proxy-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Generic Transparent Proxies - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zopeInterface>=3.3.0:${PORTSDIR}/devel/py-zopeInterface -RUN_DEPENDS= ${BUILD_DEPENDS} - -USE_ZIP= yes -USE_PYTHON= 2.4+ -USE_PYDISTUTILS= easy_install -PYEASYINSTALL_ARCHDEP= yes -PYDISTUTILS_PKGNAME= zope.proxy - -.include <bsd.port.mk> diff --git a/net/py-zope.proxy/distinfo b/net/py-zope.proxy/distinfo deleted file mode 100644 index 9d10572aaa69..000000000000 --- a/net/py-zope.proxy/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (zope.proxy-3.6.0.zip) = 896d9c53837d01875fe55cc69f43f7aa -SHA256 (zope.proxy-3.6.0.zip) = 7ee1aa543e83edd9a1b321262925279e9e02bef214c8e875edb860eacd8d4b37 -SIZE (zope.proxy-3.6.0.zip) = 25587 diff --git a/net/py-zope.proxy/pkg-descr b/net/py-zope.proxy/pkg-descr deleted file mode 100644 index 860842a5414f..000000000000 --- a/net/py-zope.proxy/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Proxies are special objects which serve as mostly-transparent wrappers -around another object, intervening in the apparent behavior of the -wrapped object only when necessary to apply the policy (e.g., access -checking, location brokering, etc.) for which the proxy is responsible. - -WWW: http://pypi.python.org/pypi/zope.proxy diff --git a/net/py-zope.proxy/pkg-plist b/net/py-zope.proxy/pkg-plist deleted file mode 100644 index fd0977046eee..000000000000 --- a/net/py-zope.proxy/pkg-plist +++ /dev/null @@ -1,40 +0,0 @@ -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/decorator.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/interfaces.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.c -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/proxy.h -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.so -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/decorator.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/interfaces.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_decorator.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_proxy.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_decorator.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_proxy.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_decorator.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_proxy.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/decorator.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/interfaces.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff --git a/net/rqm/Makefile b/net/rqm/Makefile deleted file mode 100644 index bdf424e8ee5d..000000000000 --- a/net/rqm/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: rqm -# Date created: 30 January 2000 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rqm -PORTVERSION= 1.0.0 -PORTREVISION= 1 -CATEGORIES= mbone tk -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= A graphical RTP quality monitor - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -WRKSRC= ${WRKDIR}/rqm/ - -HAS_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${LOCALBASE} - -ALL_TARGET= rqm -PLIST_FILES= bin/rqm -PORTDOCS= README - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rqm ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ -.endif - -.include <bsd.port.mk> diff --git a/net/rqm/distinfo b/net/rqm/distinfo deleted file mode 100644 index 386a40bb1a63..000000000000 --- a/net/rqm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rqm-1.0.0.tar.gz) = 406a9bfe4a3e9ad9f1a981701072f54a -SHA256 (rqm-1.0.0.tar.gz) = 8e9a2a0a2ed2abe7feb24f6e7fd47a195cb0e91ee8e0daea736c692f12a01f41 -SIZE (rqm-1.0.0.tar.gz) = 3853534 diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa deleted file mode 100644 index 31697563d121..000000000000 --- a/net/rqm/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.orig Sun Oct 3 08:47:46 1999 -+++ configure Sun Jan 30 16:05:14 2000 -@@ -53,9 +53,9 @@ - - echo "Configuring rqm v$VERSION for $OSTYPE" - --GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int -Werror" --TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a" --TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic" -+GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int" -+TCL_LIBS="-L${PREFIX}/lib -ltk84 -ltcl84" -+TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/generic" - DEFS="" - - AR="ar" -@@ -103,7 +103,7 @@ - ;; - FreeBSD ) CC="gcc" - WFLAGS=$GCCWFLAGS -- INCLUDE="-I/usr/local/include" -+ INCLUDE="-I${LOCALBASE}/include" - LDLIBS="-lm" - DEBUG="-g" - CHAR="-fsigned-char" -@@ -172,8 +172,8 @@ - s@__AR__@$AR@ - s@__RANLIB__@$RANLIB@ - s@__WFLAGS__@$WFLAGS@ --s@__INCLUDE__@$TCL_INCL $INCLUDE -I../common@g --s@__LDLIBS__@$TCL_LIBS -L../common -lcommon $LDLIBS@g -+s@__INCLUDE__@$TCL_INCL $INCLUDE -I${PREFIX}/include/uclmmbase@g -+s@__LDLIBS__@$TCL_LIBS -L${PREFIX}/lib -luclmmbase $LDLIBS@g - s@__CHAR__@$CHAR@ - s@__DEBUG__@$DEBUG2@ - s@__OPTIMIZE__@$OPTIMIZE2@ diff --git a/net/rqm/files/patch-ab b/net/rqm/files/patch-ab deleted file mode 100644 index c6f546039ba6..000000000000 --- a/net/rqm/files/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ ---- main.c.orig Wed Mar 8 08:32:07 2000 -+++ main.c Wed Mar 8 08:32:28 2000 -@@ -67,7 +67,7 @@ - } - } - --static void rtp_callback(struct rtp *s, rtp_event *e) -+static void rqm_rtp_callback(struct rtp *s, rtp_event *e) - { - rtp_packet *p = (rtp_packet *) e->data; - rtcp_sr *sr = (rtcp_sr *) e->data; -@@ -177,7 +177,7 @@ - char *addr; - char *port; - char cmd[100]; -- u_int32 curr_rtp_time; -+ u_int32_t curr_rtp_time; - #ifdef WIN32 - WSADATA WSAdata; - if (WSAStartup(WS_VERSION_TWO, &WSAdata) != 0 && WSAStartup(WS_VERSION_ONE, &WSAdata) != 0) { -@@ -199,7 +199,7 @@ - addr = (char *) strtok(argv[1], "/"); - port = (char *) strtok(NULL, "\0"); - -- rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rtp_callback, NULL); -+ rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rqm_rtp_callback, NULL); - - /* Initialise the user interface... */ - if (tcl_init(argc, argv) == FALSE) { -@@ -215,7 +215,7 @@ - rtp_set_sdes(rtp_session, rtp_my_ssrc(rtp_session), RTCP_SDES_TOOL, VERSION, strlen(VERSION)); - - gettimeofday(&prev_t, NULL); -- curr_rtp_time = (u_int32) lrand48(); -+ curr_rtp_time = (u_int32_t) lrand48(); - while (Tk_GetNumMainWindows() > 0) { - gettimeofday(&curr_t, NULL); - curr_rtp_time += (int) (tv_diff(curr_t, prev_t) * 8000); diff --git a/net/rqm/files/patch-ac b/net/rqm/files/patch-ac deleted file mode 100644 index 00ed9055e3ea..000000000000 --- a/net/rqm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Feb 1 17:22:05 2004 -+++ Makefile.in Sun Feb 1 17:22:12 2004 -@@ -6,7 +6,7 @@ - OBJS = main.o ui.o - BIN = rqm - --$(BIN): $(OBJS) ../common/libcommon.a -+$(BIN): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) __LDLIBS__ __PROFILE__ __OPTIMIZE__ __CHECK_LIB__ -o $(BIN) - - .c.o: diff --git a/net/rqm/pkg-descr b/net/rqm/pkg-descr deleted file mode 100644 index 0f66e31ecfde..000000000000 --- a/net/rqm/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The Real-time Transport Protocol, RTP [1], provides quality of service -feedback with reception reports sent alongside the media stream. If the -media is sent via IP multicast it is possible for a third party to snoop -on these reception reports, displaying reception quality for all members -of a group. The RQM application performs such snooping. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/ diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile deleted file mode 100644 index ea02adc0d525..000000000000 --- a/net/rtptools/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: rtptools -# Date created: 5 January 1998 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rtptools -PORTVERSION= 1.18 -CATEGORIES= mbone -MASTER_SITES= http://www.cs.columbia.edu/IRT/software/rtptools/download/ - -MAINTAINER= tut@nhamon.com.ua -COMMENT= A set of tools to record, playback and monitor RTPv2 data streams - -GNU_CONFIGURE= yes - -PLIST_FILES= bin/rtpdump bin/rtpplay bin/rtpsend bin/rtptrans -DOCFILES= README ChangeLog.html rtptools.html -PORTDOCS= ${DOCSFILES} - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ -.endfor -.endif - -.include <bsd.port.mk> diff --git a/net/rtptools/distinfo b/net/rtptools/distinfo deleted file mode 100644 index 1d1d589b507d..000000000000 --- a/net/rtptools/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rtptools-1.18.tar.gz) = 9a344c5a4fed2c4be0151cc03f043bb3 -SHA256 (rtptools-1.18.tar.gz) = 7fa16f71713ca16c5ce9cf5ccbd6796315f3402bdef9c7f7023ffac32c8e2ab0 -SIZE (rtptools-1.18.tar.gz) = 119272 diff --git a/net/rtptools/files/patch-ab b/net/rtptools/files/patch-ab deleted file mode 100644 index c1d142b4a914..000000000000 --- a/net/rtptools/files/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ ---- rtp.h.orig Thu Mar 9 07:35:26 2000 -+++ rtp.h Sat Apr 21 21:52:49 2001 -@@ -110,13 +110,18 @@ - #define RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe) - #define RTCP_VALID_VALUE ((RTP_VERSION << 14) | RTCP_SR) - -+#define RTCP_FRACTION(x) (((x) >> 24) & 0xFF) -+#define RTCP_LOST(x) ((((x) & 0xFFFFFF) < 0x800000) ? \ -+ ((x) & 0xFFFFFF) \ -+ : (((x) & 0xFFFFFF) - 0x1000000)) -+ - /* - * Reception report block - */ - typedef struct { - u_int32 ssrc; /* data source being reported */ -- unsigned int fraction:8; /* fraction lost since last SR/RR */ -- int lost:24; /* cumul. no. pkts lost (signed!) */ -+ u_int32 fraclost; /* fraction lost since last SR/RR and */ -+ /* cumul. no. pkts lost (signed!) */ - u_int32 last_seq; /* extended last seq. no. received */ - u_int32 jitter; /* interarrival jitter */ - u_int32 lsr; /* last SR packet from this source */ diff --git a/net/rtptools/files/patch-ac b/net/rtptools/files/patch-ac deleted file mode 100644 index 28056951ca69..000000000000 --- a/net/rtptools/files/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ ---- rtpdump.c.orig Sat Apr 7 08:02:13 2001 -+++ rtpdump.c Sat Apr 21 21:54:10 2001 -@@ -429,8 +429,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.sr.rr[i].ssrc), -- r->r.sr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.sr.rr[i].lost), /* XXX I'm pretty sure this is wrong */ -+ RTCP_FRACTION(ntohl(r->r.sr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.sr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.sr.rr[i].last_seq), - (unsigned long)ntohl(r->r.sr.rr[i].jitter), - (unsigned long)ntohl(r->r.sr.rr[i].lsr), -@@ -446,8 +446,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.rr.rr[i].ssrc), -- r->r.rr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.rr.rr[i].lost), -+ RTCP_FRACTION(ntohl(r->r.rr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.rr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.rr.rr[i].last_seq), - (unsigned long)ntohl(r->r.rr.rr[i].jitter), - (unsigned long)ntohl(r->r.rr.rr[i].lsr), diff --git a/net/rtptools/files/patch-ad b/net/rtptools/files/patch-ad deleted file mode 100644 index 130804a6b732..000000000000 --- a/net/rtptools/files/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- rtpsend.c.orig Tue Sep 10 13:24:10 2002 -+++ rtpsend.c Sat Aug 16 08:58:12 2003 -@@ -353,9 +353,9 @@ - if (strcmp(n->type, "ssrc") == 0) - rr->ssrc = htonl(n->num); - else if (strcmp(n->type, "fraction") == 0) -- rr->fraction = (n->num)*256; -- else if (strcmp(n->type, "lost") == 0) /* PP: alignment OK? */ -- rr->lost = htonl(n->num); -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0x00ffffff) | ((n->num)*256 << 24)); -+ else if (strcmp(n->type, "lost") == 0) -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0xff000000) | n->num); - else if (strcmp(n->type, "last_seq") == 0) - rr->last_seq = htonl(n->num); - else if (strcmp(n->type, "jit") == 0) -@@ -919,6 +919,8 @@ - local = (struct in_addr *)host->h_addr_list[0];
- sin.sin_addr = *local;
- } -+ } else { -+ usage(argv[0]); - } - - /* create/connect sockets */ diff --git a/net/rtptools/pkg-descr b/net/rtptools/pkg-descr deleted file mode 100644 index be50ee27bf15..000000000000 --- a/net/rtptools/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -The rtptools distribution consists of a number of small applications that -can be used for processing RTP data. - -rtpplay - play back RTP sessions recorded by rtpdump -rtpsend - generate RTP packets from textual description, generated by hand or - rtpdump -rtpdump - parse and print RTP packets, generating output files suitable for - rtpplay and rtpsend -rtptrans - RTP translator between unicast and multicast networks - -WWW: http://www.cs.columbia.edu/irt/software/rtptools/ diff --git a/net/sdr/Makefile b/net/sdr/Makefile deleted file mode 100644 index 1b32fc22d111..000000000000 --- a/net/sdr/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# New ports collection makefile for: sdr -# Date created: 5 September 1996 -# Whom: Bill Fenner <fenner@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= sdr -PORTVERSION= 3.0 -PORTREVISION= 3 -CATEGORIES= mbone tk -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Multicast Session Directory - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -PLIST_FILES= bin/sdr -WRKSRC= ${WRKDIR}/sdr/freebsd -HAS_CONFIGURE= yes -USE_GMAKE= yes - -post-extract: - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -MAKE_ARGS+= "CC=gcc -g -O" -.endif - -.include <bsd.port.post.mk> diff --git a/net/sdr/distinfo b/net/sdr/distinfo deleted file mode 100644 index 4be266510e61..000000000000 --- a/net/sdr/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (sdr-3.0.tar.gz) = df7df7911b5c08df968296f970f9e31d -SHA256 (sdr-3.0.tar.gz) = 57a6d631e14b2270dad04048a0f50c38dfcf3bfda67b96d8265820d567761460 -SIZE (sdr-3.0.tar.gz) = 304691 diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd deleted file mode 100644 index 34a7a8c8a943..000000000000 --- a/net/sdr/files/Makefile.freebsd +++ /dev/null @@ -1,8 +0,0 @@ -CC = gcc -g -O -fwritable-strings -INCLUDES = -I${LOCALBASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase -LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -lX11 -lz -lm -CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD - -all:: sdr -install: - install -s -c -o root -g wheel -m 555 sdr ${PREFIX}/bin diff --git a/net/sdr/files/patch-ab b/net/sdr/files/patch-ab deleted file mode 100644 index bb154934fbd1..000000000000 --- a/net/sdr/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/Makefile.template.orig Tue May 25 16:27:44 1999 -+++ ../src/Makefile.template Thu Nov 4 11:05:39 1999 -@@ -88,7 +88,7 @@ - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -- tclsh8.0 ../src/plugin2tcl.tcl -+ tclsh8.4 ../src/plugin2tcl.tcl - - uweb: $(WWWOBJS) - $(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS) diff --git a/net/sdr/files/patch-src-generic.tcl b/net/sdr/files/patch-src-generic.tcl deleted file mode 100644 index 6f1ebef5a5c6..000000000000 --- a/net/sdr/files/patch-src-generic.tcl +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/generic.tcl.orig 2008-08-31 12:38:25.000000000 +0800 -+++ ../src/generic.tcl 2008-08-31 12:39:01.000000000 +0800 -@@ -89,8 +89,6 @@ - proc tixAddBalloon {w class msg {initWait 500}} { - global tixBal - if {$class == "Button" } { -- bind $w <Enter> "+tkButtonEnter $w" -- bind $w <Leave> "+tkButtonLeave $w" - bind $w <ButtonPress> "+tixBalEnd $w" - } else { - if { $class == "Entry" } { diff --git a/net/sdr/pkg-descr b/net/sdr/pkg-descr deleted file mode 100644 index 4c6400374ee6..000000000000 --- a/net/sdr/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Sdr is a session directory tool designed to allow the advertisement -and joining of multicast conferences. It was originally based on -sd written by Van Jacobson at LBNL, but implements a later version -of the session description protocol than sd does. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/ diff --git a/net/udpcast/Makefile b/net/udpcast/Makefile deleted file mode 100644 index 1c33f6320ea4..000000000000 --- a/net/udpcast/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: udpcast -# Date created: Mon Jul 19 19:10:56 UTC 2004 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= udpcast -PORTVERSION= 0.${RELEASE_DATE} -CATEGORIES= mbone sysutils -MASTER_SITES= http://udpcast.linux.lu/download/ -DISTNAME= ${PORTNAME}-${RELEASE_DATE} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A file transfer tool using ethernet's multicast - -USE_GMAKE= yes -USE_PERL5_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${RELEASE_DATE} - -RELEASE_DATE= 20081213 - -PROGRAM_SBIN_FILES= udp-receiver udp-sender - -PLIST_FILES= sbin/udp-receiver \ - sbin/udp-sender -PORTDOCS= Changelog.txt cmd.html - -MAN1= udp-receiver.1 udp-sender.1 - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -do-install: -.ifndef(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for file in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -. endfor -.endif -.for file in ${PROGRAM_SBIN_FILES} - @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/sbin/ -.endfor -.for file in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/ -.endfor - -.include <bsd.port.mk> diff --git a/net/udpcast/distinfo b/net/udpcast/distinfo deleted file mode 100644 index 66ccd2a93184..000000000000 --- a/net/udpcast/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (udpcast-20081213.tar.gz) = 23f3371cb60a1f66f6be12fa98d4d5ca -SHA256 (udpcast-20081213.tar.gz) = 73adac6869e7653ad33a3b92498080a2a0398c60ac78c50a701057325f612d57 -SIZE (udpcast-20081213.tar.gz) = 160550 diff --git a/net/udpcast/files/patch-libbb_udpcast.h b/net/udpcast/files/patch-libbb_udpcast.h deleted file mode 100644 index 1f2289b163ae..000000000000 --- a/net/udpcast/files/patch-libbb_udpcast.h +++ /dev/null @@ -1,13 +0,0 @@ ---- libbb_udpcast.h.orig 2009-02-10 10:07:40.000000000 +0100 -+++ libbb_udpcast.h 2009-02-10 10:06:51.000000000 +0100 -@@ -24,6 +24,10 @@ - #include <malloc.h> - #endif - -+#ifdef HAVE_STDLIB_H -+ #include <stdlib.h> -+#endif -+ - #define xmalloc malloc - - #endif /* BB_VER */ diff --git a/net/udpcast/files/patch-participants.h b/net/udpcast/files/patch-participants.h deleted file mode 100644 index 6e7ef8da3d7f..000000000000 --- a/net/udpcast/files/patch-participants.h +++ /dev/null @@ -1,13 +0,0 @@ ---- participants.h.orig 2005-12-22 23:59:18.000000000 +0100 -+++ participants.h 2009-02-05 12:18:19.000000000 +0100 -@@ -3,6 +3,10 @@ - - #define MAX_CLIENTS 1024 - -+#include <sys/types.h> -+#include <sys/socket.h> -+ -+ - typedef struct participantsDb *participantsDb_t; - - #define isParticipantValid udpc_isParticipantValid diff --git a/net/udpcast/files/patch-rateGovernor.c b/net/udpcast/files/patch-rateGovernor.c deleted file mode 100644 index 14de493ebb02..000000000000 --- a/net/udpcast/files/patch-rateGovernor.c +++ /dev/null @@ -1,28 +0,0 @@ ---- rateGovernor.c.orig 2008-09-20 09:07:29.000000000 +0200 -+++ rateGovernor.c 2009-02-09 08:20:17.000000000 +0100 -@@ -23,6 +23,25 @@ - #define DL_RATE_GOVERNOR - #endif - -+ -+#ifdef __FreeBSD__ -+char * -+strndup(const char *str, size_t n) -+{ -+ size_t len; -+ char *copy; -+ -+ for (len = 0; len < n && str[len]; len++) -+ continue; -+ -+ if ((copy = malloc(len + 1)) == NULL) -+ return (NULL); -+ memcpy(copy, str, len); -+ copy[len] = '\0'; -+ return (copy); -+} -+#endif -+ - void *rgInitGovernor(struct net_config *cfg, struct rateGovernor_t *gov) - { - if(cfg->nrGovernors == MAX_GOVERNORS) { diff --git a/net/udpcast/files/patch-socklib.c b/net/udpcast/files/patch-socklib.c deleted file mode 100644 index 974921257f31..000000000000 --- a/net/udpcast/files/patch-socklib.c +++ /dev/null @@ -1,46 +0,0 @@ ---- socklib.c.orig 2008-09-18 22:43:15.000000000 +0200 -+++ socklib.c 2009-02-10 10:01:40.000000000 +0100 -@@ -18,6 +18,7 @@ - #endif - - #ifdef HAVE_NET_IF_H -+# include <sys/socket.h> - # include <net/if.h> - #endif - -@@ -66,6 +67,8 @@ - # define DEBUG 0 - #endif - -+#undef SIOCGIFINDEX -+ - #ifdef LOSSTEST - /** - * Packet loss/swap testing... -@@ -353,7 +356,7 @@ - - int setTtl(int sock, int ttl) { - /* set the socket to broadcast */ -- return setsockopt(sock, SOL_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int)); -+ return setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int)); - } - - #ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX -@@ -422,7 +425,7 @@ - - - int setMcastDestination(int sock, net_if_t *net_if, struct sockaddr_in *addr) { --#ifdef WINDOWS -+#if defined(WINDOWS) || defined(__FreeBSD__) - int r; - struct sockaddr_in interface_addr; - struct in_addr if_addr; -@@ -720,7 +723,7 @@ - - net_if->name = strdup(chosen->ifr_name); - --#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX -+#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX__TODO - /* Index for multicast subscriptions */ - if(ioctl(s, SIOCGIFINDEX, chosen) < 0) - udpc_fatal(-1, "Error getting index for %s: %s", net_if->name, diff --git a/net/udpcast/files/patch-udpr-negotiate.c b/net/udpcast/files/patch-udpr-negotiate.c deleted file mode 100644 index c1a1fddbd386..000000000000 --- a/net/udpcast/files/patch-udpr-negotiate.c +++ /dev/null @@ -1,29 +0,0 @@ ---- udpr-negotiate.c.orig 2007-05-25 12:01:59.000000000 +0200 -+++ udpr-negotiate.c 2009-02-06 08:18:02.000000000 +0100 -@@ -3,6 +3,10 @@ - #include <errno.h> - #include <sys/stat.h> - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "log.h" - #include "socklib.h" - #include "udpcast.h" -@@ -82,13 +86,13 @@ - if(disk_config->fileName != NULL) { - int oflags = O_CREAT | O_WRONLY; - if((disk_config->flags & FLAG_SYNC)) { -- oflags |= O_SYNC; -+ oflags |= O_FSYNC; - } else if( !(disk_config->flags & FLAG_NOSYNC)) { - struct stat buf; - if(stat(disk_config->fileName, &buf) == 0) { - /* If target is device, open it synchronously */ - if(S_ISCHR(buf.st_mode) || S_ISBLK(buf.st_mode)) -- oflags |= O_SYNC; -+ oflags |= O_FSYNC; - } - } - outFile = open(disk_config->fileName, oflags | O_BINARY, 0644); diff --git a/net/udpcast/pkg-descr b/net/udpcast/pkg-descr deleted file mode 100644 index 834bd3b3e5e3..000000000000 --- a/net/udpcast/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -[ excerpt taken from developer's www site ] - -UDPcast is a file transfer tool that can send data simultaneously -to many destinations on a LAN. This can for instance be used to -install entire classrooms of PC's at once. The advantage of UDPcast -over using other methods (nfs, ftp, whatever) is that UDPcast uses -Ethernet's multicast abilities: it won't take longer to install 15 -machines than it would to install just 2. - -WWW: http://udpcast.linux.lu/ diff --git a/net/unison232/Makefile b/net/unison232/Makefile deleted file mode 100644 index 3f55db3ab3f1..000000000000 --- a/net/unison232/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# New ports collection makefile for: unison -# Date created: 4 October 2000 -# Whom: Dan Pelleg <dpelleg+unison@cs.cmu.edu> -# -# $FreeBSD$ -# - -PORTNAME= unison -PORTVERSION= 2.27.157 -PORTREVISION?= 2 -CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz - -MAINTAINER= daniel+unison@pelleg.org -COMMENT= A user-level file synchronization tool - -PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_GMAKE= yes -MAKE_ARGS= CFLAGS="" -CONFLICTS= unison-devel-[0-9]* unison-nox11-[0-9]* - -.include <bsd.port.pre.mk> - -.if !defined(NOPORTDOCS) -DOCS= BUGS.txt NEWS README -EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ - unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps -.endif - -.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) -WITH_GTK2= yes -.endif - -.if defined(WITH_GTK2) -MAKE_ARGS+= UISTYLE=gtk2 -PLIST_SUB+= TEXT="" -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ - lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -PATCH_DEPENDS+= ${BUILD_DEPENDS} -CONFLICTS+= ocaml-nox11* -.else -MAKE_ARGS+= UISTYLE=text -PLIST_SUB+= TEXT="@comment " -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11 -PATCH_DEPENDS+= ${BUILD_DEPENDS} -.endif - -.if defined(WITH_GTK2) -post-build: - @${ECHO} Building text-only version - @${ECHO} ${WRKSRC} - @${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} -.endif -.if defined(WITH_GTK2) - @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin - @${CAT} ${PKGMESSAGE} -.else - @${CAT} ${PKGMESSAGE}.nox11 -.endif - -.include <bsd.port.post.mk> diff --git a/net/unison232/distinfo b/net/unison232/distinfo deleted file mode 100644 index 7f16bf256273..000000000000 --- a/net/unison232/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -MD5 (unison-2.27.157/unison-2.27.157.tar.gz) = 4cc2a0332cb8c947adc04b9d4f2a83b0 -SHA256 (unison-2.27.157/unison-2.27.157.tar.gz) = ec04069e95249a5b4e212ab48ec03820b1e1f707fb4c607e7f98851e98735adc -SIZE (unison-2.27.157/unison-2.27.157.tar.gz) = 674332 -MD5 (unison-2.27.157/unison-2.27.157-manual.html) = 5c1185a47a3217351e37dba55ea937c5 -SHA256 (unison-2.27.157/unison-2.27.157-manual.html) = 58f514c4c0818ebed6b2afa8e3dbf84871e240ddb6819d91e1b7c93be36c3f50 -SIZE (unison-2.27.157/unison-2.27.157-manual.html) = 235599 -MD5 (unison-2.27.157/unison-2.27.157-manual.pdf) = d4a780abb68af73177f5d59f759e4c89 -SHA256 (unison-2.27.157/unison-2.27.157-manual.pdf) = 6af0f5242a08056d7dbcfce171083a577ed9748d13d1f9bc5d7050f224ec0162 -SIZE (unison-2.27.157/unison-2.27.157-manual.pdf) = 453255 -MD5 (unison-2.27.157/unison-2.27.157-manual.ps) = 6672037b889e62b392eb269fb7f45fd6 -SHA256 (unison-2.27.157/unison-2.27.157-manual.ps) = 31d2328ccc7006212e90e7eece45942cd32efffde9b3eebc0075f98f0147e5c0 -SIZE (unison-2.27.157/unison-2.27.157-manual.ps) = 551643 diff --git a/net/unison232/pkg-descr b/net/unison232/pkg-descr deleted file mode 100644 index 10d805d9eb0a..000000000000 --- a/net/unison232/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Unison is a file-synchronization tool for Unix and Windows. It allows two -replicas of a collection of files and directories to be stored on different -hosts (or different disks on the same host), modified separately, and then -brought up to date by propagating the changes in each replica to the other. - -Unison shares a number of features with tools such as configuration -management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.) -uni-directional mirroring utilities (rsync, etc.) and other synchronizers -(Intellisync, Reconcile, etc). - -WWW: http://www.cis.upenn.edu/~bcpierce/unison/ - -- Dan Pelleg - -daniel+unison@pelleg.org diff --git a/net/unison232/pkg-message b/net/unison232/pkg-message deleted file mode 100644 index 3c1cfd40d2c0..000000000000 --- a/net/unison232/pkg-message +++ /dev/null @@ -1,4 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -Together with a gtk-enabled version, a text-only unison-text binary -is installed as it depends on a smaller number of libraries. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/net/unison232/pkg-message.nox11 b/net/unison232/pkg-message.nox11 deleted file mode 100644 index fe8b86b9b4eb..000000000000 --- a/net/unison232/pkg-message.nox11 +++ /dev/null @@ -1,3 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -A text-only unison binary is installed. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/net/unison232/pkg-plist b/net/unison232/pkg-plist deleted file mode 100644 index 7fc5e3d995b4..000000000000 --- a/net/unison232/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/unison -%%TEXT%%bin/unison-text -%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net/wb/Makefile b/net/wb/Makefile deleted file mode 100644 index ce6020a014c1..000000000000 --- a/net/wb/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: wb -# Date created: 2 Novermber 1996 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= wb -PORTVERSION= 1.59 -PORTREVISION= 4 -CATEGORIES= mbone -MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/ -DISTFILES= i386-wb-1.59.tar.Z - -MAINTAINER= ports@FreeBSD.org -COMMENT= A shared drawing (whiteboard) tool using multicast - -NO_WRKSUBDIR= yes -NO_BUILD= yes -STRIP= - -# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do. -USE_GHOSTSCRIPT_RUN= yes - -PLIST_FILES= bin/wb -PORTDOCS= README CHANGES NOTES lblwb.ps - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/NOTES ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${DOCSDIR}/ -.endif - -.include <bsd.port.mk> diff --git a/net/wb/distinfo b/net/wb/distinfo deleted file mode 100644 index 83c5d40e0f98..000000000000 --- a/net/wb/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (i386-wb-1.59.tar.Z) = 7601eb1192ee2774940d805500c0a9ce -SHA256 (i386-wb-1.59.tar.Z) = 0bae5c24f4c65031e99ac5c5df08e91eab92e5542c5a9f9a278f838c84bb035e -SIZE (i386-wb-1.59.tar.Z) = 2049555 diff --git a/net/wb/pkg-descr b/net/wb/pkg-descr deleted file mode 100644 index 9c196397ccc9..000000000000 --- a/net/wb/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -This is a beta-release of the LBL 'whiteboard'. - -Before using wb, read the file NOTES from the distribution (note -especially the .sd.tcl change needed if you are running sd v1.14 -or earlier) and print and read the postscript file lblwb.ps. - -If you simply want a shared "whiteboard" drawing surface, you -don't need to do anything but install wb. But wb can also be -used to export, view and annotate arbitrary PostScript files. -If you want to include PostScript images in your wb conference, -either your X server has to support Display PostScript (the DEC -& SGI X servers do) or wb has to be able to exec the public -domain postscript renderer `GhostScript'. If you want to -render postscript with Ghostscript, it has to be installed on -your machine and has to be in your shell search path with the -name "gs". |