diff --git a/alsa-mixer-recognize-Dock-headphone-jack.patch b/alsa-mixer-recognize-Dock-headphone-jack.patch deleted file mode 100644 index 6c5a66b..0000000 --- a/alsa-mixer-recognize-Dock-headphone-jack.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 594da41d07edcebc5fd319388852a66cc3f12ace Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons -Date: Sun, 31 Aug 2014 20:11:21 +0200 -Subject: [PATCH] alsa-mixer: recognize Dock headphone jack -References: bnc#851362 - -Recognize the Dock headphone jack in the same way the normal & front -headphone jacks are detected. - -Reviewed-by: David Henningsson - ---- - src/modules/alsa/mixer/paths/analog-output-headphones.conf | 8 ++++++++ - src/modules/alsa/mixer/paths/analog-output-speaker.conf | 4 ++++ - 2 files changed, 12 insertions(+) - -diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf -index 5222c23027d1..a41d41f2dec9 100644 ---- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf -+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf -@@ -25,6 +25,14 @@ description-key = analog-output-headphones - [Properties] - device.icon_name = audio-headphones - -+[Jack Dock Headphone] -+required-any = any -+ -+[Jack Dock Headphone Phantom] -+required-any = any -+state.plugged = unknown -+state.unplugged = unknown -+ - [Jack Front Headphone] - required-any = any - -diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf -index d79fad1140fb..f708e618e4b6 100644 ---- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf -+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf -@@ -29,6 +29,10 @@ device.icon_name = audio-speakers - state.plugged = no - state.unplugged = unknown - -+[Jack Dock Headphone] -+state.plugged = no -+state.unplugged = unknown -+ - [Jack Front Headphone] - state.plugged = no - state.unplugged = unknown --- -2.1.3 - diff --git a/pulseaudio.changes b/pulseaudio.changes index 24cf170..0887324 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 20 18:26:27 CET 2014 - tiwai@suse.de + +- Revert yet another one due to still lost headphone handling + (bnc#905418): + alsa-mixer-recognize-Dock-headphone-jack.patch + ------------------------------------------------------------------- Mon Nov 17 22:38:54 CET 2014 - tiwai@suse.de diff --git a/pulseaudio.spec b/pulseaudio.spec index e6e321c..3e3dc9d 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -44,8 +44,6 @@ Patch1: suppress-socket-error-msg.diff Patch2: pulseaudio-wrong-memset.patch # PATCH-FIX-UPSTREAM pulseaudio-bnc881524-rtp.patch sreeves@suse.com Patch3: pulseaudio-bnc881524-rtp.patch -# PATCH-FIX-UPSTREAM alsa-mixer-recognize-Dock-headphone-jack.patch tiwai@suse.de -Patch4: alsa-mixer-recognize-Dock-headphone-jack.patch BuildRequires: alsa-devel >= 1.0.19 # require only minimal bluez, if we are on bluez 5 we will determine in %build phase BuildRequires: bluez-devel >= 4.99 @@ -300,7 +298,6 @@ This package contains GDM integration hooks for the PulseAudio sound server. %patch1 -p1 %patch2 %patch3 -p1 -%patch4 -p1 %build echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in