Version bump with patch optionalizing ogg as requested in previous ebuild. Closing bug 188094, thanks to Martin Bosner for reporting.

Package-Manager: portage-2.1.3.7

5 files changed, 106 insertions, 5 deletions

diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog
index 9e7ce1b3f54a..1efbc423c906 100644
--- a/media-libs/speex/ChangeLog
+++ b/media-libs/speex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/speex
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.57 2007/08/13 21:11:34 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.58 2007/08/27 15:01:06 drac Exp $
+
+*speex-1.2_beta2 (27 Aug 2007)
+
+  27 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/speex-1.2_beta2-optional-ogg-and-cflags.patch,
+  +speex-1.2_beta2.ebuild:
+  Version bump with patch optionalizing ogg as requested in previous ebuild.
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> speex-1.1.12.ebuild:
   ppc. stable
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index e2401c097ee6..a6b8a63e3a89 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,9 +2,14 @@ AUX speex-1.1.12-malloc.patch 337 RMD160 30eb657cf06b66ec80f7d4b66a9125f0d776726
 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
+AUX speex-1.2_beta2-optional-ogg-and-cflags.patch 1169 RMD160 8e740233eea96c93a1c6a5efea5187809aab8740 SHA1 01cdd53fde58ced46eaae8356646370b1d747179 SHA256 d1a7c4ed3212c34af1e07c97bc3ec79b444a9a5dea9a98f5e250e2a0905e417c
+MD5 0caeb7305ca1ceab569a80b6393ca351 files/speex-1.2_beta2-optional-ogg-and-cflags.patch 1169
+RMD160 8e740233eea96c93a1c6a5efea5187809aab8740 files/speex-1.2_beta2-optional-ogg-and-cflags.patch 1169
+SHA256 d1a7c4ed3212c34af1e07c97bc3ec79b444a9a5dea9a98f5e250e2a0905e417c files/speex-1.2_beta2-optional-ogg-and-cflags.patch 1169
 DIST speex-1.1.11.1.tar.gz 720528 RMD160 6287327d6a3d5f45637af516cab568249e765160 SHA1 59cac04ddce85087b7143e20bdb3959a1d62e107 SHA256 b32000d4ca4e6f3cf02eeca90de765e759efa53c33f8ada8500df73fa55cda1f
 DIST speex-1.1.12.tar.gz 740110 RMD160 24271522d1e1d4b8ccb2833d5fbd75b33789de07 SHA1 8d52c5fc51ae5fd3b1297e5aaa48872dd045a671 SHA256 77c8505bd9b73192789770299e0a727fba9c1d556d853b8cc473bfee393709f8
 DIST speex-1.1.7.tar.gz 594364 RMD160 2365581c1c5eb276be24ee332798b4039402038f SHA1 8f58ae945370a6b7b7b0fd52d567ec22a863de40 SHA256 95674d39b89bdb46d786aa2ea40e907467f211eaede9d0a8c6c2f397c93a9de2
+DIST speex-1.2beta2.tar.gz 997255 RMD160 6e86dec0b56bae8d65cf3b6476f6d5cb3a74b1ec SHA1 7a0c55763d71f2d845c65968964b1fb1b1897f2e SHA256 e57573e86276972080b5d82746d0968492859f35eaa265e79b5cfb130b26e3da
 EBUILD speex-1.1.11.1.ebuild 1160 RMD160 254d402fc1ceb139744255f900f6b24b4f06a842 SHA1 f66f1144d58535d0e932ca767fef52bc31e9cc6e SHA256 9d5167d7b0d213f480b75cf3e2f0d15218e5d200273232400d8f6b321837b964
 MD5 fb4fa334251635deb0c88242974585b5 speex-1.1.11.1.ebuild 1160
 RMD160 254d402fc1ceb139744255f900f6b24b4f06a842 speex-1.1.11.1.ebuild 1160
@@ -17,10 +22,14 @@ EBUILD speex-1.1.7.ebuild 946 RMD160 3a08df5c3eeea73876e0a611a0756b501187d957 SH
 MD5 d0ff9d557293d990ea3b05e725a04368 speex-1.1.7.ebuild 946
 RMD160 3a08df5c3eeea73876e0a611a0756b501187d957 speex-1.1.7.ebuild 946
 SHA256 c9258b1ffe93b9c04ff0248afe2760ef88037f999c141e2544c9349a64f983a6 speex-1.1.7.ebuild 946
-MISC ChangeLog 7703 RMD160 49fa92800fd1558d862cd577a126c06346efd6a0 SHA1 d9dd330365d62b7450b63580b2ad14e52547fc0f SHA256 a8dc16067cbe87ed229db8ae148cabb7fc94224863fb403378899f97b13c5683
-MD5 2eb7ad89f2c9249a0c36da46fa7f8f5d ChangeLog 7703
-RMD160 49fa92800fd1558d862cd577a126c06346efd6a0 ChangeLog 7703
-SHA256 a8dc16067cbe87ed229db8ae148cabb7fc94224863fb403378899f97b13c5683 ChangeLog 7703
+EBUILD speex-1.2_beta2.ebuild 1178 RMD160 a41139d8723fc1251d2ccdd5c97e5e40d322720a SHA1 9888e6d8e07b73ef1cb14a6a4d5e1100e1d330f9 SHA256 1e31eb761f1277b26d3e506c84a6bfc6a5d74055bc79af40cfc5aaf04d38832e
+MD5 54296ee6f638faac2738e66563224fc6 speex-1.2_beta2.ebuild 1178
+RMD160 a41139d8723fc1251d2ccdd5c97e5e40d322720a speex-1.2_beta2.ebuild 1178
+SHA256 1e31eb761f1277b26d3e506c84a6bfc6a5d74055bc79af40cfc5aaf04d38832e speex-1.2_beta2.ebuild 1178
+MISC ChangeLog 7939 RMD160 6575910f898ac63c4d712a7a3c2501e881dd9dad SHA1 4b0a77cb3fefab41f5873d64905988475bf81aaa SHA256 3bab378e83fd0e2f06c3937951b9d3b414ee5f58fe401f6c6797fa3ebec0a793
+MD5 bd97cf84b2968ced2f99961fb8cf595c ChangeLog 7939
+RMD160 6575910f898ac63c4d712a7a3c2501e881dd9dad ChangeLog 7939
+SHA256 3bab378e83fd0e2f06c3937951b9d3b414ee5f58fe401f6c6797fa3ebec0a793 ChangeLog 7939
 MISC metadata.xml 217 RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a SHA1 bb95f672fc20ce8075d27f34c751073cb97849d2 SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789
 MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
 RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a metadata.xml 217
