diff --git a/.cvsignore b/.cvsignore index ab29353..b68c3a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -23,3 +23,4 @@ alsa-utils-1.0.19.tar.bz2 alsa-utils-1.0.20.tar.bz2 alsa-utils-1.0.21.tar.bz2 alsa-utils-1.0.22.tar.bz2 +alsa-utils-1.0.23.tar.bz2 diff --git a/alsa-info.sh b/alsa-info.sh index fe7c08d..c9d2a4e 100644 --- a/alsa-info.sh +++ b/alsa-info.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.58 +SCRIPT_VERSION=0.4.59 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog" ################################################################################# @@ -439,6 +439,9 @@ cat /proc/asound/card*/codec\#* > $TEMPDIR/alsa-hda-intel.tmp 2> /dev/null cat /proc/asound/card*/codec97\#0/ac97\#0-0 > $TEMPDIR/alsa-ac97.tmp 2> /dev/null cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > $TEMPDIR/alsa-ac97-regs.tmp 2> /dev/null +#Check for USB mixer setup +cat /proc/asound/card*/usbmixer > $TEMPDIR/alsa-usbmixer.tmp 2> /dev/null + #Fetch the info, and put it in $FILE in a nice readable format. if [[ -z $PASTEBIN ]]; then echo "upload=true&script=true&cardinfo=" > $FILE @@ -596,6 +599,17 @@ then echo "" >> $FILE fi +if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ] +then + echo "!!USB Mixer information" >> $FILE + echo "!!---------------------------" >> $FILE + echo "--startcollapse--" >> $FILE + echo "" >> $FILE + cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE + echo "--endcollapse--" >> $FILE + echo "" >> $FILE + echo "" >> $FILE +fi #If no command line options are specified, then run as though --with-all was specified if [[ -z "$1" ]] diff --git a/alsa-utils.spec b/alsa-utils.spec index efad03c..7ecb50a 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -3,13 +3,14 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.22 +Version: 1.0.23 Release: 1%{?prever_dot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2 Source4: alsaunmute +Source5: alsaunmute.1 Source6: alsa-info.sh Source10: alsa.rules Source11: alsactl.conf @@ -44,6 +45,10 @@ install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules # Install support utilities mkdir -p -m755 $RPM_BUILD_ROOT/bin install -p -m 755 alsaunmute %{buildroot}/bin/ +mkdir -p -m755 $RPM_BUILD_ROOT/usr/share/man/man1 +gzip -9 -c alsaunmute.1 > alsaunmute.1.gz +install -p -m 755 alsaunmute.1.gz %{buildroot}/usr/share/man/man1 +rm alsaunmute.1.gz # Link alsactl to /usr/sbin mkdir -p $RPM_BUILD_ROOT/%{_sbindir} @@ -92,6 +97,11 @@ if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then fi %changelog +* Wed Apr 21 2010 Jaroslav Kysela 1.0.23-1 +- updated to 1.0.23 final +- added man page for alsaunmute +- updated alsa-info.sh script to 0.4.59 + * Fri Jan 1 2010 Jaroslav Kysela 1.0.22-1 - updated to 1.0.22 final diff --git a/alsactl.conf b/alsactl.conf index 71f0d80..df0ef21 100644 --- a/alsactl.conf +++ b/alsactl.conf @@ -1,6 +1,6 @@ # # ALSA library configuration file for alsactl tool -# (/usr/share/alsa tree is not necessary for alsactl) +# (/usr/share/alsa tree is not required to run the alsactl utility) # ctl.hw { diff --git a/alsaunmute.1 b/alsaunmute.1 new file mode 100644 index 0000000..505aaa6 --- /dev/null +++ b/alsaunmute.1 @@ -0,0 +1,28 @@ +.TH ALSAUNMUTE 1 "21 April 2010" +.SH NAME +alsaunmute \- a simple script to initialize ALSA sound devices + +.SH DESCRIPTION +\fBalsaunmute\fP is a shell script which runs the \fBalsactl(1)\fP +utility with \fIinit\fP argument (see the script for details). + +.SH OPTIONS +None + +.SS +Example: +\fBalsaunmute\fR + +.SH SEE ALSO +\fB +alsactl(1), +alsamixer(1), +amixer(1) +\fP + +.SH BUGS +None known. + +.SH AUTHOR +\fBalsaunmute\fP are by Jaroslav Kysela + diff --git a/sources b/sources index 064e238..c577a25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7180316188552ee1e6759a03f1fe98d alsa-utils-1.0.22.tar.bz2 +cb0cf46029ac9549cf3a31bff6a4f4e1 alsa-utils-1.0.23.tar.bz2