[pulseaudio] 03/04: Replace raop channels patch with proper fix from upstream.

[Felipe Sateler]

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

fsateler pushed a commit to branch master
in repository pulseaudio.

commit 0f19f75d246cc0bfbdae383f5784246fd33525bb
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Aug 29 20:13:56 2014 -0400

    Replace raop channels patch with proper fix from upstream.
---
 debian/changelog                                   |  6 ++++
 ...use-incompatible-default-sample-spec-para.patch | 41 ++++++++++++++++++++++
 debian/patches/0001-raop-sink-channels.patch       | 20 -----------
 debian/patches/series                              |  2 +-
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1c91e6..71e7039 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (5.0-13) UNRELEASED; urgency=medium
+
+  * Replace raop channels patch with proper fix from upstream.
+
+ -- Felipe Sateler <fsateler at debian.org>  Sat, 11 Oct 2014 01:24:16 -0300
+
 pulseaudio (5.0-12) experimental; urgency=medium
 
   * Import patch from upstream fixing float endianness swap.
diff --git a/debian/patches/0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch b/debian/patches/0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
new file mode 100644
index 0000000..a58b2e3
--- /dev/null
+++ b/debian/patches/0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
@@ -0,0 +1,41 @@
+From b1c4e7bf6bae405999d3247c332a71be6b130496 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
+Date: Tue, 19 Aug 2014 14:08:34 +0300
+Subject: [PATCH] raop: Don't use incompatible default sample spec parameters
+
+Since the RAOP sink supports only some formats and channel counts, we
+shouldn't blindly use pa_core.default_sample_spec. This patch changes
+things so that we default to PA_SAMPLE_S16NE and 2 channels, and only
+take the sample rate from pa_core.default_sample_spec.
+---
+ src/modules/raop/module-raop-sink.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c
+index 2d08645..13036d9 100644
+--- a/src/modules/raop/module-raop-sink.c
++++ b/src/modules/raop/module-raop-sink.c
+@@ -518,15 +518,17 @@ int pa__init(pa_module*m) {
+         goto fail;
+     }
+ 
+-    ss = m->core->default_sample_spec;
++    ss.format = PA_SAMPLE_S16NE;
++    ss.channels = 2;
++    ss.rate = m->core->default_sample_spec.rate;
+     if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
+         pa_log("invalid sample format specification");
+         goto fail;
+     }
+ 
+-    if ((/*ss.format != PA_SAMPLE_U8 &&*/ ss.format != PA_SAMPLE_S16NE) ||
++    if ((ss.format != PA_SAMPLE_S16NE) ||
+         (ss.channels > 2)) {
+-        pa_log("sample type support is limited to mono/stereo and U8 or S16NE sample data");
++        pa_log("sample type support is limited to mono/stereo and S16NE sample data");
+         goto fail;
+     }
+ 
+-- 
+2.1.0
+
diff --git a/debian/patches/0001-raop-sink-channels.patch b/debian/patches/0001-raop-sink-channels.patch
deleted file mode 100644
index f82665e..0000000
--- a/debian/patches/0001-raop-sink-channels.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/modules/raop/module-raop-discover.c b/src/modules/raop/module-raop-discover.c
-index 4ebe5fc..74dde96 100644
---- a/src/modules/raop/module-raop-discover.c
-+++ b/src/modules/raop/module-raop-discover.c
-@@ -190,6 +190,7 @@ static void resolver_cb(
- 
-         if (nicename) {
-             args = pa_sprintf_malloc("server=[%s]:%u "
-+                                     "channels=2 "
-                                      "sink_name=%s "
-                                      "sink_properties='device.description=\"%s\"'",
-                                      avahi_address_snprint(at, sizeof(at), a), port,
-@@ -198,6 +199,7 @@ static void resolver_cb(
-             pa_xfree(nicename);
-         } else {
-             args = pa_sprintf_malloc("server=[%s]:%u "
-+                                     "channels=2 "
-                                      "sink_name=%s",
-                                      avahi_address_snprint(at, sizeof(at), a), port,
-                                      vname);
diff --git a/debian/patches/series b/debian/patches/series
index ef00e37..97b3013 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-raop-sink-channels.patch
+0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
 0003-exit-with-X-session.patch
 0004-dont-start-when-already-running.patch

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