cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- make the h323 FLAVOR build correctly with new pwlib/h323

Browse Source 
- add a pre-build target so that we can remove IS_INTERACTIVE
(from sthen@)

ok sthen@
This commit is contained in:
ajacoutot 2008-03-15 17:41:12 +00:00
parent 2791facafa
commit 4bebb7f3ca
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/asterisk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2008/02/07 22:08:30 sthen Exp $ # $OpenBSD: Makefile,v 1.33 2008/03/15 17:41:12 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit COMMENT-main= open source multi-protocol PBX and telephony toolkit
@ -14,6 +14,8 @@ HOMEPAGE= http://www.asterisk.org/
MAINTAINER= Stuart Henderson <sthen@openbsd.org> MAINTAINER= Stuart Henderson <sthen@openbsd.org>
# GPLv2 except iaxy.bin (freely redistributable, see LICENSE) # GPLv2 except iaxy.bin (freely redistributable, see LICENSE)
# "Specific permission is also granted to link Asterisk with OpenSSL
# and OpenH323 and distribute the resulting binary files."
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
@ -166,14 +168,17 @@ CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} \
# h323 # h323
.if ${FLAVOR:L:Mh323} .if ${FLAVOR:L:Mh323}
IS_INTERACTIVE= Yes
# must restart build by hand.
LIB_DEPENDS-main+= h323::net/openh323 \ LIB_DEPENDS-main+= h323::net/openh323 \
pt::devel/pwlib pt::devel/pwlib
CONFIGURE_ARGS+= --with-pwlib=${LOCALBASE}/lib \ CONFIGURE_ARGS+= --with-pwlib=${LOCALBASE}/lib \
--with-h323=${LOCALBASE}/lib --with-h323=${LOCALBASE}/lib
WANTLIB-main+= expat ossaudio avutil WANTLIB-main+= expat ossaudio avutil
FULLPKGNAME-main= ${DISTNAME}-h323 FULLPKGNAME-main= ${DISTNAME}p0-h323
pre-build:
cd ${WRKSRC} && ${MAKE_PROGRAM} include/asterisk/buildopts.h
cd ${WRKSRC}/channels/h323 && ${MAKE_PROGRAM} opt
.else .else
CONFIGURE_ARGS+= --with-pwlib=no \ CONFIGURE_ARGS+= --with-pwlib=no \
--with-h323=no --with-h323=no

11
telephony/asterisk/patches/patch-channels_h323_ast_h323_cxx Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-channels_h323_ast_h323_cxx,v 1.1 2008/03/15 17:41:12 ajacoutot Exp $
--- channels/h323/ast_h323.cxx.orig Thu Mar 6 09:33:18 2008
+++ channels/h323/ast_h323.cxx Thu Mar 6 09:33:45 2008
@@ -81,6 +81,7 @@ static MyH323EndPoint *endPoint = NULL;
/** PWLib entry point */
static MyProcess *localProcess = NULL;
+int timerChangePipe[2];
static int _timerChangePipe[2];
static unsigned traceOptions = PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine;