diff --git a/.cvsignore b/.cvsignore index 45e9d67..ab29353 100644 --- a/.cvsignore +++ b/.cvsignore @@ -22,3 +22,4 @@ alsa-utils-1.0.18.tar.bz2 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 diff --git a/alsa-utils.spec b/alsa-utils.spec index 770413c..3394de5 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -3,8 +3,8 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.21 -Release: 2%{?prever_dot}%{?dist} +Version: 1.0.22 +Release: 1%{?prever_dot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -13,8 +13,6 @@ Source4: alsaunmute Source6: alsa-info.sh Source10: alsa.rules Source11: alsactl.conf -Patch1: alsactl-init-fix-headphone2.patch -Patch2: alsactl-init-add-speaker.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} BuildRequires: ncurses-devel @@ -28,8 +26,6 @@ Architecture (ALSA). %prep %setup -q -n %{name}-%{version}%{?prever} -%patch1 -p1 -b .headphone -%patch2 -p1 -b .speaker %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin --disable-alsaconf @@ -96,6 +92,9 @@ if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then fi %changelog +* Mon Jan 4 2010 Jaroslav Kysela 1.0.22-1 +- updated to 1.0.22 final + * Thu Sep 3 2009 Jaroslav Kysela 1.0.21-1 - updated to 1.0.21 final - updated alsa-info.sh script to 0.4.58 diff --git a/alsactl-init-add-speaker.patch b/alsactl-init-add-speaker.patch deleted file mode 100644 index bb8ef38..0000000 --- a/alsactl-init-add-speaker.patch +++ /dev/null @@ -1,83 +0,0 @@ -From e02f8e8aba21357eacce483bd46106624863c5a3 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Wed, 12 Aug 2009 12:45:05 +0200 -Subject: [PATCH] alsactl - Initialize Speaker volume to 0dB when Master is present - -Initialize Speaker volume to 0dB as well as Headphone when Master -is present. Also initialize Headphone,1 for machines with dual -headphones. - -Signed-off-by: Takashi Iwai ---- - alsactl/init/default | 27 +++++++++++++++++++++------ - 1 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/alsactl/init/default b/alsactl/init/default -index f2c0539..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", \ -@@ -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" - -@@ -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" --- -1.5.5.1 - diff --git a/alsactl-init-fix-headphone2.patch b/alsactl-init-fix-headphone2.patch deleted file mode 100644 index c2ce86e..0000000 --- a/alsactl-init-fix-headphone2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2cbf39749cd71a2b892b6006ae69283576176d17 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 2 Sep 2009 14:31:49 +0200 -Subject: [PATCH] alsactl init: Fix typo "(" -> "{" in Headphone default rule - -Reported-by: Philipp Jocham -Signed-off-by: Jaroslav Kysela ---- - alsactl/init/default | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/alsactl/init/default b/alsactl/init/default -index 8653ec6..f2c0539 100644 ---- a/alsactl/init/default -+++ b/alsactl/init/default -@@ -49,7 +49,7 @@ 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", \ --- -1.5.5.1 - diff --git a/sources b/sources index d0d11cb..064e238 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3672287c2608040d111ce45495ba7602 alsa-utils-1.0.21.tar.bz2 +f7180316188552ee1e6759a03f1fe98d alsa-utils-1.0.22.tar.bz2