Revision bump, add workaround to bug #332861

(Portage version: 2.1.10.10/cvs/Linux x86_64)

3 files changed, 97 insertions, 1 deletions

diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog
index de7284dc6745..fc78f0f94eb2 100644
--- a/media-libs/speex/ChangeLog
+++ b/media-libs/speex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/speex
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.96 2011/07/19 17:47:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.97 2011/08/10 19:45:14 chutzpah Exp $
+
+*speex-1.2_rc1-r1 (10 Aug 2011)
+
+  10 Aug 2011; Patrick McLean <chutzpah@gentoo.org> +speex-1.2_rc1-r1.ebuild,
+  +files/speex-1.2_rc1-r1-configure.patch:
+  Revision bump, add workaround to bug #332861
 
   19 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> speex-1.2_rc1.ebuild:
   Missing dev-util/pkgconfig DEPEND wrt #373617 by Malte Starostik
diff --git a/media-libs/speex/files/speex-1.2_rc1-r1-configure.patch b/media-libs/speex/files/speex-1.2_rc1-r1-configure.patch
new file mode 100644
index 000000000000..a6c9166a9259
--- /dev/null
+++ b/media-libs/speex/files/speex-1.2_rc1-r1-configure.patch
@@ -0,0 +1,40 @@
+diff -urN speex-1.2rc1.orig/configure.ac speex-1.2rc1/configure.ac
+--- speex-1.2rc1.orig/configure.ac	2008-07-21 03:17:08.000000000 +0100
++++ speex-1.2rc1/configure.ac	2011-03-15 00:23:21.263751871 +0000
+@@ -112,9 +112,6 @@
+ 
+ AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
+ 
+-XIPH_PATH_OGG([src="src"], [src=""])
+-AC_SUBST(src)
+-
+ AC_CHECK_LIB(m, sin)
+ 
+ # Check for getopt_long; if not found, use included source.
+@@ -139,10 +136,16 @@
+   AC_DEFINE([ENABLE_VALGRIND], , [Enable valgrind extra checks])
+ fi])
+ 
++AC_ARG_ENABLE(ogg, [  --enable-ogg            Enable OGG support], [if test "$enableval" = yes; then
++  XIPH_PATH_OGG([src="src"], [src=""])
++  AC_SUBST(src)
++fi
++])
++
+ AC_ARG_ENABLE(sse, [  --enable-sse            Enable SSE support], [
+ if test "x$enableval" != xno; then
+ has_sse=yes
+-CFLAGS="$CFLAGS -O3 -msse"
++CFLAGS="$CFLAGS -msse"
+ else
+ has_sse=no
+ fi
+@@ -217,7 +220,7 @@
+  ],
+  [gpl-fftw3], [
+   AC_DEFINE([USE_GPL_FFTW3], [], [Use FFTW3 for FFT])
+-  PKG_CHECK_MODULES(FFT, fftw3f)
++  PKG_CHECK_MODULES([FFT], [fftw3f])
+  ],
+  [proprietary-intel-mkl], [
+   AC_DEFINE([USE_INTEL_MKL], [], [Use Intel Math Kernel Library for FFT])
diff --git a/media-libs/speex/speex-1.2_rc1-r1.ebuild b/media-libs/speex/speex-1.2_rc1-r1.ebuild
new file mode 100644
index 000000000000..1ae07e277002
--- /dev/null
+++ b/media-libs/speex/speex-1.2_rc1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1-r1.ebuild,v 1.1 2011/08/10 19:45:14 chutzpah Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_} ; MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech."
+HOMEPAGE="http://www.speex.org"
+SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ogg sse static-libs"
+
+RDEPEND="ogg? ( media-libs/libogg )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-configure.patch
+
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		libspeex/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-lfs-flags
+
+	econf \
+		$(use_enable static-libs static) \
+		--disable-dependency-tracking \
+		$(use_enable sse) \
+		$(use_enable ogg)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install || die
+	dodoc AUTHORS ChangeLog NEWS README* TODO
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}