.gear/rules | 2 + .../tags/7a502b53b04cd1e492d4a7ca646950b17340a18c | 8 + .gear/tags/list | 1 + alsa-utils-set_default_volume | 50 ++++ alsa-utils.spec | 263 ++++++++++++++++++++ alsaconf/alsaconf.in | 20 +-- alsactl/init_sysdeps.c | 2 +- configure.in | 1 + 8 files changed, 327 insertions(+), 20 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..4b0460c --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: v@version@:. +diff: v@version@:. . diff --git a/.gear/tags/7a502b53b04cd1e492d4a7ca646950b17340a18c b/.gear/tags/7a502b53b04cd1e492d4a7ca646950b17340a18c new file mode 100644 index 0000000..779f792 --- /dev/null +++ b/.gear/tags/7a502b53b04cd1e492d4a7ca646950b17340a18c @@ -0,0 +1,8 @@ +object 09a07aafdbbd1ea28c6fdb74b74517d73042b15a +type commit +tag v1.0.18 +tagger Jaroslav Kysela 1225284131 +0100 + +Release v1.0.18 + +Signed-off-by: Jaroslav Kysela diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..edab994 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +7a502b53b04cd1e492d4a7ca646950b17340a18c v1.0.18 diff --git a/alsa-utils-set_default_volume b/alsa-utils-set_default_volume new file mode 100644 index 0000000..8358f42 --- /dev/null +++ b/alsa-utils-set_default_volume @@ -0,0 +1,50 @@ +#!/bin/sh +# +# set default volumes for playback on ALSA +# +# set_default_mixer [-f] [card#] +# +# written by Takashi Iwai +# + +if [ -f /etc/asound.state -a x$1 != x-f ]; then + /usr/sbin/alsactl restore >/dev/null 2>&1 + exit 0 +fi + +if [ x$1 = x-f ]; then + shift +fi + +if [ -n "$1" ]; then + card="-c $1" +fi + +function mixer() { + amixer $card set "$1" "$2" >/dev/null 2>&1 + amixer $card set "$1" unmute >/dev/null 2>&1 +} + +mixer Master 75% +mixer PCM 90% +mixer Synth 90% +mixer CD 90% +# mute mic +amixer set Mic 0% mute >/dev/null 2>&1 +# ESS 1969 chipset has 2 PCM channels +mixer PCM,1 90% +# Trident/YMFPCI/emu10k1 +mixer Wave 100% +mixer Music 100% +mixer AC97 100% +# CS4237B chipset: +mixer 'Master Digital' 75% +# Envy24 chips with analog outs +mixer DAC 90% +mixer DAC,0 90% +mixer DAC,1 90% +# some notebooks use headphone instead of master +mixer Headphone 75% +mixer Playback 100% + +exit 0 diff --git a/alsa-utils.spec b/alsa-utils.spec new file mode 100644 index 0000000..bdb5ebd --- /dev/null +++ b/alsa-utils.spec @@ -0,0 +1,263 @@ +Name: alsa-utils +Version: 1.0.18 +Release: alt1 +Summary: Advanced Linux Sound Architecture (ALSA) utils +Summary(ru_RU.UTF-8): Утилиты ALSA +Summary(uk_UA.UTF-8): Утиліти ALSA +License: GPL +Group: System/Kernel and hardware +Url: http://www.alsa-project.org +Packager: Valery Inozemtsev + +Obsoletes: alsa2-utils < 0.9.4 +Provides: alsa2-utils = %version +Conflicts: alsa-utils < 1.0.9a-alt1 + +Requires: libalsa >= %version +Requires: dialog +Requires: aplay = %version-%release +Requires: amixer = %version-%release + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: intltool libalsa-devel libncursesw-devel xmlto + +%description +Advanced Linux Sound Architecture (ALSA) utils. Modularized architecture with +support for a large range of ISA and PCI cards. Fully compatible with OSS/Lite +(kernel sound drivers), but contains many enhanced features. + +%description -l ru_RU.UTF-8 +Пакет содержит утилиты ALSA (современной звуковой подсистемы Linux), +такие как микшер. + +%description -l uk_UA.UTF-8 +Пакет містить утиліти ALSA (сучасної звукової підсистеми Linux), +такі як мікшер. + +%package -n aplay +Summary: play utility for ALSA +Summary(ru_RU.UTF-8): Утилита play для ALSA +Summary(uk_UA.UTF-8): Утиліта play для ALSA +Group: Sound + +%description -n aplay +This package contains minimal client utility for ALSA: +"aplay" is traditional "play" equivalent. + +%description -n aplay -l ru_RU.UTF-8 +Этот пакет содержит минимальный клиент ALSA: +"aplay" - эквивалент традиционного "play". + +%description -n aplay -l uk_UA.UTF-8 +Цей пакунок містить мінімальний клієнт ALSA: +"aplay" - еквівалент традиційного "play". + +%package -n amixer +Summary: Command-line mixer for ALSA soundcard driver +License: GPL +Group: Sound + +%description -n amixer +amixer allows command-line control of the mixer for the ALSA soundcard +driver. +amixer supports multiple soundcards. + +%prep +%setup -q +%patch -p1 + +%build +export AUTOPOINT=true +touch config.rpath +%autoreconf +%configure \ + --with-curses=ncursesw +%make_build + +%install +%make DESTDIR=%buildroot install +install -pD -m755 alsa-utils-set_default_volume %buildroot%_bindir/set_default_volume + +%find_lang --with-man --output=%name.lang %name alsaconf + +%files -f %name.lang +%doc ChangeLog README +%_bindir/* +%exclude %_bindir/aplay +%exclude %_bindir/arecord +%exclude %_bindir/amixer +%_sbindir/* +%_datadir/alsa/speaker-test +%_datadir/sounds/alsa +%_man1dir/* +%_man7dir/* +%exclude %_man1dir/aplay.1* +%exclude %_man1dir/arecord.1* +%exclude %_man1dir/amixer.1* + +%files -n aplay +%_bindir/aplay +%_bindir/arecord +%_man1dir/aplay.* +%_man1dir/arecord.1* + +%files -n amixer +%_bindir/amixer +%_man1dir/amixer.1* + +%changelog +* Wed Oct 29 2008 Valery Inozemtsev 1.0.18-alt1 +- 1.0.18 + +* Sun Aug 03 2008 Valery Inozemtsev 1.0.17-alt2 +- iecset update for new consumer status channel bits + +* Wed Jul 16 2008 Valery Inozemtsev 1.0.17-alt1 +- 1.0.17 + +* Thu May 01 2008 Valery Inozemtsev 1.0.16-alt1 +- 1.0.16 + +* Sun Jan 27 2008 Valery Inozemtsev 1.0.15-alt1 +- 1.0.15 +- spec cleanup +- update build dependencies + +* Mon Aug 06 2007 Michael Shigorin 1.0.14-alt3 +- changes by led (thanks!): + + added amixer subpackage (#12487) + + moved aplay.1 to aplay subpackage +- moved arecord binary and manpage to aplay subpackage too (symlinks) + +* Mon Jun 11 2007 Michael Shigorin 1.0.14-alt2 +- relaxed overly strict Requires, thanks shrek@ + +* Mon Jun 11 2007 Michael Shigorin 1.0.14-alt1 +- 1.0.14 +- set _unpackaged_files_terminate_build +- added localized manpages + +* Mon Oct 16 2006 Michael Shigorin 1.0.13-alt1 +- 1.0.13 + +* Sat Sep 02 2006 Michael Shigorin 1.0.12-alt1 +- 1.0.12 + +* Wed Apr 19 2006 Michael Shigorin 1.0.11-alt1 +- 1.0.11 + +* Wed Apr 05 2006 Michael Shigorin 1.0.11-alt0.4 +- 1.0.11rc4 +- packaged translations + +* Sat Mar 04 2006 Michael Shigorin 1.0.11-alt0.2 +- 1.0.11rc2 (due to strict libalsa version requirement and #9181) + +* Fri Feb 17 2006 Michael Shigorin 1.0.10-alt2 +- more strict libalsa requires (should fix #9028) + +* Wed Nov 16 2005 Michael Shigorin 1.0.10-alt1 +- 1.0.10 + +* Mon Jul 04 2005 Michael Shigorin 1.0.9a-alt2 +- added Conflicts: for previous versions due to aplay split + (#7279); thanks Andrey Rahmatullin (wrar@) + +* Thu Jun 23 2005 Michael Shigorin 1.0.9a-alt1 +- 1.0.9a +- temporarily fixated libalsa requires (build/install) at 1.0.9 + since usual condition (>=%%version) would fail +- moved aplay to separate subpackage (#7156), + required by main package +- added test sounds (were missing somehow) + +* Thu Jun 09 2005 Michael Shigorin 1.0.9a-alt0 +- 1.0.9a + +* Mon Jan 17 2005 ALT QA Team Robot 1.0.8-alt1.1 +- Rebuilt with ncurses-5.4.20050108-alt2 + +* Thu Jan 13 2005 Michael Shigorin 1.0.8-alt1 +- 1.0.8 +- updated alt-no-newt patch + +* Thu Dec 16 2004 Michael Shigorin 1.0.7-alt1 +- 1.0.7 + +* Sat Jul 03 2004 Michael Shigorin 1.0.5-alt3 +- *applied* the patch for #3824 from wrar@, whoops! + +* Sat Jun 26 2004 Michael Shigorin 1.0.5-alt2 +- fixed #3824, thanks to Andrey Rahmatullin (wrar@) for bug/patch +- added ru/uk package info + +* Mon May 31 2004 Michael Shigorin 1.0.5-alt1 +- 1.0.5 + +* Thu Apr 08 2004 Michael Shigorin 1.0.4-alt2 +- removed forbidden requires: alsa + +* Sat Apr 03 2004 Michael Shigorin 1.0.4-alt1 +- 1.0.4 + +* Tue Mar 02 2004 Michael Shigorin 1.0.3-alt1 +- 1.0.3 + +* Thu Jan 29 2004 Michael Shigorin 1.0.2-alt2 +- 1.0.2, Final Upload by ALSA Project (TM) 20040129 18:35 +0200 +- thanks to Sergey Vlasov (vsu@) for alerting about re-uploads + +* Wed Jan 28 2004 Michael Shigorin 1.0.2-alt1 +- 1.0.2 + +* Thu Jan 15 2004 Michael Shigorin 1.0.1-alt1 +- 1.0.1 +- added %_bindir/set_default_volume from SuSE package + +* Wed Oct 22 2003 Michael Shigorin 0.9.8-alt1 +- 0.9.8 + +* Fri Sep 26 2003 Michael Shigorin 0.9.7-alt1 +- 0.9.7 + +* Wed Jul 30 2003 Michael Shigorin 0.9.6-alt1 +- 0.9.6 +- relaxed alsa (kernel module) dependency -- any alsa2 should suffice + and userspace upgrade shouldn't force kernel module upgrade + +* Tue Jul 15 2003 Michael Shigorin 0.9.5-alt1 +- 0.9.5 + +* Mon Jun 23 2003 Michael Shigorin 0.9.4-alt1 +- 0.9.4 +- renamed to alsa-utils + +* Wed Apr 02 2003 Michael Shigorin 0.9.2-alt0.1 +- 0.9.2 (unofficial build) + +* Tue Feb 04 2003 Rider 0.9.0rc7-alt1 +- 0.9.0rc7 + +* Tue Nov 26 2002 Konstantin Volckov 0.9.0rc6-alt1 +- 0.9.0rc6 +- Rebuilt in new environment + +* Fri Jun 07 2002 Konstantin Volckov 0.9.0rc1-alt1 +- 0.9.0rc1 + +* Thu Feb 28 2002 Konstantin Volckov 0.9.0beta12-alt1 +- 0.9.0beta12 + +* Wed Dec 26 2001 Konstantin Volckov 0.9.0beta10-alt1a +- 0.9.0beta10a + +* Wed Nov 21 2001 Konstantin Volckov 0.9.0beta9-alt1 +- 0.9.0beta9 + +* Fri Oct 12 2001 Konstantin Volckov 0.9.0beta8-alt1 +- 0.9.0beta8 + +* Fri Sep 21 2001 Konstantin Volckov 0.9.0beta7-alt1 +- First build for Sisyphus diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in index f72f12b..52b2fb1 100644 --- a/alsaconf/alsaconf.in +++ b/alsaconf/alsaconf.in @@ -315,27 +315,9 @@ else fi fi -# Check for dialog, whiptail, gdialog, awk, ... ? +# Check for dialog, gdialog, awk, ... ? if type -p dialog > /dev/null; then DIALOG=dialog -else - if type -p whiptail > /dev/null; then - whiptail_wrapper() { - X1="$1" - X2="$2" - if [ $1 = --yesno ]; then - X3=`expr $3 + 2` - else - X3=$3 - fi - shift 3 - whiptail "$X1" "$X2" $X3 "$@" - } - DIALOG=whiptail_wrapper - else - xecho "Error, dialog or whiptail not found." - exit 1 - fi fi if type -p awk > /dev/null; then : else diff --git a/alsactl/init_sysdeps.c b/alsactl/init_sysdeps.c index f263138..245fb28 100644 --- a/alsactl/init_sysdeps.c +++ b/alsactl/init_sysdeps.c @@ -17,7 +17,7 @@ * */ -#ifdef __GLIBC__ +#ifndef __GLIBC__ static size_t strlcpy(char *dst, const char *src, size_t size) { size_t bytes = 0; diff --git a/configure.in b/configure.in index 78fc426..1b6eb31 100644 --- a/configure.in +++ b/configure.in @@ -4,6 +4,7 @@ AC_INIT(alsamixer/alsamixer.c) AC_PREFIX_DEFAULT(/usr) AM_INIT_AUTOMAKE(alsa-utils, 1.0.18) +IT_PROG_INTLTOOL([0.35.0]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.15])