Version bump, bug 297304

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 106 insertions, 13 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 33c780c78ad6..bf180f743f18 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/alsa-plugins
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.114 2009/09/19 13:55:50 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.115 2010/01/07 17:22:18 beandog Exp $
+
+*alsa-plugins-1.0.22 (07 Jan 2010)
+
+  07 Jan 2010; Steve Dibb <beandog@gentoo.org> +alsa-plugins-1.0.22.ebuild,
+  +files/alsa-plugins-1.0.22-automagic.patch:
+  Version bump, bug 297304
 
   19 Sep 2009; Markus Meier <maekke@gentoo.org> alsa-plugins-1.0.20.ebuild:
   arm stable, bug #280464
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index ee3b8c75ff38..b03857042c25 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 RMD160 2c39a3bc0860cebd86542f3afe60f061146b4efa SHA1 ac1839723063fcf3286d1ddf1bd291ba6c0b1220 SHA256 6dfabe2b373e702ebd617754e4a4a32d4fccd1e35c47b280136fe49c2faa8b1e
 AUX alsa-plugins-1.0.17-automagic.patch 2409 RMD160 9a4f13962e395de52c9b1b5c4d38e2f7d5f5b97d SHA1 e389bfbdb2d0d50f577e36a7cf00b58b752a2621 SHA256 5272c5f0d86d577f517d0652a4b7eee9977adb25aefa71d0a8690e5bc1607df0
 AUX alsa-plugins-1.0.19-missing-avutil.patch 489 RMD160 d32cfe36584809e4aa979a2ee12d4059607c710a SHA1 2a3e565e9e630fbadef45fe1643d78bb83d4be2b SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a
 AUX alsa-plugins-1.0.19-speex.patch 2741 RMD160 60df99a4085979c313ffc69b2444d7acd81d0ea2 SHA1 294ceb536f66dd81b09ecdae436780439a3d6e2d SHA256 2768121c051d4ddd1581b8a5790369136591538550d2ca48c0f32816c03310f4
 AUX alsa-plugins-1.0.20-automagic.patch 343 RMD160 62e4ace9f1413fc61aa5193a7ff6052e1d898fd5 SHA1 e81137ffaf7e28c22609aa851995dbc6a59d4f29 SHA256 e9fbdf06516a49bd64fe3011b9bcbcf2723befc6f71a231b95cb3c5008e4f213
 AUX alsa-plugins-1.0.21-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae707eb0ace945 SHA1 aa22f83603c908159231100e7ba1d64965720b30 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5
+AUX alsa-plugins-1.0.22-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae707eb0ace945 SHA1 aa22f83603c908159231100e7ba1d64965720b30 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5
 AUX ffmpeg-headers.patch 2016 RMD160 2a0e21f32de08172912d14ab007db1af46bf4e96 SHA1 dc1e77310c76c135798669cb36f880beae6cb249 SHA256 9badd3be64569e92b45353175e4db1e977cf7c5c18d1fb489405fd3c94bb1e45
 DIST alsa-plugins-1.0.17.tar.bz2 308119 RMD160 488661a743460d0f09d6679252798f65e4817cb3 SHA1 aac646dd368b8c42e12548356a5b66dcedd4d754 SHA256 35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560
 DIST alsa-plugins-1.0.19.tar.bz2 315471 RMD160 662d945b89c71dca3e7190bc6f80bcf134fb4b18 SHA1 578ae437b04961ca4841c41439441f7ad0dac890 SHA256 67be087c24af9d2a380b29d6e90b7187b337a0c484c31438a0d38ff429c71100
 DIST alsa-plugins-1.0.20.tar.bz2 324365 RMD160 e966530c7bf0d2c437d31e9fde49bcb5f4aaff78 SHA1 dc9972416e9b50e6a5cc4f31abd0fb668efba937 SHA256 210ceedcb84bf3030e9f362d55b734312632ce72e348bd758536ec62a37aac97
 DIST alsa-plugins-1.0.21.tar.bz2 325828 RMD160 853416f1c78c9c2b99ba5f2ed0c36df88f21a387 SHA1 dae6f4dd4aa8638aded472cf503eb2c2e5f69730 SHA256 b89c0c4c14dadb3c15cf87a1963bfae3d6aae62d4530a0ab7df1b714ab42dad4
