diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-12 21:06:21 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-12 21:06:21 +0000 |
| commit | ad9dae7b9b960e80a70e84cf844cc3699ca66835 (patch) | |
| tree | 7e436cd02ac2d8dae10c848bf4804eab65e375fc | |
| parent | fix bug so that it works on amd64 (diff) | |
| download | gentoo-2-ad9dae7b9b960e80a70e84cf844cc3699ca66835.tar.gz gentoo-2-ad9dae7b9b960e80a70e84cf844cc3699ca66835.tar.bz2 gentoo-2-ad9dae7b9b960e80a70e84cf844cc3699ca66835.zip | |
Add patch to remove malloc.h inclusion, and mark ~x86-fbsd. Thanks to Alex Unleashed in bug #132793.
(Portage version: 2.1_pre10-r5)
| -rw-r--r-- | media-libs/speex/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/speex/files/speex-1.1.12-malloc.patch | 11 | ||||
| -rw-r--r-- | media-libs/speex/speex-1.1.12.ebuild | 12 |
3 files changed, 22 insertions, 8 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/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 |