diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2013-11-04 17:08:47 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:57:36 +0200 |
commit | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (patch) | |
tree | 9b98e6e193c7870cb27ac861394c1c4592850922 /source/ap/alsa-utils | |
parent | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (diff) | |
download | current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.gz |
Slackware 14.1slackware-14.1
Mon Nov 4 17:08:47 UTC 2013
Slackware 14.1 x86_64 stable is released!
It's been another interesting release cycle here at Slackware bringing
new features like support for UEFI machines, updated compilers and
development tools, the switch from MySQL to MariaDB, and many more
improvements throughout the system. Thanks to the team, the upstream
developers, the dedicated Slackware community, and everyone else who
pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'source/ap/alsa-utils')
-rwxr-xr-x | source/ap/alsa-utils/alsa-utils.SlackBuild | 6 | ||||
-rw-r--r-- | source/ap/alsa-utils/doinst.sh | 21 | ||||
-rw-r--r-- | source/ap/alsa-utils/rc.alsa | 30 | ||||
-rw-r--r-- | source/ap/alsa-utils/rc.alsa-oss | 24 |
4 files changed, 60 insertions, 21 deletions
diff --git a/source/ap/alsa-utils/alsa-utils.SlackBuild b/source/ap/alsa-utils/alsa-utils.SlackBuild index 3e642d08..2540cc68 100755 --- a/source/ap/alsa-utils/alsa-utils.SlackBuild +++ b/source/ap/alsa-utils/alsa-utils.SlackBuild @@ -85,8 +85,10 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG mkdir -p $PKG/etc/rc.d -zcat $CWD/rc.alsa.gz > $PKG/etc/rc.d/rc.alsa -chmod 0755 $PKG/etc/rc.d/rc.alsa +zcat $CWD/rc.alsa.gz > $PKG/etc/rc.d/rc.alsa.new +chmod 0755 $PKG/etc/rc.d/rc.alsa.new +zcat $CWD/rc.alsa-oss.gz > $PKG/etc/rc.d/rc.alsa-oss.new +chmod 0644 $PKG/etc/rc.d/rc.alsa-oss.new find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/ap/alsa-utils/doinst.sh b/source/ap/alsa-utils/doinst.sh index 0ee74150..8a9b2878 100644 --- a/source/ap/alsa-utils/doinst.sh +++ b/source/ap/alsa-utils/doinst.sh @@ -4,3 +4,24 @@ fi # Better a dangling symlink than for nobody to know where this went: rm -f etc/asound.state ( cd etc && ln -sf ../var/lib/alsa/asound.state . ) + +# Duplicate permissions from any existing rc scripts: +if [ -e etc/rc.d/rc.alsa ]; then + if [ -x etc/rc.d/rc.alsa ]; then + chmod 755 etc/rc.d/rc.alsa.new + else + chmod 644 etc/rc.d/rc.alsa.new + fi +fi +if [ -e etc/rc.d/rc.alsa-oss ]; then + if [ -x etc/rc.d/rc.alsa-oss ]; then + chmod 755 etc/rc.d/rc.alsa-oss.new + else + chmod 644 etc/rc.d/rc.alsa-oss.new + fi +fi + +# Move the scripts into place: +mv etc/rc.d/rc.alsa.new etc/rc.d/rc.alsa +mv etc/rc.d/rc.alsa-oss.new etc/rc.d/rc.alsa-oss + diff --git a/source/ap/alsa-utils/rc.alsa b/source/ap/alsa-utils/rc.alsa index 2a984a51..077966da 100644 --- a/source/ap/alsa-utils/rc.alsa +++ b/source/ap/alsa-utils/rc.alsa @@ -1,5 +1,5 @@ #!/bin/sh -# Load the mixer settings and OSS compatibility for ALSA. +# Load the mixer settings and OSS compatibility (if enabled) for ALSA. # (the Advanced Linux Sound Architecture) # A function to load the ALSA mixer settings: @@ -13,7 +13,7 @@ load_alsa_mixer() { if [ ! -r /var/lib/alsa/no.asound.state ]; then echo "Setting default ALSA mixer settings." # set default mixer volumes for ALSA - # Taken from the alsaconfig script. + # Taken from the alsaconf script. amixer -s -q <<EOF set Master 75% unmute set Master -12dB @@ -59,23 +59,13 @@ EOF fi } -# A function to load the ALSA OSS compat modules: -load_alsa_oss_modules() { - if modprobe -c | tr _ - | grep -wq snd-pcm-oss ; then - if ! cat /proc/modules | tr _ - | grep -wq snd-pcm-oss ; then - echo "Loading OSS compatibility modules for ALSA." - modprobe snd-pcm-oss - modprobe snd-seq-oss - modprobe snd-mixer-oss - fi - fi -} - -# If hotplug or something else has loaded the ALSA modules, then +# If udev or something else has loaded the ALSA modules, then # simply load the mixer settings and make sure the OSS compat -# modules are loaded: +# modules are loaded (if enabled): if [ -d /proc/asound ]; then - load_alsa_oss_modules + if [ -x /etc/rc.d/rc.alsa-oss ]; then + sh /etc/rc.d/rc.alsa-oss + fi load_alsa_mixer else # If there are ALSA modules defined in /etc/modprobe.d/*, but @@ -87,9 +77,11 @@ else modprobe $module done fi - # If ALSA is now up, then load the mixer settings and OSS modules: + # If ALSA is now up, then load the mixer settings and OSS modules (if enabled): if [ -d /proc/asound ]; then - load_alsa_oss_modules + if [ -x /etc/rc.d/rc.alsa-oss ]; then + sh /etc/rc.d/rc.alsa-oss + fi load_alsa_mixer fi fi diff --git a/source/ap/alsa-utils/rc.alsa-oss b/source/ap/alsa-utils/rc.alsa-oss new file mode 100644 index 00000000..cc27b762 --- /dev/null +++ b/source/ap/alsa-utils/rc.alsa-oss @@ -0,0 +1,24 @@ +#!/bin/sh +# Load the ALSA OSS kernel modules to support OSS applications. +# To use this, set this script as executable (chmod 755 rc.alsa-oss) +# and it will be run from the main rc.alsa script. Unless you know +# that something requires OSS support, it is better to leave this +# script disabled. Some applications will try OSS first even though +# they also support ALSA, and will block other applications from +# using audio I/O. +# +# Many programs that use OSS can be run using the aoss wrapper and +# will then use ALSA in a non-blocking way (and will not require +# loading these kernel modules). Consider trying that before enabling +# these modules. (See "man aoss") + +if modprobe -c | tr _ - | grep -wq snd-pcm-oss ; then + if ! cat /proc/modules | tr _ - | grep -wq snd-pcm-oss ; then + echo "Loading OSS compatibility modules for ALSA." + # Use -b to enable blacklisting these modules: + modprobe -q -b snd-pcm-oss + modprobe -q -b snd-seq-oss + modprobe -q -b snd-mixer-oss + fi +fi + |