[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.7-3-18-g57fcc44

[neurocyte-guest at users.alioth.debian.org]

The branch, master has been updated
       via  57fcc445c0e1ef45eccdc67c911826675935c911 (commit)
      from  3f889baa9bfee9b46510c87d296b420024253fe3 (commit)


- Shortlog ------------------------------------------------------------
57fcc44 Added, svn commit r2074 from upstream

Summary of changes:
 debian/changelog                                   |    2 +
 ...ng-of-samples-into-PA.-Problem-discovered.patch |   23 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 26 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 57fcc445c0e1ef45eccdc67c911826675935c911
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Thu Nov 22 16:33:53 2007 +0100

    Added, svn commit r2074 from upstream

diff --git a/debian/changelog b/debian/changelog
index 3f71660..c0ebf8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ pulseaudio (0.9.8-1) UNRELEASED; urgency=low
     - Dropped, merged upstream.
   * debian/patches/0002-Double-esound-maximum-sample-size.patch:
     + Added, from Ubuntu.
+  * debian/p..s/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch:
+    + Added, svn commit r2074 from upstream.
 
   [Daniel T Chen]
   * debian/control: Add lsb-base (>= 3) to pulseaudio's dependencies.
diff --git a/debian/patches/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch b/debian/patches/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
new file mode 100644
index 0000000..3f17a00
--- /dev/null
+++ b/debian/patches/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
@@ -0,0 +1,23 @@
+From 50b9a0cc8da84f848f0e9099c484edfdec2a92db Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Thu, 22 Nov 2007 15:09:00 +0000
+Subject: [PATCH] fix uploading of samples into PA. Problem discovered by Colin Guthrie
+
+git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@2074 fefdeb5f-60dc-0310-8127-8f9354f1896f
+---
+ src/pulse/stream.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/pulse/stream.c b/src/pulse/stream.c
+index 3e2d455..8ec348f 100644
+--- a/src/pulse/stream.c
++++ b/src/pulse/stream.c
+@@ -586,7 +586,7 @@ void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED
+         }
+     }
+ 
+-    if (s->context->version >= 12) {
++    if (s->context->version >= 12 && s->direction != PA_STREAM_UPLOAD) {
+         pa_sample_spec ss;
+         pa_channel_map cm;
+         const char *dn = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 842e64a..511aa72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
 0002-Double-esound-maximum-sample-size.patch
+0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch

-- 
pulseaudio packaging