[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.9-1-6-g03f8cb3
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Sat Mar 29 14:17:31 UTC 2008
The branch, master has been updated
via 03f8cb3136b9d4f432f69945320ecc972eb76a85 (commit)
via dee298c48d59effdf8363d28ec0653acf277c734 (commit)
via b1c882f3ecd4feecffcc56c3a0b139fceb75be58 (commit)
via d33814d6ed099e6962ac6112fdb63dd5b158026d (commit)
from 120feeb3044a019c8d15641ba84f4761d3444136 (commit)
- Shortlog ------------------------------------------------------------
03f8cb3 Drop patched merged upstream
dee298c New upstream version
b1c882f Merge branch 'upstream'
Summary of changes:
ChangeLog | 7014 --------------------
Makefile.am | 2 +-
Makefile.in | 53 +-
aclocal.m4 | 566 ++-
bootstrap.sh | 2 +-
config.guess | 36 +-
config.h.in | 27 +-
config.sub | 48 +-
configure | 1812 ++++--
configure.ac | 203 +-
debian/changelog | 15 +-
...ocket-to-tmp-.esd-socket-to-match-up-with.patch | 10 +-
.../0002-Double-esound-maximum-sample-size.patch | 24 -
...ng-of-samples-into-PA.-Problem-discovered.patch | 23 -
...-to-create-.pulse-before-using-any-config.patch | 31 -
...rotocol-fields-introduced-in-version-12-w.patch | 53 -
...opcodes-added-in-version-12-in-the-tunnel.patch | 81 -
...fig-to-not-fail-if-loading-of-esd-gconf-o.patch | 41 -
...08-Fix-compilation-on-non-linux-platforms.patch | 39 -
debian/patches/series | 7 -
depcomp | 33 +-
doxygen/Makefile.am | 2 +-
doxygen/Makefile.in | 8 +-
install-sh | 228 +-
ltmain.sh | 68 +-
man/Makefile.am | 2 +-
man/Makefile.in | 8 +-
man/default.pa.5.xml.in | 2 +-
man/esdcompat.1.xml.in | 2 +-
man/pabrowse.1.xml.in | 2 +-
man/pacat.1.xml.in | 2 +-
man/pacmd.1.xml.in | 2 +-
man/pactl.1.xml.in | 2 +-
man/padsp.1.xml.in | 2 +-
man/paplay.1.xml.in | 2 +-
man/pasuspender.1 | 2 +
man/pasuspender.1.xml.in | 9 +-
man/pax11publish.1.xml.in | 2 +-
man/pulse-client.conf.5.xml.in | 2 +-
man/pulse-daemon.conf.5.xml.in | 2 +-
man/pulseaudio.1.xml.in | 2 +-
man/xmltoman.css | 2 +-
man/xmltoman.dtd | 2 +-
man/xmltoman.xsl | 2 +-
src/Makefile.am | 18 +-
src/Makefile.in | 63 +-
src/daemon/PulseAudio.policy | 49 -
src/daemon/caps.c | 2 +-
src/daemon/caps.h | 2 +-
src/daemon/cmdline.c | 4 +-
src/daemon/cmdline.h | 2 +-
src/daemon/cpulimit.c | 4 +-
src/daemon/cpulimit.h | 2 +-
src/daemon/daemon-conf.c | 2 +-
src/daemon/daemon-conf.h | 2 +-
src/daemon/daemon.conf.in | 4 +-
src/daemon/default.pa.in | 20 +-
src/daemon/dumpmodules.c | 2 +-
src/daemon/esdcompat.in | 2 +-
src/daemon/ltdl-bind-now.c | 39 +-
src/daemon/ltdl-bind-now.h | 2 +-
src/daemon/main.c | 30 +-
src/daemon/org.pulseaudio.policy | 52 +
src/daemon/polkit.c | 78 +-
src/depmod.py | 2 +-
src/modules/alsa-util.c | 6 +-
src/modules/alsa-util.h | 2 +-
src/modules/bt-proximity-helper.c | 40 +-
src/modules/dbus-util.c | 2 +-
src/modules/dbus-util.h | 2 +-
src/modules/gconf/gconf-helper.c | 2 +-
src/modules/gconf/module-gconf.c | 2 +-
src/modules/module-alsa-sink.c | 2 +-
src/modules/module-alsa-source.c | 2 +-
src/modules/module-bt-proximity.c | 2 +-
src/modules/module-cli.c | 2 +-
src/modules/module-combine.c | 6 +-
src/modules/module-default-device-restore.c | 2 +-
src/modules/module-defs.h.m4 | 2 +-
src/modules/module-detect.c | 2 +-
src/modules/module-esound-compat-spawnfd.c | 2 +-
src/modules/module-esound-sink.c | 2 +-
src/modules/module-hal-detect.c | 2 +-
src/modules/module-jack-sink.c | 3 +-
src/modules/module-jack-source.c | 3 +-
src/modules/module-ladspa-sink.c | 25 +-
src/modules/module-lirc.c | 2 +-
src/modules/module-match.c | 2 +-
src/modules/module-mmkbd-evdev.c | 2 +-
src/modules/module-native-protocol-fd.c | 2 +-
src/modules/module-null-sink.c | 2 +-
src/modules/module-oss.c | 2 +-
src/modules/module-pipe-sink.c | 2 +-
src/modules/module-pipe-source.c | 2 +-
src/modules/module-protocol-stub.c | 15 +-
src/modules/module-remap-sink.c | 2 +-
src/modules/module-rescue-streams.c | 2 +-
src/modules/module-sine.c | 2 +-
src/modules/module-solaris.c | 2 +-
src/modules/module-suspend-on-idle.c | 2 +-
src/modules/module-tunnel.c | 46 +-
src/modules/module-volume-restore.c | 2 +-
src/modules/module-x11-bell.c | 2 +-
src/modules/module-x11-publish.c | 2 +-
src/modules/module-x11-xsmp.c | 2 +-
src/modules/module-zeroconf-discover.c | 7 +-
src/modules/module-zeroconf-publish.c | 2 +-
src/modules/oss-util.c | 2 +-
src/modules/oss-util.h | 2 +-
src/modules/rtp/module-rtp-send.c | 2 +-
src/modules/rtp/rtp.c | 2 +-
src/modules/rtp/rtp.h | 2 +-
src/modules/rtp/sap.c | 2 +-
src/modules/rtp/sap.h | 2 +-
src/modules/rtp/sdp.c | 2 +-
src/modules/rtp/sdp.h | 2 +-
src/pulse/browser.c | 2 +-
src/pulse/browser.h | 2 +-
src/pulse/cdecl.h | 2 +-
src/pulse/channelmap.c | 2 +-
src/pulse/channelmap.h | 2 +-
src/pulse/client-conf-x11.c | 2 +-
src/pulse/client-conf-x11.h | 2 +-
src/pulse/client-conf.c | 2 +-
src/pulse/client-conf.h | 2 +-
src/pulse/client.conf.in | 2 +-
src/pulse/context.c | 8 +-
src/pulse/context.h | 2 +-
src/pulse/def.h | 2 +-
src/pulse/error.c | 2 +-
src/pulse/error.h | 2 +-
src/pulse/glib-mainloop.c | 2 +-
src/pulse/glib-mainloop.h | 2 +-
src/pulse/internal.h | 2 +-
src/pulse/introspect.c | 2 +-
src/pulse/introspect.h | 2 +-
src/pulse/mainloop-api.c | 2 +-
src/pulse/mainloop-api.h | 2 +-
src/pulse/mainloop-signal.c | 2 +-
src/pulse/mainloop-signal.h | 2 +-
src/pulse/mainloop.c | 2 +-
src/pulse/mainloop.h | 2 +-
src/pulse/operation.c | 2 +-
src/pulse/operation.h | 2 +-
src/pulse/pulseaudio.h | 2 +-
src/pulse/sample.c | 2 +-
src/pulse/sample.h | 11 +-
src/pulse/scache.c | 2 +-
src/pulse/scache.h | 2 +-
src/pulse/simple.c | 2 +-
src/pulse/simple.h | 2 +-
src/pulse/stream.c | 14 +-
src/pulse/stream.h | 2 +-
src/pulse/subscribe.c | 2 +-
src/pulse/subscribe.h | 2 +-
src/pulse/thread-mainloop.c | 2 +-
src/pulse/thread-mainloop.h | 2 +-
src/pulse/timeval.c | 2 +-
src/pulse/timeval.h | 2 +-
src/pulse/utf8.c | 2 +-
src/pulse/utf8.h | 2 +-
src/pulse/util.c | 9 +-
src/pulse/util.h | 2 +-
src/pulse/version.h | 4 +-
src/pulse/version.h.in | 2 +-
src/pulse/volume.c | 2 +-
src/pulse/volume.h | 2 +-
src/pulse/xmalloc.c | 2 +-
src/pulse/xmalloc.h | 2 +-
src/pulsecore/asyncmsgq.c | 2 +-
src/pulsecore/asyncmsgq.h | 2 +-
src/pulsecore/asyncq.c | 2 +-
src/pulsecore/asyncq.h | 2 +-
src/pulsecore/atomic.h | 233 +-
src/pulsecore/authkey-prop.c | 2 +-
src/pulsecore/authkey-prop.h | 2 +-
src/pulsecore/authkey.c | 2 +-
src/pulsecore/authkey.h | 2 +-
src/pulsecore/autoload.c | 2 +-
src/pulsecore/autoload.h | 4 +-
src/pulsecore/avahi-wrap.c | 2 +-
src/pulsecore/avahi-wrap.h | 2 +-
src/pulsecore/cli-command.c | 36 +-
src/pulsecore/cli-command.h | 2 +-
src/pulsecore/cli-text.c | 2 +-
src/pulsecore/cli-text.h | 2 +-
src/pulsecore/cli.c | 2 +-
src/pulsecore/cli.h | 2 +-
src/pulsecore/client.c | 2 +-
src/pulsecore/client.h | 2 +-
src/pulsecore/conf-parser.c | 2 +-
src/pulsecore/conf-parser.h | 2 +-
src/pulsecore/core-def.h | 2 +-
src/pulsecore/core-error.c | 2 +-
src/pulsecore/core-error.h | 2 +-
src/pulsecore/core-scache.c | 13 +-
src/pulsecore/core-scache.h | 2 +-
src/pulsecore/core-subscribe.c | 2 +-
src/pulsecore/core-subscribe.h | 2 +-
src/pulsecore/core-util.c | 11 +-
src/pulsecore/core-util.h | 2 +-
src/pulsecore/core.c | 2 +-
src/pulsecore/core.h | 2 +-
src/pulsecore/creds.h | 2 +-
src/pulsecore/dllmain.c | 2 +-
src/pulsecore/dynarray.c | 2 +-
src/pulsecore/dynarray.h | 2 +-
src/pulsecore/endianmacros.h | 16 +-
src/pulsecore/esound.h | 2 +-
src/pulsecore/flist.c | 2 +-
src/pulsecore/flist.h | 2 +-
src/pulsecore/gccmacro.h | 4 +-
src/pulsecore/hashmap.c | 2 +-
src/pulsecore/hashmap.h | 2 +-
src/pulsecore/hook-list.c | 2 +-
src/pulsecore/hook-list.h | 2 +-
src/pulsecore/idxset.c | 2 +-
src/pulsecore/idxset.h | 2 +-
src/pulsecore/inet_ntop.c | 2 +-
src/pulsecore/inet_pton.c | 2 +-
src/pulsecore/iochannel.c | 2 +-
src/pulsecore/iochannel.h | 2 +-
src/pulsecore/ioline.c | 2 +-
src/pulsecore/ioline.h | 2 +-
src/pulsecore/ipacl.c | 2 +-
src/pulsecore/ipacl.h | 2 +-
src/pulsecore/llist.h | 2 +-
src/pulsecore/log.c | 2 +-
src/pulsecore/log.h | 2 +-
src/pulsecore/ltdl-helper.c | 2 +-
src/pulsecore/ltdl-helper.h | 2 +-
src/pulsecore/macro.h | 2 +-
src/pulsecore/mcalign.c | 2 +-
src/pulsecore/mcalign.h | 2 +-
src/pulsecore/memblock.c | 2 +-
src/pulsecore/memblock.h | 2 +-
src/pulsecore/memblockq.c | 2 +-
src/pulsecore/memblockq.h | 2 +-
src/pulsecore/memchunk.c | 2 +-
src/pulsecore/memchunk.h | 2 +-
src/pulsecore/modargs.c | 2 +-
src/pulsecore/modargs.h | 2 +-
src/pulsecore/modinfo.c | 2 +-
src/pulsecore/modinfo.h | 2 +-
src/pulsecore/module.c | 2 +-
src/pulsecore/module.h | 2 +-
src/pulsecore/msgobject.c | 2 +-
src/pulsecore/msgobject.h | 2 +-
src/pulsecore/mutex-posix.c | 2 +-
src/pulsecore/mutex-win32.c | 2 +-
src/pulsecore/mutex.h | 2 +-
src/pulsecore/namereg.c | 2 +-
src/pulsecore/namereg.h | 2 +-
src/pulsecore/native-common.h | 2 +-
src/pulsecore/object.c | 2 +-
src/pulsecore/object.h | 2 +-
src/pulsecore/once.c | 2 +-
src/pulsecore/once.h | 2 +-
src/pulsecore/packet.c | 2 +-
src/pulsecore/packet.h | 2 +-
src/pulsecore/parseaddr.c | 2 +-
src/pulsecore/parseaddr.h | 2 +-
src/pulsecore/pdispatch.c | 2 +-
src/pulsecore/pdispatch.h | 2 +-
src/pulsecore/pid.c | 2 +-
src/pulsecore/pid.h | 2 +-
src/pulsecore/pipe.c | 2 +-
src/pulsecore/pipe.h | 2 +-
src/pulsecore/play-memblockq.c | 2 +-
src/pulsecore/play-memblockq.h | 2 +-
src/pulsecore/play-memchunk.c | 2 +-
src/pulsecore/play-memchunk.h | 2 +-
src/pulsecore/poll.c | 2 +-
src/pulsecore/poll.h | 2 +-
src/pulsecore/props.c | 2 +-
src/pulsecore/props.h | 2 +-
src/pulsecore/protocol-cli.c | 2 +-
src/pulsecore/protocol-cli.h | 2 +-
src/pulsecore/protocol-esound.c | 4 +-
src/pulsecore/protocol-esound.h | 2 +-
src/pulsecore/protocol-http.c | 2 +-
src/pulsecore/protocol-http.h | 2 +-
src/pulsecore/protocol-native.c | 15 +-
src/pulsecore/protocol-native.h | 2 +-
src/pulsecore/protocol-simple.c | 2 +-
src/pulsecore/protocol-simple.h | 2 +-
src/pulsecore/pstream-util.c | 2 +-
src/pulsecore/pstream-util.h | 2 +-
src/pulsecore/pstream.c | 2 +-
src/pulsecore/pstream.h | 2 +-
src/pulsecore/queue.c | 2 +-
src/pulsecore/queue.h | 2 +-
src/pulsecore/random.c | 2 +-
src/pulsecore/random.h | 2 +-
src/pulsecore/refcnt.h | 2 +-
src/pulsecore/resampler.c | 10 +-
src/pulsecore/resampler.h | 2 +-
src/pulsecore/rtpoll.c | 2 +
src/pulsecore/sample-util.c | 2 +-
src/pulsecore/sample-util.h | 2 +-
src/pulsecore/sconv-s16be.c | 2 +-
src/pulsecore/sconv-s16be.h | 2 +-
src/pulsecore/sconv-s16le.c | 2 +-
src/pulsecore/sconv-s16le.h | 2 +-
src/pulsecore/sconv.c | 2 +-
src/pulsecore/sconv.h | 2 +-
src/pulsecore/semaphore-posix.c | 2 +-
src/pulsecore/semaphore.h | 2 +-
src/pulsecore/shm.c | 6 +-
src/pulsecore/shm.h | 2 +-
src/pulsecore/sink-input.c | 4 +-
src/pulsecore/sink-input.h | 2 +-
src/pulsecore/sink.c | 4 +-
src/pulsecore/sink.h | 2 +-
src/pulsecore/sioman.c | 2 +-
src/pulsecore/sioman.h | 2 +-
src/pulsecore/socket-client.c | 2 +-
src/pulsecore/socket-client.h | 2 +-
src/pulsecore/socket-server.c | 2 +-
src/pulsecore/socket-server.h | 2 +-
src/pulsecore/socket-util.c | 2 +-
src/pulsecore/socket-util.h | 2 +-
src/pulsecore/sound-file-stream.c | 2 +-
src/pulsecore/sound-file-stream.h | 2 +-
src/pulsecore/sound-file.c | 7 +-
src/pulsecore/sound-file.h | 2 +-
src/pulsecore/source-output.c | 4 +-
src/pulsecore/source-output.h | 2 +-
src/pulsecore/source.c | 4 +-
src/pulsecore/source.h | 2 +-
src/pulsecore/speex/arch.h | 50 +-
src/pulsecore/speex/resample.c | 31 +-
src/pulsecore/speexwrap.h | 2 +-
src/pulsecore/strbuf.c | 2 +-
src/pulsecore/strbuf.h | 2 +-
src/pulsecore/strlist.c | 2 +-
src/pulsecore/strlist.h | 2 +-
src/pulsecore/tagstruct.c | 2 +-
src/pulsecore/tagstruct.h | 2 +-
src/pulsecore/thread-posix.c | 2 +-
src/pulsecore/thread-win32.c | 2 +-
src/pulsecore/thread.h | 2 +-
src/pulsecore/time-smoother.c | 2 +-
src/pulsecore/time-smoother.h | 2 +-
src/pulsecore/tokenizer.c | 2 +-
src/pulsecore/tokenizer.h | 2 +-
src/pulsecore/x11prop.c | 2 +-
src/pulsecore/x11prop.h | 2 +-
src/pulsecore/x11wrap.c | 2 +-
src/pulsecore/x11wrap.h | 2 +-
src/tests/asyncmsgq-test.c | 2 +-
src/tests/asyncq-test.c | 2 +-
src/tests/channelmap-test.c | 2 +-
src/tests/cpulimit-test.c | 2 +-
src/tests/flist-test.c | 2 +-
src/tests/get-binary-name-test.c | 2 +-
src/tests/hook-list-test.c | 2 +-
src/tests/interpol-test.c | 2 +-
src/tests/ipacl-test.c | 2 +-
src/tests/mainloop-test.c | 2 +-
src/tests/mcalign-test.c | 2 +-
src/tests/memblock-test.c | 2 +-
src/tests/memblockq-test.c | 2 +-
src/tests/pacat-simple.c | 2 +-
src/tests/parec-simple.c | 2 +-
src/tests/queue-test.c | 2 +-
src/tests/remix-test.c | 2 +-
src/tests/resampler-test.c | 2 +-
src/tests/rtpoll-test.c | 2 +
src/tests/sig2str-test.c | 2 +-
src/tests/smoother-test.c | 2 +-
src/tests/sync-playback.c | 2 +-
src/tests/thread-mainloop-test.c | 2 +-
src/tests/thread-test.c | 2 +-
src/tests/utf8-test.c | 2 +-
src/tests/voltest.c | 2 +-
src/utils/pabrowse.c | 2 +-
src/utils/pacat.c | 2 +-
src/utils/pacmd.c | 2 +-
src/utils/pactl.c | 6 +-
src/utils/padsp | 2 +-
src/utils/padsp.c | 138 +-
src/utils/paplay.c | 2 +-
src/utils/pasuspender.c | 2 +-
src/utils/pax11publish.c | 2 +-
todo | 2 +-
386 files changed, 3422 insertions(+), 8807 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 03f8cb3136b9d4f432f69945320ecc972eb76a85
Author: CJ van den Berg <cj at vdbonline.com>
Date: Sat Mar 29 08:36:17 2008 +0100
Drop patched merged upstream
diff --git a/debian/changelog b/debian/changelog
index 9d92f94..ad0c8d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,14 @@ pulseaudio (0.9.10~svn2189-1) UNRELEASED; urgency=low
[ CJ van den Berg ]
* New Upstream Version
+ * debian/patches: Drop patches merged upstream
+ - 0002-Double-esound-maximum-sample-size.patch
+ - 0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
+ - 0004-make-sure-to-create-.pulse-before-using-any-config.patch
+ - 0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
+ - 0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
+ - 0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
+ - 0008-Fix-compilation-on-non-linux-platforms.patch
[ Petter Reinholdtsen ]
* debian/pulseaudio.init: Fix problems with LSB header in init.d script.
diff --git a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
index 263f843..7850af3 100644
--- a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
+++ b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
@@ -1,4 +1,4 @@
-From 2c5b1549cf30232a10ab855a2e240b1b217fbbe8 Mon Sep 17 00:00:00 2001
+From 4ca50fb382e88a8da101ff069d099e9f25412468 Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj at vdbonline.com>
Date: Wed, 31 Oct 2007 13:59:31 +0100
Subject: [PATCH] Set ESD socket to /tmp/.esd/socket to match up with libesd
@@ -8,15 +8,15 @@ Subject: [PATCH] Set ESD socket to /tmp/.esd/socket to match up with libesd
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index 597993c..b09d0f2 100755
+index 064a6cc..be46526 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
-@@ -46,7 +46,7 @@ load-module module-detect
- .endif
+@@ -47,7 +47,7 @@ load-module module-detect
### Load several protocols
+ .ifexists module-esound-protocol-unix at PA_SOEXT@
-load-module module-esound-protocol-unix
+load-module module-esound-protocol-unix socket="/tmp/.esd/socket"
+ .endif
load-module module-native-protocol-unix
- ### Network access (may be configured with paprefs, so leave this commented
diff --git a/debian/patches/0002-Double-esound-maximum-sample-size.patch b/debian/patches/0002-Double-esound-maximum-sample-size.patch
deleted file mode 100644
index 0c9a20a..0000000
--- a/debian/patches/0002-Double-esound-maximum-sample-size.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5def85371aa7f80523c0aa1640772ada6c66831c Mon Sep 17 00:00:00 2001
-From: Oliver Grawert <ogra at ubuntu.com>
-Date: Sun, 18 Nov 2007 20:36:17 +0100
-Subject: [PATCH] Double esound maximum sample size
-
-To make sure the login and logout gnome sounds can be processed on remote
-connections.
----
- src/pulsecore/protocol-esound.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
-index 70be848..e59c7da 100644
---- a/src/pulsecore/protocol-esound.c
-+++ b/src/pulsecore/protocol-esound.c
-@@ -72,7 +72,7 @@
- #define RECORD_BUFFER_SECONDS (5)
- #define RECORD_BUFFER_FRAGMENTS (100)
-
--#define MAX_CACHE_SAMPLE_SIZE (1024000)
-+#define MAX_CACHE_SAMPLE_SIZE (2048000)
-
- #define SCACHE_PREFIX "esound."
-
diff --git a/debian/patches/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch b/debian/patches/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
deleted file mode 100644
index 3f17a00..0000000
--- a/debian/patches/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 50b9a0cc8da84f848f0e9099c484edfdec2a92db Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Thu, 22 Nov 2007 15:09:00 +0000
-Subject: [PATCH] fix uploading of samples into PA. Problem discovered by Colin Guthrie
-
-git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@2074 fefdeb5f-60dc-0310-8127-8f9354f1896f
----
- src/pulse/stream.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pulse/stream.c b/src/pulse/stream.c
-index 3e2d455..8ec348f 100644
---- a/src/pulse/stream.c
-+++ b/src/pulse/stream.c
-@@ -586,7 +586,7 @@ void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED
- }
- }
-
-- if (s->context->version >= 12) {
-+ if (s->context->version >= 12 && s->direction != PA_STREAM_UPLOAD) {
- pa_sample_spec ss;
- pa_channel_map cm;
- const char *dn = NULL;
diff --git a/debian/patches/0004-make-sure-to-create-.pulse-before-using-any-config.patch b/debian/patches/0004-make-sure-to-create-.pulse-before-using-any-config.patch
deleted file mode 100644
index e8854cd..0000000
--- a/debian/patches/0004-make-sure-to-create-.pulse-before-using-any-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6a46aba92e3bf840c5fb9640ae0488e94c019322 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Sat, 24 Nov 2007 16:22:23 +0000
-Subject: [PATCH] make sure to create ~/.pulse before using any configuration file from it
-
-git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@2078 fefdeb5f-60dc-0310-8127-8f9354f1896f
----
- src/pulsecore/core-util.c | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
-index c1b7f53..03c4a51 100644
---- a/src/pulsecore/core-util.c
-+++ b/src/pulsecore/core-util.c
-@@ -1129,8 +1129,15 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
-
- if ((e = getenv("PULSE_CONFIG_PATH")))
- fn = lfn = pa_sprintf_malloc("%s/%s", e, local);
-- else if (pa_get_home_dir(h, sizeof(h)))
-+ else if (pa_get_home_dir(h, sizeof(h))) {
-+ char *d;
-+
-+ d = pa_sprintf_malloc("%s/.pulse", h);
-+ mkdir(d, 0755);
-+ pa_xfree(d);
-+
- fn = lfn = pa_sprintf_malloc("%s/.pulse/%s", h, local);
-+ }
-
- if (lfn) {
- FILE *f;
diff --git a/debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch b/debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
deleted file mode 100644
index 0d76e3e..0000000
--- a/debian/patches/0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1e0a2e94f26b3ebbfabf2874e62160f9928e8274 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Fri, 4 Jan 2008 12:15:35 +0100
-Subject: [PATCH] Don't add protocol fields introduced in version 12 when connecting to a server with a lower version
-
----
- src/pulsecore/protocol-native.c | 12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
-index cfa4bad..55a84bd 100644
---- a/src/pulsecore/protocol-native.c
-+++ b/src/pulsecore/protocol-native.c
-@@ -1069,6 +1069,9 @@ static void sink_input_suspend_cb(pa_sink_input *i, pa_bool_t suspend) {
- s = PLAYBACK_STREAM(i->userdata);
- playback_stream_assert_ref(s);
-
-+ if (s->connection->version < 12)
-+ return;
-+
- t = pa_tagstruct_new(NULL, 0);
- pa_tagstruct_putu32(t, PA_COMMAND_PLAYBACK_STREAM_SUSPENDED);
- pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
-@@ -1086,6 +1089,9 @@ static void sink_input_moved_cb(pa_sink_input *i) {
- s = PLAYBACK_STREAM(i->userdata);
- playback_stream_assert_ref(s);
-
-+ if (s->connection->version < 12)
-+ return;
-+
- t = pa_tagstruct_new(NULL, 0);
- pa_tagstruct_putu32(t, PA_COMMAND_PLAYBACK_STREAM_MOVED);
- pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
-@@ -1142,6 +1148,9 @@ static void source_output_suspend_cb(pa_source_output *o, pa_bool_t suspend) {
- s = RECORD_STREAM(o->userdata);
- record_stream_assert_ref(s);
-
-+ if (s->connection->version < 12)
-+ return;
-+
- t = pa_tagstruct_new(NULL, 0);
- pa_tagstruct_putu32(t, PA_COMMAND_RECORD_STREAM_SUSPENDED);
- pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
-@@ -1159,6 +1168,9 @@ static void source_output_moved_cb(pa_source_output *o) {
- s = RECORD_STREAM(o->userdata);
- record_stream_assert_ref(s);
-
-+ if (s->connection->version < 12)
-+ return;
-+
- t = pa_tagstruct_new(NULL, 0);
- pa_tagstruct_putu32(t, PA_COMMAND_RECORD_STREAM_MOVED);
- pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
diff --git a/debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch b/debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
deleted file mode 100644
index 9e8a9c8..0000000
--- a/debian/patches/0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From c383cf489cdcb0d6c6e3cf6b5c22df74f0945148 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Fri, 4 Jan 2008 12:21:49 +0100
-Subject: [PATCH] Implement opcodes added in version 12 in the tunnel moduel
-
----
- src/modules/module-tunnel.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 40 insertions(+), 0 deletions(-)
-
-diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
-index 43a10ce..c7cbed3 100644
---- a/src/modules/module-tunnel.c
-+++ b/src/modules/module-tunnel.c
-@@ -129,6 +129,8 @@ static void command_subscribe_event(pa_pdispatch *pd, uint32_t command, uint32_t
- static void command_stream_killed(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
- static void command_overflow(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
- static void command_underflow(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-+static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-+static void command_moved(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-
- static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
- #ifdef TUNNEL_SINK
-@@ -139,6 +141,10 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
- [PA_COMMAND_UNDERFLOW] = command_underflow,
- [PA_COMMAND_PLAYBACK_STREAM_KILLED] = command_stream_killed,
- [PA_COMMAND_RECORD_STREAM_KILLED] = command_stream_killed,
-+ [PA_COMMAND_PLAYBACK_STREAM_SUSPENDED] = command_suspend,
-+ [PA_COMMAND_RECORD_STREAM_SUSPENDED] = command_suspend,
-+ [PA_COMMAND_PLAYBACK_STREAM_MOVED] = command_moved,
-+ [PA_COMMAND_RECORD_STREAM_MOVED] = command_moved,
- };
-
- struct userdata {
-@@ -226,6 +232,28 @@ static void command_underflow(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command,
- pa_log_warn("Server signalled buffer underrun.");
- }
-
-+static void command_suspend(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
-+ struct userdata *u = userdata;
-+
-+ pa_assert(pd);
-+ pa_assert(t);
-+ pa_assert(u);
-+ pa_assert(u->pdispatch == pd);
-+
-+ pa_log_debug("Server reports a stream suspension.");
-+}
-+
-+static void command_moved(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
-+ struct userdata *u = userdata;
-+
-+ pa_assert(pd);
-+ pa_assert(t);
-+ pa_assert(u);
-+ pa_assert(u->pdispatch == pd);
-+
-+ pa_log_debug("Server reports a stream move.");
-+}
-+
- static void stream_cork(struct userdata *u, pa_bool_t cork) {
- pa_tagstruct *t;
- pa_assert(u);
-@@ -1058,6 +1086,18 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t
- pa_tagstruct_putu32(reply, u->fragsize);
- #endif
-
-+ /* New flags added in 0.9.8 */
-+ if (u->version >= 12) {
-+ /* TODO: set these to useful values */
-+ pa_tagstruct_put_boolean(reply, FALSE); /*no_remap*/
-+ pa_tagstruct_put_boolean(reply, FALSE); /*no_remix*/
-+ pa_tagstruct_put_boolean(reply, FALSE); /*fix_format*/
-+ pa_tagstruct_put_boolean(reply, FALSE); /*fix_rate*/
-+ pa_tagstruct_put_boolean(reply, FALSE); /*fix_channels*/
-+ pa_tagstruct_put_boolean(reply, FALSE); /*no_move*/
-+ pa_tagstruct_put_boolean(reply, FALSE); /*variable_rate*/
-+ }
-+
- pa_pstream_send_tagstruct(u->pstream, reply);
- pa_pdispatch_register_reply(u->pdispatch, tag, DEFAULT_TIMEOUT, create_stream_callback, u, NULL);
-
diff --git a/debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch b/debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
deleted file mode 100644
index 39b2252..0000000
--- a/debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6cfd9de5d5e1fcfe718b790700418b98e4b5f447 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Fri, 4 Jan 2008 12:47:46 +0100
-Subject: [PATCH] Change config to not fail if loading of esd, gconf or x11-publish fails
-
----
- src/daemon/default.pa.in | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index b09d0f2..7afd800 100755
---- a/src/daemon/default.pa.in
-+++ b/src/daemon/default.pa.in
-@@ -46,7 +46,9 @@ load-module module-detect
- .endif
-
- ### Load several protocols
-+.nofail
- load-module module-esound-protocol-unix socket="/tmp/.esd/socket"
-+.fail
- load-module module-native-protocol-unix
-
- ### Network access (may be configured with paprefs, so leave this commented
-@@ -79,6 +81,8 @@ load-module module-suspend-on-idle
- #load-module module-x11-bell sample=x11-bell
-
- ### Publish connection data in the X11 root window
-+.nofail
-+
- .ifexists @PA_DLSEARCHPATH@/module-x11-publish at PA_SOEXT@
- load-module module-x11-publish
- .endif
-@@ -95,6 +99,8 @@ load-module module-x11-publish
- load-module module-gconf
- .endif
-
-+.fail
-+
- ### Make some devices default
- #set-default-sink output
- #set-default-source input
diff --git a/debian/patches/0008-Fix-compilation-on-non-linux-platforms.patch b/debian/patches/0008-Fix-compilation-on-non-linux-platforms.patch
deleted file mode 100644
index dee9d67..0000000
--- a/debian/patches/0008-Fix-compilation-on-non-linux-platforms.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 36aaad043cf1d8cc06bf93be1a8531cc5a040566 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Fri, 4 Jan 2008 13:53:54 +0100
-Subject: [PATCH] Fix compilation on non-linux platforms
-
----
- src/pulsecore/rtpoll.c | 2 ++
- src/tests/rtpoll-test.c | 2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
-index 354c4c0..8300826 100644
---- a/src/pulsecore/rtpoll.c
-+++ b/src/pulsecore/rtpoll.c
-@@ -161,8 +161,10 @@ void pa_rtpoll_install(pa_rtpoll *p) {
- p->installed = 1;
-
- #ifdef HAVE_PPOLL
-+# ifdef __linux__
- if (p->dont_use_ppoll)
- return;
-+# endif
-
- if ((p->rtsig = pa_rtsig_get_for_thread()) < 0) {
- pa_log_warn("Failed to reserve POSIX realtime signal.");
-diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
-index 3ab992a..e649377 100644
---- a/src/tests/rtpoll-test.c
-+++ b/src/tests/rtpoll-test.c
-@@ -49,7 +49,9 @@ int main(int argc, char *argv[]) {
- pa_rtpoll_item *i, *w;
- struct pollfd *pollfd;
-
-+#ifdef SIGRTMIN
- pa_rtsig_configure(SIGRTMIN+10, SIGRTMAX);
-+#endif
-
- p = pa_rtpoll_new();
-
diff --git a/debian/patches/series b/debian/patches/series
index fc5cd0d..7102271 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1 @@
0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
-0002-Double-esound-maximum-sample-size.patch
-0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
-0004-make-sure-to-create-.pulse-before-using-any-config.patch
-0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
-0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
-0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
-0008-Fix-compilation-on-non-linux-platforms.patch
commit dee298c48d59effdf8363d28ec0653acf277c734
Author: CJ van den Berg <cj at vdbonline.com>
Date: Sat Mar 29 08:26:16 2008 +0100
New upstream version
diff --git a/debian/changelog b/debian/changelog
index 8f7390a..9d92f94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-pulseaudio (0.9.9-2) UNRELEASED; urgency=low
+pulseaudio (0.9.10~svn2189-1) UNRELEASED; urgency=low
+
+ [ CJ van den Berg ]
+ * New Upstream Version
[ Petter Reinholdtsen ]
* debian/pulseaudio.init: Fix problems with LSB header in init.d script.
(Closes: #470934)
- -- CJ van den Berg <cj at vdbonline.com> Fri, 14 Mar 2008 21:50:26 +0100
+ -- CJ van den Berg <cj at vdbonline.com> Sat, 29 Mar 2008 08:24:26 +0100
pulseaudio (0.9.9-1) unstable; urgency=high
commit b1c882f3ecd4feecffcc56c3a0b139fceb75be58
Merge: 120feeb3044a019c8d15641ba84f4761d3444136 d33814d6ed099e6962ac6112fdb63dd5b158026d
Author: CJ van den Berg <cj at vdbonline.com>
Date: Sat Mar 29 08:24:26 2008 +0100
Merge branch 'upstream'
--
pulseaudio packaging
More information about the Pkg-pulseaudio-devel
mailing list