pool/pulseaudio
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 262530 from multimedia:libs

Browse Source 
- Revert yet another one due to still lost headphone handling
  (bnc#905418):
  alsa-mixer-recognize-Dock-headphone-jack.patch (forwarded request 262529 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/262530
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=124
This commit is contained in:
Dominique Leuenberger 2014-11-24 10:13:19 +00:00 committed by Git OBS Bridge
commit 6ddfec6558
5 changed files with 26 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
alsa-mixer-Ignore-some-elements-in-the-analog-output.patch
View File

@ -1,68 +0,0 @@
From 717834086c57667823a34d76357a572f43e5313b Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
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

53
alsa-mixer-recognize-Dock-headphone-jack.patch
View File

@ -1,53 +0,0 @@
From 594da41d07edcebc5fd319388852a66cc3f12ace Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@luon.net>
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 <david.henningsson@canonical.com>
---
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

20
pulseaudio.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
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
- Remove a patch causing more regressions, lost headphone handling
on Thinkpads (bnc#905418):
0002-alsa-mixer-Ignore-some-elements-in-the-analog-output.patch
-------------------------------------------------------------------
Wed Nov 12 12:53:49 CET 2014 - tiwai@suse.de
- Fix setup-pulseaudio script not to leave $ALSA_CONFIG_PATH when
alsa-plugins-pulse isn't installed (bnc#905055)
-------------------------------------------------------------------
Wed Nov 5 14:49:17 CET 2014 - tiwai@suse.de

16
pulseaudio.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package pulseaudio
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -44,10 +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
# 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
@ -79,13 +75,13 @@ BuildRequires: pkgconfig(dbus-1) >= 1.4.12
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(json) >= 0.9
BuildRequires: pkgconfig(sbc) >= 1.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xtst)
PreReq: %fillup_prereq
PreReq: pwdutils
@ -302,8 +298,6 @@ 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

1
setup-pulseaudio
View File

@ -81,6 +81,7 @@ enable_alsa() {
set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf
else
echo "Missing /etc/alsa-pluse.conf; please install alsa-plugins-pulse package"
delete_variable ALSA_CONFIG_PATH
fi
}