Fix compiling with asterisk-1.2.x on uclibc systems.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 70 insertions, 6 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/Manifest b/net-misc/asterisk-chan_capi-cm/Manifest
index 9ba1b2228e1b..75a6c0b69c62 100644
--- a/net-misc/asterisk-chan_capi-cm/Manifest
+++ b/net-misc/asterisk-chan_capi-cm/Manifest
@@ -1,12 +1,13 @@
-MD5 f63d6e97fa8b596190b97a4cac1085e1 asterisk-chan_capi-cm-0.6.0.ebuild 1365
+MD5 2e6cf8e8dab2c81acaf0565db6f12118 asterisk-chan_capi-cm-0.6.0.ebuild 1579
 MD5 0280c5431b2bc4f09e3d249d25b1010e asterisk-chan_capi-cm-0.5.4.ebuild 1594
 MD5 56c38e32af5d204847de2d9a87b72351 asterisk-chan_capi-cm-0.5.3.ebuild 1588
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 c0233d6c09dcf582ad8363807472d967 ChangeLog 1792
-MD5 c4a4c56e1a808521fa676cd70e015c9d asterisk-chan_capi-cm-0.6.1.ebuild 1365
+MD5 b27bf9edb111cc142947b45a06676f9f ChangeLog 2018
+MD5 0bdb3d355952d52e9108703cbe89c1cf asterisk-chan_capi-cm-0.6.1.ebuild 1579
 MD5 20866dceae16bdac07ffa8b6f8aa2986 files/chan_capi-0.3.5-gentoo.diff 1113
 MD5 e38626bf14b300bea371ed7dbe17003a files/digest-asterisk-chan_capi-cm-0.6.0 67
 MD5 26ad4e3f1d9f576c0cdb02f80881d678 files/digest-asterisk-chan_capi-cm-0.5.4 69
 MD5 e38626bf14b300bea371ed7dbe17003a files/digest-asterisk-chan_capi-cm-0.6.1 67
 MD5 7e64c5311ef2ac1051df45fb82b2aed6 files/digest-asterisk-chan_capi-cm-0.5.3 69
 MD5 49f69b06231dd6ef79fe070882426dab files/chan_capi-0.6.0-gentoo.diff 1296
+MD5 f638c698d5aacae0f9263923c1cde20d files/chan_capi-cm-0.6.1-asterisk-1.2.diff 1152
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);