On 2007/07/10 00:54, Stuart Henderson wrote: > Anyone who's testing this might as well go for 1.4.7 now. > seems ok on amd64, running a sparc64 build now.
sparc64 is working ok so far. (I should add that these days, 1.4 mostly works better than 1.2). here's an *untested* (beyond building on amd64 and loaded with 1.4) update for app_conference (the in-tree version doesn't load on 1.4). if anyone's using app_conference with Asterisk 1.2 could they give this a go too please and let me know if it still works. cvs server: Diffing . Index: Makefile =================================================================== RCS file: /cvs/ports/telephony/app_conference/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 2 Feb 2006 04:42:43 -0000 1.2 +++ Makefile 10 Jul 2007 00:36:15 -0000 @@ -2,11 +2,11 @@ SHARED_ONLY= Yes COMMENT= "conferencing application for asterisk" -DISTNAME= app_conference-20060201 +DISTNAME= app_conference-20070710 CATEGORIES= telephony -MASTER_SITES= http://mirrors.protection.cx/~jolan/ +MASTER_SITES= http://spacehopper.org/ -HOMEPAGE= http://iaxclient.sourceforge.net/ +HOMEPAGE= http://sourceforge.net/projects/appconference/ # GPL PERMIT_DISTFILES_CDROM= Yes @@ -20,7 +20,8 @@ USE_GMAKE= Yes BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::telephony/asterisk -MAKE_ENV+= LOCALBASE=${LOCALBASE} +MAKE_ENV+= LOCALBASE=${LOCALBASE} \ + ASTERISK_INCLUDE_DIR=${LOCALBASE}/include do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/asterisk/modules Index: distinfo =================================================================== RCS file: /cvs/ports/telephony/app_conference/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 17:26:13 -0000 1.3 +++ distinfo 10 Jul 2007 00:36:15 -0000 @@ -1,5 +1,5 @@ -MD5 (app_conference-20060201.tar.gz) = rcC9l4tgDCNwVfdjQQLkTw== -RMD160 (app_conference-20060201.tar.gz) = GHLxS0+ybFJah6bX875nrtBrcl0= -SHA1 (app_conference-20060201.tar.gz) = dJTxLV147HfhnvRv0u7rurYtOd4= -SHA256 (app_conference-20060201.tar.gz) = ZeVEbDh8IMxyEQN0vN5QwY1fcgHfjbzZgv8l4t/IkTI= -SIZE (app_conference-20060201.tar.gz) = 54565 +MD5 (app_conference-20070710.tar.gz) = X8+XhMITEomfo3Is4U9qMQ== +RMD160 (app_conference-20070710.tar.gz) = HkAugP1FW8yXXIC8U39F0CK/ZL8= +SHA1 (app_conference-20070710.tar.gz) = bj9TRc6Tsb9wx/CTIcPowb8IXW0= +SHA256 (app_conference-20070710.tar.gz) = Pptg+YPF4ULiLPe5tmYguSrrXW7juQ81bBWLBr/iXoo= +SIZE (app_conference-20070710.tar.gz) = 157639 cvs server: Diffing patches Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/telephony/app_conference/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 29 Nov 2005 03:40:38 -0000 1.2 +++ patches/patch-Makefile 10 Jul 2007 00:36:15 -0000 @@ -1,63 +1,37 @@ $OpenBSD: patch-Makefile,v 1.2 2005/11/29 03:40:38 jolan Exp $ ---- Makefile.orig Thu Oct 27 12:53:35 2005 -+++ Makefile Mon Nov 28 21:38:08 2005 -@@ -17,13 +17,13 @@ - # app_conference defines which can be passed on the command-line +--- Makefile.orig Tue Jul 10 00:58:58 2007 ++++ Makefile Tue Jul 10 01:09:01 2007 +@@ -18,8 +18,8 @@ # --INSTALL_PREFIX := /opt/horizon --INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules -+#INSTALL_PREFIX := /opt/horizon + INSTALL_PREFIX := +-INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/usr/lib/asterisk/modules +-INSTALL_SOUNDS_DIR := $(INSTALL_PREFIX)/var/lib/asterisk/sounds +INSTALL_MODULES_DIR := $(PREFIX)/lib/asterisk/modules ++INSTALL_SOUNDS_DIR := $(PREFIX)/share/asterisk/sounds --ASTERISK_INCLUDE_DIR := $(HOME)/local/asterisk/asterisk/include -+ASTERISK_INCLUDE_DIR := $(LOCALBASE)/include + ASTERISK_INCLUDE_DIR ?= ../asterisk/include - # turn app_conference debugging on or off ( 0 == OFF, 1 == ON ) --APP_CONFERENCE_DEBUG := 1 -+APP_CONFERENCE_DEBUG := 0 - - # 0 = OFF 1 = astdsp 2 = speex - SILDET := 2 -@@ -41,32 +41,32 @@ SHAREDOS = app_conference.so - - PROC = $(shell uname -m) - INSTALL = install --CC = gcc -+#CC = gcc - - INCLUDE = -I$(ASTERISK_INCLUDE_DIR) - LIBS = -ldl -lpthread -lm - DEBUG := -g +@@ -47,7 +47,7 @@ INSTALL = install + INCLUDE = -I$(ASTERISK_INCLUDE_DIR) + DEBUG := -g --CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -+CFLAGS += -fPIC -Wall -Wmissing-prototypes -Wmissing-declarations $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE +-CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG) ++CFLAGS += -fPIC -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP + CPPFLAGS = $(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 -+#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 -+#CFLAGS += -march=pentium3 -msse -mfpmath=sse,387 - - + #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math +@@ -59,8 +59,8 @@ CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE # 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 += $(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) --CFLAGS += -DCRYPTO +-CPPFLAGS += -DCRYPTO +#CFLAGS += $(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) -+#CFLAGS += -DCRYPTO ++#CPPFLAGS += -DCRYPTO - ifeq ($(APP_CONFERENCE_DEBUG), 1) - CFLAGS += -DAPP_CONFERENCE_DEBUG + # + # Uncomment this if you want G.729A support (need to have the actual codec installed @@ -89,7 +89,7 @@ OSARCH=$(shell uname -s) ifeq (${OSARCH},Darwin) SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace @@ -66,13 +40,13 @@ $OpenBSD: patch-Makefile,v 1.2 2005/11/2 +SOLINK=-shared -fPIC -Xlinker -x endif - # -@@ -102,7 +102,7 @@ clean: - rm -f *.so *.o $(OBJS) - - app_conference.so : $(OBJS) -- $(CC) -pg -shared -Xlinker -x -o $@ $(OBJS) -+ $(CC) -shared -Xlinker -x -o $@ $(OBJS) + DEPS += $(subst .o,.d,$(OBJS)) +@@ -109,7 +109,7 @@ distclean: clean + $(RM) $(TARGET) + + $(TARGET): $(OBJS) +- $(CC) -pg $(SOLINK) -o $@ $(OBJS) ++ $(CC) $(SOLINK) -o $@ $(OBJS) vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o $(CC) $(PROFILE) -o $@ $^ -lm Index: patches/patch-app_conference_c =================================================================== RCS file: patches/patch-app_conference_c diff -N patches/patch-app_conference_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-app_conference_c 10 Jul 2007 00:36:15 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ +--- app_conference.c.orig Tue Jul 10 01:25:01 2007 ++++ app_conference.c Tue Jul 10 01:25:52 2007 +@@ -20,10 +20,10 @@ + * + */ + +-#include "asterisk/autoconfig.h" ++#include <asterisk/autoconfig.h> + #include "app_conference.h" + #include "common.h" +-#include "asterisk/module.h" ++#include <asterisk/module.h> + + /* + Index: patches/patch-cli_c =================================================================== RCS file: patches/patch-cli_c diff -N patches/patch-cli_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cli_c 10 Jul 2007 00:36:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cli.c.orig Tue Jul 10 01:25:09 2007 ++++ cli.c Tue Jul 10 01:25:58 2007 +@@ -20,7 +20,7 @@ + * + */ + +-#include "asterisk/autoconfig.h" ++#include <asterisk/autoconfig.h> + #include "cli.h" + + static char conference_restart_usage[] = Index: patches/patch-conference_c =================================================================== RCS file: /cvs/ports/telephony/app_conference/patches/patch-conference_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-conference_c --- patches/patch-conference_c 10 Nov 2005 21:13:11 -0000 1.1.1.1 +++ patches/patch-conference_c 10 Jul 2007 00:36:15 -0000 @@ -1,20 +1,15 @@ -$OpenBSD: patch-conference_c,v 1.1.1.1 2005/11/10 21:13:11 jolan Exp $ ---- conference.c.orig Thu Nov 10 13:22:21 2005 -+++ conference.c Thu Nov 10 13:50:48 2005 -@@ -17,6 +17,7 @@ +$OpenBSD$ +--- conference.c.orig Tue Jul 10 00:58:58 2007 ++++ conference.c Tue Jul 10 01:26:05 2007 +@@ -20,9 +20,9 @@ + * */ +-#include "asterisk/autoconfig.h" ++#include <asterisk/autoconfig.h> #include "conference.h" +-#include "asterisk/utils.h" +#include <asterisk/utils.h> // // static variables -@@ -618,7 +619,7 @@ struct ast_conference* create_conf( char - // 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 ) ; Index: patches/patch-frame_c =================================================================== RCS file: patches/patch-frame_c diff -N patches/patch-frame_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-frame_c 10 Jul 2007 00:36:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- frame.c.orig Tue Jul 10 01:25:17 2007 ++++ frame.c Tue Jul 10 01:26:10 2007 +@@ -20,7 +20,7 @@ + * + */ + +-#include "asterisk/autoconfig.h" ++#include <asterisk/autoconfig.h> + #include "frame.h" + + conf_frame* mix_frames( conf_frame* frames_in, int speaker_count, int listener_count ) Index: patches/patch-member_c =================================================================== RCS file: patches/patch-member_c diff -N patches/patch-member_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-member_c 10 Jul 2007 00:36:15 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- member.c.orig Tue Jul 10 01:25:22 2007 ++++ member.c Tue Jul 10 01:26:20 2007 +@@ -21,7 +21,7 @@ + */ + + #include <stdio.h> +-#include "asterisk/autoconfig.h" ++#include <asterisk/autoconfig.h> + #include "member.h" + + cvs server: Diffing pkg Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/telephony/app_conference/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 10 Nov 2005 21:13:11 -0000 1.1.1.1 +++ pkg/PLIST 10 Jul 2007 00:36:15 -0000 @@ -1,4 +1,4 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/10 21:13:11 jolan Exp $ -lib/asterisk/modules/app_conference.so -share/doc/app_conference/ -share/doc/app_conference/README +lib/asterisk/modules/${BASE_PKGPATH}.so +share/doc/${BASE_PKGPATH}/ +share/doc/${BASE_PKGPATH}/README
