[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.17-1-4-g1571a0a

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Sep 27 11:59:17 UTC 2009


The branch, master has been updated
       via  1571a0a8371d565169480cba38461559dd77d3c0 (commit)
      from  b8f5b1e610297c122280b08613b0f503153784b4 (commit)


- Shortlog ------------------------------------------------------------
1571a0a sync patches from the 0.9.18-stable branch

Summary of changes:
 debian/changelog                                   |   12 +++-
 ...x-parsing-of-sink-info-from-newer-servers.patch |   47 ++++++++++++++
 ...parsing-of-source-info-from-newer-servers.patch |   65 ++++++++++++++++++++
 ...003-svolume-tweak-constraints-for-32-bits.patch |   57 +++++++++++++++++
 debian/patches/series                              |    3 +
 5 files changed, 183 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 1571a0a8371d565169480cba38461559dd77d3c0
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Sep 27 13:59:08 2009 +0200

    sync patches from the 0.9.18-stable branch
    
    * d/p/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch
      + Added. Fix parsing of the sink info when using module-tunnel
        From the upstream 0.9.18-stable branch
    * d/p/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch
      + Added. Fix parsing of the source info when using module-tunnel
        From the upstream 0.9.18-stable branch
    * d/p/0003-svolume-tweak-constraints-for-32-bits.patch
      + Added. Fixes gcc and the inline assembly using the same register.
        From the upstream 0.9.18-stable branch

diff --git a/debian/changelog b/debian/changelog
index 8adf903..d4375c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
 pulseaudio (0.9.18-1) UNRELEASED; urgency=low
 
   * New upstream release
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 27 Sep 2009 13:46:08 +0200
+  * d/p/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch
+    + Added. Fix parsing of the sink info when using module-tunnel
+      From the upstream 0.9.18-stable branch
+  * d/p/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch
+    + Added. Fix parsing of the source info when using module-tunnel
+      From the upstream 0.9.18-stable branch
+  * d/p/0003-svolume-tweak-constraints-for-32-bits.patch
+    + Added. Fixes gcc and the inline assembly using the same register.
+      From the upstream 0.9.18-stable branch
+
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 27 Sep 2009 13:50:40 +0200
 
 pulseaudio (0.9.17-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch b/debian/patches/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch
new file mode 100644
index 0000000..4c09c60
--- /dev/null
+++ b/debian/patches/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch
@@ -0,0 +1,47 @@
+From 4fa100209a73ebd4799095fbd54a8769ab149f6b Mon Sep 17 00:00:00 2001
+From: Emil Renner Berthing <esmil at mailme.dk>
+Date: Sun, 20 Sep 2009 21:28:23 +0200
+Subject: [PATCH 1/3] tunnel: fix parsing of sink info from newer servers
+
+---
+ src/modules/module-tunnel.c |   27 +++++++++++++++++++++++++++
+ 1 files changed, 27 insertions(+), 0 deletions(-)
+
+diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
+index af4b8b2..1740448 100644
+--- a/src/modules/module-tunnel.c
++++ b/src/modules/module-tunnel.c
+@@ -1069,6 +1069,33 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command,  uint32_t tag, pa_t
+         }
+     }
+ 
++    if (u->version >= 16) {
++        uint32_t n_ports, j;
++        const char *s;
++
++        if (pa_tagstruct_getu32(t, &n_ports)) {
++            pa_log("Parse failure");
++            goto fail;
++        }
++
++        for (j = 0; j < n_ports; j++) {
++            uint32_t priority;
++
++            if (pa_tagstruct_gets(t, &s) < 0 || /* name */
++                pa_tagstruct_gets(t, &s) < 0 || /* description */
++                pa_tagstruct_getu32(t, &priority) < 0) {
++
++                pa_log("Parse failure");
++                goto fail;
++            }
++        }
++
++        if (pa_tagstruct_gets(t, &s) < 0) { /* active port */
++            pa_log("Parse failure");
++            goto fail;
++        }
++    }
++
+     if (!pa_tagstruct_eof(t)) {
+         pa_log("Packet too long");
+         goto fail;
diff --git a/debian/patches/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch b/debian/patches/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch
new file mode 100644
index 0000000..a2cb3a4
--- /dev/null
+++ b/debian/patches/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch
@@ -0,0 +1,65 @@
+From f61ccd599856d527a281101686b6359f273f491f Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <cguthrie at mandriva.org>
+Date: Sun, 20 Sep 2009 21:36:14 +0100
+Subject: [PATCH 2/3] tunnel: fix parsing of source info from newer servers
+
+---
+ src/modules/module-tunnel.c |   31 +++++++++++++++++++++++++++++--
+ 1 files changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
+index 1740448..c97de3a 100644
+--- a/src/modules/module-tunnel.c
++++ b/src/modules/module-tunnel.c
+@@ -1070,7 +1070,7 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command,  uint32_t tag, pa_t
+     }
+ 
+     if (u->version >= 16) {
+-        uint32_t n_ports, j;
++        uint32_t n_ports;
+         const char *s;
+ 
+         if (pa_tagstruct_getu32(t, &n_ports)) {
+@@ -1078,7 +1078,7 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command,  uint32_t tag, pa_t
+             goto fail;
+         }
+ 
+-        for (j = 0; j < n_ports; j++) {
++        for (uint32_t j = 0; j < n_ports; j++) {
+             uint32_t priority;
+ 
+             if (pa_tagstruct_gets(t, &s) < 0 || /* name */
+@@ -1272,6 +1272,33 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command,  uint32_t tag, pa
+         }
+     }
+ 
++    if (u->version >= 16) {
++        uint32_t n_ports;
++        const char *s;
++
++        if (pa_tagstruct_getu32(t, &n_ports)) {
++            pa_log("Parse failure");
++            goto fail;
++        }
++
++        for (uint32_t j = 0; j < n_ports; j++) {
++            uint32_t priority;
++
++            if (pa_tagstruct_gets(t, &s) < 0 || /* name */
++                pa_tagstruct_gets(t, &s) < 0 || /* description */
++                pa_tagstruct_getu32(t, &priority) < 0) {
++
++                pa_log("Parse failure");
++                goto fail;
++            }
++        }
++
++        if (pa_tagstruct_gets(t, &s) < 0) { /* active port */
++            pa_log("Parse failure");
++            goto fail;
++        }
++    }
++
+     if (!pa_tagstruct_eof(t)) {
+         pa_log("Packet too long");
+         goto fail;
diff --git a/debian/patches/0003-svolume-tweak-constraints-for-32-bits.patch b/debian/patches/0003-svolume-tweak-constraints-for-32-bits.patch
new file mode 100644
index 0000000..2f0a767
--- /dev/null
+++ b/debian/patches/0003-svolume-tweak-constraints-for-32-bits.patch
@@ -0,0 +1,57 @@
+From a449061ed1b4282c9e8899079bf8da59129fc9ab Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wim.taymans at collabora.co.uk>
+Date: Wed, 23 Sep 2009 17:16:04 +0200
+Subject: [PATCH 3/3] svolume: tweak constraints for 32 bits
+
+Tweak the constraints a little so that register starved 32bit systems
+can select a stack variable for the channel paramter instead of reusing one of
+the registers we're using in the code.
+---
+ src/pulsecore/svolume_mmx.c |    4 ++--
+ src/pulsecore/svolume_sse.c |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c
+index 62f3397..1768eb5 100644
+--- a/src/pulsecore/svolume_mmx.c
++++ b/src/pulsecore/svolume_mmx.c
+@@ -152,7 +152,7 @@ pa_volume_s16ne_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
+         " emms                          \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
+-        : "r" ((pa_reg_x86)channels)
++        : "X" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
+@@ -228,7 +228,7 @@ pa_volume_s16re_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
+         " emms                          \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
+-        : "r" ((pa_reg_x86)channels)
++        : "X" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
+diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
+index 5276bda..ab9394f 100644
+--- a/src/pulsecore/svolume_sse.c
++++ b/src/pulsecore/svolume_sse.c
+@@ -149,7 +149,7 @@ pa_volume_s16ne_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
+         "8:                             \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
+-        : "r" ((pa_reg_x86)channels)
++        : "X" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
+@@ -237,7 +237,7 @@ pa_volume_s16re_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
+         "8:                             \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
+-        : "r" ((pa_reg_x86)channels)
++        : "X" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..cf12532 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch
+0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch
+0003-svolume-tweak-constraints-for-32-bits.patch

-- 
pulseaudio packaging



More information about the Pkg-pulseaudio-devel mailing list