Add patch to remove malloc.h inclusion, and mark ~x86-fbsd. Thanks to Alex Unleashed in bug #132793.

Package-Manager: portage-2.1_pre10-r5

4 files changed, 58 insertions, 30 deletions

diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog
index 9c8f8909ea89..048a0055a315 100644
--- a/media-libs/speex/ChangeLog
+++ b/media-libs/speex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/speex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.48 2006/04/19 13:11:09 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.49 2006/05/12 21:06:21 flameeyes Exp $
+
+  12 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/speex-1.1.12-malloc.patch, speex-1.1.12.ebuild:
+  Add patch to remove malloc.h inclusion, and mark ~x86-fbsd. Thanks to Alex
+  Unleashed in bug #132793.
 
   19 Apr 2006; Patrick McLean <chutzpah@gentoo.org> +speex-1.1.5.ebuild:
   Re-add speex-1.1.5 since media-plugins/xmms-speex depends on it
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index da3f538984b1..4a9f20e138d6 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,9 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ae47820e2c670dbc410f2e461c46ff0 ChangeLog 6678
-RMD160 24ddaac6a7422cae4852324e48fc6048b0c1f67c ChangeLog 6678
-SHA256 bcac6b8534b0baad4c5584d9d3733d0d482f8625580a4c126bd23973bd42952b ChangeLog 6678
+AUX speex-1.1.12-malloc.patch 337 RMD160 30eb657cf06b66ec80f7d4b66a9125f0d776726a SHA1 ea1a7ed550154646f8e9fc8a6fa7d45376c196ae SHA256 67db66fb39f89845cb7efdf7ccab389016b667d2d4fa2883fa25adc555aa4e74 size 337
+MD5 7df4b50ceda2456be6f0a3315c95c9b5 files/speex-1.1.12-malloc.patch 337
+RMD160 30eb657cf06b66ec80f7d4b66a9125f0d776726a files/speex-1.1.12-malloc.patch 337
+SHA256 67db66fb39f89845cb7efdf7ccab389016b667d2d4fa2883fa25adc555aa4e74 files/speex-1.1.12-malloc.patch 337
+DIST speex-1.1.11.1.tar.gz 720528 size 720528
+DIST speex-1.1.12.tar.gz 740110 RMD160 24271522d1e1d4b8ccb2833d5fbd75b33789de07 SHA256 77c8505bd9b73192789770299e0a727fba9c1d556d853b8cc473bfee393709f8 size 740110
+DIST speex-1.1.5.tar.gz 600280 RMD160 4deae4534c068349d18d8ff67fc7ee073aad7f46 SHA256 3e1d63e002ccb016b6976c76491192fbca810a6f69a0afaa0a059c40f8de9b20 size 600280
+DIST speex-1.1.7.tar.gz 594364 size 594364
+EBUILD speex-1.1.11.1.ebuild 1123 RMD160 5b08b28ef60e989db1b12bb57f9e89c7a5d72855 SHA1 acd861e2883d0b4165b98c824db059f3ed11030d SHA256 20df8bf35287e1cc485cec7d56255a3f7b6c7155549f15904af5ad109dcbf510 size 1123
+MD5 d4b623d30ef220303e8741a0de9f137a speex-1.1.11.1.ebuild 1123
+RMD160 5b08b28ef60e989db1b12bb57f9e89c7a5d72855 speex-1.1.11.1.ebuild 1123
+SHA256 20df8bf35287e1cc485cec7d56255a3f7b6c7155549f15904af5ad109dcbf510 speex-1.1.11.1.ebuild 1123
+EBUILD speex-1.1.12.ebuild 1163 RMD160 8b37274dfa43dcb23c14821befa69c2ac445cd2d SHA1 0c112f02cd3feed9b0a62fc924eab3284f5f5998 SHA256 84a4af8c07b2b3cb89528980a79d39af979a0775e89cf98361c68136909c1bff size 1163
+MD5 6da122e2ebcdbd3310390386440d95fe speex-1.1.12.ebuild 1163
+RMD160 8b37274dfa43dcb23c14821befa69c2ac445cd2d speex-1.1.12.ebuild 1163
+SHA256 84a4af8c07b2b3cb89528980a79d39af979a0775e89cf98361c68136909c1bff speex-1.1.12.ebuild 1163
+EBUILD speex-1.1.5.ebuild 949 RMD160 dfd57aba481978570432af47e13ed6aab6122959 SHA1 cf4b0e76a9741c9ef48335403ef63ad98d338345 SHA256 5aa5ea862d30241f85ba9ff886258e354ce879a63741d75e4ee021a090f169e5 size 949
+MD5 bb92ffffa3123fce7d1fbe5b1d78331b speex-1.1.5.ebuild 949
+RMD160 dfd57aba481978570432af47e13ed6aab6122959 speex-1.1.5.ebuild 949
+SHA256 5aa5ea862d30241f85ba9ff886258e354ce879a63741d75e4ee021a090f169e5 speex-1.1.5.ebuild 949
+EBUILD speex-1.1.7.ebuild 958 RMD160 2a8e3ea3e276d52fc76c0a2a523de8945a2b50d7 SHA1 c04c594abbacbc48ea9e7747e717d7f299332fbf SHA256 c7a6390ee0f50e01c92f9e06551568fff4e116cb6cbfdb538e0b07576b72d23d size 958
+MD5 a6bd9b95eb11105da3d18d9d58b3aa3e speex-1.1.7.ebuild 958
+RMD160 2a8e3ea3e276d52fc76c0a2a523de8945a2b50d7 speex-1.1.7.ebuild 958
+SHA256 c7a6390ee0f50e01c92f9e06551568fff4e116cb6cbfdb538e0b07576b72d23d speex-1.1.7.ebuild 958
+MISC ChangeLog 6895 RMD160 1d6494623f3f204ddf330d8293a8e558a4e0654c SHA1 84d5ac4fd74fee749a373a1fd3aeb7510eaca562 SHA256 dd3089ab74949076b3237c6016046bae7c5a798d579aad45722f0ab7bccb726c size 6895
+MD5 7cd10ff06dc8c52977aab76e36f3b6a7 ChangeLog 6895
+RMD160 1d6494623f3f204ddf330d8293a8e558a4e0654c ChangeLog 6895
+SHA256 dd3089ab74949076b3237c6016046bae7c5a798d579aad45722f0ab7bccb726c ChangeLog 6895
+MISC metadata.xml 217 RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a SHA1 bb95f672fc20ce8075d27f34c751073cb97849d2 SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 size 217
+MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
+RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a metadata.xml 217
+SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 metadata.xml 217
 MD5 72fed2862c8474730d712250d2810156 files/digest-speex-1.1.11.1 66
 RMD160 bc905e935054f806deea6872f505060ca541c124 files/digest-speex-1.1.11.1 66
 SHA256 845aa8b56f1a7be580a92899b5dd1ebb3c320d53a43e9d5d433eb49d0870a596 files/digest-speex-1.1.11.1 66