@@ -34,3 +43,6 @@ SHA256 156a6caf340c5bbcdc3413493758f35faf187fa6f6aac5883198d254ed22ab4b files/di
 MD5 b049f9cf9c718e292dd3036658fd2ebf files/digest-speex-1.1.7 235
 RMD160 6584b7b8fda33d272c6e7a61e08bcee20e769fb1 files/digest-speex-1.1.7 235
 SHA256 b5c500b136ba42703516f37ca7f92c88d290e11d8e61da7b87f5b88fe3516691 files/digest-speex-1.1.7 235
+MD5 0024640e88c5078d512117a1c14c687e files/digest-speex-1.2_beta2 244
+RMD160 198d260abd68ca16f4c9a5586483ca34d4841403 files/digest-speex-1.2_beta2 244
+SHA256 f6d00a8414db8afd1ee7db73b4c76bf7226c155851103235ddcf8cf4d6a27997 files/digest-speex-1.2_beta2 244
diff --git a/media-libs/speex/files/digest-speex-1.2_beta2 b/media-libs/speex/files/digest-speex-1.2_beta2
new file mode 100644
index 000000000000..388f14df64f0
--- /dev/null
+++ b/media-libs/speex/files/digest-speex-1.2_beta2
@@ -0,0 +1,3 @@
+MD5 5480fa53a7451603ecb57ff815c87ac0 speex-1.2beta2.tar.gz 997255
+RMD160 6e86dec0b56bae8d65cf3b6476f6d5cb3a74b1ec speex-1.2beta2.tar.gz 997255
+SHA256 e57573e86276972080b5d82746d0968492859f35eaa265e79b5cfb130b26e3da speex-1.2beta2.tar.gz 997255
diff --git a/media-libs/speex/files/speex-1.2_beta2-optional-ogg-and-cflags.patch b/media-libs/speex/files/speex-1.2_beta2-optional-ogg-and-cflags.patch
new file mode 100644
index 000000000000..210715b35290
--- /dev/null
+++ b/media-libs/speex/files/speex-1.2_beta2-optional-ogg-and-cflags.patch
@@ -0,0 +1,35 @@
+diff -ur speex-1.2beta2.orig/configure.ac speex-1.2beta2/configure.ac
+--- speex-1.2beta2.orig/configure.ac	2007-05-17 17:14:35.000000000 +0300
++++ speex-1.2beta2/configure.ac	2007-08-27 17:49:26.000000000 +0300
+@@ -67,9 +67,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.
+@@ -89,6 +86,12 @@
+ AC_DEFINE_UNQUOTED(SPEEX_MICRO_VERSION, ${SPEEX_MICRO_VERSION}, [Version micro])
+ AC_DEFINE_UNQUOTED(SPEEX_EXTRA_VERSION, "${SPEEX_EXTRA_VERSION}", [Version extra])
+ 
++AC_ARG_ENABLE(ogg, [  --enable-ogg       Enable OGG],
++[if test "$enableval" = yes; then
++  XIPH_PATH_OGG([src="src"], [src=""])
++  AC_SUBST(src)
++fi])
++
+ AC_ARG_ENABLE(wideband, [  --disable-wideband      Disable wideband codec],
+ [if test "$enableval" = no; then
+   AC_DEFINE([DISABLE_WIDEBAND], , [Disable wideband codec])
+@@ -106,7 +109,7 @@
+ 
+ AC_ARG_ENABLE(sse, [  --enable-sse            Enable SSE support], [if test "$enableval" = yes; then
+ AC_DEFINE([_USE_SSE], , [Enable SSE support])
+-CFLAGS="$CFLAGS -O3 -msse"
++CFLAGS="$CFLAGS -msse"
+ fi
+ ])
+ 
diff --git a/media-libs/speex/speex-1.2_beta2.ebuild b/media-libs/speex/speex-1.2_beta2.ebuild
new file mode 100644
index 000000000000..c3acae10ff3d
--- /dev/null
+++ b/media-libs/speex/speex-1.2_beta2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_beta2.ebuild,v 1.1 2007/08/27 15:01:07 drac Exp $
+
+inherit autotools eutils
+
+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="doc ogg sse vorbis-psy wideband"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-optional-ogg-and-cflags.patch
+	eautoreconf
+	_elibtoolize
+}
+
+src_compile() {
+	econf $(use_enable vorbis-psy) $(use_enable sse) \
+		$(use_enable ogg) $(use_enable wideband)
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README* TODO
+
+	# Install manual.pdf to correct location.
+	rm -f "${D}"/usr/share/doc/speex-1.2beta2/manual.pdf
+	use doc && dodoc doc/manual.pdf
+}