From 3e36e8d5cee3b5ed023bbf9583ba8c4b42451fe1ab8cb497806a7a294aeab2a0 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 16 Jun 2015 07:05:47 +0000 Subject: [PATCH] Accepting request 312211 from home:tiwai:branches:multimedia:libs - Fix missing dock line-out jack detection (boo#934850): 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch OBS-URL: https://build.opensuse.org/request/show/312211 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=155 --- ...line-out-path-unavailable-when-Front.patch | 31 +++++++++++ ...a-mixer-Recognize-Dock-Line-Out-jack.patch | 51 +++++++++++++++++++ pulseaudio.changes | 7 +++ pulseaudio.spec | 6 +++ 4 files changed, 95 insertions(+) create mode 100644 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch create mode 100644 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch diff --git a/0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch b/0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch new file mode 100644 index 0000000..e46d8e3 --- /dev/null +++ b/0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch @@ -0,0 +1,31 @@ +From 5598923b8e64de873a417b512d709c5674f3a96d Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Tue, 5 May 2015 09:43:32 +0200 +Subject: [PATCH] alsa-mixer: Make line out path unavailable when "Front + Headphone" is plugged in + +This case was apparently overlooked. + +Signed-off-by: David Henningsson +--- + src/modules/alsa/mixer/paths/analog-output-lineout.conf | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf +index 53ee2f453922..68f444ae80a9 100644 +--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf ++++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf +@@ -29,6 +29,10 @@ required-any = any + state.plugged = no + state.unplugged = unknown + ++[Jack Front Headphone] ++state.plugged = no ++state.unplugged = unknown ++ + [Jack Line Out Front] + required-any = any + +-- +2.4.3 + diff --git a/0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch b/0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch new file mode 100644 index 0000000..f8dd7a5 --- /dev/null +++ b/0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch @@ -0,0 +1,51 @@ +From 8911d02a6ed1622ab6e53eac3383753dc3caeac7 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Mon, 15 Jun 2015 16:48:44 +0200 +Subject: [PATCH] alsa-mixer: Recognize "Dock Line Out" jack + +Some machines provide "Dock Line Out Jack" control that should be +handled like a normal line out. + +Signed-off-by: Takashi Iwai +--- + src/modules/alsa/mixer/paths/analog-output-lineout.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-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf +index 68f444ae80a9..773abc409aa2 100644 +--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf ++++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf +@@ -71,6 +71,14 @@ state.plugged = unknown + state.unplugged = unknown + required-any = any + ++[Jack Dock Line Out] ++required-any = any ++ ++[Jack Dock Line Out Phantom] ++state.plugged = unknown ++state.unplugged = unknown ++required-any = any ++ + [Element Hardware Master] + switch = mute + volume = merge +diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf +index 39193dd8851e..9e81e5592baa 100644 +--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf ++++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf +@@ -44,6 +44,10 @@ state.unplugged = unknown + state.plugged = no + state.unplugged = unknown + ++[Jack Dock Line Out] ++state.plugged = no ++state.unplugged = unknown ++ + [Jack Speaker Phantom] + required-any = any + state.plugged = unknown +-- +2.4.3 + diff --git a/pulseaudio.changes b/pulseaudio.changes index fb7313c..7ec72f5 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 16 08:11:46 CEST 2015 - tiwai@suse.de + +- Fix missing dock line-out jack detection (boo#934850): + 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch + 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch + ------------------------------------------------------------------- Tue Apr 7 08:33:58 UTC 2015 - sleep_walker@suse.cz diff --git a/pulseaudio.spec b/pulseaudio.spec index 68b676c..ea02ace 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -42,6 +42,10 @@ Source99: baselibs.conf Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff Patch2: pulseaudio-wrong-memset.patch +# PATCH-FIX-UPSTREAM 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch boo#934850 +Patch101: 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch +# PATCH-FIX-UPSTREAM 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch boo#934850 +Patch102: 0002-alsa-mixer-Recognize-Dock-Line-Out-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 @@ -313,6 +317,8 @@ Optional dependency offering zsh completion for various PulseAudio utilities %patch0 %patch1 -p1 %patch2 +%patch101 -p1 +%patch102 -p1 %build echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in