Add variables to block the automatic module load/unload, to help out cases where they do weird things, like my G5 with snd-aoa.

Package-Manager: portage-2.1.4_rc11

4 files changed, 34 insertions, 27 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index a0959f105e3b..d6705eb0a13e 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.221 2007/10/24 19:52:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.222 2007/12/29 06:37:59 robbat2 Exp $
+
+  29 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> files/alsasound.confd,
+  files/alsasound.initd:
+  Add variables to block the automatic module load/unload, to help out cases
+  where they do weird things, like my G5 with snd-aoa.
 
   24 Oct 2007; Christian Heim <phreak@gentoo.org> -alsa-utils-1.0.13.ebuild,
   -alsa-utils-1.0.14_rc1.ebuild, -alsa-utils-1.0.15_rc1.ebuild:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 0b60ad73a3da..67c639193e55 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX alsa-modules.conf-rc 1028 RMD160 8e115310eb0e13e08b21304c98a78e721be0029a SHA1 7a2b5fed91fa640894efaf2f557eb2b04aff1a40 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570
 MD5 ccc2347c7466759e6155c3cdba15ec49 files/alsa-modules.conf-rc 1028
 RMD160 8e115310eb0e13e08b21304c98a78e721be0029a files/alsa-modules.conf-rc 1028
@@ -41,14 +38,14 @@ AUX alsasound-init-20070218 7657 RMD160 283ed673ec6f61c3aac77957393bd84ba05ff8d2
 MD5 d7fb1248eea596adb16a18cba55f1242 files/alsasound-init-20070218 7657
 RMD160 283ed673ec6f61c3aac77957393bd84ba05ff8d2 files/alsasound-init-20070218 7657
 SHA256 0330f7c58719e5669e39224be60bb6c2a1ba09b138801785655ffd245dc9d1e8 files/alsasound-init-20070218 7657
-AUX alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 SHA1 6d5762b94bcf83b5e896300575e0a11bc49fc89d SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827
-MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
-RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515
-SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827 files/alsasound.confd 515
-AUX alsasound.initd 6412 RMD160 0ade3d19cf50ca1c6e2e1a051c61a2d6a65a9bec SHA1 898158e92a13c7b9bba8e34de1c0be529e01c4c9 SHA256 c85b9ebf94e720aae91d46a523c6b64a58e45f7fba19b86b16725b4f91e246e9
-MD5 eb4b8ea6a93d55029f796a9a73e77751 files/alsasound.initd 6412
-RMD160 0ade3d19cf50ca1c6e2e1a051c61a2d6a65a9bec files/alsasound.initd 6412
-SHA256 c85b9ebf94e720aae91d46a523c6b64a58e45f7fba19b86b16725b4f91e246e9 files/alsasound.initd 6412
+AUX alsasound.confd 812 RMD160 bcd15052e2082a49be00a4783ccd9f3ad6856e0c SHA1 93e5abc7c873ec36d1b31e5518989a32b231fcaf SHA256 f0ffd8cc3bed66b2a8201e5b5dd9acedabddb6c875c84da7141293f35dda16cc
+MD5 7a6916b0b94bea767c8e438c700f1d9d files/alsasound.confd 812
+RMD160 bcd15052e2082a49be00a4783ccd9f3ad6856e0c files/alsasound.confd 812
+SHA256 f0ffd8cc3bed66b2a8201e5b5dd9acedabddb6c875c84da7141293f35dda16cc files/alsasound.confd 812
+AUX alsasound.initd 6480 RMD160 4e67306b871e11181442b2f8a2065c72745450ab SHA1 9d1ab3bf1c6ac2c4a37efb614cdc32936d1e92ec SHA256 f93e0aace1616904302a9250a47e3a02718580549648e6715c9ec273a119dbc1
+MD5 984a3ed1eefbe323dd72eabbe0e175f6 files/alsasound.initd 6480
+RMD160 4e67306b871e11181442b2f8a2065c72745450ab files/alsasound.initd 6480
+SHA256 f93e0aace1616904302a9250a47e3a02718580549648e6715c9ec273a119dbc1 files/alsasound.initd 6480
 DIST alsa-utils-1.0.14.tar.bz2 1013872 RMD160 e912588fc6ad223c7176847b8f99c80dd2ca7bb5 SHA1 767e71805ee606a4589bda9e95babbca61f9e92f SHA256 307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
 DIST alsa-utils-1.0.14rc2.tar.bz2 981123 RMD160 9975bc5c71df585ad1818647a1abb2be68910403 SHA1 6b1556930e413764ef71e7097d3436999ae8e4eb SHA256 306bd7c4436c1c56a0a499317e23b5b58aea3718df17c138ab0df56fd9bf3e0c
 DIST alsa-utils-1.0.15.tar.bz2 1014199 RMD160 0487b7f85b719d845f1f78daa1f906119df8251c SHA1 61e922f44dd8e2ce1a5595facd47b2eb583f9509 SHA256 3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac
@@ -72,10 +69,10 @@ EBUILD alsa-utils-1.0.15.ebuild 2260 RMD160 523d2b8b4d40f8faff9b64a389e0a96c27fc
 MD5 cc1eaa4c7bf1b0686155cfc995918ad2 alsa-utils-1.0.15.ebuild 2260
 RMD160 523d2b8b4d40f8faff9b64a389e0a96c27fcb29f alsa-utils-1.0.15.ebuild 2260
 SHA256 acbf637356394e9ee1a818b9a12897310e1451d8eda757713347ef072d51ddce alsa-utils-1.0.15.ebuild 2260
-MISC ChangeLog 33342 RMD160 b06efd050414b9288d5d35b40a25b4d9c53d045b SHA1 d623ba5f054b6a4374f3b063c8e60247477b8ece SHA256 6b6b8142aaad70b1fb463eea9047a38d7df3e6c900b8203e54647cc2e136b2a6
-MD5 31ab84c3863c7a2dd772b9d2dadd2503 ChangeLog 33342
-RMD160 b06efd050414b9288d5d35b40a25b4d9c53d045b ChangeLog 33342
-SHA256 6b6b8142aaad70b1fb463eea9047a38d7df3e6c900b8203e54647cc2e136b2a6 ChangeLog 33342
+MISC ChangeLog 33577 RMD160 892c69405ad08e17cf64153e52313bf8cd618d04 SHA1 a039ca920b27788cc01fac548e336db1f8bbd00f SHA256 55997d0307c2c14b7c69bc0900264b6e8fa811228a90ca20cb34787ca1efa674
+MD5 4b0d7a38ef7dd5ec64d4ba44c1bd8b3c ChangeLog 33577
+RMD160 892c69405ad08e17cf64153e52313bf8cd618d04 ChangeLog 33577
+SHA256 55997d0307c2c14b7c69bc0900264b6e8fa811228a90ca20cb34787ca1efa674 ChangeLog 33577
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -95,10 +92,3 @@ SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/di
 MD5 5b2dc3a8275ee645779855409f0b2400 files/digest-alsa-utils-1.0.15 259
 RMD160 dc34a3e8ea8df620c9215b75cdf6bf36827189ad files/digest-alsa-utils-1.0.15 259
 SHA256 8a384e351b63df2d48c81da585b5adeeb47f9208fbedaad6f7f605bfa32f16c9 files/digest-alsa-utils-1.0.15 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHXxzwp/wUKkr7RBoRApz2AJ4n7/rygCBdvKTZjahQHWmoTn5sFwCgolXg
-IBAFucssiD/bpldfJnKr+eQ=
-=X5BK
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/files/alsasound.confd b/media-sound/alsa-utils/files/alsasound.confd
index 6e82cdd32e95..0d63dcfe647b 100644
--- a/media-sound/alsa-utils/files/alsasound.confd
+++ b/media-sound/alsa-utils/files/alsasound.confd
@@ -20,3 +20,15 @@ RESTORE_ON_START="yes"
 # yes - Save state
 
 SAVE_ON_STOP="yes"
+
+# LOAD_ON_START:
+# Do you want to load sound modules when alsasound starts?
+# no - Do not load modules
+# yes - Load modules
+LOAD_ON_START="yes"
+
+# UNLOAD_ON_STOP:
+# Do you want to unload sound modules when alsasound stops?
+# no - Do not unload modules
+# yes - Unload modules
+UNLOAD_ON_STOP="yes"
diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd
index 4c8b8129d8b4..ac0a169a5cda 100644
--- a/media-sound/alsa-utils/files/alsasound.initd
+++ b/media-sound/alsa-utils/files/alsasound.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.5 2007/03/19 21:32:12 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.6 2007/12/29 06:37:59 robbat2 Exp $
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -187,7 +187,7 @@ save() {
 }
 
 start() {
-	if [ -f /proc/modules ] ; then
+	if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then
 		ebegin "Loading ALSA modules"
 		eindent
 		load_modules
@@ -217,8 +217,8 @@ stop() {
 	ebegin "Killing processes using ALSA"
 	terminate
 	eend 0
-
-	if [ -f /proc/modules ]; then
+	
+	if [ -f /proc/modules ] && [ "${UNLOAD_ON_STOP}" = "yes" ]; then
 		local ver="24"
 		rmmod --version | grep -q module-init-tools && ver="26"