+DIST alsa-plugins-1.0.22.tar.bz2 326266 RMD160 d7540360fc06f531344f735339bd17cad98e140d SHA1 e9bc0cba71a4b66f39d7af5f3638a5667fc76ff2 SHA256 19cd2728a6b91a5ee5ee7a838a7a9bd22824219789716e995e2b24b1dd28b23d
 EBUILD alsa-plugins-1.0.17-r1.ebuild 1990 RMD160 99442ca679493f10dbbacab62212f1f236b2aa07 SHA1 3bc23f97c9b97046731ff473d9bb5359f7b2c84c SHA256 0f5135a143812b1f1ea1b15838eaa14c395e45db42488b5354a376429920db4b
 EBUILD alsa-plugins-1.0.19.ebuild 2050 RMD160 05ce8fc2c35b24cb97b149e73484c073c4a1d888 SHA1 be956df7b353a91ef6232e5cb705e25159dd3fd6 SHA256 0af0e850ce160346974568c1c3b0f994cb1dbb92c1aa17020193627f2afb4df1
 EBUILD alsa-plugins-1.0.20.ebuild 2170 RMD160 2886059c659fe9b34a8da0478267d8162f606b66 SHA1 e9c6ae5494a347b33a5b5a12314d270d5ffe2680 SHA256 deba6bdc514020036fc4886d514643173b6929f24a45c882fe96ba8b8ca826aa
 EBUILD alsa-plugins-1.0.21.ebuild 2177 RMD160 84f372907d28cbc57593648d8c584d5eee20738d SHA1 9cf12fffb0154c6f9f20d5b2bde0994560ce5a6d SHA256 25f02048c275e8b6f940a7406525690d53560a0713547b0d279ad150215bf886
-MISC ChangeLog 17403 RMD160 5dd69d1ed1c017674f4d3c7c052f4d335f83c0b3 SHA1 727efd93f0e29b8804e4cc073bc17b70091e5857 SHA256 2fea2e436c2c774b8f4bd15073f5f24ed06c00fc328f95240150ce312a12af00
+EBUILD alsa-plugins-1.0.22.ebuild 2176 RMD160 032ca496c6252d3ebf6a250f604e6809497ef883 SHA1 58fd876872e0798678f003ad5caff3c253d14e63 SHA256 05696c167e280858e91dde55a1edd3f5f42d3dcdb188a00132a8b77cdc388ec4
+MISC ChangeLog 17590 RMD160 f25bf97da916a7d0379d0ad424a20ac0471b888c SHA1 a5dd9a4f598a5db70befeb38ced0010f9b3f8310 SHA256 31b1171e26dfdd7c2d31e6451442f587f0e354eb93ab141a8bcf7ff85a153782
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq04xIACgkQkKaRLQcq0GKtFgCfaNbdodflEHXhoRLU2P93Klvm
-4J4An0+37aBHyij4IH4cWBPhthQ0QCzp
-=bfKB
------END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.22.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.22.ebuild
new file mode 100644
index 000000000000..8893c8b9e339
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.22.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.22.ebuild,v 1.1 2010/01/07 17:22:18 beandog Exp $
+
+EAPI=2
+
+MY_P="${P/_/}"
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}[alsa_pcm_plugins_ioplug]
+	ffmpeg? ( media-video/ffmpeg
+		media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
+	libsamplerate? (
+		media-libs/libsamplerate
+		media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] )
+	pulseaudio? ( media-sound/pulseaudio )
+	speex? ( media-libs/speex
+		media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] )
+	!media-plugins/alsa-jack"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		"${S}/pulse/Makefile.am"
+
+	# Bug #256119
+	epatch "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch
+
+	# Bug #278352
+	epatch "${FILESDIR}"/${P}-automagic.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	use debug || append-flags -DNDEBUG
+
+	local myspeex
+
+	if use speex; then
+		myspeex=lib
+	else
+		myspeex=no
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable ffmpeg avcodec) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable pulseaudio) \
+		--with-speex=${myspeex}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cd "${S}/doc"
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use pulseaudio && dodoc README-pulse
+	use ffmpeg && dodoc lavcrate.txt a52.txt
+}
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.22-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.22-automagic.patch
new file mode 100644
index 000000000000..f7d9e7dc437a
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.22-automagic.patch
@@ -0,0 +1,12 @@
+diff -ur alsa-plugins-1.0.21.orig/Makefile.am alsa-plugins-1.0.21/Makefile.am
+--- alsa-plugins-1.0.21.orig/Makefile.am	2009-05-06 10:07:28.000000000 +0300
++++ alsa-plugins-1.0.21/Makefile.am	2009-08-01 18:23:26.000000000 +0300
+@@ -17,7 +17,7 @@
+ if HAVE_PPH
+ SUBDIRS += pph
+ endif
+-if HAVE_SPEEXDSP
++if USE_LIBSPEEX
+ SUBDIRS += speex
+ endif
+