[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.8-1-2-gb2abd64

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Fri Jan 4 11:39:12 UTC 2008


The branch, master has been updated
       via  b2abd64aa12c6013fcd2596f53e94f280f4ff58e (commit)
       via  578ab4b741d27a9354bf717ed481ecc9fca1d286 (commit)
      from  b278a4e6cfbd6d3224fb74a045a000ddeab8b666 (commit)


- Shortlog ------------------------------------------------------------
b2abd64 * debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
578ab4b * Bump shlibs of libpulse and libpulse-browse. Upstream has started

Summary of changes:
 debian/changelog                                   |   18 +++++
 debian/libpulse-browse0.shlibs                     |    1 +
 debian/libpulse0.shlibs                            |    2 +-
 ...-module-tunnel-to-use-protocol-version-11.patch |   25 ------
 ...-to-create-.pulse-before-using-any-config.patch |   31 ++++++++
 ...rotocol-fields-introduced-in-version-12-w.patch |   53 +++++++++++++
 ...-to-create-.pulse-before-using-any-config.patch |   31 --------
 ...opcodes-added-in-version-12-in-the-tunnel.patch |   81 ++++++++++++++++++++
 debian/patches/series                              |    5 +-
 9 files changed, 188 insertions(+), 59 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit b2abd64aa12c6013fcd2596f53e94f280f4ff58e
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Fri Jan 4 12:38:48 2008 +0100

    * debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
      - Added. Don't send fields/opcodes adding in protocol version 12 to
        clients using version 11.
    * debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
      - Added. Add dummy implementations of the opcodes added in protocol
      version 12.
    * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch
      - Removed. Obsoleted by the two previous patches
    * debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch
      - Renamed to 0004-make-sure-to-create-.pulse-before-using-any-config.patch
    * debian/patches/

diff --git a/debian/changelog b/debian/changelog
index 3cacacc..ee1e03c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,17 @@ pulseaudio (0.9.8-2) UNRELEASED; urgency=low
 
   * Bump shlibs of libpulse and libpulse-browse. Upstream has started
     versioning symbols.
+  * debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
+    - Added. Don't send fields/opcodes adding in protocol version 12 to
+      clients using version 11.
+  * debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
+    - Added. Add dummy implementations of the opcodes added in protocol
+    version 12.
+  * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch
+    - Removed. Obsoleted by the two previous patches
+  * debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch
+    - Renamed to 0004-make-sure-to-create-.pulse-before-using-any-config.patch
+  * debian/patches/
 
  -- Sjoerd Simons <sjoerd at debian.org>  Fri, 04 Jan 2008 12:13:08 +0100
 
diff --git a/debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch b/debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch
deleted file mode 100644
index f0b54af..0000000
--- a/debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d91b6d26e698ad63761faf722850ad0cec52d4e4 Mon Sep 17 00:00:00 2001
-From: CJ van den Berg <cj at vdbonline.com>
-Date: Wed, 28 Nov 2007 22:26:14 +0100
-Subject: [PATCH] Force module-tunnel to use protocol version 11
-
-PulseAudio 0.9.8 uses protocol version 12, but module-tunnel does not
-support the new opcodes in version 12 yet. This should prevent
-module-tunnel reporting "protocol error" and unloading.
----
- src/modules/module-tunnel.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
-index 43a10ce..5ff0416 100644
---- a/src/modules/module-tunnel.c
-+++ b/src/modules/module-tunnel.c
-@@ -1145,7 +1145,7 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata
-     t = pa_tagstruct_new(NULL, 0);
-     pa_tagstruct_putu32(t, PA_COMMAND_AUTH);
-     pa_tagstruct_putu32(t, tag = u->ctag++);
--    pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION);
-+    pa_tagstruct_putu32(t, 11);
-     pa_tagstruct_put_arbitrary(t, u->auth_cookie, sizeof(u->auth_cookie));
- 
- #ifdef HAVE_CREDS
diff --git a/debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch b/debian/patches/0004-make-sure-to-create-.pulse-before-using-any-config.patch
similarity index 95%
rename from debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch
rename to debian/patches/0004-make-sure-to-create-.pulse-before-using-any-config.patch
index c6f63cf..e8854cd 100644
--- a/debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch
+++ b/debian/patches/0004-make-sure-to-create-.pulse-before-using-any-config.patch
@@ -1,4 +1,4 @@
-From dcff2dd5a7b6ae0c0a4aa0944fdad9501eeb84d3 Mon Sep 17 00:00:00 2001
+From 6a46aba92e3bf840c5fb9640ae0488e94c019322 Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart at poettering.net>
 Date: Sat, 24 Nov 2007 16:22:23 +0000
 Subject: [PATCH] make sure to create ~/.pulse before using any configuration file from it
