diff --git a/alsa-utils-git-fixes.diff b/alsa-utils-git-fixes.diff index b014a62..6ab0956 100644 --- a/alsa-utils-git-fixes.diff +++ b/alsa-utils-git-fixes.diff @@ -1,5 +1,5 @@ diff --git a/alsactl/init/default b/alsactl/init/default -index c9aa7cc..8653ec6 100644 +index c9aa7cc..2ac187f 100644 --- a/alsactl/init/default +++ b/alsactl/init/default @@ -46,7 +46,7 @@ CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \ @@ -11,7 +11,33 @@ index c9aa7cc..8653ec6 100644 # if master volume control is present, turn headphone volume to max ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end" ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end" -@@ -68,7 +68,8 @@ CTL{name}="PC Speaker Playback Switch",PROGRAM=="__ctl_search", \ +@@ -56,8 +56,23 @@ CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \ + CTL{values}="on" + + CTL{reset}="mixer" +-CTL{name}="Speaker Playback Volume",PROGRAM=="__ctl_search", \ +- CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++CTL{name}="Headphone Playback Volume",CTL{index}="1",PROGRAM!="__ctl_search",\ ++ GOTO="headphone1_end" ++# if master volume control is present, turn headphone volume to max ++ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone1_end" ++ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone1_end" ++CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++LABEL="headphone1_end" ++CTL{name}="Headphone Playback Switch",CTL{index}="1",PROGRAM=="__ctl_search", \ ++ CTL{values}="on" ++ ++CTL{reset}="mixer" ++CTL{name}="Sepaker Playback Volume",PROGRAM!="__ctl_search",GOTO="speaker0_end" ++# if master volume control is present, turn speaker volume to max ++ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="speaker0_end" ++ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="speaker0_end" ++CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" ++LABEL="speaker0_end" + CTL{name}="Speaker Playback Switch",PROGRAM=="__ctl_search", \ + CTL{values}="on" + +@@ -68,7 +83,8 @@ CTL{name}="PC Speaker Playback Switch",PROGRAM=="__ctl_search", \ CTL{values}="on" CTL{reset}="mixer" @@ -21,7 +47,7 @@ index c9aa7cc..8653ec6 100644 # if master volume control is present, turn PCM volume to max ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm0_end" ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm0_end" -@@ -77,12 +78,12 @@ CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm0_end" +@@ -77,12 +93,12 @@ CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm0_end" CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm0_end" CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="75%" LABEL="pcm0_end" @@ -37,7 +63,7 @@ index c9aa7cc..8653ec6 100644 # if master volume control is present, turn PCM volume to max ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm1_end" ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm1_end" -@@ -93,6 +94,8 @@ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="75%" +@@ -93,6 +109,8 @@ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="75%" LABEL="pcm1_end" CTL{name}="PCM Playback Switch",CTL{index}="1",PROGRAM=="__ctl_search", \ CTL{values}="on" @@ -46,7 +72,7 @@ index c9aa7cc..8653ec6 100644 CTL{reset}="mixer" CTL{name}="DAC Playback Volume",PROGRAM=="__ctl_search", \ -@@ -101,7 +104,7 @@ CTL{name}="DAC Playback Switch",PROGRAM=="__ctl_search", \ +@@ -101,7 +119,7 @@ CTL{name}="DAC Playback Switch",PROGRAM=="__ctl_search", \ CTL{values}="on" CTL{reset}="mixer" diff --git a/alsa-utils.changes b/alsa-utils.changes index 3179a5d..6b46116 100644 --- a/alsa-utils.changes +++ b/alsa-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 12 12:52:16 CEST 2009 - tiwai@suse.de + +- fix alsactl init Speaker volume setup + ------------------------------------------------------------------- Fri Jun 19 16:12:04 CEST 2009 - tiwai@suse.de diff --git a/alsa-utils.spec b/alsa-utils.spec index 729a6ef..b168df2 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -28,7 +28,7 @@ Requires: dialog pciutils AutoReqProv: on Summary: Advanced Linux Sound Architecture Utilities Version: 1.0.20 -Release: 3 +Release: 4 Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 Patch: alsa-utils-git-fixes.diff Patch1: alsa-utils-gettext-version-removal.diff @@ -96,136 +96,3 @@ make %{?jobs:-j %jobs} %{_datadir}/alsa %changelog -* Fri Jun 19 2009 tiwai@suse.de -- tricolorize alsamixer volumes -- fix alsactl init values -* Tue Jun 02 2009 tiwai@suse.de -- fix alsamixer man page about capture elements -* Fri May 29 2009 tiwai@suse.de -- sync with the upstream: - * alsamixer code rewrite - * more alsactl init fixes - * translations updates -* Wed May 20 2009 tiwai@suse.de -- speaker-test minor clean-ups -- fix alsactl init headphone volume setup -* Wed May 06 2009 tiwai@suse.de -- updated to version 1.0.20: - * including previous patches - * a few more fixes about alsactl init command -* Thu Apr 23 2009 tiwai@suse.de -- updated as of 2009.04.23: - * Added vi-like key bindings to alsamixer - * alsactl/init: Fix CTL{value} assigning - make it relevant to - documentation - * aplay/arecord: improve suspicious buffer detection and add - --test-coef parameter - * aplay/arecord: remove debug printfs introduced by previous - patch - * aplay/arecord: fix underrun/overrun time calculation for - monotonic clock -* Wed Mar 18 2009 tiwai@suse.de -- add missing -I option for alsactl -- prefer /etc/modprobe.d/50-sound.conf for new module-init-tools -* Mon Feb 16 2009 tiwai@suse.de -- alsactl: init - modify default rule to better support some HDA - codecs -- Fix build with partially-installed alsa-lib -* Thu Jan 22 2009 tiwai@suse.de -- updated to version 1.0.19 -- use ANSI-C functions instead of index() -* Wed Nov 26 2008 tiwai@suse.de -- fix division-by-zero error in speaker-test program -* Wed Oct 29 2008 tiwai@suse.de -- updated to version 1.0.18-final; - just including all previous fixes -* Thu Oct 23 2008 tiwai@suse.de -- added --test-position in aplay/arecord for debugging -- can disable the build of alsaconf in configure -- alsactl -g option to ignore 'no soundcards' error -* Thu Sep 11 2008 tiwai@suse.de -- fix possible segfaults during parsing in alsactl -* Wed Sep 10 2008 tiwai@suse.de -- updated to 1.0.18rc3: - * more alsactl init implementations -* Wed Aug 06 2008 tiwai@suse.de -- alsactl init implementation (still non-working status, though) -- iecset utility updates for new IEC958 status bits -* Tue Jul 15 2008 tiwai@suse.de -- updated to 1.0.17-final: - * just a version bump -* Wed Jun 18 2008 tiwai@suse.de -- updated to 1.0.17rc2: - * including last fixes -* Wed Apr 16 2008 tiwai@suse.de -- HG snapshot 20080416: - * fix a cast warning in aplay - * use ncurses*-config in configure -* Fri Mar 14 2008 tiwai@suse.de -- HG snapshot 20080314: - * stereo VU-meter support in aplay -* Mon Mar 10 2008 tiwai@suse.de -- HG snapshot 20080309: - * support extensible WAV format in aplay - * flush output in aseqdump - * fix poll timeout in seq/* utils - * clean up configure -* Wed Feb 13 2008 tiwai@suse.de -- clean up configure script -- add support of IEEE float in aplay/arecord -* Fri Feb 08 2008 tiwai@suse.de -- updated to version 1.0.16-final: - * just a version bump -* Tue Jan 22 2008 tiwai@suse.de -- updated to version 1.0.16-rc1: - * just a version bump -* Wed Jan 09 2008 tiwai@suse.de -- updated to HG 2008.01.09 version: - * alsact: skip inactive controls - * alsamixer: add 8-channel support - * aplay, speaker-test: remove obsolete APIs -* Fri Dec 14 2007 tiwai@suse.de -- updated to HG 2007.12.14 version: - * merged previous patches - * fix blocking mode around snd_pcm_drain() calls in aplay -* Fri Nov 30 2007 tiwai@suse.de -- Merge upstream fixes: - * make -F option as default for alsactl - * fix iecset index range - * fix a bug in alsactl restore that restores wrong values -* Mon Nov 12 2007 tiwai@suse.de -- fix double entries of comment.tlv in alsactl (#340516) -* Mon Nov 05 2007 tiwai@suse.de -- fix speaker-test with pulse plugin output -- use stderr for error message from speaker-test -* Mon Oct 29 2007 tiwai@suse.de -- make alsactl more robust - * restore the volume values with channel changes - * restore from dB level if available -* Tue Oct 16 2007 tiwai@suse.de -- updated to version 1.0.15-final - * including all previous patches -* Mon Sep 17 2007 tiwai@suse.de -- fix the handling of capture enum elements in alsamixer (#325677) -* Tue Aug 14 2007 tiwai@suse.de -- amixer - Allow to pass enum item string for cset, too -- aplay - Include missing time.h for time() -* Mon Jul 30 2007 tiwai@suse.de -- HG fixes (as of 2007.07.28) - * don't install hwcfg file for openSUSE 10.3 in alsaconf - * fix the handling of enum channels in amixer - * fix VU meter of aplay - * fix possible infinite loop with signal handler in aplay -* Thu May 31 2007 tiwai@suse.de -- updated to version 1.0.14-final - including previous HG fixes -* Thu May 24 2007 tiwai@suse.de -- HG patch as of 2007.05.24: - * more error verbose messages in alsactl - * fix duplicated mixer elements in alsamixer -- Use find_lang -* Wed May 02 2007 tiwai@suse.de -- updated to version 1.0.14rc4 - including HG fixes -* Mon Apr 16 2007 tiwai@suse.de -- split from alsa package