Hello community, here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at Thu Sep 3 18:05:25 CEST 2009. -------- --- alsa-utils/alsa-utils.changes 2009-08-31 17:28:19.000000000 +0200 +++ alsa-utils/alsa-utils.changes 2009-09-02 14:55:04.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 2 14:52:56 CEST 2009 - tiwai@suse.de + +- fix build with older distros; removed an obsolete patch +- fix alsactl init syntax errors in the default config + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- alsa-utils-alsamixer-old-ncurses-fix.diff New: ---- alsa-utils-git-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.mZXYjz/_old 2009-09-03 18:04:28.000000000 +0200 +++ /var/tmp/diff_new_pack.mZXYjz/_new 2009-09-03 18:04:28.000000000 +0200 @@ -28,12 +28,11 @@ AutoReqProv: on Summary: Advanced Linux Sound Architecture Utilities Version: 1.0.21 -Release: 1 +Release: 2 Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 -# Patch: alsa-utils-git-fixes.diff +Patch: alsa-utils-git-fixes.diff Patch1: alsa-utils-gettext-version-removal.diff # Patch2: alsa-utils-po-pre-patch.diff -Patch3: alsa-utils-alsamixer-old-ncurses-fix.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,13 +54,10 @@ # fix po changes in tarball first # %patch2 -p1 # rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-* -# %patch -p1 +%patch -p1 %if %suse_version < 1020 %patch1 -p1 %endif -%if %suse_version < 1110 -%patch3 -p1 -%endif %build %if %suse_version < 1020 ++++++ alsa-utils-git-fixes.diff ++++++ diff --git a/alsactl/init/default b/alsactl/init/default index 8653ec6..a2069e3 100644 --- a/alsactl/init/default +++ b/alsactl/init/default @@ -39,7 +39,7 @@ CTL{reset}="mixer" CTL{name}="Front Playback Volume",PROGRAM!="__ctl_search",GOTO="front0_end" # if master volume control is present, turn front volume to max ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="front0_end" -ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="front0_end" +ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="front0_end" CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" LABEL="front0_end" CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \ @@ -49,15 +49,30 @@ CTL{reset}="mixer" CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end" # 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" +ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone0_end" CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" LABEL="headphone0_end" 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" @@ -72,7 +87,7 @@ CTL{name}="PCM Playback Volume",PROGRAM!="__ctl_search", \ CTL{name}="PCM Volume",PROGRAM!="__ctl_search", GOTO="pcm0_end" # 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" +ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm0_end" # exception - some HDA codecs have shifted dB range 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" @@ -86,7 +101,7 @@ CTL{name}="PCM Playback Volume",CTL{index}="1",PROGRAM!="__ctl_search", \ CTL{name}="PCM Volume",PROGRAM!="__ctl_search",GOTO="pcm1_end" # 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" +ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm1_end" # exception - some HDA codecs have shifted dB range CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm1_end" CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm1_end" @@ -125,7 +140,7 @@ CTL{reset}="mixer" CTL{name}="CD Playback Volume",PROGRAM!="__ctl_search", GOTO="cd0_end" # if master volume control is present, turn CD volume to max ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="cd0_end" -ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="cd0_end" +ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="cd0_end" # exception - some HDA codecs have shifted dB range CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="cd0_end" CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="cd0_end" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org