[SCM] pulseaudio packaging branch, master, updated. debian/1.1-3-8-gd8a56ae
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun May 13 15:08:22 UTC 2012
The branch, master has been updated
via d8a56aefa21f0006365fce0a1b39155f61ae67d1 (commit)
via b1a1eb079d2c502cf89ad193ea35d8a7d842ea5d (commit)
via 7280abf89aaad71f82d3935f05fdc40171f244b5 (commit)
via 1463a9f1686ba5b213dafff56bd2a77a39f61631 (commit)
via c005348077256a7ec516c09683feb62aa6855bdc (commit)
via 50be6b94119035709ad4f624cb2a3d2842865b6a (commit)
via 37c676e57cd346588f9ee0940b50f04603b6d889 (commit)
via 4e9660e4a387a752a81172c074016d8d9e98cbb7 (commit)
from 5e253a22b47b7f91c72abb45da8ff69dc5963ef0 (commit)
- Shortlog ------------------------------------------------------------
d8a56ae Target unstable
b1a1eb0 debian/pulse-alsa.conf: Fix name hint definition (Closes: 671471).
7280abf pulseaudio: Build module-systemd-login on linux
1463a9f pulseaudio: Add new modules and manpage
c005348 New upstream release (2.0)
50be6b9 Merge tag 'upstream/2.0'
4e9660e NMU for hurd changes
Summary of changes:
.tarball-version | 2 +-
.version | 2 +-
ABOUT-NLS | 1282 --
ChangeLog | 2 +
LICENSE | 20 +-
Makefile.in | 174 +-
README | 5 +-
aclocal.m4 | 1474 ++-
compile | 232 +-
config.guess | 494 +-
config.h.in | 23 +-
config.rpath | 672 -
config.sub | 249 +-
configure |21112 ++++++++++++--------
configure.ac | 148 +-
debian/changelog | 19 +
debian/control | 3 +-
debian/libpulse0.symbols | 8 +-
.../0001-Move-libpulsecommon-into-pkglib.patch | 33 -
...e-padsp-helper-lib-into-a-private-library.patch | 232 -
.../0003-Force-order-of-library-installation.patch | 53 -
debian/patches/series | 3 -
debian/pulse-alsa.conf | 18 +-
debian/pulseaudio.install | 6 +-
debian/pulseaudio.manpages | 2 +
debian/rules | 8 +-
debian/shlibs.local | 2 +-
depcomp | 190 +-
doxygen/Makefile.in | 75 +-
install-sh | 29 +-
ltmain.sh | 119 +-
m4/iconv.m4 | 214 -
m4/intltool.m4 | 71 +-
m4/lib-ld.m4 | 110 -
m4/lib-link.m4 | 774 -
m4/lib-prefix.m4 | 224 -
m4/libtool.m4 | 310 +-
m4/ltoptions.m4 | 19 +-
m4/ltversion.m4 | 10 +-
m4/nls.m4 | 32 -
man/Makefile.am | 3 +
man/Makefile.in | 133 +-
man/default.pa.5 | 8 +-
man/default.pa.5.xml.in | 9 +-
man/esdcompat.1 | 2 +-
man/pacat.1 | 2 +-
man/pacmd.1 | 8 +-
man/pacmd.1.xml.in | 11 +-
man/pactl.1 | 6 +-
man/pactl.1.xml.in | 7 +-
man/padsp.1 | 2 +-
man/paplay.1 | 2 +-
man/pasuspender.1 | 2 +-
man/pax11publish.1 | 4 +-
man/pulse-cli-syntax.5 | 162 +
man/pulse-cli-syntax.5.xml.in | 335 +
man/pulse-client.conf.5 | 6 +-
man/pulse-daemon.conf.5 | 14 +-
man/pulse-daemon.conf.5.xml.in | 28 +-
man/pulseaudio.1 | 24 +-
man/pulseaudio.1.xml.in | 31 +-
man/start-pulseaudio-kde.1 | 2 +-
man/start-pulseaudio-x11.1 | 2 +-
missing | 53 +-
po/ChangeLog | 476 -
po/Makefile.in.in | 13 +-
po/POTFILES.in | 1 +
po/as.po | 1343 +-
po/bn_IN.po | 1357 +-
po/ca.po | 1369 +-
po/cs.po | 1349 +-
po/de.po | 1359 +-
po/de_CH.po | 1343 +-
po/el.po | 1177 +-
po/es.po | 1360 +-
po/fi.po | 1348 +-
po/fr.po | 1358 +-
po/gu.po | 1347 +-
po/he.po | 1184 +-
po/hi.po | 1344 +-
po/hu.po | 1347 +-
po/it.po | 1351 +-
po/ja.po | 1343 +-
po/kn.po | 1343 +-
po/ml.po | 1350 +-
po/mr.po | 1345 +-
po/nl.po | 1360 +-
po/or.po | 1345 +-
po/pa.po | 1344 +-
po/pl.po | 1654 +-
po/pt.po | 1356 +-
po/pt_BR.po | 1350 +-
po/ru.po | 1346 +-
po/sr.po | 1353 +-
po/sr at latin.po | 1353 +-
po/sv.po | 1163 +-
po/ta.po | 1354 +-
po/te.po | 1347 +-
po/uk.po | 1554 +-
po/zh_CN.po | 1351 +-
po/zh_TW.po | 1191 +-
src/Makefile.am | 258 +-
src/Makefile.in | 4043 ++--
src/daemon/cmdline.c | 6 +-
src/daemon/daemon-conf.c | 25 +-
src/daemon/daemon-conf.h | 1 +
src/daemon/daemon.conf.in | 1 +
src/daemon/default.pa.in | 9 +-
src/daemon/main.c | 3 +
src/map-file | 8 +-
src/module-cork-music-on-phone-symdef.h | 29 -
src/module-role-cork-symdef.h | 29 +
src/module-switch-on-port-available-symdef.h | 29 +
src/module-systemd-login-symdef.h | 29 +
src/module-virtual-surround-sink-symdef.h | 29 +
src/module-xenpv-sink-symdef.h | 29 +
src/modules/alsa/alsa-mixer.c | 941 +-
src/modules/alsa/alsa-mixer.h | 53 +-
src/modules/alsa/alsa-sink.c | 273 +-
src/modules/alsa/alsa-source.c | 195 +-
src/modules/alsa/alsa-util.c | 178 +-
src/modules/alsa/alsa-util.h | 6 +
.../alsa/mixer/paths/analog-input-dock-mic.conf | 19 +
.../alsa/mixer/paths/analog-input-front-mic.conf | 19 +
.../mixer/paths/analog-input-internal-mic.conf | 32 +
.../alsa/mixer/paths/analog-input-linein.conf | 50 +-
src/modules/alsa/mixer/paths/analog-input-mic.conf | 19 +
.../alsa/mixer/paths/analog-input-rear-mic.conf | 19 +
.../alsa/mixer/paths/analog-output-headphones.conf | 5 +-
.../alsa/mixer/paths/analog-output-speaker.conf | 34 +-
.../alsa/mixer/paths/analog-output.conf.common | 11 +-
src/modules/alsa/mixer/paths/hdmi-output-0.conf | 6 +
src/modules/alsa/mixer/paths/hdmi-output-1.conf | 6 +
src/modules/alsa/mixer/paths/hdmi-output-2.conf | 6 +
src/modules/alsa/mixer/paths/hdmi-output-3.conf | 6 +
.../alsa/mixer/profile-sets/90-pulseaudio.rules | 27 +-
src/modules/alsa/mixer/profile-sets/default.conf | 21 +-
.../alsa/mixer/profile-sets/extra-hdmi.conf | 164 +
.../mixer/profile-sets/maudio-fasttrack-pro.conf | 4 +-
src/modules/alsa/module-alsa-card.c | 167 +-
src/modules/alsa/module-alsa-sink.c | 6 +-
src/modules/alsa/module-alsa-source.c | 6 +-
src/modules/bluetooth/a2dp-codecs.h | 18 +-
src/modules/bluetooth/bluetooth-util.c | 50 +-
src/modules/bluetooth/bluetooth-util.h | 1 +
src/modules/bluetooth/ipc.c | 19 +-
src/modules/bluetooth/ipc.h | 3 +-
src/modules/bluetooth/module-bluetooth-device.c | 118 +-
src/modules/bluetooth/module-bluetooth-discover.c | 4 +-
src/modules/bluetooth/module-bluetooth-proximity.c | 12 +-
src/modules/bluetooth/sbc/sbc.c | 37 +-
src/modules/bluetooth/sbc/sbc_primitives.h | 2 +-
src/modules/bluetooth/sbc/sbc_tables.h | 6 +-
src/modules/dbus/iface-core.c | 47 +-
src/modules/dbus/iface-device.c | 10 +-
src/modules/dbus/iface-stream.c | 2 +-
src/modules/echo-cancel/echo-cancel.h | 77 +
src/modules/echo-cancel/module-echo-cancel.c | 857 +-
src/modules/echo-cancel/webrtc.cc | 291 +
src/modules/jack/module-jack-sink.c | 9 +-
src/modules/jack/module-jack-source.c | 9 +-
src/modules/macosx/module-coreaudio-device.c | 2 +-
src/modules/module-combine-sink.c | 3 +-
src/modules/module-console-kit.c | 12 +
src/modules/module-cork-music-on-phone.c | 237 -
src/modules/module-device-manager.c | 4 +-
src/modules/module-equalizer-sink.c | 17 +-
src/modules/module-esound-sink.c | 2 +-
src/modules/module-filter-apply.c | 258 +-
src/modules/module-filter-heuristics.c | 23 +-
src/modules/module-intended-roles.c | 19 +-
src/modules/module-ladspa-sink.c | 2 +-
src/modules/module-loopback.c | 23 +-
src/modules/module-null-sink.c | 2 +-
src/modules/module-pipe-source.c | 2 +-
src/modules/module-role-cork.c | 312 +
src/modules/module-stream-restore.c | 315 +-
src/modules/module-switch-on-port-available.c | 256 +
src/modules/module-systemd-login.c | 243 +
src/modules/module-tunnel.c | 153 +-
src/modules/module-udev-detect.c | 13 +-
src/modules/module-virtual-sink.c | 5 +-
src/modules/module-virtual-source.c | 4 +-
src/modules/module-virtual-surround-sink.c | 850 +
src/modules/oss/oss-util.c | 19 +-
src/modules/rtp/module-rtp-recv.c | 8 +-
src/modules/rtp/module-rtp-send.c | 3 +-
src/modules/rtp/rtp.c | 4 +-
src/modules/x11/module-x11-xsmp.c | 2 +-
src/modules/xen/gntalloc.h | 88 +
src/modules/xen/gntdev.h | 156 +
src/modules/xen/module-xenpv-sink.c | 803 +
src/pulse/context.c | 8 +-
src/pulse/context.h | 2 +-
src/pulse/def.h | 45 +-
src/pulse/error.c | 2 +-
src/pulse/format.c | 320 +-
src/pulse/format.h | 91 +-
src/pulse/internal.h | 5 -
src/pulse/introspect.c | 126 +-
src/pulse/introspect.h | 106 +-
src/pulse/mainloop.c | 4 +-
src/pulse/proplist.c | 16 +-
src/pulse/proplist.h | 31 +-
src/pulse/pulseaudio.h | 21 +
src/pulse/simple.h | 26 +-
src/pulse/stream.c | 18 +-
src/pulse/stream.h | 227 +-
src/pulse/thread-mainloop.h | 31 +-
src/pulse/utf8.c | 7 +-
src/pulse/utf8.h | 2 +-
src/pulse/version.h | 8 +-
src/pulsecore/card.c | 10 +-
src/pulsecore/card.h | 4 +
src/pulsecore/cli-command.c | 200 +-
src/pulsecore/cli-text.c | 73 +-
src/pulsecore/core-util.c | 48 +-
src/pulsecore/core-util.h | 1 +
src/pulsecore/core.h | 2 +
src/pulsecore/cpu-arm.c | 4 +-
src/pulsecore/cpu-arm.h | 2 +-
src/pulsecore/dbus-util.c | 30 +-
src/pulsecore/dbus-util.h | 8 +
src/pulsecore/device-port.c | 114 +
src/pulsecore/device-port.h | 70 +
src/pulsecore/dynarray.c | 4 +-
src/pulsecore/dynarray.h | 4 +-
src/pulsecore/flist.c | 74 +-
src/pulsecore/i18n.c | 3 +-
src/pulsecore/i18n.h | 4 +-
src/pulsecore/iochannel.c | 2 +
src/pulsecore/macro.h | 3 +-
src/pulsecore/memblock.c | 4 +-
src/pulsecore/memblockq.c | 33 +-
src/pulsecore/memblockq.h | 11 +-
src/pulsecore/memchunk.h | 2 +-
src/pulsecore/mime-type.c | 3 +-
src/pulsecore/modargs.c | 13 +
src/pulsecore/modargs.h | 3 +
src/pulsecore/mutex-posix.c | 6 +-
src/pulsecore/namereg.c | 12 +-
src/pulsecore/play-memblockq.c | 2 +-
src/pulsecore/play-memchunk.c | 2 +-
src/pulsecore/poll.c | 16 +-
src/pulsecore/prioq.c | 256 -
src/pulsecore/prioq.h | 62 -
src/pulsecore/proplist-util.c | 33 +
src/pulsecore/proplist-util.h | 1 +
src/pulsecore/protocol-dbus.c | 13 +-
src/pulsecore/protocol-esound.c | 6 +-
src/pulsecore/protocol-http.c | 3 +-
src/pulsecore/protocol-native.c | 129 +-
src/pulsecore/protocol-simple.c | 6 +-
src/pulsecore/pstream.c | 67 +-
src/pulsecore/pstream.h | 4 +-
src/pulsecore/queue.c | 4 +-
src/pulsecore/queue.h | 4 +-
src/pulsecore/resampler.c | 496 +-
src/pulsecore/rtpoll.h | 8 +-
src/pulsecore/sample-util.c | 175 +-
src/pulsecore/sconv_sse.c | 24 +-
src/pulsecore/shm.c | 2 +-
src/pulsecore/sink-input.c | 225 +-
src/pulsecore/sink-input.h | 1 +
src/pulsecore/sink.c | 243 +-
src/pulsecore/sink.h | 33 +-
src/pulsecore/socket-server.c | 6 +-
src/pulsecore/socket-util.c | 20 +-
src/pulsecore/sound-file-stream.c | 2 +-
src/pulsecore/source-output.c | 184 +-
src/pulsecore/source-output.h | 1 +
src/pulsecore/source.c | 150 +-
src/pulsecore/source.h | 18 +-
src/pulsecore/svolume.orc | 8 +-
src/pulsecore/svolume_arm.c | 2 +-
src/pulsecore/svolume_mmx.c | 18 +-
src/pulsecore/svolume_orc.c | 2 +-
src/pulsecore/svolume_sse.c | 22 +-
src/pulsecore/tokenizer.c | 6 +-
src/pulsecore/vector.h | 98 -
src/tests/asyncmsgq-test.c | 16 +-
src/tests/asyncq-test.c | 11 +-
src/tests/connect-stress.c | 2 +-
src/tests/extended-test.c | 4 +-
src/tests/format-test.c | 47 +-
src/tests/get-binary-name-test.c | 10 +-
src/tests/interpol-test.c | 20 +-
src/tests/ipacl-test.c | 112 +-
src/tests/lock-autospawn-test.c | 2 -
src/tests/memblock-test.c | 49 +-
src/tests/memblockq-test.c | 35 +-
src/tests/mix-test.c | 8 +-
src/tests/once-test.c | 7 +-
src/tests/prioq-test.c | 44 -
src/tests/proplist-test.c | 15 +-
src/tests/queue-test.c | 2 +-
src/tests/resampler-test.c | 38 +-
src/tests/smoother-test.c | 11 +-
src/tests/sync-playback.c | 2 +-
src/tests/thread-mainloop-test.c | 2 -
src/tests/thread-test.c | 22 +-
src/tests/utf8-test.c | 6 +-
src/tests/vector-test.c | 83 -
src/tests/voltest.c | 134 -
src/tests/volume-test.c | 134 +
src/utils/pacat.c | 7 +
src/utils/pacmd.c | 125 +-
src/utils/pactl.c | 38 +-
src/utils/padsp | 86 -
src/utils/padsp.c | 1 +
src/utils/padsp.in | 86 +
src/utils/pasuspender.c | 2 +
src/utils/pax11publish.c | 2 +
src/utils/qpaeq | 43 +-
314 files changed, 56987 insertions(+), 36166 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit d8a56aefa21f0006365fce0a1b39155f61ae67d1
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun May 13 17:07:33 2012 +0200
Target unstable
diff --git a/debian/changelog b/debian/changelog
index 079e52d..fdf4052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (2.0-1) UNRELEASED; urgency=low
+pulseaudio (2.0-1) unstable; urgency=low
* New upstream release (2.0)
* debian/patches: Drop all patches, all merged upstream
@@ -8,7 +8,7 @@ pulseaudio (2.0-1) UNRELEASED; urgency=low
* pulseaudio: Build module-systemd-login on linux
* debian/pulse-alsa.conf: Fix name hint definition (Closes: 671471).
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 16:36:08 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 17:07:15 +0200
pulseaudio (1.1-3.2) unstable; urgency=low
commit b1a1eb079d2c502cf89ad193ea35d8a7d842ea5d
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun May 13 16:38:10 2012 +0200
debian/pulse-alsa.conf: Fix name hint definition (Closes: 671471).
diff --git a/debian/changelog b/debian/changelog
index 730b5c8..079e52d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ pulseaudio (2.0-1) UNRELEASED; urgency=low
module-virtual-surround-sink
* pulseaudio: Add new manpage: man 5 pulse-cli-syntax
* pulseaudio: Build module-systemd-login on linux
+ * debian/pulse-alsa.conf: Fix name hint definition (Closes: 671471).
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 15:52:42 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 16:36:08 +0200
pulseaudio (1.1-3.2) unstable; urgency=low
diff --git a/debian/pulse-alsa.conf b/debian/pulse-alsa.conf
index 05a873a..e39406d 100644
--- a/debian/pulse-alsa.conf
+++ b/debian/pulse-alsa.conf
@@ -15,10 +15,6 @@ pcm.!default {
ctl.!default {
type pulse
-}
-
-pcm.pulse {
- type pulse
hint {
show {
@func refer
@@ -28,7 +24,17 @@ pcm.pulse {
}
}
-ctl.pulse {
- type pulse
+pcm.pulse {
+ type pulse
+ hint {
+ description "Playback/recording through the PulseAudio sound server"
+ }
+}
+
+ctl.pulse {
+ type pulse
+ hint {
+ description "Playback/recording through the PulseAudio sound server"
+ }
}
commit 7280abf89aaad71f82d3935f05fdc40171f244b5
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun May 13 15:55:47 2012 +0200
pulseaudio: Build module-systemd-login on linux
diff --git a/debian/changelog b/debian/changelog
index 7cf7d7b..730b5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ pulseaudio (2.0-1) UNRELEASED; urgency=low
* pulseaudio: Add new modules: module-switch-on-port-available,
module-virtual-surround-sink
* pulseaudio: Add new manpage: man 5 pulse-cli-syntax
+ * pulseaudio: Build module-systemd-login on linux
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 15:49:51 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 15:52:42 +0200
pulseaudio (1.1-3.2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b5382be..1b99932 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Build-Depends: debhelper (>= 8.1.3), cdbs, quilt, m4, dh-autoreconf,
libtdb-dev, intltool, libgtk2.0-dev, libxtst-dev,
libssl-dev,
libx11-xcb-dev, libice-dev, libxcb1-dev (>= 1.6),
- libjson0-dev, liborc-0.4-dev (>= 1:0.4.11), libfftw3-dev
+ libjson0-dev, liborc-0.4-dev (>= 1:0.4.11), libfftw3-dev,
+ libsystemd-daemon-dev [linux-any], libsystemd-login-dev [linux-any]
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/pulseaudio.git
Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/pulseaudio.git
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index ffa27b2..4814bf5 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -75,6 +75,7 @@ usr/lib/pulse-*/modules/module-virtual-sink.so
usr/lib/pulse-*/modules/module-virtual-source.so
usr/lib/pulse-*/modules/module-switch-on-port-available.so
usr/lib/pulse-*/modules/module-virtual-surround-sink.so
+usr/lib/pulse-*/modules/module-systemd-login.so
lib/udev/rules.d/90-pulseaudio.rules
usr/share/locale
usr/share/pulseaudio
diff --git a/debian/rules b/debian/rules
index be18e54..50d25e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,11 @@ include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
common-build-arch::
- grep -v -e alsa -e evdev -e udev -e share/pulseaudio \
+ grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \
debian/pulseaudio.install > debian/pulseaudio.install.kfreebsd-i386
- grep -v -e alsa -e evdev -e udev -e share/pulseaudio \
+ grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \
debian/pulseaudio.install > debian/pulseaudio.install.kfreebsd-amd64
- grep -v -e alsa -e evdev -e udev -e share/pulseaudio \
+ grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \
debian/pulseaudio.install > debian/pulseaudio.install.hurd-i386
common-install-arch::
commit 1463a9f1686ba5b213dafff56bd2a77a39f61631
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun May 13 15:51:14 2012 +0200
pulseaudio: Add new modules and manpage
* pulseaudio: Add new modules: module-switch-on-port-available,
module-virtual-surround-sink
* pulseaudio: Add new manpage: man 5 pulse-cli-syntax
diff --git a/debian/changelog b/debian/changelog
index 8fe1760..7cf7d7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ pulseaudio (2.0-1) UNRELEASED; urgency=low
* New upstream release (2.0)
* debian/patches: Drop all patches, all merged upstream
+ * pulseaudio: Add new modules: module-switch-on-port-available,
+ module-virtual-surround-sink
+ * pulseaudio: Add new manpage: man 5 pulse-cli-syntax
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 15:28:02 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 15:49:51 +0200
pulseaudio (1.1-3.2) unstable; urgency=low
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 945ca60..ffa27b2 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -73,9 +73,10 @@ usr/lib/pulse-*/modules/module-null-source.so
usr/lib/pulse-*/modules/module-switch-on-connect.so
usr/lib/pulse-*/modules/module-virtual-sink.so
usr/lib/pulse-*/modules/module-virtual-source.so
+usr/lib/pulse-*/modules/module-switch-on-port-available.so
+usr/lib/pulse-*/modules/module-virtual-surround-sink.so
lib/udev/rules.d/90-pulseaudio.rules
usr/share/locale
usr/share/pulseaudio
usr/lib/*/libpulsecore-*.so usr/lib
-usr/share/man/man5/default.pa.5
usr/share/alsa
diff --git a/debian/pulseaudio.manpages b/debian/pulseaudio.manpages
index afcf94b..bbe139c 100644
--- a/debian/pulseaudio.manpages
+++ b/debian/pulseaudio.manpages
@@ -1,4 +1,6 @@
+debian/tmp/usr/share/man/man5/default.pa.5
debian/tmp/usr/share/man/man1/pulseaudio.1
+debian/tmp/usr/share/man/man5/pulse-cli-syntax.5
debian/tmp/usr/share/man/man5/pulse-client.conf.5
debian/tmp/usr/share/man/man5/pulse-daemon.conf.5
debian/tmp/usr/share/man/man1/start-pulseaudio-kde.1
commit c005348077256a7ec516c09683feb62aa6855bdc
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun May 13 15:28:29 2012 +0200
New upstream release (2.0)
* New upstream release (2.0)
* debian/patches: Drop all patches, all merged upstream
diff --git a/debian/changelog b/debian/changelog
index 9720df8..8fe1760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (2.0-1) UNRELEASED; urgency=low
+
+ * New upstream release (2.0)
+ * debian/patches: Drop all patches, all merged upstream
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 May 2012 15:28:02 +0200
+
pulseaudio (1.1-3.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/libpulse0.symbols b/debian/libpulse0.symbols
index 09700a0..a1e1793 100644
--- a/debian/libpulse0.symbols
+++ b/debian/libpulse0.symbols
@@ -175,8 +175,15 @@ libpulse.so.0 libpulse0 #MINVER#
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
pa_format_info_from_string at PULSE_0 0.99.4
+ pa_format_info_get_prop_int at PULSE_0 2.0
+ pa_format_info_get_prop_int_array at PULSE_0 2.0
+ pa_format_info_get_prop_int_range at PULSE_0 2.0
+ pa_format_info_get_prop_string at PULSE_0 2.0
+ pa_format_info_get_prop_string_array at PULSE_0 2.0
+ pa_format_info_get_prop_type at PULSE_0 2.0
pa_format_info_is_compatible at PULSE_0 0.99.4
pa_format_info_is_pcm at PULSE_0 0.99.4
pa_format_info_new at PULSE_0 0.99.4
@@ -191,7 +198,6 @@ libpulse.so.0 libpulse0 #MINVER#
pa_format_info_set_sample_format at PULSE_0 0.99.4
pa_format_info_snprint at PULSE_0 0.99.4
pa_format_info_to_sample_spec at PULSE_0 0.99.4
- pa_format_info_to_sample_spec_fake at PULSE_0 0.99.4
pa_format_info_valid at PULSE_0 0.99.4
pa_frame_size at PULSE_0 0.99.1
pa_get_binary_name at PULSE_0 0.99.1
diff --git a/debian/patches/0001-Move-libpulsecommon-into-pkglib.patch b/debian/patches/0001-Move-libpulsecommon-into-pkglib.patch
deleted file mode 100644
index b63605f..0000000
--- a/debian/patches/0001-Move-libpulsecommon-into-pkglib.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a53a0644a19bb11479dd4b3b2a0a34f667854a81 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl at debian.org>
-Date: Wed, 15 Feb 2012 21:54:28 +0100
-Subject: [PATCH 1/3] Move libpulsecommon into $pkglib
-
-libpulsecommon is a private library only for use within pulseaudio, so
-lets move it into a private directory
----
- src/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e3af12f..1084134 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -523,7 +523,7 @@ connect_stress_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
- # Common library #
- ###################################
-
--lib_LTLIBRARIES = \
-+pkglib_LTLIBRARIES = \
- libpulsecommon- at PA_MAJORMINOR@.la
-
- libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
-@@ -688,7 +688,7 @@ pulseinclude_HEADERS = \
- pulse/volume.h \
- pulse/xmalloc.h
-
--lib_LTLIBRARIES += \
-+lib_LTLIBRARIES = \
- libpulse.la \
- libpulse-simple.la
-
diff --git a/debian/patches/0002-Move-the-padsp-helper-lib-into-a-private-library.patch b/debian/patches/0002-Move-the-padsp-helper-lib-into-a-private-library.patch
deleted file mode 100644
index 4439ee2..0000000
--- a/debian/patches/0002-Move-the-padsp-helper-lib-into-a-private-library.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From d2acbf2b717a22764392f7e84208d343fcc36638 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl at debian.org>
-Date: Wed, 15 Feb 2012 21:59:17 +0100
-Subject: [PATCH 2/3] Move the padsp helper lib into a private library
-
-libpulsedsp is only used as a LD_PRELOAD library
-for the padsp wrapper. So no need to have it in
-a public library
----
- src/Makefile.am | 13 +++++++-
- src/utils/padsp | 86 ----------------------------------------------------
- src/utils/padsp.in | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 97 insertions(+), 88 deletions(-)
- delete mode 100755 src/utils/padsp
- create mode 100644 src/utils/padsp.in
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1084134..15045df 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,7 +86,7 @@ EXTRA_DIST = \
- daemon/esdcompat.in \
- daemon/start-pulseaudio-x11.in \
- daemon/start-pulseaudio-kde.in \
-- utils/padsp \
-+ utils/padsp.in \
- utils/qpaeq \
- modules/module-defs.h.m4 \
- daemon/pulseaudio.desktop.in \
-@@ -756,8 +756,17 @@ libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version
- ###################################
-
- if HAVE_OSS_WRAPPER
--lib_LTLIBRARIES += libpulsedsp.la
-+pkglib_LTLIBRARIES += libpulsedsp.la
- bin_SCRIPTS += utils/padsp
-+
-+edit = @sed \
-+ -e "s|@pkglibdir[@]|$(pkglibdir)|g"
-+
-+utils/padsp: utils/padsp.in
-+ $(edit) $< >$@
-+
-+CLEANFILES += utils/padsp
-+
- endif
-
- libpulsedsp_la_SOURCES = utils/padsp.c
-diff --git a/src/utils/padsp b/src/utils/padsp
-deleted file mode 100755
-index 4fe175c..0000000
---- a/src/utils/padsp
-+++ /dev/null
-@@ -1,86 +0,0 @@
--#!/bin/sh
--
--# This file is part of PulseAudio.
--#
--# Copyright 2006 Lennart Poettering
--# Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
--#
--# PulseAudio is free software; you can redistribute it and/or modify
--# it under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# PulseAudio is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU Lesser General Public License
--# along with PulseAudio; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
--# USA.
--
--while getopts 'hs:n:m:MSDd' param ; do
-- case $param in
-- s)
-- PULSE_SERVER="$OPTARG"
-- export PULSE_SERVER
-- ;;
-- n)
-- PADSP_CLIENT_NAME="$OPTARG"
-- export PADSP_CLIENT_NAME
-- ;;
-- m)
-- PADSP_STREAM_NAME="$OPTARG"
-- export PADSP_STREAM_NAME
-- ;;
-- M)
-- PADSP_NO_MIXER=1
-- export PADSP_NO_MIXER
-- ;;
-- S)
-- PADSP_NO_SNDSTAT=1
-- export PADSP_NO_SNDSTAT
-- ;;
-- D)
-- PADSP_NO_DSP=1
-- export PADSP_NO_DSP
-- ;;
-- d)
-- if [ x"$PADSP_DEBUG" = x ]; then
-- PADSP_DEBUG=1
-- else
-- PADSP_DEBUG=$(( $PADSP_DEBUG + 1 ))
-- fi
-- export PADSP_DEBUG
-- ;;
-- *)
-- echo "$0 - redirect OSS audio devices to PulseAudio"
-- echo " "
-- echo "$0 [options] application [arguments]"
-- echo " "
-- echo "options:"
-- echo " -h show brief help"
-- echo " -s <host>[:<port>] contact a specific PulseAudio server"
-- echo " -n <name> client name to report to the server"
-- echo " -m <name> stream name to report to the server"
-- echo " -M disable /dev/mixer emulation"
-- echo " -S disable /dev/sndstat emulation"
-- echo " -D disable /dev/dsp emulation"
-- echo " -d enable debug output"
-- exit 0
-- ;;
-- esac
--done
--
--shift $(( $OPTIND - 1 ))
--
--if [ x"$LD_PRELOAD" = x ] ; then
-- LD_PRELOAD="libpulsedsp.so"
--else
-- LD_PRELOAD="$LD_PRELOAD libpulsedsp.so"
--fi
--
--export LD_PRELOAD
--
--exec "$@"
-diff --git a/src/utils/padsp.in b/src/utils/padsp.in
-new file mode 100644
-index 0000000..4ecce8c
---- /dev/null
-+++ b/src/utils/padsp.in
-@@ -0,0 +1,86 @@
-+#!/bin/sh
-+
-+# This file is part of PulseAudio.
-+#
-+# Copyright 2006 Lennart Poettering
-+# Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
-+#
-+# PulseAudio is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# PulseAudio is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# along with PulseAudio; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-+# USA.
-+
-+while getopts 'hs:n:m:MSDd' param ; do
-+ case $param in
-+ s)
-+ PULSE_SERVER="$OPTARG"
-+ export PULSE_SERVER
-+ ;;
-+ n)
-+ PADSP_CLIENT_NAME="$OPTARG"
-+ export PADSP_CLIENT_NAME
-+ ;;
-+ m)
-+ PADSP_STREAM_NAME="$OPTARG"
-+ export PADSP_STREAM_NAME
-+ ;;
-+ M)
-+ PADSP_NO_MIXER=1
-+ export PADSP_NO_MIXER
-+ ;;
-+ S)
-+ PADSP_NO_SNDSTAT=1
-+ export PADSP_NO_SNDSTAT
-+ ;;
-+ D)
-+ PADSP_NO_DSP=1
-+ export PADSP_NO_DSP
-+ ;;
-+ d)
-+ if [ x"$PADSP_DEBUG" = x ]; then
-+ PADSP_DEBUG=1
-+ else
-+ PADSP_DEBUG=$(( $PADSP_DEBUG + 1 ))
-+ fi
-+ export PADSP_DEBUG
-+ ;;
-+ *)
-+ echo "$0 - redirect OSS audio devices to PulseAudio"
-+ echo " "
-+ echo "$0 [options] application [arguments]"
-+ echo " "
-+ echo "options:"
-+ echo " -h show brief help"
-+ echo " -s <host>[:<port>] contact a specific PulseAudio server"
-+ echo " -n <name> client name to report to the server"
-+ echo " -m <name> stream name to report to the server"
-+ echo " -M disable /dev/mixer emulation"
-+ echo " -S disable /dev/sndstat emulation"
-+ echo " -D disable /dev/dsp emulation"
-+ echo " -d enable debug output"
-+ exit 0
-+ ;;
-+ esac
-+done
-+
-+shift $(( $OPTIND - 1 ))
-+
-+if [ x"$LD_PRELOAD" = x ] ; then
-+ LD_PRELOAD="@pkglibdir@/libpulsedsp.so"
-+else
-+ LD_PRELOAD="$LD_PRELOAD @pkglibdir@/libpulsedsp.so"
-+fi
-+
-+export LD_PRELOAD
-+
-+exec "$@"
diff --git a/debian/patches/0003-Force-order-of-library-installation.patch b/debian/patches/0003-Force-order-of-library-installation.patch
deleted file mode 100644
index 79caedb..0000000
--- a/debian/patches/0003-Force-order-of-library-installation.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 91a75465680b321d26fbcf4f6fede0644329e59c Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Fri, 17 Feb 2012 22:11:59 +0100
-Subject: [PATCH 3/3] Force order of library installation
-
-libtools causing relinking on installation, to make this succeed
-libpulsecommon needs to be installed before the other libraries and the
-padsp libraries needs to be installed afterwards.
-
-Unfortunately autotools doesn't consider dependencies when running the
-install target, thus we have to enforce the ordering ourselves
----
- src/Makefile.am | 22 +++++++++++++++++++++-
- 1 files changed, 21 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 15045df..07ba7d2 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -756,7 +756,8 @@ libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version
- ###################################
-
- if HAVE_OSS_WRAPPER
--pkglib_LTLIBRARIES += libpulsedsp.la
-+padsplibdir = $(pkglibdir)
-+padsplib_LTLIBRARIES = libpulsedsp.la
- bin_SCRIPTS += utils/padsp
-
- edit = @sed \
-@@ -1953,4 +1954,23 @@ update-map-file:
-
- update-all: update-ffmpeg update-sbc update-map-file
-
-+# Force installation order of libraries. libtool relinks on install time, in
-+# which case libpulsecommon has to be install before others, but the padsp
-+# preload library has to be done after the normal libraries (e.g. libpulse)
-+# ...
-+# Unfortunately automake behaviour means that rules without commands also
-+# override build-in rules, so it's not trivial to add dependencies.
-+# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 for the workaround
-+# ...
-+# Isn't libtool/autotools fun!
-+
-+installlibLTLIBRARIES = install-libLTLIBRARIES
-+$(installlibLTLIBRARIES): install-pkglibLTLIBRARIES
-+
-+installmodlibexecLTLIBRARIES = install-modlibexecLTLIBRARIES
-+$(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES
-+
-+installpadsplibLTLIBRARIES = install-padsplibLTLIBRARIES
-+$(installpadsplibLTLIBRARIES): install-libLTLIBRARIES
-+
- .PHONY: utils/padsp massif update-all update-ffmpeg update-sbc update-map-file
diff --git a/debian/patches/0004-hurd.patch b/debian/patches/0004-hurd.patch
deleted file mode 100644
index 41e486c..0000000
--- a/debian/patches/0004-hurd.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-commit 6aa84d6db0180ce4d12a17818fb6527a12f2e8fb
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Date: Mon Nov 14 11:33:47 2011 +0100
-
- pipe: use pa_pipe_buf instead of the macro PIPE_BUF
-
- This helps when porting to platforms that lack PIPE_BUF.
-
- See bug #42715
-
-diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
-index a941f08..3335907 100644
---- a/src/modules/module-pipe-source.c
-+++ b/src/modules/module-pipe-source.c
-@@ -286,7 +286,7 @@ int pa__init(pa_module*m) {
-
- pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
- pa_source_set_rtpoll(u->source, u->rtpoll);
-- pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec));
-+ pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(pa_pipe_buf(u->fd), &u->source->sample_spec));
-
- u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
- pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
-
-commit 992333697f29cf83208f92d2a64e984b778547f0
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Date: Mon Nov 14 11:44:43 2011 +0100
-
- rtp: use the right type when checking cmsg_type
-
- Use SCM_* instead of SO_* when checking the type of each cmsghdr.
-
- See bug #42715
-
-diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
-index 05c736a..178717c 100644
---- a/src/modules/rtp/rtp.c
-+++ b/src/modules/rtp/rtp.c
-@@ -278,14 +278,14 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
- }
-
- for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm))
-- if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) {
-+ if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SCM_TIMESTAMP) {
- memcpy(tstamp, CMSG_DATA(cm), sizeof(struct timeval));
- found_tstamp = TRUE;
- break;
- }
-
- if (!found_tstamp) {
-- pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!");
-+ pa_log_warn("Couldn't find SCM_TIMESTAMP data in auxiliary recvmsg() data!");
- memset(tstamp, 0, sizeof(tstamp));
- }
-
-
-commit e2876aeb408429b1363080ad77f45690d22e5794
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Date: Mon Nov 14 11:48:47 2011 +0100
-
- module-rtp-recv: fail when SO_TIMESTAMP is not defined
-
- SO_TIMESTAMP is not POSIX and not available in any platform, so just fail
- if the current platform does not have it.
-
- See bug #42715
-
-diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
-index 9d86805..412f4c3 100644
---- a/src/modules/rtp/module-rtp-recv.c
-+++ b/src/modules/rtp/module-rtp-recv.c
-@@ -428,11 +428,16 @@ static int mcast_socket(const struct sockaddr* sa, socklen_t salen) {
-
- pa_make_udp_socket_low_delay(fd);
-
-+#ifdef SO_TIMESTAMP
- one = 1;
- if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one)) < 0) {
- pa_log("SO_TIMESTAMP failed: %s", pa_cstrerror(errno));
- goto fail;
- }
-+#else
-+ pa_log("SO_TIMESTAMP unsupported on this platform");
-+ goto fail;
-+#endif
-
- one = 1;
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) {
-
-commit 9a92327c27a5a321fd15274fb5b1b180e5417a74
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Date: Mon Nov 14 11:58:25 2011 +0100
-
- mutex: handle gracefully if a PTHREAD_PRIO_INHERIT protocol cannot be set
-
- This adds an additional check for unavailable PTHREAD_PRIO_INHERIT to the
- fallback work done in ca717643ee768307475fc36ea29d920a13db0a8e
-
- See bug #42715
-
-diff --git a/src/pulsecore/mutex-posix.c b/src/pulsecore/mutex-posix.c
-index 634087d..d90525b 100644
---- a/src/pulsecore/mutex-posix.c
-+++ b/src/pulsecore/mutex-posix.c
-@@ -50,8 +50,10 @@ pa_mutex* pa_mutex_new(pa_bool_t recursive, pa_bool_t inherit_priority) {
- pa_assert_se(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) == 0);
-
- #ifdef HAVE_PTHREAD_PRIO_INHERIT
-- if (inherit_priority)
-- pa_assert_se(pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT) == 0);
-+ if (inherit_priority) {
-+ r = pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
-+ pa_assert(r == 0 || r == ENOTSUP);
-+ }
- #endif
-
- m = pa_xnew(pa_mutex, 1);
-commit b6a3cc3ad6b2efff27f79927e42129ad9037130a
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Date: Mon Nov 14 12:07:12 2011 +0100
-
- pacmd: dynamically allocate ibuf and obuf
-
- Use pa_pipe_buf to determine the minimum size for ibuf and obuf, taking into
- account the two descriptors that use each of them.
-
- See bug #42715
-
-diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
-index 6d4cc9b..802832c 100644
---- a/src/utils/pacmd.c
-+++ b/src/utils/pacmd.c
-@@ -47,8 +47,9 @@ int main(int argc, char*argv[]) {
- int fd = -1;
- int ret = 1, i;
- struct sockaddr_un sa;
-- char ibuf[PIPE_BUF], obuf[PIPE_BUF];
-- size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
-+ char *ibuf = NULL;
-+ char *obuf = NULL;
-+ size_t ibuf_size, ibuf_index, ibuf_length, obuf_size, obuf_index, obuf_length;
- char *cli;
- pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed;
- struct pollfd pollfd[3];
-@@ -104,6 +105,11 @@ int main(int argc, char*argv[]) {
- goto fail;
- }
-
-+ i = pa_pipe_buf(fd);
-+ ibuf_size = PA_MIN(i, pa_pipe_buf(STDIN_FILENO));
-+ ibuf = pa_xmalloc(ibuf_size);
-+ obuf_size = PA_MIN(i, pa_pipe_buf(STDOUT_FILENO));
-+ obuf = pa_xmalloc(obuf_size);
- ibuf_index = ibuf_length = obuf_index = obuf_length = 0;
- ibuf_eof = obuf_eof = ibuf_closed = obuf_closed = FALSE;
-
-@@ -111,11 +117,11 @@ int main(int argc, char*argv[]) {
- for (i = 1; i < argc; i++) {
- size_t k;
-
-- k = PA_MIN(sizeof(ibuf) - ibuf_length, strlen(argv[i]));
-+ k = PA_MIN(ibuf_size - ibuf_length, strlen(argv[i]));
- memcpy(ibuf + ibuf_length, argv[i], k);
- ibuf_length += k;
-
-- if (ibuf_length < sizeof(ibuf)) {
-+ if (ibuf_length < ibuf_size) {
- ibuf[ibuf_length] = i < argc-1 ? ' ' : '\n';
- ibuf_length++;
- }
-@@ -184,7 +190,7 @@ int main(int argc, char*argv[]) {
- ssize_t r;
- pa_assert(ibuf_length <= 0);
-
-- if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), &stdin_type)) <= 0) {
-+ if ((r = pa_read(STDIN_FILENO, ibuf, ibuf_size, &stdin_type)) <= 0) {
- if (r < 0) {
- pa_log(_("read(): %s"), strerror(errno));
- goto fail;
-@@ -204,7 +210,7 @@ int main(int argc, char*argv[]) {
- ssize_t r;
- pa_assert(obuf_length <= 0);
-
-- if ((r = pa_read(fd, obuf, sizeof(obuf), &fd_type)) <= 0) {
-+ if ((r = pa_read(fd, obuf, obuf_size, &fd_type)) <= 0) {
- if (r < 0) {
- pa_log(_("read(): %s"), strerror(errno));
- goto fail;
-@@ -262,5 +268,8 @@ fail:
- if (fd >= 0)
- pa_close(fd);
-
-+ pa_xfree(obuf);
-+ pa_xfree(ibuf);
-+
- return ret;
- }
-
-
-commit 8499afc36f71342ec6118dc81adb85bc1b3f4aea
-Author: Pino Toscano <pino at debian.org>
-Date: Mon Mar 19 12:42:15 2012 +0000
-
- libpulse: Cope with systems not implementing SA_NOCLDWAIT
-
- Even though SA_NOCLDWAIT is a POSIX mandatory flag the Hurd doesn't
- implement it. So let's only check for it if it's defined.
-
-diff --git a/src/pulse/context.c b/src/pulse/context.c
-index e03d88c..5bd3448 100644
---- a/src/pulse/context.c
-+++ b/src/pulse/context.c
-@@ -660,7 +660,11 @@ static int context_autospawn(pa_context *c) {
- goto fail;
- }
-
-+#ifdef SA_NOCLDWAIT
- if ((sa.sa_flags & SA_NOCLDWAIT) || sa.sa_handler == SIG_IGN) {
-+#else
-+ if (sa.sa_handler == SIG_IGN) {
-+#endif
- pa_log_debug("Process disabled waitpid(), cannot autospawn.");
- pa_context_fail(c, PA_ERR_CONNECTIONREFUSED);
- goto fail;
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1c4f7ee..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-Move-libpulsecommon-into-pkglib.patch
-0002-Move-the-padsp-helper-lib-into-a-private-library.patch
-0003-Force-order-of-library-installation.patch
-0004-hurd.patch
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index d349688..945ca60 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -61,7 +61,7 @@ usr/lib/pulse-*/modules/module-volume-restore.so
usr/lib/pulse-*/modules/module-alsa-card.so
usr/lib/pulse-*/modules/module-augment-properties.so
usr/lib/pulse-*/modules/module-card-restore.so
-usr/lib/pulse-*/modules/module-cork-music-on-phone.so
+usr/lib/pulse-*/modules/module-role-cork.so
usr/lib/pulse-*/modules/module-sine-source.so
usr/lib/pulse-*/modules/module-rygel-media-server.so
usr/lib/pulse-*/modules/module-device-manager.so
diff --git a/debian/rules b/debian/rules
index f66af4b..be18e54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ common-install-arch::
common-configure-arch::
ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
- make -C src libpulsecore_1.1_la-svolume_arm.lo CFLAGS+=-march=armv6
+ make -C src libpulsecore_2.0_la-svolume_arm.lo CFLAGS+=-march=armv6
endif
pulseaudio-install-arch::
diff --git a/debian/shlibs.local b/debian/shlibs.local
index f0887c4..a18985f 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1 +1 @@
-libpulsecommon 1.1 libpulse0 (= ${binary:Version})
+libpulsecommon 2.0 libpulse0 (= ${binary:Version})
commit 50be6b94119035709ad4f624cb2a3d2842865b6a
Merge: 4e9660e4a387a752a81172c074016d8d9e98cbb7 37c676e57cd346588f9ee0940b50f04603b6d889
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun May 13 15:26:38 2012 +0200
Merge tag 'upstream/2.0'
Upstream version 2.0
commit 4e9660e4a387a752a81172c074016d8d9e98cbb7
Author: Samuel Thibault <sthibault at debian.org>
Date: Sun May 13 15:24:21 2012 +0200
NMU for hurd changes
diff --git a/debian/changelog b/debian/changelog
index eaea863..9720df8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (1.1-3.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply upstream patches to fix build on hurd-i386 (Closes: 573339).
+
+ -- Samuel Thibault <sthibault at debian.org> Wed, 25 Apr 2012 12:33:21 +0200
+
pulseaudio (1.1-3) unstable; urgency=low
* Tighten dependencies for packages that uses the internal helper library
diff --git a/debian/patches/0004-hurd.patch b/debian/patches/0004-hurd.patch
new file mode 100644
index 0000000..41e486c
--- /dev/null
+++ b/debian/patches/0004-hurd.patch
@@ -0,0 +1,225 @@
+commit 6aa84d6db0180ce4d12a17818fb6527a12f2e8fb
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Date: Mon Nov 14 11:33:47 2011 +0100
+
+ pipe: use pa_pipe_buf instead of the macro PIPE_BUF
+
+ This helps when porting to platforms that lack PIPE_BUF.
+
+ See bug #42715
+
+diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
+index a941f08..3335907 100644
+--- a/src/modules/module-pipe-source.c
++++ b/src/modules/module-pipe-source.c
+@@ -286,7 +286,7 @@ int pa__init(pa_module*m) {
+
+ pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
+ pa_source_set_rtpoll(u->source, u->rtpoll);
+- pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec));
++ pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(pa_pipe_buf(u->fd), &u->source->sample_spec));
+
+ u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
+ pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
+
+commit 992333697f29cf83208f92d2a64e984b778547f0
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Date: Mon Nov 14 11:44:43 2011 +0100
+
+ rtp: use the right type when checking cmsg_type
+
+ Use SCM_* instead of SO_* when checking the type of each cmsghdr.
+
+ See bug #42715
+
+diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
+index 05c736a..178717c 100644
+--- a/src/modules/rtp/rtp.c
++++ b/src/modules/rtp/rtp.c
+@@ -278,14 +278,14 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
+ }
+
+ for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm))
+- if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) {
++ if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SCM_TIMESTAMP) {
+ memcpy(tstamp, CMSG_DATA(cm), sizeof(struct timeval));
+ found_tstamp = TRUE;
+ break;
+ }
+
+ if (!found_tstamp) {
+- pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!");
++ pa_log_warn("Couldn't find SCM_TIMESTAMP data in auxiliary recvmsg() data!");
+ memset(tstamp, 0, sizeof(tstamp));
+ }
+
+
+commit e2876aeb408429b1363080ad77f45690d22e5794
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Date: Mon Nov 14 11:48:47 2011 +0100
+
+ module-rtp-recv: fail when SO_TIMESTAMP is not defined
+
+ SO_TIMESTAMP is not POSIX and not available in any platform, so just fail
+ if the current platform does not have it.
+
+ See bug #42715
+
+diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
+index 9d86805..412f4c3 100644
+--- a/src/modules/rtp/module-rtp-recv.c
++++ b/src/modules/rtp/module-rtp-recv.c
+@@ -428,11 +428,16 @@ static int mcast_socket(const struct sockaddr* sa, socklen_t salen) {
+
+ pa_make_udp_socket_low_delay(fd);
+
++#ifdef SO_TIMESTAMP
+ one = 1;
+ if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one)) < 0) {
+ pa_log("SO_TIMESTAMP failed: %s", pa_cstrerror(errno));
+ goto fail;
+ }
++#else
++ pa_log("SO_TIMESTAMP unsupported on this platform");
++ goto fail;
++#endif
+
+ one = 1;
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) {
+
+commit 9a92327c27a5a321fd15274fb5b1b180e5417a74
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Date: Mon Nov 14 11:58:25 2011 +0100
+
+ mutex: handle gracefully if a PTHREAD_PRIO_INHERIT protocol cannot be set
+
+ This adds an additional check for unavailable PTHREAD_PRIO_INHERIT to the
+ fallback work done in ca717643ee768307475fc36ea29d920a13db0a8e
+
+ See bug #42715
+
+diff --git a/src/pulsecore/mutex-posix.c b/src/pulsecore/mutex-posix.c
+index 634087d..d90525b 100644
+--- a/src/pulsecore/mutex-posix.c
++++ b/src/pulsecore/mutex-posix.c
+@@ -50,8 +50,10 @@ pa_mutex* pa_mutex_new(pa_bool_t recursive, pa_bool_t inherit_priority) {
+ pa_assert_se(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) == 0);
+
+ #ifdef HAVE_PTHREAD_PRIO_INHERIT
+- if (inherit_priority)
+- pa_assert_se(pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT) == 0);
++ if (inherit_priority) {
++ r = pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
++ pa_assert(r == 0 || r == ENOTSUP);
++ }
+ #endif
+
+ m = pa_xnew(pa_mutex, 1);
+commit b6a3cc3ad6b2efff27f79927e42129ad9037130a
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Date: Mon Nov 14 12:07:12 2011 +0100
+
+ pacmd: dynamically allocate ibuf and obuf
+
+ Use pa_pipe_buf to determine the minimum size for ibuf and obuf, taking into
+ account the two descriptors that use each of them.
+
+ See bug #42715
+
+diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
+index 6d4cc9b..802832c 100644
+--- a/src/utils/pacmd.c
++++ b/src/utils/pacmd.c
+@@ -47,8 +47,9 @@ int main(int argc, char*argv[]) {
+ int fd = -1;
+ int ret = 1, i;
+ struct sockaddr_un sa;
+- char ibuf[PIPE_BUF], obuf[PIPE_BUF];
+- size_t ibuf_index, ibuf_length, obuf_index, obuf_length;
++ char *ibuf = NULL;
++ char *obuf = NULL;
++ size_t ibuf_size, ibuf_index, ibuf_length, obuf_size, obuf_index, obuf_length;
+ char *cli;
+ pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed;
+ struct pollfd pollfd[3];
+@@ -104,6 +105,11 @@ int main(int argc, char*argv[]) {
+ goto fail;
+ }
+
++ i = pa_pipe_buf(fd);
++ ibuf_size = PA_MIN(i, pa_pipe_buf(STDIN_FILENO));
++ ibuf = pa_xmalloc(ibuf_size);
++ obuf_size = PA_MIN(i, pa_pipe_buf(STDOUT_FILENO));
++ obuf = pa_xmalloc(obuf_size);
+ ibuf_index = ibuf_length = obuf_index = obuf_length = 0;
+ ibuf_eof = obuf_eof = ibuf_closed = obuf_closed = FALSE;
+
+@@ -111,11 +117,11 @@ int main(int argc, char*argv[]) {
+ for (i = 1; i < argc; i++) {
+ size_t k;
+
+- k = PA_MIN(sizeof(ibuf) - ibuf_length, strlen(argv[i]));
++ k = PA_MIN(ibuf_size - ibuf_length, strlen(argv[i]));
+ memcpy(ibuf + ibuf_length, argv[i], k);
+ ibuf_length += k;
+
+- if (ibuf_length < sizeof(ibuf)) {
++ if (ibuf_length < ibuf_size) {
+ ibuf[ibuf_length] = i < argc-1 ? ' ' : '\n';
+ ibuf_length++;
+ }
+@@ -184,7 +190,7 @@ int main(int argc, char*argv[]) {
+ ssize_t r;
+ pa_assert(ibuf_length <= 0);
+
+- if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), &stdin_type)) <= 0) {
++ if ((r = pa_read(STDIN_FILENO, ibuf, ibuf_size, &stdin_type)) <= 0) {
+ if (r < 0) {
+ pa_log(_("read(): %s"), strerror(errno));
+ goto fail;
+@@ -204,7 +210,7 @@ int main(int argc, char*argv[]) {
+ ssize_t r;
+ pa_assert(obuf_length <= 0);
+
+- if ((r = pa_read(fd, obuf, sizeof(obuf), &fd_type)) <= 0) {
++ if ((r = pa_read(fd, obuf, obuf_size, &fd_type)) <= 0) {
+ if (r < 0) {
+ pa_log(_("read(): %s"), strerror(errno));
+ goto fail;
+@@ -262,5 +268,8 @@ fail:
+ if (fd >= 0)
+ pa_close(fd);
+
++ pa_xfree(obuf);
++ pa_xfree(ibuf);
++
+ return ret;
+ }
+
+
+commit 8499afc36f71342ec6118dc81adb85bc1b3f4aea
+Author: Pino Toscano <pino at debian.org>
+Date: Mon Mar 19 12:42:15 2012 +0000
+
+ libpulse: Cope with systems not implementing SA_NOCLDWAIT
+
+ Even though SA_NOCLDWAIT is a POSIX mandatory flag the Hurd doesn't
+ implement it. So let's only check for it if it's defined.
+
+diff --git a/src/pulse/context.c b/src/pulse/context.c
+index e03d88c..5bd3448 100644
+--- a/src/pulse/context.c
++++ b/src/pulse/context.c
+@@ -660,7 +660,11 @@ static int context_autospawn(pa_context *c) {
+ goto fail;
+ }
+
++#ifdef SA_NOCLDWAIT
+ if ((sa.sa_flags & SA_NOCLDWAIT) || sa.sa_handler == SIG_IGN) {
++#else
++ if (sa.sa_handler == SIG_IGN) {
++#endif
+ pa_log_debug("Process disabled waitpid(), cannot autospawn.");
+ pa_context_fail(c, PA_ERR_CONNECTIONREFUSED);
+ goto fail;
+
diff --git a/debian/patches/series b/debian/patches/series
index dfcd11e..1c4f7ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Move-libpulsecommon-into-pkglib.patch
0002-Move-the-padsp-helper-lib-into-a-private-library.patch
0003-Force-order-of-library-installation.patch
+0004-hurd.patch
--
pulseaudio packaging
More information about the pkg-pulseaudio-devel
mailing list