[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.13-1-4-g0cd5670
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Nov 16 17:43:09 UTC 2008
The branch, master has been updated
via 0cd56708cc929c0317ec2474b3a1fde582cc537e (commit)
from c802f7bea980db3f20a1518a6777358e1ff51a94 (commit)
- Shortlog ------------------------------------------------------------
0cd5670 Cherry-pick various patches from upstream git
Summary of changes:
debian/changelog | 8 +++-
...o-use-64bit-rounding-even-on-32bit-machin.patch | 40 ++++++++++++++++++++
...move-dbus-matches-an-filters-when-unloadi.patch | 38 +++++++++++++++++++
.../0005-Fix-two-typos-that-broke-tunnels.patch | 32 ++++++++++++++++
debian/patches/series | 3 +
5 files changed, 120 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 0cd56708cc929c0317ec2474b3a1fde582cc537e
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Nov 16 17:43:05 2008 +0000
Cherry-pick various patches from upstream git
* 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
- Fix rounding errors on 32 bit machines. From upstream git
* 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
- Properly remove dbus filters when unloading the bluetooth module
* 0005-Fix-two-typos-that-broke-tunnels.patch
- Fix tunnels. From upstream git
diff --git a/debian/changelog b/debian/changelog
index d424468..ec7cddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
pulseaudio (0.9.13-2) UNRELEASED; urgency=low
* Rename libpulsecore5 to libpulsecore8 to correctly reflect the soname
-
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 16 Nov 2008 15:01:26 +0000
+ * 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
+ - Fix rounding errors on 32 bit machines. From upstream git
+ * 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
+ - Properly remove dbus filters when unloading the bluetooth module
+ * 0005-Fix-two-typos-that-broke-tunnels.patch
+ - Fix tunnels. From upstream git
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 16 Nov 2008 17:37:24 +0000
pulseaudio (0.9.13-1) experimental; urgency=low
diff --git a/debian/patches/0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch b/debian/patches/0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
new file mode 100644
index 0000000..d7e178e
--- /dev/null
+++ b/debian/patches/0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
@@ -0,0 +1,40 @@
+From b47ce0f5c3a5c23c674b46e5608b88a67e70da73 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Fri, 24 Oct 2008 04:34:10 +0200
+Subject: [PATCH] make sure to use 64bit rounding even on 32bit machines when converting to pa_usec_t
+
+---
+ src/pulsecore/time-smoother.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/pulsecore/time-smoother.c b/src/pulsecore/time-smoother.c
+index 6a2ffaa..6562194 100644
+--- a/src/pulsecore/time-smoother.c
++++ b/src/pulsecore/time-smoother.c
+@@ -313,7 +313,7 @@ static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
+ /* Move back from origin */
+ ty += (double) s->ey;
+
+- *y = ty >= 0 ? (pa_usec_t) lrint(ty) : 0;
++ *y = ty >= 0 ? (pa_usec_t) llrint(ty) : 0;
+
+ /* Horner scheme */
+ if (deriv)
+@@ -360,7 +360,7 @@ void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
+
+ /* And calculate when we want to be on track again */
+ s->px = s->ex + s->adjust_time;
+- s->py = s->ry + (pa_usec_t) lrint(s->dp * (double) s->adjust_time);
++ s->py = s->ry + (pa_usec_t) llrint(s->dp * (double) s->adjust_time);
+
+ s->abc_valid = FALSE;
+
+@@ -456,7 +456,7 @@ pa_usec_t pa_smoother_translate(pa_smoother *s, pa_usec_t x, pa_usec_t y_delay)
+
+ /* pa_log_debug("translate(%llu) = %llu (%0.2f)", (unsigned long long) y_delay, (unsigned long long) ((double) y_delay / nde), nde); */
+
+- return (pa_usec_t) lrint((double) y_delay / nde);
++ return (pa_usec_t) llrint((double) y_delay / nde);
+ }
+
+ void pa_smoother_reset(pa_smoother *s) {
diff --git a/debian/patches/0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch b/debian/patches/0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
new file mode 100644
index 0000000..716508d
--- /dev/null
+++ b/debian/patches/0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
@@ -0,0 +1,38 @@
+From 3ab1e82495c8aca71b99d36d5ef41af395c78330 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Mon, 13 Oct 2008 19:52:02 +0200
+Subject: [PATCH] properly remove dbus matches an filters when unloading m-b-d
+
+---
+ src/modules/bluetooth/module-bluetooth-discover.c | 17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
+index 0601e9a..9d14c1a 100644
+--- a/src/modules/bluetooth/module-bluetooth-discover.c
++++ b/src/modules/bluetooth/module-bluetooth-discover.c
+@@ -452,8 +452,23 @@ void pa__done(pa_module* m) {
+ device_free(i);
+ }
+
+- if (u->conn)
++ if (u->conn) {
++ DBusError error;
++ dbus_error_init(&error);
++
++ dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Adapter',member='DeviceRemoved'", &error);
++ dbus_error_free(&error);
++
++ dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='PropertyChanged'", &error);
++ dbus_error_free(&error);
++
++ dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='PropertyChanged'", &error);
++ dbus_error_free(&error);
++
++ dbus_connection_remove_filter(pa_dbus_connection_get(u->conn), filter_cb, u);
++
+ pa_dbus_connection_unref(u->conn);
++ }
+
+ pa_xfree(u);
+ }
diff --git a/debian/patches/0005-Fix-two-typos-that-broke-tunnels.patch b/debian/patches/0005-Fix-two-typos-that-broke-tunnels.patch
new file mode 100644
index 0000000..df02c0d
--- /dev/null
+++ b/debian/patches/0005-Fix-two-typos-that-broke-tunnels.patch
@@ -0,0 +1,32 @@
+From 94958bb7c690f7bc4c3dd2a2b87ffa567929e9da Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <pulse at colin.guthr.ie>
+Date: Sat, 11 Oct 2008 18:20:06 +0100
+Subject: [PATCH] Fix two typos that broke tunnels
+
+Signed-off-by: Lennart Poettering <lennart at poettering.net>
+---
+ src/modules/module-tunnel.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
+index 4bbb11a..a46d6e5 100644
+--- a/src/modules/module-tunnel.c
++++ b/src/modules/module-tunnel.c
+@@ -508,7 +508,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
+
+ switch (code) {
+
+- case PA_SINK_MESSAGE_SET_STATE: {
++ case PA_SOURCE_MESSAGE_SET_STATE: {
+ int r;
+
+ if ((r = pa_source_process_msg(o, code, data, offset, chunk)) >= 0)
+@@ -520,7 +520,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
+ case PA_SOURCE_MESSAGE_GET_LATENCY: {
+ pa_usec_t yr, yl, *usec = data;
+
+- yl = pa_bytes_to_usec((uint64_t) u->counter, &PA_SINK(o)->sample_spec);
++ yl = pa_bytes_to_usec((uint64_t) u->counter, &PA_SOURCE(o)->sample_spec);
+ yr = pa_smoother_get(u->smoother, pa_rtclock_usec());
+
+ *usec = yr > yl ? yr - yl : 0;
diff --git a/debian/patches/series b/debian/patches/series
index e247c39..4ace9ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
0002-load-module-gconf-earlier.patch
+0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
+0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
+0005-Fix-two-typos-that-broke-tunnels.patch
--
pulseaudio packaging
More information about the Pkg-pulseaudio-devel
mailing list