From 8d42bf75d70bd4c07dcf738dc3b966a1799fcbc4 Mon Sep 17 00:00:00 2001 From: perex Date: May 15 2009 12:28:28 +0000 Subject: add fix headphone patch --- diff --git a/alsa-utils.spec b/alsa-utils.spec index e41b601..19e61e1 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -4,7 +4,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: 1.0.20 -Release: 1%{?prever_dot}%{?dist} +Release: 2%{?prever_dot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -13,6 +13,7 @@ Source4: alsaunmute Source6: alsa-info.sh Source10: alsa.rules Source11: alsactl.conf +Patch1: alsactl-init-fix-headphone.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} BuildRequires: ncurses-devel @@ -26,6 +27,7 @@ Architecture (ALSA). %prep %setup -q -n %{name}-%{version}%{?prever} +%patch1 -p1 -b .headphone %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin --disable-alsaconf @@ -92,6 +94,9 @@ if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then fi %changelog +* Fri May 15 2009 Jaroslav Kysela 1.0.20-2 +- fixed Headphone Volume issue (bz#500956) + * Mon May 11 2009 Jaroslav Kysela 1.0.20-1 - updated to 1.0.20 final - updated alsa-info.sh script to 0.4.56 diff --git a/alsactl-init-fix-headphone.patch b/alsactl-init-fix-headphone.patch new file mode 100644 index 0000000..dece760 --- /dev/null +++ b/alsactl-init-fix-headphone.patch @@ -0,0 +1,35 @@ +From 0d3aeb969592134f7749bd21fd2f641eb13d7090 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 15 May 2009 12:37:48 +0200 +Subject: [PATCH] alsactl: fixed Headphone Playback Volume setting in default rules + +Signed-off-by: Jaroslav Kysela +--- + alsactl/init/default | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/alsactl/init/default b/alsactl/init/default +index c9aa7cc..af0f94f 100644 +--- a/alsactl/init/default ++++ b/alsactl/init/default +@@ -46,7 +46,7 @@ CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \ + CTL{values}="on" + + CTL{reset}="mixer" +-CTL{name}="Headphone Playback Volume",PROGRAM=="__ctl_search",GOTO="headphone0_end" ++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" +@@ -101,7 +101,7 @@ CTL{name}="DAC Playback Switch",PROGRAM=="__ctl_search", \ + CTL{values}="on" + + CTL{reset}="mixer" +-CTL{name}="Synth Playback Volume",,PROGRAM=="__ctl_search", \ ++CTL{name}="Synth Playback Volume",PROGRAM=="__ctl_search", \ + CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" + CTL{name}="Synth Playback Switch",PROGRAM=="__ctl_search", \ + CTL{values}="on" +-- +1.5.5.1 +