diff --git a/debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch b/debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
new file mode 100644
index 0000000..0d76e3e
--- /dev/null
+++ b/debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
@@ -0,0 +1,53 @@
+From 1e0a2e94f26b3ebbfabf2874e62160f9928e8274 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Fri, 4 Jan 2008 12:15:35 +0100
+Subject: [PATCH] Don't add protocol fields introduced in version 12 when connecting to a server with a lower version
+
+---
+ src/pulsecore/protocol-native.c |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
+index cfa4bad..55a84bd 100644
+--- a/src/pulsecore/protocol-native.c
++++ b/src/pulsecore/protocol-native.c
+@@ -1069,6 +1069,9 @@ static void sink_input_suspend_cb(pa_sink_input *i, pa_bool_t suspend) {
+     s = PLAYBACK_STREAM(i->userdata);
+     playback_stream_assert_ref(s);
+ 
++    if (s->connection->version < 12)
++      return;
++
+     t = pa_tagstruct_new(NULL, 0);
+     pa_tagstruct_putu32(t, PA_COMMAND_PLAYBACK_STREAM_SUSPENDED);
+     pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
+@@ -1086,6 +1089,9 @@ static void sink_input_moved_cb(pa_sink_input *i) {
+     s = PLAYBACK_STREAM(i->userdata);
+     playback_stream_assert_ref(s);
+ 
++    if (s->connection->version < 12)
++      return;
++
+     t = pa_tagstruct_new(NULL, 0);
+     pa_tagstruct_putu32(t, PA_COMMAND_PLAYBACK_STREAM_MOVED);
+     pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
+@@ -1142,6 +1148,9 @@ static void source_output_suspend_cb(pa_source_output *o, pa_bool_t suspend) {
+     s = RECORD_STREAM(o->userdata);
+     record_stream_assert_ref(s);
+ 
++    if (s->connection->version < 12)
++      return;
++
+     t = pa_tagstruct_new(NULL, 0);
+     pa_tagstruct_putu32(t, PA_COMMAND_RECORD_STREAM_SUSPENDED);
+     pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
+@@ -1159,6 +1168,9 @@ static void source_output_moved_cb(pa_source_output *o) {
+     s = RECORD_STREAM(o->userdata);
+     record_stream_assert_ref(s);
+ 
++    if (s->connection->version < 12)
++      return;
++
+     t = pa_tagstruct_new(NULL, 0);
+     pa_tagstruct_putu32(t, PA_COMMAND_RECORD_STREAM_MOVED);
+     pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
diff --git a/debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch b/debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
new file mode 100644
index 0000000..9e8a9c8
--- /dev/null
+++ b/debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
@@ -0,0 +1,81 @@
+From c383cf489cdcb0d6c6e3cf6b5c22df74f0945148 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Fri, 4 Jan 2008 12:21:49 +0100
+Subject: [PATCH] Implement opcodes added in version 12 in the tunnel moduel
+
+---
+ src/modules/module-tunnel.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 40 insertions(+), 0 deletions(-)
+
+diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
+index 43a10ce..c7cbed3 100644
+--- a/src/modules/module-tunnel.c
++++ b/src/modules/module-tunnel.c
+@@ -129,6 +129,8 @@ static void command_subscribe_event(pa_pdispatch *pd, uint32_t command, uint32_t
+ static void command_stream_killed(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+ static void command_overflow(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+ static void command_underflow(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
++static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
++static void command_moved(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+ 
+ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
+ #ifdef TUNNEL_SINK
+@@ -139,6 +141,10 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
+     [PA_COMMAND_UNDERFLOW] = command_underflow,
+     [PA_COMMAND_PLAYBACK_STREAM_KILLED] = command_stream_killed,
+     [PA_COMMAND_RECORD_STREAM_KILLED] = command_stream_killed,
++    [PA_COMMAND_PLAYBACK_STREAM_SUSPENDED] = command_suspend,
++    [PA_COMMAND_RECORD_STREAM_SUSPENDED] = command_suspend,
++    [PA_COMMAND_PLAYBACK_STREAM_MOVED] = command_moved,
++    [PA_COMMAND_RECORD_STREAM_MOVED] = command_moved,
+ };
+ 
+ struct userdata {
+@@ -226,6 +232,28 @@ static void command_underflow(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command,
+     pa_log_warn("Server signalled buffer underrun.");
+ }
+ 
++static void command_suspend(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
++    struct userdata *u = userdata;
++
++    pa_assert(pd);
++    pa_assert(t);
++    pa_assert(u);
++    pa_assert(u->pdispatch == pd);
++
++    pa_log_debug("Server reports a stream suspension.");
++}
++
++static void command_moved(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
++    struct userdata *u = userdata;
++
++    pa_assert(pd);
++    pa_assert(t);
++    pa_assert(u);
++    pa_assert(u->pdispatch == pd);
++
++    pa_log_debug("Server reports a stream move.");
++}
++
+ static void stream_cork(struct userdata *u, pa_bool_t cork) {
+     pa_tagstruct *t;
+     pa_assert(u);
+@@ -1058,6 +1086,18 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t
+     pa_tagstruct_putu32(reply, u->fragsize);
+ #endif
+ 
++    /* New flags added in 0.9.8 */
++    if (u->version >= 12) {
++        /* TODO: set these to useful values */
++        pa_tagstruct_put_boolean(reply, FALSE); /*no_remap*/
++        pa_tagstruct_put_boolean(reply, FALSE); /*no_remix*/
++        pa_tagstruct_put_boolean(reply, FALSE); /*fix_format*/
++        pa_tagstruct_put_boolean(reply, FALSE); /*fix_rate*/
++        pa_tagstruct_put_boolean(reply, FALSE); /*fix_channels*/
++        pa_tagstruct_put_boolean(reply, FALSE); /*no_move*/
++        pa_tagstruct_put_boolean(reply, FALSE); /*variable_rate*/
++    }
++
+     pa_pstream_send_tagstruct(u->pstream, reply);
+     pa_pdispatch_register_reply(u->pdispatch, tag, DEFAULT_TIMEOUT, create_stream_callback, u, NULL);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 996c821..4079a68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 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
-0004-Force-module-tunnel-to-use-protocol-version-11.patch
-0005-make-sure-to-create-.pulse-before-using-any-config.patch
+0004-make-sure-to-create-.pulse-before-using-any-config.patch
+0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
+0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch

commit 578ab4b741d27a9354bf717ed481ecc9fca1d286
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Fri Jan 4 12:13:52 2008 +0100

    * Bump shlibs of libpulse and libpulse-browse. Upstream has started
      versioning symbols.

diff --git a/debian/changelog b/debian/changelog
index 03a009f..3cacacc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (0.9.8-2) UNRELEASED; urgency=low
+
+  * Bump shlibs of libpulse and libpulse-browse. Upstream has started
+    versioning symbols.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 04 Jan 2008 12:13:08 +0100
+
 pulseaudio (0.9.8-1) unstable; urgency=low
 
   [ CJ van den Berg ]
diff --git a/debian/libpulse-browse0.shlibs b/debian/libpulse-browse0.shlibs
new file mode 100644
index 0000000..a6b6ad8
--- /dev/null
+++ b/debian/libpulse-browse0.shlibs
@@ -0,0 +1 @@
+libpulse-browse 0 libpulse-browse0 (>= 0.9.8)
diff --git a/debian/libpulse0.shlibs b/debian/libpulse0.shlibs
index 45fb55a..02e7d42 100644
--- a/debian/libpulse0.shlibs
+++ b/debian/libpulse0.shlibs
@@ -1,2 +1,2 @@
-libpulse 0 libpulse0 (>= 0.9.7)
+libpulse 0 libpulse0 (>= 0.9.8)
 libpulse-simple 0 libpulse0

-- 
pulseaudio packaging



More information about the Pkg-pulseaudio-devel mailing list