diff options
| author |   Martin Holzer <mholzer@gentoo.org> | 2003-12-18 22:30:06 +0000 |
|---|---|---|
| committer | Martin Holzer <mholzer@gentoo.org> | 2003-12-18 22:30:06 +0000 |
| commit | 2942ed1bcb14514515893ee6724dddaa120a7a98 (patch) | |
| tree | 4153b5ec24d2a0249cb065fd9f706327a246fbc4 /media-sound/alsa-utils | |
| parent | Marked stable on hppa. (diff) | |
| download | historical-2942ed1bcb14514515893ee6724dddaa120a7a98.tar.gz historical-2942ed1bcb14514515893ee6724dddaa120a7a98.tar.bz2 historical-2942ed1bcb14514515893ee6724dddaa120a7a98.zip | |
updating init script for oss emu. closes 34541
Diffstat (limited to 'media-sound/alsa-utils')
| -rw-r--r-- | media-sound/alsa-utils/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/alsa-utils/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/alsa-utils/files/alsasound | 18 |
3 files changed, 18 insertions, 9 deletions
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog index 7028c84c1a88..de7bb67eab2d 100644 --- a/media-sound/alsa-utils/ChangeLog +++ b/media-sound/alsa-utils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/alsa-utils # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.36 2003/12/07 19:44:14 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.37 2003/12/18 22:29:56 mholzer Exp $ + + 18 Dec 2003; Martin Holzer <mholzer@gentoo.org> files/alsasound: + updating init script for oss emu. closes 34541 *alsa-utils-1.0.0_rc2 (07 Dec 2003) diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 0d4ff126f1e9..c04522e4e1fb 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -1,4 +1,4 @@ -MD5 51d2de4db7d7fcecdae9046fab117bf0 ChangeLog 5804 +MD5 09ddaff54eb2170b8670f438d3ddeb98 ChangeLog 5921 MD5 b268f1eb52b27b8146ddf58e76c55d4f alsa-utils-0.5.10-r8.ebuild 970 MD5 0d1f89bc0713a7239243219ee57a1b7b alsa-utils-0.9.0_rc2.ebuild 921 MD5 140f4dd3c22323f5e9f671306f048d4d alsa-utils-0.9.2.ebuild 907 @@ -13,8 +13,8 @@ MD5 a82c4c173c1d617bae9967438c659bac files/digest-alsa-utils-0.5.10-r8 70 MD5 59a93bf64737644e4001cbb6ad5387b4 files/digest-alsa-utils-0.9.0_rc2 71 MD5 55414f65ffecf5f44fa35295dae8bf19 files/digest-alsa-utils-0.9.2 69 MD5 996e706f28a921ebf60f003fd19cd8a2 files/digest-alsa-utils-1.0.0_rc1 72 +MD5 9b9f711aab8ee085e1f24c8d2cbebf74 files/alsasound 4803 MD5 07ad906b0309f5e8061f7a6c99985532 files/digest-alsa-utils-0.9.5 69 MD5 f8aff370f9c369682ac793f5b3f4886e files/alsa-modules.conf-rc 1158 -MD5 df31104ae96e4681075c4716801a0d21 files/alsasound 4648 MD5 ad803523008747726c87b9c505517f4c files/digest-alsa-utils-1.0.0_rc2 72 MD5 c393c831cb8bcda375cd4690e85b3495 files/digest-alsa-utils-0.9.8 69 diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound index 6a8c0aa699ca..5cbcbc8d19ba 100644 --- a/media-sound/alsa-utils/files/alsasound +++ b/media-sound/alsa-utils/files/alsasound @@ -1,5 +1,5 @@ #!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.5 2003/12/04 16:38:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.6 2003/12/18 22:29:56 mholzer Exp $ # # Gentoo users: add this script to 'boot' run level. # ================================================== @@ -59,11 +59,17 @@ start() { fi [ -z "${DRIVERS}" ] && eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" - OSS="$(modprobe -l | grep "snd.*oss" | sed -e "s:\/.*\/::" -e "s:\..*::")" - for i in ${OSS} - do - DRIVERS="${i} ${DRIVERS}" - done + # Test for use of OSS + + if modprobe -c | grep -q "snd.*oss$" ; then + einfo "Using ALSA OSS emulation" + OSS="$(modprobe -l | grep "snd.*oss" | sed -e "s:\/.*\/::" -e "s:\..*::")" + # Add oss modules to list + for i in ${OSS} + do + DRIVERS="${i} ${DRIVERS}" + done + fi for DRIVER in ${DRIVERS} do |