[pulseaudio] 01/02: Remove patch hunk that set u->transport to NULL

[Luke Yelavich]

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu-yakkety
in repository pulseaudio.

commit e46dd1b7532749c15109691e2e702dde61f0cb7a
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Thu Nov 3 10:02:06 2016 +1100

    Remove patch hunk that set u->transport to NULL
    
    At the time this code was written for 15.10, it was to prevent an assertion.
    Now with newer versions of pulse, the opposite is happening in some
    circumstances.
---
 debian/changelog                                               | 10 ++++++++++
 ...0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 559094d..0e4d872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pulseaudio (1:9.0-2ubuntu2.1) UNRELEASED; urgency=medium
+
+  * 0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch:
+    - Remove patch hunk that set u->transport to NULL. At the time this
+      code was written for 15.10, it was to prevent an assertion. Now with
+      newer versions of pulse, the opposite is happening in some circumstances
+      (LP: #1574324)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 03 Nov 2016 16:38:09 +1100
+
 pulseaudio (1:9.0-2ubuntu2) yakkety; urgency=medium
 
   * Bumping packages off the system requires Conflicts/Replaces, not Breaks.
diff --git a/debian/patches/0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch b/debian/patches/0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch
index 6f7079a..b0cc8b0 100644
--- a/debian/patches/0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch
+++ b/debian/patches/0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch
@@ -488,16 +488,6 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c
          pa_source_unlink(u->source);
  
      if (u->thread) {
-@@ -1582,7 +1738,8 @@ static void stop_thread(struct userdata
- 
-     if (u->transport) {
-         transport_release(u);
--        u->transport = NULL;
-+        /* Do not set transport pointer to NULL. When failing to switch
-+         * profile NULL u->transport would assert. */
-     }
- 
-     if (u->sink) {
 @@ -1840,6 +1997,22 @@ static pa_card_profile *create_card_prof
      return cp;
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git