[pulseaudio] 02/04: 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-xenial
in repository pulseaudio.

commit 552657a74f2d6d625c271e388095a50cada44859
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                                               |  7 ++++++-
 ...0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a31638f..071274e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ pulseaudio (1:8.0-0ubuntu3.1) UNRELEASED; urgency=medium
 
   * debian/pulseaudio.maintscript: Bump versions for files that need to be
     removed as they are obsolete (LP: #1573296)
+  * 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 <luke at galactica>  Wed, 27 Apr 2016 13:39:16 +0200
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 27 Apr 2016 13:39:16 +0200
 
 pulseaudio (1:8.0-0ubuntu3) xenial; urgency=medium
 
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 c9758db..83d0ae2 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 6ebcda2..999c254 100644
          pa_source_unlink(u->source);
  
      if (u->thread) {
-@@ -1582,7 +1738,8 @@ static void stop_thread(struct userdata *u) {
- 
-     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_profile(struct userdata *u, const char *uuid
      return cp;
  }

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