diff options
| author |   Stefan Knoblich <stkn@gentoo.org> | 2005-12-21 21:09:00 +0000 |
|---|---|---|
| committer | Stefan Knoblich <stkn@gentoo.org> | 2005-12-21 21:09:00 +0000 |
| commit | 7d57afa8201e259212965f344cec6d3f82fee0a9 (patch) | |
| tree | 32368e637e06013aefc142c31602fda04bb66444 /net-misc | |
| parent | repoman: Trim trailing whitespace (diff) | |
| download | gentoo-2-7d57afa8201e259212965f344cec6d3f82fee0a9.tar.gz gentoo-2-7d57afa8201e259212965f344cec6d3f82fee0a9.tar.bz2 gentoo-2-7d57afa8201e259212965f344cec6d3f82fee0a9.zip | |
Fix compiling with asterisk-1.2.x on uclibc systems.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-misc')
4 files changed, 66 insertions, 3 deletions
diff --git a/net-misc/asterisk-chan_capi-cm/ChangeLog b/net-misc/asterisk-chan_capi-cm/ChangeLog index 4c63f877054a..66e988f8d038 100644 --- a/net-misc/asterisk-chan_capi-cm/ChangeLog +++ b/net-misc/asterisk-chan_capi-cm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/asterisk-chan_capi-cm # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.11 2005/11/20 21:26:09 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/ChangeLog,v 1.12 2005/12/21 21:09:00 stkn Exp $ + + 21 Dec 2005; Stefan Knoblich <stkn@gentoo.org> + +files/chan_capi-cm-0.6.1-asterisk-1.2.diff, + asterisk-chan_capi-cm-0.6.0.ebuild, asterisk-chan_capi-cm-0.6.1.ebuild: + Fix compiling with asterisk-1.2.x on uclibc systems. *asterisk-chan_capi-cm-0.6.1 (20 Nov 2005) diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild index 5f1e92988ff7..cdd7e3c1480f 100644 --- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild +++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild,v 1.1 2005/09/21 12:39:08 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.0.ebuild,v 1.2 2005/12/21 21:09:00 stkn Exp $ IUSE="" @@ -27,6 +27,12 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/chan_capi-0.6.0-gentoo.diff + + # put system includes before asterisk ones, use ast_mutex_init instead + # of ast_pthread_mutex_init + if has_version ">=net-misc/asterisk-1.1.0"; then + epatch ${FILESDIR}/chan_capi-cm-0.6.1-asterisk-1.2.diff + fi } src_compile() { diff --git a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild index 4f9e96744e51..60a1cd21a9bf 100644 --- a/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild +++ b/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild,v 1.1 2005/11/20 21:26:09 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi-cm/asterisk-chan_capi-cm-0.6.1.ebuild,v 1.2 2005/12/21 21:09:00 stkn Exp $ IUSE="" @@ -27,6 +27,12 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/chan_capi-0.6.0-gentoo.diff + + # put system includes before asterisk ones, use ast_mutex_init instead + # of ast_pthread_mutex_init + if has_version ">=net-misc/asterisk-1.1.0"; then + epatch ${FILESDIR}/chan_capi-cm-0.6.1-asterisk-1.2.diff + fi } src_compile() { diff --git a/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.1-asterisk-1.2.diff b/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.1-asterisk-1.2.diff new file mode 100644 index 000000000000..3a44d3b34319 --- /dev/null +++ b/net-misc/asterisk-chan_capi-cm/files/chan_capi-cm-0.6.1-asterisk-1.2.diff @@ -0,0 +1,46 @@ +--- chan_capi-cm-0.6/chan_capi.c.orig 2005-09-20 18:40:15 +0000 ++++ chan_capi-cm-0.6/chan_capi.c 2005-12-21 22:56:57 +0000 +@@ -18,6 +18,17 @@ + + #include "config.h" + ++#include <sys/time.h> ++#include <sys/signal.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <string.h> ++#include <ctype.h> ++#include <errno.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <sys/types.h> ++ + #include <asterisk/lock.h> + #include <asterisk/frame.h> + #include <asterisk/channel.h> +@@ -33,16 +44,6 @@ + #include <asterisk/utils.h> + #include <asterisk/cli.h> + #include <asterisk/causes.h> +-#include <sys/time.h> +-#include <sys/signal.h> +-#include <stdlib.h> +-#include <stdio.h> +-#include <string.h> +-#include <ctype.h> +-#include <errno.h> +-#include <unistd.h> +-#include <fcntl.h> +-#include <sys/types.h> + #include <asterisk/dsp.h> + #include "xlaw.h" + #include "chan_capi20.h" +@@ -4011,7 +4012,7 @@ + } + memset(tmp, 0, sizeof(struct ast_capi_pvt)); + +- ast_pthread_mutex_init(&(tmp->lock),NULL); ++ ast_mutex_init(&(tmp->lock)); + + strncpy(tmp->name, conf->name, sizeof(tmp->name) - 1); + strncpy(tmp->context, conf->context, sizeof(tmp->context) - 1); |