Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at 2015-06-24 20:26:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old) and /work/SRC/openSUSE:Factory/.pulseaudio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseaudio" Changes: -------- --- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2015-04-12 00:08:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes 2015-06-24 20:26:41.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 16 08:11:46 CEST 2015 - [email protected] + +- 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 + +------------------------------------------------------------------- New: ---- 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.bCxEDj/_old 2015-06-24 20:26:42.000000000 +0200 +++ /var/tmp/diff_new_pack.bCxEDj/_new 2015-06-24 20:26:42.000000000 +0200 @@ -42,6 +42,10 @@ 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 @@ %patch0 %patch1 -p1 %patch2 +%patch101 -p1 +%patch102 -p1 %build echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in ++++++ 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch ++++++ >From 5598923b8e64de873a417b512d709c5674f3a96d Mon Sep 17 00:00:00 2001 From: David Henningsson <[email protected]> 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 <[email protected]> --- 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 ++++++ 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch ++++++ >From 8911d02a6ed1622ab6e53eac3383753dc3caeac7 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> 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 <[email protected]> --- 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
