[pulseaudio] alsa-mixer: Fix the analog-output-speaker-always path

[Rex Dieter]

commit fad4b43ec6ef558c58718c7043a7f3ff735a3a36
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jan 4 07:40:58 2013 -0600

    alsa-mixer: Fix the analog-output-speaker-always path

 ...Fix-the-analog-output-speaker-always-path.patch |   41 ++++++++++++++++++++
 pulseaudio.spec                                    |    8 ++++
 2 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch b/0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
new file mode 100644
index 0000000..eaf78a4
--- /dev/null
+++ b/0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
@@ -0,0 +1,41 @@
+From 299e32b767ac60ddbaa747cd03c09b780e364637 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Wed, 19 Dec 2012 11:24:33 +0100
+Subject: [PATCH] alsa-mixer: Fix the analog-output-speaker-always path
+
+A left over "required-any" made this path useless for most people.
+While we're at it, also add "Front Headphone" like for the normal
+speaker path.
+
+Tested-by: Colin Guthrie <gmane at colin.guthr.ie>
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+---
+ src/modules/alsa/mixer/paths/analog-output-speaker-always.conf | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+index 3ebdc4a..8a2b3df 100644
+--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
++++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+@@ -30,6 +30,10 @@ device.icon_name = audio-speakers
+ state.plugged = no
+ state.unplugged = unknown
+ 
++[Jack Front Headphone]
++state.plugged = no
++state.unplugged = unknown
++
+ [Element Hardware Master]
+ switch = mute
+ volume = merge
+@@ -132,7 +136,6 @@ switch = mute
+ volume = merge
+ override-map.1 = lfe
+ override-map.2 = lfe,lfe
+-required-any = any
+ 
+ [Element CLFE]
+ switch = mute
+-- 
+1.8.0.2
+
diff --git a/pulseaudio.spec b/pulseaudio.spec
index dea5365..337c6ef 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -14,6 +14,9 @@ URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 Source0:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
 Source1:        default.pa-for-gdm
 
+## upstream patches
+Patch101: 0001-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+
 BuildRequires:  m4
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  intltool
@@ -186,6 +189,8 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %prep
 %setup -q -T -b0
 
+%patch101 -p1 -b .0001
+
 ## kill rpaths
 %if "%{_libdir}" != "/usr/lib"
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -451,6 +456,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> 3.0-4
+- alsa-mixer: Fix the analog-output-speaker-always path
+
 * Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> 3.0-3
 - move libpulsedsp plugin to -libs, avoids -utils multilib (#891425)