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

commit 01afdd0ba810d949dfed1a664943eb410c6f32e7
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Oct 26 11:26:36 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                                               |  4 ++++
 ...0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f9f921..d0d4d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,10 @@ pulseaudio (1:9.0-4ubuntu1) UNRELEASED; urgency=medium
       support via trust-store is planned
     - Use conflicts/replaces instead of breaks to handle former
       pulseaudio-module-udev split
+  * 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
 
  -- Luke Yelavich <themuso at ubuntu.com>  Wed, 26 Oct 2016 11:19:16 +1100
 
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