Skip to content
Permalink
Browse files

pulseaudio: 8.0 -> 9.0

Release notes:
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/9.0/

Rebased 0001-client-conf-Add-allow-autospawn-for-root.patch.

Removed 0001-Revert-module-switch-on-port-available-Route-to-pref.patch,
because the issues that were caused by the reverted commit have been
fixed.

The patch set that fixes the initial selection of HDMI profiles
(YOCTO#8448) is replaced with updated patches cherry-picked from
upstream.

Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Ross Burton <ross.burton@intel.com>
  • Loading branch information...
tanuk authored and rpurdie committed Jul 20, 2016
1 parent e512887 commit 319595e8264af32c54ba6324e220eb4ec43b7565

This file was deleted.

Oops, something went wrong.
@@ -1,32 +1,26 @@
From 339eb179baa7810113f6456accc05b3a32c1cdba Mon Sep 17 00:00:00 2001
From 9c3cdfcd198ef9727ea542f284ac6d8c1bcd7a3a Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Fri, 23 Oct 2015 12:36:34 +0300
Subject: [PATCH 2/4] alsa, bluetooth: fail if user-requested profile doesn't
Subject: [PATCH 1/5] alsa, bluetooth: fail if user-requested profile doesn't
exist

If we can't fulfill the user request fully, I think we shouldn't
fulfill it at all, to make it clear that the requested operation
didn't succeed.

http://bugzilla.yoctoproject.org/show_bug.cgi?id=8448

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>

Upstream-Status: Denied [The patch set needs some work to be accepted.
The review thread:
http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/24301]
Upstream-Status: Accepted [expected in 10.0]

Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
---
src/modules/alsa/module-alsa-card.c | 10 ++++++++--
src/modules/bluetooth/module-bluez4-device.c | 6 ++++--
2 files changed, 12 insertions(+), 4 deletions(-)
src/modules/alsa/module-alsa-card.c | 11 +++++++++--
src/modules/bluetooth/module-bluez4-device.c | 7 +++++--
2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index a7fec04..32f517e 100644
index e5cc4ae..d761683 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -754,8 +754,14 @@ int pa__init(pa_module *m) {
@@ -799,8 +799,15 @@ int pa__init(pa_module *m) {
goto fail;
}

@@ -37,29 +31,31 @@ index a7fec04..32f517e 100644
+ pa_card_new_data_set_profile(&data, profile);
+ else {
+ pa_log("No such profile: %s", profile);
+ pa_card_new_data_done(&data);
+ goto fail;
+ }
+ }

u->card = pa_card_new(m->core, &data);
pa_card_new_data_done(&data);
diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c
index b40c6a0..94e6988 100644
index 9a921a5..a2de525 100644
--- a/src/modules/bluetooth/module-bluez4-device.c
+++ b/src/modules/bluetooth/module-bluez4-device.c
@@ -2310,8 +2310,10 @@ static int add_card(struct userdata *u) {
@@ -2301,8 +2301,11 @@ static int add_card(struct userdata *u) {
if ((default_profile = pa_modargs_get_value(u->modargs, "profile", NULL))) {
if (pa_hashmap_get(data.profiles, default_profile))
pa_card_new_data_set_profile(&data, default_profile);
- else
- pa_log_warn("Profile '%s' not valid or not supported by device.", default_profile);
+ else {
+ pa_log("Profile '%s' not valid or not supported by device.", default_profile);
+ pa_card_new_data_done(&data);
+ return -1;
+ }
}

u->card = pa_card_new(u->core, &data);
--
2.1.4
2.8.1

Oops, something went wrong.

0 comments on commit 319595e

Please sign in to comment.
You can’t perform that action at this time.