Revision bump, add workaround to bug #332861

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 114 insertions, 6 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/Manifest b/media-libs/speex/Manifest
index f7a4899e50a2..8a85543c99e4 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,14 +2,26 @@
 Hash: SHA256
 
 AUX speex-1.2_rc1-configure.patch 874 RMD160 5b361daaf91abaf4ef62e9ccc7c24432e846f319 SHA1 1ce1a2e82a2a11fbc5065050859102fbfc409737 SHA256 205aa8a4ba729f015535b084f8932c19f5efaa35f81df8b8dc807201fb40c922
+AUX speex-1.2_rc1-r1-configure.patch 1153 RMD160 97dc7401b978b4934df10580e3d962f2140599d5 SHA1 86b5873f7e6858fcbe7cc9c8134c4e87b742cc2c SHA256 8dde6cee655d622b31d49bdae09fe77975d993543c35ad6cdbc065210268cdf0
 DIST speex-1.2rc1.tar.gz 1061882 RMD160 6f4a11ef910b0db9b820826bcac3da1b79cad3a1 SHA1 52daa72572e844e5165315e208da539b2a55c5eb SHA256 342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6
+EBUILD speex-1.2_rc1-r1.ebuild 1195 RMD160 29212f076162b36a49bb93403a4d6a8b38dcc3ec SHA1 5a5d24e48411ea8836b9d7f898b065b2b3c5dc0a SHA256 a97a9b4d8d13f0b2d69ed67198f024262fc840a91d1f401d9a9111d8fce8df4a
 EBUILD speex-1.2_rc1.ebuild 1183 RMD160 b22f100952c3edef7af53ab860f0a5bb82e149d8 SHA1 8d815c7f5cd535e3cba1324c4aee80681f6f6eb5 SHA256 536d30919a90108e8e6e567c0c427effa43a2a83a01edd418134b7a271e5207f
-MISC ChangeLog 12447 RMD160 a73f2cc265a97ee2788f087daeb77bc876bbfc5d SHA1 600103cbf2332334cdf8e6a94a443c4823c00845 SHA256 e32030e839c431aa53d04c10280fdadd377331dabf645e24aebb6a2e21460166
+MISC ChangeLog 12648 RMD160 e6af534957c726da14a1e881d6f5361f95cfce5c SHA1 ef0aa00c456ac3bff96a0f82a06fe8e0ad141c92 SHA256 0fb3f256b01d64e82296ac81f04ea42f00352d29725592a8f1d4fdca18af0e45
 MISC metadata.xml 227 RMD160 db91bfb1298cfaa0069ba0d53f7d8f2791f7d344 SHA1 51ff8c11f7cb3c6b7a97ff2c24af697f1f5ac2ca SHA256 0f8c8d5cb2453a9adf2c7c88c98e613ef02ca8640ecc46379fe9a5e50f7bff7b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4lwr8ACgkQXkR9YqOcLPF5MwD/U/wnrry/Lv+D2mS4uRQGoab0
-xFtLQiK5kQ8V1H7NuWcA+QF2Q0CNwLfBsNqjZsRrsf86VVx2QQ5CkICyRh7/uX+p
-=3VWL
+iQIcBAEBCAAGBQJOQt/XAAoJEHy/RO9cNQiDKYIP/jXVLDTJ1k1Y//I4beBWI+vn
+f8Pr8To6USRl+qQOv/guWLJ/awEKH40lxgp6bh81HkP5sAV8KmixcKslhTEIPidj
+hEH8NdxWrizyfzQi6FzvxTOGJvnTBzbJnRHxoBeN5wG5VT7nSqJ+JRDSxFATJ6rY
+fqjyvaqscUZzoyE+nNYH5KpFK0HbDW8B8y7MBqv2L2APpAm2WVCXPadY5kwGmeKx
+NWGA28AzxlypnneGRok7b1YbAWNgNvRKkcW53mDpgqkHfYGml/tAqzS2Nys2k8zH
+lsnoLpgKtrCXxwHe1NkdCo6MJ0v9S/THcxDqLb3fUy7z/siPLxoT7KP4oWTCdLBz
+045oKwYtvyjqVJdrr9SxS/JjvgKLMucq+zAX5pYpxF1cNJ5+0gFfqtzxogAZekt4
+usrD6VcHJ/4Rr00QzRkIGVJEsFCNclxzx4DDzd7jl1XReypLgPff1hv3v6d0lqXy
+zsvCk+T9rfNyZrcxwALvM4RDljx1KKSt+/JfxJP7a2xLXLxnoEY5nO/eRmokRMGQ
+GT1nZIa7o6PMSzNU+Ats/COHwt2LQj9qAOYcnvcAsQbkFlpIlNRFRS2fvkFakrpd
+04rMdWC6lHyJGOtHaik2gl2ts95QB3p9UwS4mG/tgk3L2j8e43af8jmUNc3wdPu/
+6Y6Gec1apcbNMy4iJFTk
+=O5TX
 -----END PGP SIGNATURE-----
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 '{}' +
+}