Add new configuration for autoprobing the presence of PulseAudio and setting up the pulse device as default if PA is present. This makes the previous pulse.conf and pulse-alsa.conf unnceessary. Also remove now-irrelevant Also remove now-irrelevant alsa-jack blocker.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

5 files changed, 148 insertions, 5 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 956fcf954a48..74c941c38a22 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.141 2012/01/26 11:53:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.142 2012/02/12 16:44:54 ford_prefect Exp $
+
+*alsa-plugins-1.0.25-r1 (12 Feb 2012)
+
+  12 Feb 2012; Arun Raghavan <ford_prefect@gentoo.org>
+  +files/51-pulseaudio-probe.conf, +alsa-plugins-1.0.25-r1.ebuild,
+  +files/pulse-default.conf:
+  Add new configuration for autoprobing the presence of PulseAudio and setting
+  up the pulse device as default if PA is present. This makes the previous
+  pulse.conf and pulse-alsa.conf unnceessary. Also remove now-irrelevant
+  alsa-jack blocker.
 
 *alsa-plugins-1.0.25 (26 Jan 2012)
 
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 57c00ee2b0c9..25c83cf573c9 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 51-pulseaudio-probe.conf 437 RMD160 6c481be7345f023efa92536c4ca0759890a580f4 SHA1 b02e0dc3ab9b4411630def4be0e925dd9a6e21fb SHA256 59e27621718449afbc8370af22a7185f9396eabc47894f940ad9775c04101939
 AUX alsa-plugins-1.0.19-missing-avutil.patch 489 RMD160 d32cfe36584809e4aa979a2ee12d4059607c710a SHA1 2a3e565e9e630fbadef45fe1643d78bb83d4be2b SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a
 AUX alsa-plugins-1.0.21-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae707eb0ace945 SHA1 aa22f83603c908159231100e7ba1d64965720b30 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5
 AUX alsa-plugins-1.0.23-automagic.patch 346 RMD160 59875c0f8372c16e38a232b05a9681c5d9b463ae SHA1 b05aca9232383e21c79915d096aafe357c9cab08 SHA256 fe30d4011c06c37a84ff74f467f37d3c6e7a43c01b436de49addf9a36f794840
 AUX pulse-alsa.conf 435 RMD160 4de093dbba575a3c1fa15fec4a0614fc2d064916 SHA1 579ad8059e1f0a772add0469f6408a1a9b71b253 SHA256 375c30b3c3df309c219695af901cbc829e287fe1cec39880ca6a1255d7f8d9ef
+AUX pulse-default.conf 196 RMD160 8d6eda7a28dab00200fff54e2915c7a45ab1aa2f SHA1 ab25eb9d11357e220cbcf542f2ba384b9ebb29ac SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f
 AUX pulse.conf 433 RMD160 6fa0c0dc8a33d4cd757a70e69b20d47bba2c7afa SHA1 4ec0c6521cb126b29f00f82555d92b78dfccfe10 SHA256 bdea4e706b353c4baca34583f0bab1b01b1bdee091d72c263102e531d6b0bf57
 DIST alsa-plugins-1.0.24.tar.bz2 329502 RMD160 70f14c04805a2c1ac34a23e507d6ffd031c12bad SHA1 3f8680de2e3f14ee74027f7e070b3fe416e19dd4 SHA256 fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263
 DIST alsa-plugins-1.0.25.tar.bz2 331568 RMD160 757f19af4d86557568188e481391b77f36ab320e SHA1 ab66de081c5b0137943658a2991ba3d5efe91573 SHA256 a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab
 EBUILD alsa-plugins-1.0.24.ebuild 2335 RMD160 886dae3850939462b90cb54c07abef22819fa8af SHA1 288dcb27a03e12fd1ef58776c58feb39feb5b12d SHA256 d0f9593535dffb8675ec66d5eecbc76c0642ca3825dbf9d15067f29d8164d03b
+EBUILD alsa-plugins-1.0.25-r1.ebuild 2534 RMD160 57e24b702dbf5edcdf585435ce4c71e38d668a0f SHA1 d2d2b5c1f8a97348ad0d4e800ed7a4301ffd0d7d SHA256 b9183ffa0d0eaba14e712d0a263d796cda4dde99e70f0b539c013c64d20a2611
 EBUILD alsa-plugins-1.0.25.ebuild 2164 RMD160 592a5ec1f3ae0a79e665d0bb4bbcf9c5d845573f SHA1 9cb2ce1808efe1ce956b0fdc237a1065526e39ec SHA256 751995a316050ab188fc934aa869775fe7e630df70b7e1eb4d82e40ab8e510ea
-MISC ChangeLog 21357 RMD160 94df7cd132e416ad891efbf84d8c4b8e3b6a9d3e SHA1 750a216acc893fe06484b55b7b2f9397b0f1ca0c SHA256 d24dff9406419d536ad1ab65f196020aac9b795350912dcd086c155e245ff02f
+MISC ChangeLog 21800 RMD160 96fa983bae5d2a4406377469aeee316d7b05a91c SHA1 495b4e359d50115e2f29c639084df9d70a184563 SHA256 40ed39d4caa0b559f066dc804e016d3752e19605fa0d36aa85b670b11562130b
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8hPrwACgkQp5vW4rUFj5rfjQCfXY0UUPc70ZN47nz2FoncpLG8
-T5sAoIlmRMDi/eEnv3h6DokyTpWuryqM
-=YlKj
+iEYEARECAAYFAk837KgACgkQ+Vqt1inD4uySzgCgkCX4XKAjVhXs50N1LNSGwoXv
+cxsAnid079rR/cgb6gF0ULU4fpjHw3k/
+=coJA
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
new file mode 100644
index 000000000000..087f9dab6d29
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 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.25-r1.ebuild,v 1.1 2012/02/12 16:44:54 ford_prefect Exp $
+
+EAPI=3
+
+MY_P="${P/_/}"
+
+inherit autotools base 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}
+	ffmpeg? ( virtual/ffmpeg
+		media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
+	libsamplerate? (
+		media-libs/libsamplerate
+		media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	speex? ( media-libs/speex
+		media-libs/alsa-lib )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.19-missing-avutil.patch"
+	"${FILESDIR}/${PN}-1.0.23-automagic.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	base_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"
+
+	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 ffmpeg && dodoc lavcrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+	fi
+
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}
diff --git a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf
new file mode 100644
index 000000000000..c2272c85b072
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf
@@ -0,0 +1,19 @@
+# PulseAudio alsa plugin configuration file to set the pulseaudio plugin as
+# default output for applications using alsa when pulseaudio is running.
+
+hook_func.pulse_load_if_running {
+	lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so"
+	func "conf_pulse_hook_load_if_running"
+}
+
+@hooks [
+	{
+		func pulse_load_if_running
+		files [
+			"/usr/share/alsa/pulse-default.conf"
+			"/etc/asound.conf"
+			"~/.asoundrc"
+		]
+		errors false
+	}
+]
diff --git a/media-plugins/alsa-plugins/files/pulse-default.conf b/media-plugins/alsa-plugins/files/pulse-default.conf
new file mode 100644
index 000000000000..8f7cbf29d60c
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/pulse-default.conf
@@ -0,0 +1,10 @@
+# This file is referred to from files in /usr/share/alsa/alsa.conf.d/ in order
+# to set up the pulse device as the default if required.
+
+pcm.!default {
+	type pulse
+}
+
+ctl.!default {
+	type pulse
+}