summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/asterisk-spandsp_codec_g726/ChangeLog10
-rw-r--r--net-misc/asterisk-spandsp_codec_g726/Manifest5
-rw-r--r--net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild7
-rw-r--r--net-misc/asterisk-spandsp_codec_g726/files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch15
4 files changed, 30 insertions, 7 deletions
diff --git a/net-misc/asterisk-spandsp_codec_g726/ChangeLog b/net-misc/asterisk-spandsp_codec_g726/ChangeLog
index 60e3c9f34603..c6380de92f88 100644
--- a/net-misc/asterisk-spandsp_codec_g726/ChangeLog
+++ b/net-misc/asterisk-spandsp_codec_g726/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/asterisk-spandsp_codec_g726
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-spandsp_codec_g726/ChangeLog,v 1.2 2007/01/06 16:40:13 drizzt Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-spandsp_codec_g726/ChangeLog,v 1.3 2008/12/25 10:17:44 pva Exp $
+
+ 25 Dec 2008; Peter Volkov <pva@gentoo.org>
+ +files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch,
+ asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild:
+ Fixed build issue with updated spandsp library, bug #252378, thank Bruno
+ Redondi for this fix.
06 Jan 2007; Timothy Redaelli <drizzt@gentoo.org>
asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild:
diff --git a/net-misc/asterisk-spandsp_codec_g726/Manifest b/net-misc/asterisk-spandsp_codec_g726/Manifest
index 3b1cb37edef8..332847e036bc 100644
--- a/net-misc/asterisk-spandsp_codec_g726/Manifest
+++ b/net-misc/asterisk-spandsp_codec_g726/Manifest
@@ -1,4 +1,5 @@
+AUX asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch 506 RMD160 e09ede4e016dae7457a2650cc6e3b4d28ad3cf78 SHA1 79e2063e6a496a6506288aa2b58c5f39ac1a54b9 SHA256 ec26275079c7adeae2aa25055272a368716081b077b2e5bf5bddd785c81e284d
DIST spandsp-0.0.2pre26_codec_g726.c.bz2 2867 RMD160 23c6c971b3004e3e683076245f9557891bd3f0db SHA1 bd6df18218c745b6d76b6c71cda4e867922be8f0 SHA256 a5bfc64e2e45b8dc8799cdade8a8cdc82b103dd55a233e5725df8eb42d42264d
-EBUILD asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild 1584 RMD160 6d966360e9df45ccaca9223b9df8662f07de5fad SHA1 0b3e81b50d90c279e554d34b6e28ebf21fd6224b SHA256 85bc749cfc8dd4e698283e7bb9fd40a8d90d78da6dabc76fa1189ab7714a5977
-MISC ChangeLog 560 RMD160 4cfb611a7f5a6bacf7965408d3406af2150d33f0 SHA1 b7e50a139d7c3d2a831341d7c5f6f471bd7c7088 SHA256 35aa8b3067ad66c0844970d276dcf45a1405fd57ff31180520dd127c1e99c0b5
+EBUILD asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild 1630 RMD160 a16f5a2bf8f6f8dcc81b89855863924cdf10b569 SHA1 ae28345cf44d616db51ab87c06093549c5488113 SHA256 a05925a47362ad258378d869a5b9f62421418a300d3f023b98b1caf9f5104529
+MISC ChangeLog 817 RMD160 cbb077bbbd7b4b060dad2f1d33c31e97bf862132 SHA1 b5151db766b24e08e87d100af1b2eae10fdeea3b SHA256 52dffaffd42739512a5cd72b2741faf7acc6ad7a662d930f5b8aedbc42caaa20
MISC metadata.xml 450 RMD160 50881a4dce30b0c63e00effa49d29df87b83f279 SHA1 298d57a1b63258e1bba01faa8167ff302ee7d29c SHA256 b9337e2dcbaa84c6db52d58fbc82b6f207f7ac4febc8bcd6727c2247fa996b3c
diff --git a/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild b/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild
index 2e2ee807eea1..8aa3a64c99de 100644
--- a/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild
+++ b/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild,v 1.2 2007/01/06 16:40:13 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild,v 1.3 2008/12/25 10:17:44 pva Exp $
inherit eutils toolchain-funcs
@@ -27,6 +27,7 @@ do_compile() {
src_unpack() {
unpack "${A}"
+ epatch "${FILESDIR}/${P}-spanddsp.patch"
# patch include declarations
sed -e 's:^\(#include.*\)"\(asterisk/.*\)":\1<\2>:g' \
-e 's:^\(#include.*\)"\(asterisk\.h\)":\1<asterisk/\2>:g' \
@@ -41,7 +42,7 @@ src_compile() {
src_install() {
exeinto /usr/$(get_libdir)/asterisk/modules
- doexe ${LIB_CODEC_G726}.so
+ doexe ${LIB_CODEC_G726}.so || die
}
pkg_postinst() {
diff --git a/net-misc/asterisk-spandsp_codec_g726/files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch b/net-misc/asterisk-spandsp_codec_g726/files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch
new file mode 100644
index 000000000000..b0c825427a1f
--- /dev/null
+++ b/net-misc/asterisk-spandsp_codec_g726/files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=252378
+
+--- spandsp-0.0.2pre26_codec_g726.c 2008-12-24 13:46:26.000000000 +0100
++++ spandsp-0.0.2pre26_codec_g726.c 2008-12-24 13:53:20.000000000 +0100
+@@ -25,8 +25,10 @@
+ #include <string.h>
+ #include <unistd.h>
+
++#define SPANDSP_EXPOSE_INTERNAL_STRUCTURES /* we need g726_state_s definition */
+ #include <spandsp.h>
+
++#define _PLC_H_ /* asterisk/plc.h conflicts with spandsp/plc.h */
+ #include "asterisk.h"
+
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.1 $")