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

Accepting request 341695 from home:oholecek:branches:multimedia:libs

Browse Source 
- Update to 7.1
 + Fix a crasher when using srbchannel
 + Fix a build system typo that caused symlinks to turn up in /
 + Make Xonar cards work better
 + Other minor  bug fixes and improvements
- remove 0003-alsa-mixer-Add-Dock-Line-Out-jack-handling-to-analog.patc
- remove 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch
- remove pstream-Fix-use-after-free-in-srb_callback.patch

OBS-URL: https://build.opensuse.org/request/show/341695
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=162
This commit is contained in:
Takashi Iwai 2015-11-02 10:39:38 +00:00 committed by Git OBS Bridge
parent 8cc1c2e440
commit db5fba8af7
7 changed files with 17 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch
View File

@ -1,51 +0,0 @@
From 8911d02a6ed1622ab6e53eac3383753dc3caeac7 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
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 <tiwai@suse.de>
---
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

30
0003-alsa-mixer-Add-Dock-Line-Out-jack-handling-to-analog.patch
View File

@ -1,30 +0,0 @@
From e061f9afd2ee1a798d71b3d078725bfcea214202 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Fri, 18 Sep 2015 09:59:45 +0300
Subject: [PATCH] alsa-mixer: Add "Dock Line Out" jack handling to
analog-output-speaker-always
The jack is already in analog-output-speaker, so let's have the same
handling in analog-output-speaker-always too.
---
src/modules/alsa/mixer/paths/analog-output-speaker-always.conf | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index 599cfc85f0d2..71f356dce00b 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -49,6 +49,10 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Dock Line Out]
+state.plugged = no
+state.unplugged = unknown
+
[Element Hardware Master]
switch = mute
volume = merge
--
2.6.1

43
pstream-Fix-use-after-free-in-srb_callback.patch
View File

@ -1,43 +0,0 @@
>From 9d370181ec4bc1e252b54dd0e7bb52016f01b238 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Fri, 16 Oct 2015 22:12:32 +0200
Subject: [PATCH] pstream: Fix use-after-free in srb_callback
We need to guard the pstream with an extra ref to ensure
it is not destroyed at the time we check whether or not the
srbchannel is destroyed.
Reported-by: Takashi Iwai <tiwai@suse.de>
BugLink: http://bugzilla.opensuse.org/show_bug.cgi?id=950487
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
src/pulsecore/pstream.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -216,14 +216,23 @@ fail:
}
static bool srb_callback(pa_srbchannel *srb, void *userdata) {
+ bool b;
pa_pstream *p = userdata;
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
pa_assert(p->srb == srb);
+ pa_pstream_ref(p);
+
do_pstream_read_write(p);
- return p->srb != NULL;
+
+ /* If either pstream or the srb is going away, return false.
+ We need to check this before p is destroyed. */
+ b = (PA_REFCNT_VALUE(p) > 1) && (p->srb == srb);
+ pa_pstream_unref(p);
+
+ return b;
}
static void io_callback(pa_iochannel*io, void *userdata) {

3
pulseaudio-7.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa
size 1505864

3
pulseaudio-7.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9
size 1506504

12
pulseaudio.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Oct 30 13:22:54 UTC 2015 - oholecek@suse.com
- Update to 7.1
+ Fix a crasher when using srbchannel
+ Fix a build system typo that caused symlinks to turn up in /
+ Make Xonar cards work better
+ Other minor bug fixes and improvements
- remove 0003-alsa-mixer-Add-Dock-Line-Out-jack-handling-to-analog.patc
- remove 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch
- remove pstream-Fix-use-after-free-in-srb_callback.patch
-------------------------------------------------------------------
Tue Oct 20 14:44:13 CEST 2015 - tiwai@suse.de

13
pulseaudio.spec
View File

@ -16,7 +16,7 @@
#
%define drvver 7.0
%define drvver 7.1
%define soname 0
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
@ -27,7 +27,7 @@
%define _bluez5used 0%(echo "%{_bluezVersion}" | grep -q '^5' && echo 1)
%define _bashcompletionsdir %{_datadir}/bash-completion/completions
Name: pulseaudio
Version: 7.0
Version: 7.1
Release: 0
Summary: A Networked Sound Server
License: GPL-2.0+ and LGPL-2.1+
@ -46,12 +46,6 @@ Patch2: pulseaudio-wrong-memset.patch
# PATCH-FIX-SUSE disable-srbchannel.patch boo#950487 Disable srbchannel as a workaround for crashes on KDE
# XXX note this patch isn't used for now, kept just for workaround in future
Patch3: disable-srbchannel.patch
# PATCH-FIX-UPSTREAM pstream-Fix-use-after-free-in-srb_callback.patch boo#950487
Patch4: pstream-Fix-use-after-free-in-srb_callback.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
# PATCH-FIX-UPSTREAM 0003-alsa-mixer-Add-Dock-Line-Out-jack-handling-to-analog.patch boo#948979
Patch103: 0003-alsa-mixer-Add-Dock-Line-Out-jack-handling-to-analog.patch
# PATCH-FIX-UPSTREAM 0004-module-alsa-card-Report-available-ports-before-unava.patch boo#948979
Patch104: 0004-module-alsa-card-Report-available-ports-before-unava.patch
BuildRequires: alsa-devel >= 1.0.19
@ -336,9 +330,6 @@ Optional dependency offering zsh completion for various PulseAudio utilities
%if 0
%patch3 -p1
%endif
%patch4 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%build