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 2c2c95a..d7e81cd 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -4,12 +4,13 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: 1.0.23 -Release: 1%{?prever_dot}%{?dist} +Release: 3%{?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 @@ -19,6 +20,7 @@ BuildRequires: ncurses-devel BuildRequires: gettext-devel BuildRequires: xmlto Conflicts: udev < 062 +Requires: alsa-lib >= %{version}, dialog %description This package contains command line utilities for the Advanced Linux Sound @@ -44,6 +46,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/%{_mandir}/man1 +gzip -9 -c %{SOURCE5} > $RPM_BUILD_ROOT/alsaunmute.1.gz +install -p -m 755 $RPM_BUILD_ROOT/alsaunmute.1.gz %{buildroot}/%{_mandir}/man1 +rm $RPM_BUILD_ROOT/alsaunmute.1.gz # Link alsactl to /usr/sbin mkdir -p $RPM_BUILD_ROOT/%{_sbindir} @@ -92,6 +98,12 @@ if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then fi %changelog +* Mon Jun 28 2010 Jaroslav Kysela 1.0.23-3 +- add requires line (bug#526492) for specific alsa-lib package +- add requires line for dialog package (bug#561988) +- added man page for alsaunmute (bug#526174) +- updated alsa-info.sh script to 0.4.59 + * Mon Jun 28 2010 Jaroslav Kysela 1.0.23-1 - updated to 1.0.23 final diff --git a/alsaunmute.1 b/alsaunmute.1 new file mode 100644 index 0000000..057ae50 --- /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 is by Jaroslav Kysela +