inject default working pulseaudio configuration, close bug #308697

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

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 68c366faef10c1d74dd58f5e148dc6680de99bb3..964abe5a83e479dfb4d7fbaf688082bed6c3b2a9 100644 (file)
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.124 2010/04/16 22:44:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.125 2010/05/28 18:41:23 lxnay Exp $
+
+*alsa-plugins-1.0.23-r1 (28 May 2010)
+
+  28 May 2010; Fabio Erculiani <lxnay@gentoo.org>
+  -alsa-plugins-1.0.23.ebuild, +alsa-plugins-1.0.23-r1.ebuild,
+  +files/pulse.conf, +files/pulse-alsa.conf:
+  inject default working pulseaudio configuration, close bug #308697
 
 *alsa-plugins-1.0.23 (16 Apr 2010)
 

diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 7d9a3c055182fc43fac4d5817bf914c4115515b8..01cbc142e98f12b2267e849741453ad77d5da48f 100644 (file)
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,6 +7,8 @@ AUX alsa-plugins-1.0.21-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae7
 AUX alsa-plugins-1.0.22-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 ffmpeg-headers.patch 2016 RMD160 2a0e21f32de08172912d14ab007db1af46bf4e96 SHA1 dc1e77310c76c135798669cb36f880beae6cb249 SHA256 9badd3be64569e92b45353175e4db1e977cf7c5c18d1fb489405fd3c94bb1e45
+AUX pulse-alsa.conf 435 RMD160 4de093dbba575a3c1fa15fec4a0614fc2d064916 SHA1 579ad8059e1f0a772add0469f6408a1a9b71b253 SHA256 375c30b3c3df309c219695af901cbc829e287fe1cec39880ca6a1255d7f8d9ef
+AUX pulse.conf 433 RMD160 6fa0c0dc8a33d4cd757a70e69b20d47bba2c7afa SHA1 4ec0c6521cb126b29f00f82555d92b78dfccfe10 SHA256 bdea4e706b353c4baca34583f0bab1b01b1bdee091d72c263102e531d6b0bf57
 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
@@ -17,13 +16,6 @@ DIST alsa-plugins-1.0.23.tar.bz2 326504 RMD160 3e5e06ae42d2b5b17e48926bc53e2e827
 EBUILD alsa-plugins-1.0.20.ebuild 2170 RMD160 2886059c659fe9b34a8da0478267d8162f606b66 SHA1 e9c6ae5494a347b33a5b5a12314d270d5ffe2680 SHA256 deba6bdc514020036fc4886d514643173b6929f24a45c882fe96ba8b8ca826aa
 EBUILD alsa-plugins-1.0.21.ebuild 2166 RMD160 1b87dc08d92863017fa52a85401709ffcc033875 SHA1 e37f7ce75eaab5622c9044c60328e734f9ba8968 SHA256 7c796e75db9a487311a25ec0efffd64b70c5db994d957027399ab470d1d7ae8c
 EBUILD alsa-plugins-1.0.22.ebuild 2176 RMD160 032ca496c6252d3ebf6a250f604e6809497ef883 SHA1 58fd876872e0798678f003ad5caff3c253d14e63 SHA256 05696c167e280858e91dde55a1edd3f5f42d3dcdb188a00132a8b77cdc388ec4
-EBUILD alsa-plugins-1.0.23.ebuild 2177 RMD160 9bc79d4cf0b9b53f72ab389275d602b7eca92724 SHA1 a31d5b648bc1019aed9a67d7e69cf537bbb16d57 SHA256 942584abe4ac7969ad8f4384d09e75ca056fa7a0b3f6e46a92273655bdeaa540
-MISC ChangeLog 18771 RMD160 70f315a49c8d2002ea240d4b2392b332ccfaf3f0 SHA1 d6cc50f647338dd36dc5969a86ac653460531bef SHA256 b27a79dd74247e7dfdeee3b68f0ed059b26134a19cb25e5bf9f8f23254065b33
+EBUILD alsa-plugins-1.0.23-r1.ebuild 2330 RMD160 a0ad2d22588f3a5382d76644aa7d7d4a3614c378 SHA1 98e0725a8b881ac6002a5bfe96b838908b101678 SHA256 44bd11d2c5d4b829492a3ee3043b40790be46be7251624d5adbc916316334a35
+MISC ChangeLog 19035 RMD160 75c418e17ebf51ba67ae55e88344ed6f7631edae SHA1 fab1ccefde66cd1f499197ad0a3c38aab9f21cb9 SHA256 9987033fea77bc303c9b41057ff26d28fb4a21cf9ceaf4a817c6ad4aceaed392
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvI6GgACgkQp5vW4rUFj5rBRgCdHsomzxZkIcQeeMcgP3HGV5aj
-Hr4AnA4r6xC7kqsg4ZgzBju9MwdLWeo7
-=fh/r
------END PGP SIGNATURE-----

diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.23.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.23-r1.ebuild
similarity index 89%
rename from media-plugins/alsa-plugins/alsa-plugins-1.0.23.ebuild
rename to media-plugins/alsa-plugins/alsa-plugins-1.0.23-r1.ebuild
index 950854d8b48c9ab95298aa5187614c0932c74886..2d1c274e94f5f1b669f10ad9151dbe788a986057 100644 (file)
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.23.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.23-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.23.ebuild,v 1.1 2010/04/16 22:44:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.23-r1.ebuild,v 1.1 2010/05/28 18:41:23 lxnay Exp $
 
 EAPI=2
 
@@ -77,6 +77,14 @@ src_install() {
        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
+
+       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/*.conf
+       fi
+
 }

diff --git a/media-plugins/alsa-plugins/files/pulse-alsa.conf b/media-plugins/alsa-plugins/files/pulse-alsa.conf
new file mode 100644 (file)
index 0000000..9964f29
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/pulse-alsa.conf
@@ -0,0 +1,27 @@
+# This file is referred to by /usr/share/alsa/pulse.conf to set pulseaudio as
+# the default output plugin for applications using alsa when PulseAudio is
+# running.
+
+pcm.!default {
+       type pulse
+}
+
+ctl.!default {
+       type pulse
+}
+
+pcm.pulse {
+        type pulse
+       hint {
+               show {
+                       @func refer
+                       name defaults.namehint.basic
+               }
+               description "Playback/recording through the PulseAudio sound server"
+       }
+}
+
+ctl.pulse {
+        type pulse
+}
+

diff --git a/media-plugins/alsa-plugins/files/pulse.conf b/media-plugins/alsa-plugins/files/pulse.conf
new file mode 100644 (file)
index 0000000..bc409fe
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/pulse.conf
@@ -0,0 +1,18 @@
+# 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-alsa.conf"
+                       "/etc/asound.conf"
+                       "~/.asoundrc"
+               ]
+               errors false
+       }
+]