diff options
author | Stefan Knoblich <stkn@gentoo.org> | 2005-05-07 13:26:06 +0000 |
---|---|---|
committer | Stefan Knoblich <stkn@gentoo.org> | 2005-05-07 13:26:06 +0000 |
commit | a5f1d238e9bd8b0fba5454f551ab261a46a9e480 (patch) | |
tree | f182e367818f3ea125c1bc7d20e2d3521cd1b2e4 /net-misc/asterisk-app_conference | |
parent | - have savedconfig look in ROOT first then fallback to / if nothing is found (diff) | |
download | gentoo-2-a5f1d238e9bd8b0fba5454f551ab261a46a9e480.tar.gz gentoo-2-a5f1d238e9bd8b0fba5454f551ab261a46a9e480.tar.bz2 gentoo-2-a5f1d238e9bd8b0fba5454f551ab261a46a9e480.zip |
Initial import
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-misc/asterisk-app_conference')
6 files changed, 200 insertions, 0 deletions
diff --git a/net-misc/asterisk-app_conference/ChangeLog b/net-misc/asterisk-app_conference/ChangeLog new file mode 100644 index 000000000000..5102149fd397 --- /dev/null +++ b/net-misc/asterisk-app_conference/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for net-misc/asterisk-app_conference +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_conference/ChangeLog,v 1.1 2005/05/07 13:26:05 stkn Exp $ + +*asterisk-app_conference-0.0.1_pre20050506 (06 May 2005) + + 06 May 2005; Stefan Knoblich <stkn@gentoo.org> +metadata.xml, + +files/app_conference-20050506-astcfg.diff, + +files/app_conference-20050506-compile.patch, + +asterisk-app_conference-0.0.1_pre20050506.ebuild: + Initial import. + diff --git a/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild b/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild new file mode 100644 index 000000000000..83d822f52aee --- /dev/null +++ b/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild,v 1.1 2005/05/07 13:26:05 stkn Exp $ + +inherit eutils + +MY_PN="app_conference" +MY_P="${MY_PN}-${PV/0.0.1_pre/}" + +DESCRIPTION="Asterisk application plugin for conferences" +HOMEPAGE="http://iaxclient.sourceforge.net/" +SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" + +IUSE="" + +# depends on glibc's iconv support +DEPEND="sys-libs/glibc + >=net-misc/asterisk-1.0.5-r1" + +S=${WORKDIR}/${MY_PN} + +src_unpack() { + unpack ${A} + + cd ${S} + # use asterisk-config... + epatch ${FILESDIR}/${MY_P}-astcfg.diff + + # compile fixes for asterisk-stable + epatch ${FILESDIR}/${MY_P}-compile.patch +} + +src_compile() { + emake -j1 || die "emake failed" +} + +src_install() { + make DESTDIR=${D} install || die + + dodoc README LICENSE +} diff --git a/net-misc/asterisk-app_conference/files/app_conference-20050506-astcfg.diff b/net-misc/asterisk-app_conference/files/app_conference-20050506-astcfg.diff new file mode 100644 index 000000000000..09bf615595f2 --- /dev/null +++ b/net-misc/asterisk-app_conference/files/app_conference-20050506-astcfg.diff @@ -0,0 +1,85 @@ +--- app_conference/Makefile.orig 2005-05-06 15:43:47.736537144 +0200 ++++ app_conference/Makefile 2005-05-06 16:15:45.455999472 +0200 +@@ -17,10 +17,11 @@ + # app_conference defines which can be passed on the command-line + # + +-INSTALL_PREFIX := /opt/horizon +-INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules ++DESTDIR := ++INSTALL_MODULES_DIR := $(shell /usr/bin/asterisk-config --modulesdir) ++INSTALL_CONFIG_DIR := $(shell /usr/bin/asterisk-config --sysconfdir) + +-ASTERISK_INCLUDE_DIR := $(HOME)/local/asterisk/asterisk/include ++ASTERISK_INCLUDE_DIR := $(shell /usr/bin/asterisk-config --includedir) + + # turn app_conference debugging on or off ( 0 == OFF, 1 == ON ) + APP_CONFERENCE_DEBUG := 1 +@@ -43,30 +44,17 @@ + INSTALL = install + CC = gcc + +-INCLUDE = -I$(ASTERISK_INCLUDE_DIR) ++# skip asterisk includes if they are in /usr/include/asterisk ++ifneq ($(shell dirname $(ASTERISK_INCLUDE_DIR)), /usr/include) ++INCLUDE = -I$(ASTERISK_INCLUDE_DIR) ++endif ++ + LIBS = -ldl -lpthread -lm + DEBUG := -g + +-CFLAGS = -pipe -std=c99 -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE +-#CFLAGS += -O2 +-#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math +-# PERF: below is 10% faster than -O2 or -O3 alone. +-#CFLAGS += -O3 -ffast-math -funroll-loops +-# below is another 5% faster or so. +-CFLAGS += -O3 -ffast-math -funroll-all-loops -fprefetch-loop-arrays -fsingle-precision-constant +- +-# this is fun for PPC +-#CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic +- +-# this is fun for x86 +-CFLAGS += -march=pentium3 -msse -mfpmath=sse,387 +- +- +-# adding -msse -mfpmath=sse has little effect. +-#CFLAGS += -O3 -msse -mfpmath=sse +-#CFLAGS += $(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) ++CFLAGS += -pipe -std=c99 -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE + CFLAGS += $(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) +-CFLAGS += -DCRYPTO ++CFLAGS += -DCRYPTO -fPIC -DPIC + + ifeq ($(APP_CONFERENCE_DEBUG), 1) + CFLAGS += -DAPP_CONFERENCE_DEBUG +@@ -102,16 +90,22 @@ + rm -f *.so *.o $(OBJS) + + app_conference.so : $(OBJS) +- $(CC) -pg -shared -Xlinker -x -o $@ $(OBJS) ++ $(CC) -shared -Xlinker -x -o $@ $(OBJS) + + vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o + $(CC) $(PROFILE) -o $@ $^ -lm + + install: all +- for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(INSTALL_MODULES_DIR) ; done +- /var/horizon/mojo/lib/horizoncmd restart asterisk +- +-# config: all +-# cp conf.conf /etc/asterisk/ +- ++ if [ ! -d ${DESTDIR}${INSTALL_MODULES_DIR} ]; then \ ++ $(INSTALL) -m 755 -d ${DESTDIR}${INSTALL_MODULES_DIR} ; \ ++ fi ++ for x in $(SHAREDOS); do \ ++ $(INSTALL) -m 755 $$x ${DESTDIR}$(INSTALL_MODULES_DIR) ; \ ++ done ++ ++#config: all ++# if [ ! -d ${DESTDIR}${INSTALL_CONFIG_DIR} ]; then \ ++# $(INSTALL) -m 755 -d ${DESTDIR}${INSTALL_CONFIG_DIR} ; \ ++# fi ++# $(INSTALL) -m 640 conf.conf ${DESTDIR}${INSTALL_CONFIG_DIR} + diff --git a/net-misc/asterisk-app_conference/files/app_conference-20050506-compile.patch b/net-misc/asterisk-app_conference/files/app_conference-20050506-compile.patch new file mode 100644 index 000000000000..92bac639a236 --- /dev/null +++ b/net-misc/asterisk-app_conference/files/app_conference-20050506-compile.patch @@ -0,0 +1,49 @@ +--- app_conference/conference.c.orig 2005-05-06 16:07:11.284165472 +0200 ++++ app_conference/conference.c 2005-05-06 16:09:43.245063904 +0200 +@@ -611,7 +611,7 @@ + // acquire conference mutexes + ast_mutex_lock( &conf->lock ) ; + +- if ( pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) ++ if ( ast_pthread_create( &conf->conference_thread, NULL, (void*)conference_exec, conf ) == 0 ) + { + // detach the thread so it doesn't leak + pthread_detach( conf->conference_thread ) ; +--- app_conference/member.c.orig 2005-05-06 16:12:26.710213424 +0200 ++++ app_conference/member.c 2005-05-06 16:14:36.121539912 +0200 +@@ -71,10 +71,14 @@ + // + // setup asterisk read/write formats + // +- ++ ++#ifdef ASTERISK_UNSTABLE_CVS + ast_log( AST_CONF_DEBUG, "CHANNEL INFO, CHANNEL => %s, DNID => %s, CALLER_ID => %s, ANI => %s\n", + chan->name, chan->cid.cid_dnid, chan->cid.cid_num, chan->cid.cid_ani ) ; +- ++#else ++ ast_log( AST_CONF_DEBUG, "CHANNEL INFO, CHANNEL => %s, DNID => %s, CALLER_ID => %s, ANI => %s\n", ++ chan->name, chan->dnid, chan->callerid, chan->ani ) ; ++#endif + ast_log( AST_CONF_DEBUG, "CHANNEL CODECS, CHANNEL => %s, NATIVE => %d, READ => %d, WRITE => %d\n", + chan->name, chan->nativeformats, member->read_format, member->write_format ) ; + +--- app_conference/app_conference.h.orig 2005-05-06 16:10:08.133280320 +0200 ++++ app_conference/app_conference.h 2005-05-06 16:10:36.249006080 +0200 +@@ -31,6 +31,7 @@ + #include <asterisk/channel.h> + #include <asterisk/file.h> + #include <asterisk/cli.h> ++#include <asterisk/utils.h> + + /* standard includes */ + #include <stdlib.h> +@@ -40,8 +41,6 @@ + #include <math.h> + #include <stdio.h> + +-#include <pthread.h> +- + #if (SILDET == 2) + #include "libspeex/speex_preprocess.h" + #endif diff --git a/net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20050506 b/net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20050506 new file mode 100644 index 000000000000..668da5b45814 --- /dev/null +++ b/net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20050506 @@ -0,0 +1 @@ +MD5 c03c84806fca2827d8aaf17f8d26a11d app_conference-0.0.1_pre20050506.tar.bz2 45738 diff --git a/net-misc/asterisk-app_conference/metadata.xml b/net-misc/asterisk-app_conference/metadata.xml new file mode 100644 index 000000000000..a3cddc42f9cc --- /dev/null +++ b/net-misc/asterisk-app_conference/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>voip</herd> +<maintainer> + <email>stkn@gentoo.org</email> +</maintainer> +</pkgmetadata> |