[SCM] pulseaudio packaging branch, master, updated. debian/3.0-1-11-g07daecf
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Jun 16 15:05:33 UTC 2013
The branch, master has been updated
via 07daecfb4704b647a97d4bdaf3fc94c7824e3412 (commit)
via 069e4523970fb2adc03da7fa7c331584a6e67349 (commit)
via 25e5e6ec3e88c5c4d314ad4c251e4a05eb747728 (commit)
via d439dd1ab67f89fc94d062b6c31325185c002b0d (commit)
via 21cc1095d4472bd9439a9d3ee84ec26d9a68f1c6 (commit)
via 35ad5c1f857aae84c0b2430140cb128353c52be3 (commit)
via ba9d7f82d47124f32ae35a2aa7d0d1a1ee8f800f (commit)
via 6351bdc1693e4b3c6c4ae54c3cbd9d84595bb08a (commit)
via 11c3ca48285c083f5bb52fa2a8e897ce677d74db (commit)
from 8a16bd9a0ea99cf6c37917c8fdbaa6edd6a5df8a (commit)
- Shortlog ------------------------------------------------------------
07daecf Change < to << in debian/control
069e452 debian/libpulse0.symbols: Update
25e5e6e No longer uses deprecated udev symbols (Closes: #705520)
d439dd1 debian/control: Update build-depends
21cc109 Update patchset
35ad5c1 New upstream release (4.0)
ba9d7f8 Merge tag 'upstream/4.0'
11c3ca4 Acknowledge 2.0-6.1 NMU (Closes: #705435)
Summary of changes:
.gitignore | 1 +
.tarball-version | 2 +-
.version | 2 +-
Makefile.am | 13 +-
Makefile.in | 103 +-
NEWS | 55 ++
PROTOCOL | 9 +
README | 2 +-
aclocal.m4 | 249 +++--
config.h.in | 3 -
configure | 473 ++++++---
configure.ac | 58 +-
debian/changelog | 25 +-
debian/control | 12 +-
debian/libpulse0.symbols | 4 +-
...-Switch-the-default-resample-quality-to-1.patch | 84 --
...se-the-fixed-point-speex-resampler-on-ARM.patch | 23 +-
...Fix-the-analog-output-speaker-always-path.patch | 41 -
.../0004-man-Update-log-target-documentation.patch | 62 --
...-enable-BlueZ-if-libbluetooth-is-not-foun.patch | 30 -
...nge_cb-only-when-there-s-an-actual-change.patch | 57 --
...monitor-s-busy-status-to-false-if-we-own-.patch | 150 ---
.../kfreebsd_no_lock_and_threads_synchro.patch | 28 +
debian/patches/series | 7 +-
doxygen/Makefile.in | 5 +-
doxygen/doxygen.conf.in | 32 +-
man/Makefile.in | 5 +-
man/default.pa.5 | 2 +-
man/default.pa.5.xml.in | 2 +-
man/esdcompat.1 | 2 +-
man/esdcompat.1.xml.in | 2 +-
man/pacat.1 | 2 +-
man/pacat.1.xml.in | 2 +-
man/pactl.1 | 14 +-
man/pactl.1.xml.in | 18 +-
man/pulse-cli-syntax.5 | 13 +-
man/pulse-cli-syntax.5.xml.in | 22 +-
man/pulse-daemon.conf.5 | 10 +-
man/pulse-daemon.conf.5.xml.in | 25 +-
man/pulseaudio.1 | 22 +-
man/pulseaudio.1.xml.in | 36 +-
po/hu.po | 2 +-
po/pl.po | 975 ++++++++++++-------
po/uk.po | 977 +++++++++++--------
shell-completion/pulseaudio-bash-completion.sh | 564 +++++++++++
shell-completion/pulseaudio-zsh-completion.zsh | 534 ++++++++++
src/.gitignore | 3 +
src/Makefile.am | 76 +-
src/Makefile.in | 1005 +++++++++++--------
src/daemon/caps.c | 27 +-
src/daemon/caps.h | 2 +
src/daemon/cmdline.c | 37 +-
src/daemon/cpulimit.c | 2 +-
src/daemon/daemon-conf.c | 2 +-
src/daemon/default.pa.in | 7 +-
src/daemon/ltdl-bind-now.c | 1 +
src/daemon/main.c | 4 +-
src/map-file | 2 +-
src/module-remap-source-symdef.h | 29 +
src/module-role-ducking-symdef.h | 29 +
src/modules/alsa/alsa-mixer.c | 111 +--
src/modules/alsa/alsa-mixer.h | 3 +-
src/modules/alsa/alsa-sink.c | 79 +-
src/modules/alsa/alsa-source.c | 22 +-
src/modules/alsa/alsa-ucm.c | 19 +-
src/modules/alsa/alsa-util.c | 68 ++
src/modules/alsa/alsa-util.h | 8 +
.../alsa/mixer/paths/analog-input-dock-mic.conf | 5 +
.../alsa/mixer/paths/analog-input-front-mic.conf | 5 +
.../alsa/mixer/paths/analog-input-headset-mic.conf | 112 +++
.../alsa/mixer/paths/analog-input-linein.conf | 5 +
src/modules/alsa/mixer/paths/analog-input-mic.conf | 5 +
.../alsa/mixer/paths/analog-input-rear-mic.conf | 5 +
src/modules/alsa/mixer/paths/analog-input.conf | 1 -
.../alsa/mixer/paths/analog-output-headphones.conf | 18 +-
.../mixer/paths/analog-output-speaker-always.conf | 5 +-
src/modules/alsa/mixer/paths/analog-output.conf | 8 +
.../alsa/mixer/paths/analog-output.conf.common | 2 +
src/modules/alsa/mixer/paths/hdmi-output-0.conf | 1 +
src/modules/alsa/mixer/paths/hdmi-output-1.conf | 1 +
src/modules/alsa/mixer/paths/hdmi-output-2.conf | 1 +
src/modules/alsa/mixer/paths/hdmi-output-3.conf | 1 +
.../alsa/mixer/profile-sets/90-pulseaudio.rules | 1 +
src/modules/alsa/mixer/profile-sets/default.conf | 6 +-
.../alsa/mixer/profile-sets/extra-hdmi.conf | 6 +-
src/modules/alsa/module-alsa-card.c | 112 ++-
src/modules/bluetooth/bluetooth-util.c | 793 +++++++++------
src/modules/bluetooth/bluetooth-util.h | 100 +-
src/modules/bluetooth/module-bluetooth-device.c | 1028 ++++++++------------
src/modules/bluetooth/module-bluetooth-discover.c | 22 +-
src/modules/bluetooth/module-bluetooth-policy.c | 112 +--
src/modules/bluetooth/module-bluetooth-proximity.c | 32 +-
src/modules/dbus/iface-card.c | 48 +-
src/modules/dbus/iface-core.c | 68 +-
src/modules/dbus/iface-device.c | 33 +-
src/modules/dbus/module-dbus-protocol.c | 10 +-
src/modules/echo-cancel/adrian-aec.c | 32 +-
src/modules/echo-cancel/adrian-aec.h | 3 +-
src/modules/echo-cancel/adrian.c | 45 +-
src/modules/echo-cancel/adrian.h | 1 +
src/modules/echo-cancel/echo-cancel.h | 55 +-
src/modules/echo-cancel/module-echo-cancel.c | 286 +++---
src/modules/echo-cancel/null.c | 26 +-
src/modules/echo-cancel/speex.c | 56 +-
src/modules/echo-cancel/webrtc.cc | 28 +-
src/modules/gconf/module-gconf.c | 37 +-
src/modules/jack/module-jackdbus-detect.c | 18 +-
src/modules/macosx/module-bonjour-publish.c | 2 +-
src/modules/macosx/module-coreaudio-device.c | 33 +-
src/modules/module-augment-properties.c | 10 +-
src/modules/module-card-restore.c | 206 ++--
src/modules/module-combine-sink.c | 20 +-
src/modules/module-console-kit.c | 22 +-
src/modules/module-device-manager.c | 14 +-
src/modules/module-device-restore.c | 10 +-
src/modules/module-equalizer-sink.c | 66 +-
src/modules/module-filter-apply.c | 12 +-
src/modules/module-ladspa-sink.c | 47 +-
src/modules/module-loopback.c | 55 +-
src/modules/module-position-event-sounds.c | 4 +-
src/modules/module-remap-sink.c | 11 -
src/modules/module-remap-source.c | 435 +++++++++
src/modules/module-role-cork.c | 18 +-
src/modules/module-role-ducking.c | 318 ++++++
src/modules/module-rygel-media-server.c | 10 +
src/modules/module-solaris.c | 7 +-
src/modules/module-stream-restore.c | 14 +-
src/modules/module-suspend-on-idle.c | 12 +-
src/modules/module-switch-on-port-available.c | 87 +-
src/modules/module-systemd-login.c | 20 +-
src/modules/module-udev-detect.c | 84 +-
src/modules/module-virtual-sink.c | 13 -
src/modules/module-virtual-source.c | 32 +-
src/modules/module-virtual-surround-sink.c | 11 -
src/modules/module-zeroconf-discover.c | 2 +-
src/modules/module-zeroconf-publish.c | 18 +-
src/modules/oss/module-oss.c | 26 +-
src/modules/raop/module-raop-discover.c | 2 +-
src/modules/reserve-monitor.c | 43 +-
src/modules/reserve.c | 73 ++
src/modules/reserve.h | 9 +
src/modules/rtp/headerlist.c | 7 +-
src/modules/rtp/module-rtp-recv.c | 17 +-
src/modules/rtp/module-rtp-send.c | 97 +-
src/modules/rtp/rtp.c | 2 +-
src/pulse/channelmap.h | 8 +-
src/pulse/context.c | 4 +-
src/pulse/def.h | 31 +-
src/pulse/format.c | 5 +-
src/pulse/format.h | 24 +
src/pulse/internal.h | 4 +-
src/pulse/mainloop-signal.c | 3 +-
src/pulse/mainloop.c | 24 +-
src/pulse/operation.c | 23 +-
src/pulse/operation.h | 11 +
src/pulse/proplist.c | 7 +-
src/pulse/proplist.h | 114 +--
src/pulse/sample.h | 9 +-
src/pulse/simple.c | 7 +-
src/pulse/stream.c | 26 +-
src/pulse/version.h | 6 +-
src/pulse/volume.h | 4 +-
src/pulsecore/card.c | 83 +-
src/pulsecore/card.h | 13 +-
src/pulsecore/cli-command.c | 22 +-
src/pulsecore/cli-text.c | 13 +-
src/pulsecore/client.c | 4 +-
src/pulsecore/core-scache.c | 5 +-
src/pulsecore/core-util.c | 22 +-
src/pulsecore/core-util.h | 18 +-
src/pulsecore/core.c | 22 +-
src/pulsecore/core.h | 5 +-
src/pulsecore/cpu-arm.c | 4 +-
src/pulsecore/cpu-arm.h | 1 +
src/pulsecore/database-simple.c | 7 +-
src/pulsecore/device-port.c | 54 +-
src/pulsecore/device-port.h | 8 +-
src/pulsecore/hashmap.c | 25 +-
src/pulsecore/hashmap.h | 7 +-
src/pulsecore/idxset.c | 25 +-
src/pulsecore/idxset.h | 10 +-
src/pulsecore/memblock.c | 4 +-
src/pulsecore/memblockq.c | 21 +-
src/pulsecore/memblockq.h | 2 +-
src/pulsecore/mix.c | 725 ++++++++++++++
src/pulsecore/mix.h | 64 ++
src/pulsecore/mix_neon.c | 94 ++
src/pulsecore/modargs.c | 28 +-
src/pulsecore/modargs.h | 4 +
src/pulsecore/module.c | 31 +-
src/pulsecore/mutex-win32.c | 2 +-
src/pulsecore/protocol-cli.c | 2 +-
src/pulsecore/protocol-dbus.c | 68 +-
src/pulsecore/protocol-esound.c | 15 +-
src/pulsecore/protocol-http.c | 2 +-
src/pulsecore/protocol-native.c | 112 ++-
src/pulsecore/protocol-simple.c | 2 +-
src/pulsecore/pstream.c | 43 +-
src/pulsecore/remap.c | 3 +-
src/pulsecore/remap_mmx.c | 3 +-
src/pulsecore/remap_sse.c | 5 +-
src/pulsecore/resampler.c | 596 +++++-------
src/pulsecore/sample-util.c | 645 ------------
src/pulsecore/sample-util.h | 48 +-
src/pulsecore/sconv-s16le.c | 84 +-
src/pulsecore/sconv_neon.c | 25 +-
src/pulsecore/sconv_sse.c | 69 +-
src/pulsecore/semaphore-osx.c | 54 +-
src/pulsecore/shm.c | 16 +-
src/pulsecore/sink-input.c | 224 ++++-
src/pulsecore/sink-input.h | 36 +-
src/pulsecore/sink.c | 95 +-
src/pulsecore/sink.h | 2 +
src/pulsecore/sndfile-util.c | 22 +-
src/pulsecore/socket-server.c | 4 +-
src/pulsecore/sound-file-stream.c | 1 +
src/pulsecore/source-output.c | 28 +-
src/pulsecore/source.c | 48 +-
src/pulsecore/svolume_c.c | 42 +-
src/tests/alsa-mixer-path-test.c | 111 +++
src/tests/alsa-time-test.c | 24 +-
src/tests/cpu-test.c | 471 ++++++++-
src/tests/mix-special-test.c | 354 +++++++
src/tests/mix-test.c | 1 +
src/tests/mult-s16-test.c | 145 +++
src/tests/resampler-test.c | 2 +-
src/tests/smoother-test.c | 3 +-
src/tests/volume-test.c | 1 +
src/utils/pacat.c | 39 +-
src/utils/pacmd.c | 2 +-
src/utils/pactl.c | 180 +++-
src/utils/padsp.c | 15 +-
src/utils/pasuspender.c | 6 +-
src/utils/qpaeq | 22 +-
234 files changed, 10852 insertions(+), 5748 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 07daecfb4704b647a97d4bdaf3fc94c7824e3412
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jun 16 17:05:04 2013 +0200
Change < to << in debian/control
diff --git a/debian/control b/debian/control
index 02cdc3b..06c74bd 100644
--- a/debian/control
+++ b/debian/control
@@ -411,8 +411,8 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: pulseaudio-utils (< 3.0)
-Replaces: pulseaudio-utils (< 3.0)
+Conflicts: pulseaudio-utils (<< 3.0)
+Replaces: pulseaudio-utils (<< 3.0)
Description: PulseAudio OSS pre-load library
PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
WIN32 systems. It is a drop in replacement for the ESD sound server with
commit 069e4523970fb2adc03da7fa7c331584a6e67349
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sat Jun 15 12:38:21 2013 +0200
debian/libpulse0.symbols: Update
diff --git a/debian/changelog b/debian/changelog
index 68c12c2..aa898ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ pulseaudio (4.0-1) UNRELEASED; urgency=low
+ d/p/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
- Refresh remaining patches
* debian/control: Update build-depends
+ * debian/libpulse0.symbols: Update
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 12:21:53 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 12:38:09 +0200
pulseaudio (3.0-1) experimental; urgency=low
diff --git a/debian/libpulse0.symbols b/debian/libpulse0.symbols
index a1e1793..e6be713 100644
--- a/debian/libpulse0.symbols
+++ b/debian/libpulse0.symbols
@@ -98,6 +98,7 @@ libpulse.so.0 libpulse0 #MINVER#
pa_context_set_default_source at PULSE_0 0.99.1
pa_context_set_event_callback at PULSE_0 0.99.1
pa_context_set_name at PULSE_0 0.99.1
+ pa_context_set_port_latency_offset at PULSE_0 4.0
pa_context_set_sink_input_mute at PULSE_0 0.99.1
pa_context_set_sink_input_volume at PULSE_0 0.99.1
pa_context_set_sink_mute_by_index at PULSE_0 0.99.1
@@ -173,7 +174,6 @@ libpulse.so.0 libpulse0 #MINVER#
pa_ext_stream_restore_test at PULSE_0 0.99.1
pa_ext_stream_restore_write at PULSE_0 0.99.1
pa_format_info_copy at PULSE_0 0.99.4
- pa_format_info_free2 at PULSE_0 0.99.4
pa_format_info_free at PULSE_0 0.99.4
pa_format_info_free_string_array at PULSE_0 2.0
pa_format_info_from_sample_spec at PULSE_0 0.99.4
@@ -225,6 +225,7 @@ libpulse.so.0 libpulse0 #MINVER#
pa_operation_cancel at PULSE_0 0.99.1
pa_operation_get_state at PULSE_0 0.99.1
pa_operation_ref at PULSE_0 0.99.1
+ pa_operation_set_state_callback at PULSE_0 4.0
pa_operation_unref at PULSE_0 0.99.1
pa_parse_sample_format at PULSE_0 0.99.1
pa_path_get_filename at PULSE_0 0.99.1
@@ -238,6 +239,7 @@ libpulse.so.0 libpulse0 #MINVER#
pa_proplist_gets at PULSE_0 0.99.1
pa_proplist_isempty at PULSE_0 0.99.1
pa_proplist_iterate at PULSE_0 0.99.1
+ pa_proplist_key_valid at PULSE_0 4.0
pa_proplist_new at PULSE_0 0.99.1
pa_proplist_set at PULSE_0 0.99.1
pa_proplist_setf at PULSE_0 0.99.1
commit 25e5e6ec3e88c5c4d314ad4c251e4a05eb747728
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sat Jun 15 12:23:10 2013 +0200
No longer uses deprecated udev symbols (Closes: #705520)
diff --git a/debian/changelog b/debian/changelog
index 29a280c..68c12c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ pulseaudio (4.0-1) UNRELEASED; urgency=low
synchronisation on kFreeBSD. This fixes the opening of Gnome 3
sessions on these architectures.
* New upstream release (4.0)
+ - No longer uses deprecated udev symbols (Closes: #705520)
- Various bugfixes breaking audio playbacks since 3.0 (Closes: #701591)
- Drop patches applied upstream:
+ d/p/0001-Switch-the-default-resample-quality-to-1.patch
commit d439dd1ab67f89fc94d062b6c31325185c002b0d
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sat Jun 15 12:23:04 2013 +0200
debian/control: Update build-depends
diff --git a/debian/changelog b/debian/changelog
index 64c26cf..29a280c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,9 @@ pulseaudio (4.0-1) UNRELEASED; urgency=low
+ d/p/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
+ d/p/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
- Refresh remaining patches
+ * debian/control: Update build-depends
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 12:15:52 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 12:21:53 +0200
pulseaudio (3.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 56fa88b..02cdc3b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,19 +8,20 @@ Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
dh-autoreconf,
intltool,
- libasound2-dev (>= 1.0.19) [linux-any],
+ libasound2-dev (>= 1.0.24) [linux-any],
libasyncns-dev,
libatomic-ops-dev,
libavahi-client-dev,
- libbluetooth-dev (>= 4.40) [linux-any],
+ libbluetooth-dev (>= 4.99) [linux-any],
libcap-dev [linux-any],
libfftw3-dev,
libgconf2-dev,
libglib2.0-dev,
- libgtk2.0-dev,
+ libgtk-3-dev,
libice-dev,
libjack-dev (>= 0.117.0),
libjson0-dev,
+ libjson-c-dev (>= 0.11),
liblircclient-dev,
libltdl-dev (>= 2.2.6a-2),
liborc-0.4-dev (>= 1:0.4.11),
@@ -29,7 +30,6 @@ Build-Depends: debhelper (>= 8.1.3),
libsndfile1-dev (>= 1.0.20),
libspeexdsp-dev (>= 1.2~rc1),
libssl-dev,
- libsystemd-daemon-dev [linux-any],
libsystemd-login-dev [linux-any],
libtdb-dev,
libudev-dev (>= 143) [linux-any],
commit 21cc1095d4472bd9439a9d3ee84ec26d9a68f1c6
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sat Jun 15 12:17:37 2013 +0200
Update patchset
- Drop patches applied upstream:
+ d/p/0001-Switch-the-default-resample-quality-to-1.patch
+ d/p/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+ d/p/0004-man-Update-log-target-documentation.patch
+ d/p/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
+ d/p/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
+ d/p/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
- Refresh remaining patches
diff --git a/debian/changelog b/debian/changelog
index 6af5925..64c26cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,16 @@ pulseaudio (4.0-1) UNRELEASED; urgency=low
sessions on these architectures.
* New upstream release (4.0)
- Various bugfixes breaking audio playbacks since 3.0 (Closes: #701591)
-
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 11:57:11 +0200
+ - Drop patches applied upstream:
+ + d/p/0001-Switch-the-default-resample-quality-to-1.patch
+ + d/p/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+ + d/p/0004-man-Update-log-target-documentation.patch
+ + d/p/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
+ + d/p/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
+ + d/p/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
+ - Refresh remaining patches
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 12:15:52 +0200
pulseaudio (3.0-1) experimental; urgency=low
diff --git a/debian/patches/0001-Switch-the-default-resample-quality-to-1.patch b/debian/patches/0001-Switch-the-default-resample-quality-to-1.patch
deleted file mode 100644
index 2e00421..0000000
--- a/debian/patches/0001-Switch-the-default-resample-quality-to-1.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 32382f01bb65cc81acb835b79ef6f64935bc9524 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 25 Nov 2012 21:10:00 +0100
-Subject: [PATCH 1/2] Switch the default resample quality to 1
-
-Swithc the standard quality level of the speex resampler down a notch
-from -3 to -1 to lower cpu usage by the resampler. This has been
-dicussed for a while, without real oposition and has been the default in
-at least Ubuntu for a while.
----
- man/pulse-daemon.conf.5.xml.in | 2 +-
- src/daemon/daemon.conf.in | 2 +-
- src/pulsecore/core.c | 2 +-
- src/pulsecore/resampler.c | 6 +++---
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index c270d2b..43257a6 100644
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -100,7 +100,7 @@ USA.
- desktop CPUs the float point resampler is a lot faster, and it
- also offers slightly better quality. See the output of
- <opt>dump-resample-methods</opt> for a complete list of all
-- available resamplers. Defaults to <opt>speex-float-3</opt>. The
-+ available resamplers. Defaults to <opt>speex-float-1</opt>. The
- <opt>--resample-method</opt> command line option takes precedence.
- Note that some modules overwrite or allow overwriting of the
- resampler to use.</p>
-diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
-index dff97ae..2089058 100644
---- a/src/daemon/daemon.conf.in
-+++ b/src/daemon/daemon.conf.in
-@@ -54,7 +54,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
- ; log-time = no
- ; log-backtrace = 0
-
--; resample-method = speex-float-3
-+; resample-method = speex-float-1
- ; enable-remixing = yes
- ; enable-lfe-remixing = no
-
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index e4f9140..a9f1b7d 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -141,7 +141,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t shared, size_t shm_size) {
- c->disable_remixing = FALSE;
- c->disable_lfe_remixing = FALSE;
- c->deferred_volume = TRUE;
-- c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
-+ c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
-
- for (j = 0; j < PA_CORE_HOOK_MAX; j++)
- pa_hook_init(&c->hooks[j], c);
-diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
-index a13e700..5f8e9bd 100644
---- a/src/pulsecore/resampler.c
-+++ b/src/pulsecore/resampler.c
-@@ -235,7 +235,7 @@ pa_resampler* pa_resampler_new(
-
- if (method == PA_RESAMPLER_AUTO) {
- #ifdef HAVE_SPEEX
-- method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
-+ method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
- #else
- if (flags & PA_RESAMPLER_VARIABLE_RATE)
- method = PA_RESAMPLER_TRIVIAL;
-@@ -552,10 +552,10 @@ pa_resample_method_t pa_parse_resample_method(const char *string) {
- return m;
-
- if (pa_streq(string, "speex-fixed"))
-- return PA_RESAMPLER_SPEEX_FIXED_BASE + 3;
-+ return PA_RESAMPLER_SPEEX_FIXED_BASE + 1;
-
- if (pa_streq(string, "speex-float"))
-- return PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
-+ return PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
-
- return PA_RESAMPLER_INVALID;
- }
---
-1.7.10.4
-
diff --git a/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch b/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
index a41875e..fc8164f 100644
--- a/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
+++ b/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
@@ -15,11 +15,9 @@ it's of equal performance on some machines, but slower on others.
src/pulsecore/resampler.c | 4 ++++
4 files changed, 12 insertions(+)
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index 43257a6..3eccd77 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -101,6 +101,8 @@ USA.
+@@ -101,6 +101,8 @@
also offers slightly better quality. See the output of
<opt>dump-resample-methods</opt> for a complete list of all
available resamplers. Defaults to <opt>speex-float-1</opt>. The
@@ -28,24 +26,22 @@ index 43257a6..3eccd77 100644
<opt>--resample-method</opt> command line option takes precedence.
Note that some modules overwrite or allow overwriting of the
resampler to use.</p>
-diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
-index 2089058..7c43cee 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
-@@ -54,6 +54,8 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+@@ -54,7 +54,9 @@
; log-time = no
; log-backtrace = 0
+-; resample-method = speex-float-3
+# resample-method defaults to speex-float-1 on most architectures,
+# speex-fixed-1 on ARM
- ; resample-method = speex-float-1
++; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index a9f1b7d..38f0d9b 100644
+
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
-@@ -141,7 +141,11 @@ pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t shared, size_t shm_size) {
+@@ -141,7 +141,11 @@
c->disable_remixing = FALSE;
c->disable_lfe_remixing = FALSE;
c->deferred_volume = TRUE;
@@ -57,11 +53,9 @@ index a9f1b7d..38f0d9b 100644
for (j = 0; j < PA_CORE_HOOK_MAX; j++)
pa_hook_init(&c->hooks[j], c);
-diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
-index 5f8e9bd..30817cb 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
-@@ -235,7 +235,11 @@ pa_resampler* pa_resampler_new(
+@@ -236,7 +236,11 @@
if (method == PA_RESAMPLER_AUTO) {
#ifdef HAVE_SPEEX
@@ -73,6 +67,3 @@ index 5f8e9bd..30817cb 100644
#else
if (flags & PA_RESAMPLER_VARIABLE_RATE)
method = PA_RESAMPLER_TRIVIAL;
---
-1.7.10.4
-
diff --git a/debian/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch b/debian/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
deleted file mode 100644
index ad797e3..0000000
--- a/debian/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 299e32b767ac60ddbaa747cd03c09b780e364637 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson at canonical.com>
-Date: Wed, 19 Dec 2012 11:24:33 +0100
-Subject: [PATCH 3/7] alsa-mixer: Fix the analog-output-speaker-always path
-
-A left over "required-any" made this path useless for most people.
-While we're at it, also add "Front Headphone" like for the normal
-speaker path.
-
-Tested-by: Colin Guthrie <gmane at colin.guthr.ie>
-Signed-off-by: David Henningsson <david.henningsson at canonical.com>
----
- src/modules/alsa/mixer/paths/analog-output-speaker-always.conf | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
-index 3ebdc4a..8a2b3df 100644
---- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
-+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
-@@ -30,6 +30,10 @@ device.icon_name = audio-speakers
- state.plugged = no
- state.unplugged = unknown
-
-+[Jack Front Headphone]
-+state.plugged = no
-+state.unplugged = unknown
-+
- [Element Hardware Master]
- switch = mute
- volume = merge
-@@ -132,7 +136,6 @@ switch = mute
- volume = merge
- override-map.1 = lfe
- override-map.2 = lfe,lfe
--required-any = any
-
- [Element CLFE]
- switch = mute
---
-1.7.10.4
-
diff --git a/debian/patches/0004-man-Update-log-target-documentation.patch b/debian/patches/0004-man-Update-log-target-documentation.patch
deleted file mode 100644
index 719a630..0000000
--- a/debian/patches/0004-man-Update-log-target-documentation.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e5155b4f505dbc39c54944e369237202f0b42bf6 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk at iki.fi>
-Date: Mon, 17 Dec 2012 07:46:04 +0200
-Subject: [PATCH 4/7] man: Update log-target documentation.
-
----
- man/pulse-daemon.conf.5.xml.in | 15 +++++++++------
- man/pulseaudio.1.xml.in | 7 +++++--
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
-index c270d2b..744e94e 100644
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -297,12 +297,15 @@ USA.
-
- <option>
- <p><opt>log-target=</opt> The default log target. Use either
-- <opt>stderr</opt>, <opt>syslog</opt> or <opt>auto</opt>. The
-- latter is equivalent to <opt>sylog</opt> in case
-- <opt>daemonize</opt> is enabled, otherwise to
-- <opt>stderr</opt>. Defaults to <opt>auto</opt>. The
-- <opt>--log-target</opt> command line option takes
-- precedence.</p>
-+ <opt>stderr</opt>, <opt>syslog</opt>, <opt>auto</opt>,
-+ <opt>file:PATH</opt> or <opt>newfile:PATH</opt>. <opt>auto</opt> is
-+ equivalent to <opt>sylog</opt> in case <opt>daemonize</opt> is enabled,
-+ otherwise to <opt>stderr</opt>. If set to <opt>file:PATH</opt>, logging
-+ is directed to the file indicated by PATH. <opt>newfile:PATH</opt> is
-+ otherwise the same as <opt>file:PATH</opt>, but existing files are never
-+ overwritten. If the specified file already exists, a suffix is added to
-+ the file name to avoid overwriting. Defaults to <opt>auto</opt>. The
-+ <opt>--log-target</opt> command line option takes precedence.</p>
- </option>
-
- <option>
-diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
-index c556bda..12f05e8 100644
---- a/man/pulseaudio.1.xml.in
-+++ b/man/pulseaudio.1.xml.in
-@@ -217,13 +217,16 @@ USA.
- </option>
-
- <option>
-- <p><opt>--log-target</opt><arg>={auto,syslog,stderr,file:PATH}</arg></p>
-+ <p><opt>--log-target</opt><arg>={auto,syslog,stderr,file:PATH,newfile:PATH}</arg></p>
-
- <optdesc><p>Specify the log target. If set to <arg>auto</arg>
- (which is the default), then logging is directed to syslog when
- <opt>--daemonize</opt> is passed, otherwise to
- STDERR. If set to <arg>file:PATH</arg>, logging is directed to
-- the file indicated by PATH.</p></optdesc>
-+ the file indicated by PATH. <arg>newfile:PATH</arg> is otherwise
-+ the same as file:PATH, but existing files are never overwritten.
-+ If the specified file already exists, a suffix is added to the
-+ file name to avoid overwriting.</p></optdesc>
- </option>
-
- <option>
---
-1.7.10.4
-
diff --git a/debian/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch b/debian/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
deleted file mode 100644
index becec72..0000000
--- a/debian/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3ffa0bc62afd8dbfa1d1cd5cef2177a96c461343 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk at iki.fi>
-Date: Sat, 22 Sep 2012 18:16:24 +0300
-Subject: [PATCH 5/7] build: Don't enable BlueZ if libbluetooth is not found.
-
-Previously, if libsbc was available but libbluetooth was not, BlueZ
-would get incorrectly enabled.
----
- configure.ac | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3199d85..d11af11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1007,8 +1007,9 @@ AS_IF([test "x$enable_bluez" != "xno"],
- [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.99 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
- HAVE_BLUEZ=0)
- AS_IF([test "x$enable_bluez" != "xno"],
-- [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
-- HAVE_BLUEZ=0)
-+ [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_SBC=1, HAVE_SBC=0)],
-+ HAVE_SBC=0)
-+AS_IF([test "x$HAVE_SBC" != "x1"], HAVE_BLUEZ=0)
- AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)
-
- AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
---
-1.7.10.4
-
diff --git a/debian/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch b/debian/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
deleted file mode 100644
index 8445879..0000000
--- a/debian/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e02e290d7cccd0cfbc89bacf5c0be7934ee58ece Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk at iki.fi>
-Date: Wed, 16 Jan 2013 03:36:03 +0200
-Subject: [PATCH 6/7] Call change_cb() only when there's an actual change.
-
-Calling change_cb() whenever anything happens in the ownership of the
-bus name caused trouble in PulseAudio in this scenario:
-
-1. PulseAudio is using a device and owns the corresponding service
- name.
-2. Another application requests device release.
-3. PulseAudio releases the device.
-4. Change in the bus name ownership: PulseAudio gives up the
- ownership, and nobody owns the name.
-5. reserve-monitor notices that, and notifies PulseAudio.
-6. Since reserve-monitor reports the device as "not busy", PulseAudio
- decides to reserve the bus name immediately back to itself and
- opens the device again.
-
-The other application will forcibly take the bus name to itself, as
-it should according to the protocol, but the other application may
-have trouble opening the device if it tries to do that before
-PulseAudio has had time to react to the NameLost signal.
-
-This can be solved by not calling change_cb() if there are no changes
-in the device busy status. In this scenario the device is considered
-"not busy" while PulseAudio is owning the bus name, so PulseAudio gets
-no notification when the ownership changes from PulseAudio to nobody.
----
- src/modules/reserve-monitor.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/reserve-monitor.c b/src/modules/reserve-monitor.c
-index ab453e6..4097a6f 100644
---- a/src/modules/reserve-monitor.c
-+++ b/src/modules/reserve-monitor.c
-@@ -85,6 +85,8 @@ static DBusHandlerResult filter_handler(
- goto invalid;
-
- if (strcmp(name, m->service_name) == 0) {
-+ unsigned old_busy = m->busy;
-+
- m->busy = !!(new && *new);
-
- /* If we ourselves own the device, then don't consider this 'busy' */
-@@ -96,7 +98,7 @@ static DBusHandlerResult filter_handler(
- m->busy = FALSE;
- }
-
-- if (m->change_cb) {
-+ if (m->busy != old_busy && m->change_cb) {
- m->ref++;
- m->change_cb(m);
- rm_release(m);
---
-1.7.10.4
-
diff --git a/debian/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch b/debian/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
deleted file mode 100644
index a68d0ec..0000000
--- a/debian/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From b1691402bebfafba9c8055814493f55553f177c1 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk at iki.fi>
-Date: Wed, 16 Jan 2013 03:36:04 +0200
-Subject: [PATCH 7/7] Initialize monitor's busy status to false if we own the
- device.
-
-Bug found by David Henningsson.
----
- src/modules/reserve-monitor.c | 96 ++++++++++++++++++++++++++++++++++-------
- 1 file changed, 80 insertions(+), 16 deletions(-)
-
-diff --git a/src/modules/reserve-monitor.c b/src/modules/reserve-monitor.c
-index 4097a6f..4aa4a2b 100644
---- a/src/modules/reserve-monitor.c
-+++ b/src/modules/reserve-monitor.c
-@@ -59,6 +59,23 @@ struct rm_monitor {
- "member='NameOwnerChanged'," \
- "arg0='%s'"
-
-+static unsigned get_busy(
-+ DBusConnection *c,
-+ const char *name_owner) {
-+
-+ const char *un;
-+
-+ if (!name_owner || !*name_owner)
-+ return FALSE;
-+
-+ /* If we ourselves own the device, then don't consider this 'busy' */
-+ if ((un = dbus_bus_get_unique_name(c)))
-+ if (strcmp(name_owner, un) == 0)
-+ return FALSE;
-+
-+ return TRUE;
-+}
-+
- static DBusHandlerResult filter_handler(
- DBusConnection *c,
- DBusMessage *s,
-@@ -87,16 +104,7 @@ static DBusHandlerResult filter_handler(
- if (strcmp(name, m->service_name) == 0) {
- unsigned old_busy = m->busy;
-
-- m->busy = !!(new && *new);
--
-- /* If we ourselves own the device, then don't consider this 'busy' */
-- if (m->busy) {
-- const char *un;
--
-- if ((un = dbus_bus_get_unique_name(c)))
-- if (strcmp(new, un) == 0)
-- m->busy = FALSE;
-- }
-+ m->busy = get_busy(c, new);
-
- if (m->busy != old_busy && m->change_cb) {
- m->ref++;
-@@ -112,14 +120,71 @@ invalid:
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- }
-
-+static int get_name_owner(
-+ DBusConnection *connection,
-+ const char *name,
-+ char **name_owner,
-+ DBusError *error) {
-+
-+ DBusMessage *msg, *reply;
-+ int r;
-+
-+ *name_owner = NULL;
-+
-+ if (!(msg = dbus_message_new_method_call(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "GetNameOwner"))) {
-+ r = -ENOMEM;
-+ goto fail;
-+ }
-+
-+ if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) {
-+ r = -ENOMEM;
-+ goto fail;
-+ }
-+
-+ reply = dbus_connection_send_with_reply_and_block(connection, msg, DBUS_TIMEOUT_USE_DEFAULT, error);
-+ dbus_message_unref(msg);
-+ msg = NULL;
-+
-+ if (reply) {
-+ if (!dbus_message_get_args(reply, error, DBUS_TYPE_STRING, name_owner, DBUS_TYPE_INVALID)) {
-+ dbus_message_unref(reply);
-+ r = -EIO;
-+ goto fail;
-+ }
-+
-+ *name_owner = strdup(*name_owner);
-+ dbus_message_unref(reply);
-+
-+ if (!*name_owner) {
-+ r = -ENOMEM;
-+ goto fail;
-+ }
-+
-+ } else if (dbus_error_has_name(error, "org.freedesktop.DBus.Error.NameHasNoOwner"))
-+ dbus_error_free(error);
-+ else {
-+ r = -EIO;
-+ goto fail;
-+ }
-+
-+ return 0;
-+
-+fail:
-+ if (msg)
-+ dbus_message_unref(msg);
-+
-+ return r;
-+}
-+
- int rm_watch(
- rm_monitor **_m,
- DBusConnection *connection,
-- const char*device_name,
-+ const char *device_name,
- rm_change_cb_t change_cb,
- DBusError *error) {
-
- rm_monitor *m = NULL;
-+ char *name_owner;
- int r;
- DBusError _error;
-
-@@ -178,12 +243,11 @@ int rm_watch(
-
- m->matching = 1;
-
-- m->busy = dbus_bus_name_has_owner(m->connection, m->service_name, error);
--
-- if (dbus_error_is_set(error)) {
-- r = -EIO;
-+ if ((r = get_name_owner(m->connection, m->service_name, &name_owner, error)) < 0)
- goto fail;
-- }
-+
-+ m->busy = get_busy(m->connection, name_owner);
-+ free(name_owner);
-
- *_m = m;
- return 0;
---
-1.7.10.4
-
diff --git a/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch b/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
index ab631a0..ac3ba48 100644
--- a/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
+++ b/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
@@ -5,11 +5,9 @@ Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Author: Steven Chamberlain <steven at pyro.eu.org>
Last-Update: 2013-04-24
-Index: pulseaudio-2.0/src/daemon/main.c
-===================================================================
---- pulseaudio-2.0.orig/src/daemon/main.c 2012-05-13 14:26:37.000000000 +0100
-+++ pulseaudio-2.0/src/daemon/main.c 2013-04-16 00:25:32.164872810 +0100
-@@ -735,6 +735,10 @@
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -737,6 +737,10 @@
* first take the autospawn lock to make things
* synchronous. */
@@ -20,7 +18,7 @@ Index: pulseaudio-2.0/src/daemon/main.c
if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
pa_log("Failed to initialize autospawn lock");
goto finish;
-@@ -746,6 +750,7 @@
+@@ -748,6 +752,7 @@
}
autospawn_locked = TRUE;
diff --git a/debian/patches/series b/debian/patches/series
index a1e7f0a..86cb37e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
-0001-Switch-the-default-resample-quality-to-1.patch
0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
-0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
-0004-man-Update-log-target-documentation.patch
-0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
-0006-Call-change_cb-only-when-there-s-an-actual-change.patch
-0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
-debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
+kfreebsd_no_lock_and_threads_synchro.patch
commit 35ad5c1f857aae84c0b2430140cb128353c52be3
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sat Jun 15 11:59:12 2013 +0200
New upstream release (4.0)
* New upstream release (4.0)
- Various bugfixes breaking audio playbacks since 3.0 (Closes: #701591)
diff --git a/debian/changelog b/debian/changelog
index 62aa171..6af5925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (3.0-2) UNRELEASED; urgency=low
+pulseaudio (4.0-1) UNRELEASED; urgency=low
[ Luke Yelavich ]
* Pulseaudio should depend on the binary version of libpulse0
@@ -10,8 +10,10 @@ pulseaudio (3.0-2) UNRELEASED; urgency=low
Import patch from FreeBSD to disable threads locking and
synchronisation on kFreeBSD. This fixes the opening of Gnome 3
sessions on these architectures.
+ * New upstream release (4.0)
+ - Various bugfixes breaking audio playbacks since 3.0 (Closes: #701591)
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 11:46:03 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 11:57:11 +0200
pulseaudio (3.0-1) experimental; urgency=low
commit ba9d7f82d47124f32ae35a2aa7d0d1a1ee8f800f
Merge: 11c3ca48285c083f5bb52fa2a8e897ce677d74db 6351bdc1693e4b3c6c4ae54c3cbd9d84595bb08a
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sat Jun 15 11:57:09 2013 +0200
Merge tag 'upstream/4.0'
Upstream version 4.0
commit 11c3ca48285c083f5bb52fa2a8e897ce677d74db
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sat Jun 15 11:47:53 2013 +0200
Acknowledge 2.0-6.1 NMU (Closes: #705435)
* Acknowledge 2.0-6.1 NMU (Closes: #705435)
- debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
Import patch from FreeBSD to disable threads locking and
synchronisation on kFreeBSD. This fixes the opening of Gnome 3
sessions on these architectures.
diff --git a/debian/changelog b/debian/changelog
index f44fde7..62aa171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
pulseaudio (3.0-2) UNRELEASED; urgency=low
+ [ Luke Yelavich ]
* Pulseaudio should depend on the binary version of libpulse0
(Closes: #700693)
- -- Luke Yelavich <themuso at ubuntu.com> Mon, 18 Feb 2013 09:56:02 +0000
+ [ Sjoerd Simons ]
+ * Acknowledge 2.0-6.1 NMU (Closes: #705435)
+ - debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
+ Import patch from FreeBSD to disable threads locking and
+ synchronisation on kFreeBSD. This fixes the opening of Gnome 3
+ sessions on these architectures.
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 15 Jun 2013 11:46:03 +0200
pulseaudio (3.0-1) experimental; urgency=low
diff --git a/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch b/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
new file mode 100644
index 0000000..ab631a0
--- /dev/null
+++ b/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
@@ -0,0 +1,30 @@
+Description: Don't try to lock and synchronise threads on kFreeBSD.
+Bug-Debian: http://bugs.debian.org/705435
+Origin: http://svnweb.freebsd.org/ports/head/audio/pulseaudio/files/patch-src_daemon_main.c?revision=231972&view=markup&pathrev=231972
+Author: Joe Marcus Clarke <marcus at FreeBSD.org>
+Author: Steven Chamberlain <steven at pyro.eu.org>
+Last-Update: 2013-04-24
+
+Index: pulseaudio-2.0/src/daemon/main.c
+===================================================================
+--- pulseaudio-2.0.orig/src/daemon/main.c 2012-05-13 14:26:37.000000000 +0100
++++ pulseaudio-2.0/src/daemon/main.c 2013-04-16 00:25:32.164872810 +0100
+@@ -735,6 +735,10 @@
+ * first take the autospawn lock to make things
+ * synchronous. */
+
++ /* This locking and thread synchronisation code doesn't work reliably
++ * on kFreeBSD (Debian bug #705435), or in upstream FreeBSD ports
++ * (bug reference: ports/128947, patched in SVN r231972). */
++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+ if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
+ pa_log("Failed to initialize autospawn lock");
+ goto finish;
+@@ -746,6 +750,7 @@
+ }
+
+ autospawn_locked = TRUE;
++#endif
+ }
+
+ if (conf->daemonize) {
diff --git a/debian/patches/series b/debian/patches/series
index 7f55c29..a1e7f0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
0006-Call-change_cb-only-when-there-s-an-actual-change.patch
0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
+debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
--
pulseaudio packaging
More information about the pkg-pulseaudio-devel
mailing list