From f93fa7e9e76a2c5c38aabd6fcd393e5d907f5e18 Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Sat, 6 May 2006 15:18:49 +0000 Subject: Version bump, 20060120 verified to compile with asterisk-1.2.x, block unsupported versions in DEPEND. (Portage version: 2.1_pre10) --- net-misc/asterisk-app_conference/ChangeLog | 13 +++- ...sterisk-app_conference-0.0.1_pre20050506.ebuild | 6 +- ...sterisk-app_conference-0.0.1_pre20060210.ebuild | 43 +++++++++++ .../files/app_conference-20060210-astcfg.diff | 83 ++++++++++++++++++++++ ...igest-asterisk-app_conference-0.0.1_pre20050506 | 2 + ...igest-asterisk-app_conference-0.0.1_pre20060210 | 3 + 6 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild create mode 100644 net-misc/asterisk-app_conference/files/app_conference-20060210-astcfg.diff create mode 100644 net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20060210 (limited to 'net-misc') diff --git a/net-misc/asterisk-app_conference/ChangeLog b/net-misc/asterisk-app_conference/ChangeLog index 61c5c89a0cdf..82493af382bf 100644 --- a/net-misc/asterisk-app_conference/ChangeLog +++ b/net-misc/asterisk-app_conference/ChangeLog @@ -1,6 +1,15 @@ # 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.4 2005/09/19 18:36:20 stkn Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_conference/ChangeLog,v 1.5 2006/05/06 15:18:49 stkn Exp $ + +*asterisk-app_conference-0.0.1_pre20060210 (06 May 2006) + + 06 May 2006; Stefan Knoblich + +files/app_conference-20060210-astcfg.diff, + asterisk-app_conference-0.0.1_pre20050506.ebuild, + +asterisk-app_conference-0.0.1_pre20060210.ebuild: + Version bump, 20060120 verified to compile with asterisk-1.2.x, block + unsupported versions in DEPEND. 19 Sep 2005; Stefan Knoblich asterisk-app_conference-0.0.1_pre20050506.ebuild: 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 index d8029cc17f9b..4b9debe34d76 100644 --- 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 @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 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.4 2005/09/19 18:36:20 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20050506.ebuild,v 1.5 2006/05/06 15:18:49 stkn Exp $ inherit eutils @@ -20,7 +20,7 @@ IUSE="" # depends on glibc's iconv support DEPEND="sys-libs/glibc >=net-misc/asterisk-1.0.5-r1 - !>=net-misc/asterisk-1.1.0" + !>=net-misc/asterisk-1.2.0" S=${WORKDIR}/${MY_PN} diff --git a/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild b/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild new file mode 100644 index 000000000000..10bd5e9d0e51 --- /dev/null +++ b/net-misc/asterisk-app_conference/asterisk-app_conference-0.0.1_pre20060210.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2006 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_pre20060210.ebuild,v 1.1 2006/05/06 15:18:49 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="http://www.netdomination.org/pub/asterisk/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="" + +# depends on glibc's iconv support +DEPEND="sys-libs/glibc + >=net-misc/asterisk-1.2.0 + !=net-misc/asterisk-1.0*" + +S=${WORKDIR}/${MY_PN} + +src_unpack() { + unpack ${A} + + cd ${S} + # use asterisk-config... + epatch ${FILESDIR}/${MY_PN}-20060210-astcfg.diff +} + +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-20060210-astcfg.diff b/net-misc/asterisk-app_conference/files/app_conference-20060210-astcfg.diff new file mode 100644 index 000000000000..f2f2af69ad13 --- /dev/null +++ b/net-misc/asterisk-app_conference/files/app_conference-20060210-astcfg.diff @@ -0,0 +1,83 @@ +--- app_conference/Makefile.orig 2005-10-27 19:53:35.000000000 +0200 ++++ app_conference/Makefile 2006-02-11 00:07:01.000000000 +0100 +@@ -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,28 +44,16 @@ + 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 -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 -fPIC -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 + +@@ -102,16 +91,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/digest-asterisk-app_conference-0.0.1_pre20050506 b/net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20050506 index 668da5b45814..35e928d54516 100644 --- 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 @@ -1 +1,3 @@ MD5 c03c84806fca2827d8aaf17f8d26a11d app_conference-0.0.1_pre20050506.tar.bz2 45738 +RMD160 21b8db200398e88f0660063b43ec083976280575 app_conference-0.0.1_pre20050506.tar.bz2 45738 +SHA256 f83d6d48342fa1a0c2305dc1194ad283093f29fa7a9a442c19faa35691e7eccd app_conference-0.0.1_pre20050506.tar.bz2 45738 diff --git a/net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20060210 b/net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20060210 new file mode 100644 index 000000000000..4651675a8120 --- /dev/null +++ b/net-misc/asterisk-app_conference/files/digest-asterisk-app_conference-0.0.1_pre20060210 @@ -0,0 +1,3 @@ +MD5 800e66d6e1e188ce36fb4a73b8417a04 app_conference-20060210.tar.bz2 47454 +RMD160 1bb11d0baf6ab58fb7e60da40879012c7c7044d1 app_conference-20060210.tar.bz2 47454 +SHA256 e7f99eb6786baf70ed416e3f1a7c2ed7c916971bc5c85367a08fdbc590f24b82 app_conference-20060210.tar.bz2 47454 -- cgit v1.2.3-65-gdbad