@@ -16,25 +45,10 @@ SHA256 2e0a6711bc00ff3e8304f01615cdccc0e79956d840d1b08ae50b727aafdbee02 files/di
 MD5 d7d10212f2bf174a7d04e72c4a56f4be files/digest-speex-1.1.7 63
 RMD160 d07b8fdb5140cb10e5a26a890927485075bdd7e6 files/digest-speex-1.1.7 63
 SHA256 e1d5e0b3e1b118a590f3ef590b260a81adf1bbb2260259d9a2008e6e70138a17 files/digest-speex-1.1.7 63
-MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
-RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a metadata.xml 217
-SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 metadata.xml 217
-MD5 d4b623d30ef220303e8741a0de9f137a speex-1.1.11.1.ebuild 1123
-RMD160 5b08b28ef60e989db1b12bb57f9e89c7a5d72855 speex-1.1.11.1.ebuild 1123
-SHA256 20df8bf35287e1cc485cec7d56255a3f7b6c7155549f15904af5ad109dcbf510 speex-1.1.11.1.ebuild 1123
-MD5 cd3b89741dc51845877d6331dccc1df5 speex-1.1.12.ebuild 1171
-RMD160 071d0b17428169bcf114f2cc784f0737caff079f speex-1.1.12.ebuild 1171
-SHA256 8edf59ea75783063b0641fbc394d539fa2068a05c758a42c1db07bc38d5535ca speex-1.1.12.ebuild 1171
-MD5 bb92ffffa3123fce7d1fbe5b1d78331b speex-1.1.5.ebuild 949
-RMD160 dfd57aba481978570432af47e13ed6aab6122959 speex-1.1.5.ebuild 949
-SHA256 5aa5ea862d30241f85ba9ff886258e354ce879a63741d75e4ee021a090f169e5 speex-1.1.5.ebuild 949
-MD5 a6bd9b95eb11105da3d18d9d58b3aa3e speex-1.1.7.ebuild 958
-RMD160 2a8e3ea3e276d52fc76c0a2a523de8945a2b50d7 speex-1.1.7.ebuild 958
-SHA256 c7a6390ee0f50e01c92f9e06551568fff4e116cb6cbfdb538e0b07576b72d23d speex-1.1.7.ebuild 958
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFERnvRI1lqEGTUzyQRAraeAKCu8Bn6AQIwHtq/fp7X7MJdFX9JZwCgzZ9n
-fUZqbhF9XTzLnfKnRwuU7uY=
-=TCkP
+iD8DBQFEZPjUAiZjviIA2XgRArCSAKDAysvWfDnqfz9hP5s7BxZ0cfBe3QCfewPV
+JVoGAS2idKEVzd5EH+yHc1o=
+=rGMJ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/speex/files/speex-1.1.12-malloc.patch b/media-libs/speex/files/speex-1.1.12-malloc.patch
new file mode 100644
index 000000000000..a6c7003d138a
--- /dev/null
+++ b/media-libs/speex/files/speex-1.1.12-malloc.patch
@@ -0,0 +1,11 @@
+diff -Naur speex-1.1.12/libspeex/kiss_fft.h speex-1.1.12b/libspeex/kiss_fft.h
+--- speex-1.1.12/libspeex/kiss_fft.h	2005-12-22 12:14:33 +0100
++++ speex-1.1.12/libspeex/kiss_fft.h	2006-05-07 21:13:46 +0200
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <memory.h>
+-#include <malloc.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/media-libs/speex/speex-1.1.12.ebuild b/media-libs/speex/speex-1.1.12.ebuild
index 6e47a9220a26..089aa3841163 100644
--- a/media-libs/speex/speex-1.1.12.ebuild
+++ b/media-libs/speex/speex-1.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.1.12.ebuild,v 1.1 2006/04/18 15:38:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.1.12.ebuild,v 1.2 2006/05/12 21:06:21 flameeyes Exp $
 
 inherit eutils autotools libtool
 
@@ -10,15 +10,11 @@ SRC_URI="http://downloads.xiph.org/releases/speex/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ogg sse vorbis-psy"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.0 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -29,6 +25,8 @@ src_unpack() {
 	sed -i -e 's:\$(top_builddir)/libspeex/libspeex.la:libspeex.la:' \
 		${S}/libspeex/Makefile.am
 
+	epatch "${FILESDIR}/${P}-malloc.patch"
+
 	eautoreconf
 
 	# Better being safe