Add support for PulseAudio plugin (by using polyp plugin as the new renamed plugin isn't released yet), and debug useflag to disable asserts and other debugging code.

Package-Manager: portage-2.1.1_pre3

4 files changed, 110 insertions, 8 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 6f25678b08f1..a0d9aab00ed2 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.6 2006/06/23 12:46:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.7 2006/07/17 11:23:32 flameeyes Exp $
+
+*alsa-plugins-1.0.12_rc1-r1 (17 Jul 2006)
+
+  17 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-plugins-1.0.12_rc1-r1.ebuild:
+  Add support for PulseAudio plugin (by using polyp plugin as the new renamed
+  plugin isn't released yet), and debug useflag to disable asserts and other
+  debugging code.
 
 *alsa-plugins-1.0.12_rc1 (23 Jun 2006)
 
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 322323836778..454201548d40 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -15,14 +15,18 @@ EBUILD alsa-plugins-1.0.11.ebuild 1341 RMD160 25c81488cd3d86ba141b55aba71511ffad
 MD5 5dec3b375ceeb6926710e4b0850c5427 alsa-plugins-1.0.11.ebuild 1341
 RMD160 25c81488cd3d86ba141b55aba71511ffad928067 alsa-plugins-1.0.11.ebuild 1341
 SHA256 5d9119fa0a0f591d39a2eb47ab7dffc67aa98b87504cb48e978e85fadbde1525 alsa-plugins-1.0.11.ebuild 1341
+EBUILD alsa-plugins-1.0.12_rc1-r1.ebuild 2492 RMD160 3a1867c120661486f96da954f6e575b270b7c82a SHA1 7213c45670ebd94c0381e2b32390a43f4672c180 SHA256 9ab9eb0a381213b404c90efbd4a9f4c1f745ce3776baa714de17fd3a73be2637
+MD5 0856a6c36aebcdad0149a6075f2fd683 alsa-plugins-1.0.12_rc1-r1.ebuild 2492
+RMD160 3a1867c120661486f96da954f6e575b270b7c82a alsa-plugins-1.0.12_rc1-r1.ebuild 2492
+SHA256 9ab9eb0a381213b404c90efbd4a9f4c1f745ce3776baa714de17fd3a73be2637 alsa-plugins-1.0.12_rc1-r1.ebuild 2492
 EBUILD alsa-plugins-1.0.12_rc1.ebuild 1383 RMD160 37e0c9cd561abda7a918d0a99d1e34b642d1f009 SHA1 3b331652c1c53c05c46d168b1e6ad9736ea4db0a SHA256 42dc0dde66040d46cc8a58c1ca2f3236fd46124cb5c48103bf506932404e8d5c
 MD5 617d79c56263318764f9d8d4f75b6785 alsa-plugins-1.0.12_rc1.ebuild 1383
 RMD160 37e0c9cd561abda7a918d0a99d1e34b642d1f009 alsa-plugins-1.0.12_rc1.ebuild 1383
 SHA256 42dc0dde66040d46cc8a58c1ca2f3236fd46124cb5c48103bf506932404e8d5c alsa-plugins-1.0.12_rc1.ebuild 1383
-MISC ChangeLog 1216 RMD160 0fa9fd16c338fda9b861bdac3ecfdac854c91a22 SHA1 d1118a844651f8d6de1c3e7633b28dcc87bf05c1 SHA256 1a93a7c1f920c4c2c4516e564c343330eb5812659d39967fef1c4e7fa776a830
-MD5 a9af503d6e8828b914adf8f3ab74797b ChangeLog 1216
-RMD160 0fa9fd16c338fda9b861bdac3ecfdac854c91a22 ChangeLog 1216
-SHA256 1a93a7c1f920c4c2c4516e564c343330eb5812659d39967fef1c4e7fa776a830 ChangeLog 1216
+MISC ChangeLog 1524 RMD160 02f3a600838c4700f35ed2b0a8b4733d6bd1f04f SHA1 55abe0dbe3f737b990b9c0c2f74c8fa629266a65 SHA256 1318307bc884cd883d8b7e67e4ae8ce64eaca7863690e1bb34fac8e86170460e
+MD5 6eced372c72a00654d6655734d173c75 ChangeLog 1524
+RMD160 02f3a600838c4700f35ed2b0a8b4733d6bd1f04f ChangeLog 1524
+SHA256 1318307bc884cd883d8b7e67e4ae8ce64eaca7863690e1bb34fac8e86170460e ChangeLog 1524
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -33,10 +37,13 @@ SHA256 aa28b3c600c7b16d100e915875efb9d411f4ac44b3fe767f56bc93c21ee730c6 files/di
 MD5 fc7ddb904211e83fd2bce399ccf3b340 files/digest-alsa-plugins-1.0.12_rc1 271
 RMD160 04928385bf19d82ccaae414e79097bf60c9d8e76 files/digest-alsa-plugins-1.0.12_rc1 271
 SHA256 0f4ae3a6971d934a16ea5d91ce7308e9c6e5b0fcc91d2713dfdc890db1929697 files/digest-alsa-plugins-1.0.12_rc1 271
+MD5 fc7ddb904211e83fd2bce399ccf3b340 files/digest-alsa-plugins-1.0.12_rc1-r1 271
+RMD160 04928385bf19d82ccaae414e79097bf60c9d8e76 files/digest-alsa-plugins-1.0.12_rc1-r1 271
+SHA256 0f4ae3a6971d934a16ea5d91ce7308e9c6e5b0fcc91d2713dfdc890db1929697 files/digest-alsa-plugins-1.0.12_rc1-r1 271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqHQnamhnQswr0vIRApZwAJ9Pzi8vDiYxLuFyGw/ZlXDmdI2EhACfQsBV
-+hnSDpvJ1SXNpnhJRxW4wqk=
-=Lfo6
+iD8DBQFEu3M6AiZjviIA2XgRAk5wAJ9ESc+78WfH8ZAOiWjj5J+RK2RnqwCgphgg
+E/Tvu8uy4IcSV5l1R1u78Ak=
+=TDEZ
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.12_rc1-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.12_rc1-r1.ebuild
new file mode 100644
index 000000000000..64631ab06f5a
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.12_rc1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 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.12_rc1-r1.ebuild,v 1.1 2006/07/17 11:23:32 flameeyes Exp $
+
+inherit libtool autotools eutils flag-o-matic
+
+MY_P="${P/_/}"
+
+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="~amd64"
+IUSE="jack ffmpeg libsamplerate pulseaudio debug"
+
+# It could support polypaudio if it was in portage
+RDEPEND=">=media-libs/alsa-lib-1.0.11
+	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
+	ffmpeg? ( media-video/ffmpeg )
+	libsamplerate? ( media-libs/libsamplerate )
+	pulseaudio? ( media-sound/pulseaudio )
+	!media-plugins/alsa-jack"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-automagic.patch"
+
+	# PolypAudio is now renamed PulseAudio. The former was never added in portage,
+	# so just take care of the latter, by replacing the pkg-config module name
+	# and the name of the resulting plugin.
+	sed -i -e 's:polyplib:libpulse:' "${S}/configure.in"
+	sed -i -e 's:polyp/polypaudio.h:pulse/pulseaudio.h:' \
+		"${S}/polyp/polyp.h"
+	# 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}/polyp/Makefile.am"
+
+	eautoreconf
+
+	elibtoolize
+}
+
+src_compile() {
+	use debug || append-flags -DNDEBUG
+	econf \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable ffmpeg avcodec) \
+		$(use_enable pulseaudio polypaudio) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+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-polyp
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		elog "This version of alsa-plugins does not support PulseAudio under this name."
+		elog "as it was developed when it was called PolypAudio."
+		elog "For this reason all the documentation refers to PolypAudio and"
+		elog "the plugin is called polyp."
+		elog "This situation is going to be solved in next release."
+	fi
+}
\ No newline at end of file
diff --git a/media-plugins/alsa-plugins/files/digest-alsa-plugins-1.0.12_rc1-r1 b/media-plugins/alsa-plugins/files/digest-alsa-plugins-1.0.12_rc1-r1
new file mode 100644
index 000000000000..da089820a65d
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/digest-alsa-plugins-1.0.12_rc1-r1
@@ -0,0 +1,3 @@
+MD5 b9804655617b9a4ce8f500170e2c328f alsa-plugins-1.0.12rc1.tar.bz2 236246
+RMD160 98538c670914e76973be949c01266de259ae831c alsa-plugins-1.0.12rc1.tar.bz2 236246
+SHA256 a89fa478fe1066335047d503ca8a6a16d7543e3699f0d3cba8db0de1097c4747 alsa-plugins-1.0.12rc1.tar.bz2 236246