From e631ed13e4d268abc726ab33557b0c8d01870b9d0eeadcbfec36f47612602d06 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 5 Nov 2014 14:29:31 +0000 Subject: [PATCH] Accepting request 259807 from home:tiwai:branches:multimedia:libs - Fix wrong mixer setup / jack detection issues (bnc#851362) 0001-alsa-mixer-recognize-Dock-headphone-jack.patch 0002-alsa-mixer-Ignore-some-elements-in-the-analog-output.patch OBS-URL: https://build.opensuse.org/request/show/259807 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=144 --- ...e-some-elements-in-the-analog-output.patch | 68 +++++++++++++++++++ ...-mixer-recognize-Dock-headphone-jack.patch | 53 +++++++++++++++ pulseaudio.changes | 7 ++ pulseaudio.spec | 6 ++ 4 files changed, 134 insertions(+) create mode 100644 alsa-mixer-Ignore-some-elements-in-the-analog-output.patch create mode 100644 alsa-mixer-recognize-Dock-headphone-jack.patch diff --git a/alsa-mixer-Ignore-some-elements-in-the-analog-output.patch b/alsa-mixer-Ignore-some-elements-in-the-analog-output.patch new file mode 100644 index 0000000..b666060 --- /dev/null +++ b/alsa-mixer-Ignore-some-elements-in-the-analog-output.patch @@ -0,0 +1,68 @@ +From 717834086c57667823a34d76357a572f43e5313b Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Mon, 27 Oct 2014 13:00:00 +0200 +Subject: [PATCH] alsa-mixer: Ignore some elements in the analog-output path + +The analog-output path should be suppressed when there are more +specific paths available. Currently that usually doesn't happen. The +suppression can be done with the path subset detection, and this patch +makes that work (another approach would be to mark the elements as +required-absent, like analog-input does, but I like the subset +suppression more, because it requires less stuff in the configuration +files). The problem with listing the now-removed elements in +analog-output.conf was that if the sound card had e.g. a Speaker +element, then the switch behaviour was different between analog-output +and analog-output-speakers, so analog-output was not considered a +subset of analog-output-speakers. + +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=74609 +--- + src/modules/alsa/mixer/paths/analog-output.conf | 30 ------------------------ + 1 file changed, 30 deletions(-) + +--- a/src/modules/alsa/mixer/paths/analog-output.conf ++++ b/src/modules/alsa/mixer/paths/analog-output.conf +@@ -22,14 +22,6 @@ + [General] + priority = 99 + +-[Jack Line Out] +-state.plugged = unknown +-state.unplugged = unknown +- +-[Jack Line Out Phantom] +-state.plugged = unknown +-state.unplugged = unknown +- + [Element Hardware Master] + switch = mute + volume = merge +@@ -46,28 +38,6 @@ override-map.2 = all-left,all-right + switch = off + volume = off + +-[Element Line HP Swap] +-switch = off +- +-; This profile path is intended to control the default output, not the +-; headphones. But it should not hurt if we leave the headphone jack +-; enabled nonetheless. +-[Element Headphone] +-switch = mute +-volume = zero +- +-[Element Headphone2] +-switch = mute +-volume = zero +- +-[Element Speaker] +-switch = mute +-volume = off +- +-[Element Desktop Speaker] +-switch = mute +-volume = off +- + [Element Front] + switch = mute + volume = merge diff --git a/alsa-mixer-recognize-Dock-headphone-jack.patch b/alsa-mixer-recognize-Dock-headphone-jack.patch new file mode 100644 index 0000000..6c5a66b --- /dev/null +++ b/alsa-mixer-recognize-Dock-headphone-jack.patch @@ -0,0 +1,53 @@ +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 69c1338..b39aec5 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 5 14:49:17 CET 2014 - tiwai@suse.de + +- Fix wrong mixer setup / jack detection issues (bnc#851362) + 0001-alsa-mixer-recognize-Dock-headphone-jack.patch + 0002-alsa-mixer-Ignore-some-elements-in-the-analog-output.patch + ------------------------------------------------------------------- Sat Oct 18 20:29:58 UTC 2014 - crrodriguez@opensuse.org diff --git a/pulseaudio.spec b/pulseaudio.spec index 3d91fcb..a4c5986 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -44,6 +44,10 @@ 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 +# PATCH-FIX-UPSTREAM alsa-mixer-Ignore-some-elements-in-the-analog-output.patch tiwai@suse.de +Patch5: alsa-mixer-Ignore-some-elements-in-the-analog-output.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 @@ -298,6 +302,8 @@ This package contains GDM integration hooks for the PulseAudio sound server. %patch1 -p1 %patch2 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in