--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.shlibs +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.shlibs @@ -0,0 +1 @@ +libpulsecore 0.9.21 pulseaudio --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/libpulse-browse0.shlibs +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/libpulse-browse0.shlibs @@ -0,0 +1 @@ +libpulse-browse 0 libpulse-browse0 (>= 0.9.8) --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-utils.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-utils.install @@ -0,0 +1,13 @@ +usr/bin/pabrowse +usr/bin/pacat +usr/bin/pacmd +usr/bin/pactl +usr/bin/paplay +usr/bin/pamon +usr/bin/parec +usr/bin/parecord +usr/bin/padsp +usr/bin/pax11publish +usr/bin/pasuspender +usr/lib/libpulsedsp.so +usr/share/lintian/overrides/pulseaudio-utils --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/shlibs_pulseaudio.local +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/shlibs_pulseaudio.local @@ -0,0 +1,4 @@ +libpulse 0 libpulse0 (= ${binary:Version}) +libpulse-simple 0 libpulse0 (= ${binary:Version}) +libpulsecommon 0.9.16 libpulse0 (= ${binary:Version}) +libpulse-browse 0 libpulse-browse0 (>= 0.9.8) --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.postinst +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.postinst @@ -0,0 +1,45 @@ +#! /bin/sh +# postinst script for pulseaudio + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +PULSEAUDIO=/usr/bin/pulseaudio + +case "$1" in + configure) + if ! getent passwd pulse >/dev/null; then + adduser --disabled-password --quiet --system \ + --home /var/run/pulse --no-create-home\ + --gecos "PulseAudio daemon" --group pulse + adduser --quiet pulse audio + fi + if ! getent group pulse-access >/dev/null; then + addgroup --quiet --system pulse-access + fi + + if dpkg --compare-versions "$2" lt-nl "0.9.14-0ubuntu9"; then + update-rc.d -f pulseaudio remove + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-utils.manpages +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-utils.manpages @@ -0,0 +1,8 @@ +debian/tmp/usr/share/man/man1/pabrowse.1 +debian/tmp/usr/share/man/man1/pacat.1 +debian/tmp/usr/share/man/man1/pacmd.1 +debian/tmp/usr/share/man/man1/pactl.1 +debian/tmp/usr/share/man/man1/padsp.1 +debian/tmp/usr/share/man/man1/paplay.1 +debian/tmp/usr/share/man/man1/pasuspender.1 +debian/tmp/usr/share/man/man1/pax11publish.1 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/shlibs.local +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/shlibs.local @@ -0,0 +1,5 @@ +libpulse-browse 0 libpulse-browse0 (>= 0.9.8) +libpulse 0 libpulse0 (= ${binary:Version}) +libpulse-simple 0 libpulse0 (= ${binary:Version}) +libpulsecommon 0.9.17 libpulse0 (= ${binary:Version}) +libpulsecore 0.9.17 pulseaudio (= ${binary:Version}) --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-dev.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-dev.install @@ -0,0 +1,2 @@ +usr/lib/libpulsecore.so +usr/include/pulsecore/* --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/control +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/control @@ -0,0 +1,409 @@ +Source: pulseaudio +Section: sound +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Pulseaudio maintenance team +Uploaders: CJ van den Berg , Sjoerd Simons +Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl-dev, + libsamplerate0-dev, + libsndfile1-dev (>= 1.0.20) | libsndfile-dev, libx11-dev, + x11proto-core-dev, libxt-dev, libglib2.0-dev, + libasound2-dev (>= 1.0.20) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libavahi-client-dev, libjack-dev, libwrap0-dev, + liblircclient-dev, libgconf2-dev, libatomic-ops-dev, libspeexdsp-dev (>= 1.2~rc1), + libbluetooth-dev (>= 3.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + tdb-dev, intltool, libgtk2.0-dev, libxtst-dev, libssl-dev, libudev-dev (>= 143), + libice-dev, libxi-dev, x11proto-core-dev +Standards-Version: 3.8.1 +XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/pulseaudio.git +XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/pulseaudio.git +Vcs-Bzr: http://launchpad.net/~ubuntu-core-dev/pulseaudio/ubuntu.2a.maverick +Homepage: http://www.pulseaudio.org + +Package: pulseaudio +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, + lsb-base (>= 3), consolekit, libasound2-plugins, pulseaudio-utils +Conflicts: libltdl3 (<< 1.5.24-1), pulseaudio-module-udev (<< ${binary:Version}), + pulseaudio-module-rygel-media-server (<< ${binary:Version}) +Replaces: pulseaudio-module-hal, pulseaudio-module-udev (<< ${binary:Version}), + pulseaudio-module-rygel-media-server (<< ${binary:Version}) +Provides: pulseaudio-module-hal, pulseaudio-module-udev, + pulseaudio-module-rygel-media-server +Recommends: pulseaudio-module-x11, gstreamer0.10-pulseaudio, pulseaudio-esound-compat, rtkit +Suggests: pavumeter, paman, paprefs +Description: PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + These are some of PulseAudio's features: + . + * High quality software mixing of multiple audio streams with support for + more than one sink/source. May be used to combine multiple sound cards + into one (with sample rate adjustment). + . + * Wide range of supported client libraries. ESD, ALSA, oss, libao and + GStreamer client applications are supported as-is. Native PulseAudio + plug-ins are also available for xmms and mplayer. + . + * Good low latency behaviour and very accurate latency measurement for + playback and recording. Ability to fully synchronize multiple playback + streams. + . + * Network transparency, allowing an application to play back or record + audio on a different machine than the one it is running on. + . + * Extensible plug-in architecture with plug-ins for jackd, multicast-rtp + lirc and avahi, just to name a few. + . + This package contains the daemon and basic module set. + +Package: pulseaudio-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio (= ${binary:Version}) +Replaces: pulseaudio-module-hal-dbg, pulseaudio-module-udev-dbg (<< ${binary:Version}), pulseaudio-module-rygel-media-server-dbg (<< ${binary:Version}) +Description: PulseAudio sound server detached debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains the detached debugging symbols for the daemon and + basic module set. + +Package: pulseaudio-utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: avahi-daemon +Description: Command line tools for the PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + These tools provide command line access to various features of the + PulseAudio sound server. Included tools are: + . + pabrowse - Browse available PulseAudio servers on the local network. + paplay - Playback a WAV file via a PulseAudio sink. + pacat - Cat raw audio data to a PulseAudio sink. + parec - Cat raw audio data from a PulseAudio source. + pacmd - Connect to PulseAudio's built-in command line control interface. + pactl - Send a control command to a PulseAudio server. + padsp - /dev/dsp wrapper to transparently support OSS applications. + pax11publish - Store/retrieve PulseAudio default server/sink/source + settings in the X11 root window. + +Package: pulseaudio-utils-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-utils (= ${binary:Version}) +Description: PulseAudio command line tools detached debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains detached debugging symbols for the command line tools. + +Package: pulseaudio-esound-compat +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: esound, pulseaudio (<< 0.9.7) +Replaces: esound +Provides: esound +Description: PulseAudio ESD compatibility layer + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains the ESD compatibility components and enables a + PulseAudio sound server to fully replace ESD. + +Package: pulseaudio-esound-compat-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-esound-compat (= ${binary:Version}) +Description: PulseAudio ESD compatibility layer debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains debugging symbols for the ESD compatibility components. + +Package: pulseaudio-module-zeroconf +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: avahi-daemon +Description: Zeroconf module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This module enables PulseAudio to publish available sinks and sources via + zeroconf (aka. Avahi, mdns). + . + The module is called module-zeroconf-publish. + +Package: pulseaudio-module-zeroconf-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-module-zeroconf (= ${binary:Version}) +Description: Zeroconf module for PulseAudio sound server debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains detached debugging symbols for the zeroconf module. + +Package: pulseaudio-module-jack +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: jackd modules for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + These modules enables PulseAudio to connect to a jackd daemon. + . + The modules are called module-jack-sink, module-jack-source. + +Package: pulseaudio-module-jack-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-module-jack (= ${binary:Version}) +Description: jackd modules for PulseAudio sound server debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains debugging symbols for the PulseAudio jack modules. + +Package: pulseaudio-module-lirc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: lirc module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This module enables the volume of a PulseAudio sink to be controlled when + buttons of an infrared remote control are pressed (through LIRC). + . + The module is called module-lirc. + +Package: pulseaudio-module-lirc-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-module-lirc (= ${binary:Version}) +Description: lirc module for PulseAudio sound server debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains debugging symbols for the PulseAudio lirc module. + +Package: pulseaudio-module-gconf +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GConf module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This module enables PulseAudio to store additional configuration in GConf. + . + The module is called module-gconf. + +Package: pulseaudio-module-gconf-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-module-gconf (= ${binary:Version}) +Description: GConf module for PulseAudio sound server debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains debugging symbols for the PulseAudio GConf module. + +Package: pulseaudio-module-raop +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-module-zeroconf +Description: RAOP module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This module enables PulseAudio to stream audio to an Apple Airport Express. + +Package: pulseaudio-module-raop-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${shlibs:Depends}, ${misc:Depends}, + pulseaudio-module-raop (= ${binary:Version}) +Description: RAOP module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains debugging symbols for the PulseAudio RAOP module. + +Package: pulseaudio-module-bluetooth +Architecture: alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: pulseaudio (<< 0.9.14-2) +Description: Bluetooth module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This module enables PulseAudio to work with bluetooth devices, like headset + or audio gateway. + . + The module is called module-bluetooth + +Package: pulseaudio-module-bluetooth-dbg +Architecture: alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-module-bluetooth (= ${binary:Version}) +Description: Bluetooth module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains debugging symbols for the PulseAudio bluetooth module. + +Package: pulseaudio-module-x11 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-utils +Description: X11 module for PulseAudio sound server + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This module enables PulseAudio to publish itself as the default sound + server to the X11 root window automatically upon startup. The is also a + module to playback a sound file in place of the X11 bell beep. + . + The modules are called module-x11-publish and module-x11-bell. + +Package: pulseaudio-module-x11-dbg +Architecture: any +Priority: extra +Section: debug +Depends: ${misc:Depends}, pulseaudio-module-x11 (= ${binary:Version}) +Description: X11 module for PulseAudio sound server debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains debugging symbols for the PulseAudio X11 modules. + +Package: libpulse0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: pavucontrol (<< 0.9.8) +Suggests: pulseaudio +Description: PulseAudio client libraries + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + Client libraries used by applications that access a PulseAudio sound server + via PulseAudio's native interface. + +Package: libpulse0-dbg +Section: debug +Architecture: any +Priority: extra +Depends: ${misc:Depends}, libpulse0 (= ${binary:Version}) +Description: PulseAudio client libraries detached debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains detached debugging symbols for the PulseAudio native + interface client libraries. + +Package: libpulse-mainloop-glib0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: PulseAudio client libraries (glib support) + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + Client libraries used by applications that access a PulseAudio sound server + via PulseAudio's native interface. + . + This package adds support for glib2 client applications. + +Package: libpulse-mainloop-glib0-dbg +Section: debug +Architecture: any +Priority: extra +Depends: ${misc:Depends}, libpulse-mainloop-glib0 (= ${binary:Version}) +Description: PulseAudio client libraries (glib support) debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains detached debugging symbols for the PulseAudio native + interface glib support client libraries. + +Package: libpulse-browse0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: PulseAudio client libraries (zeroconf support) + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + Client libraries used by applications that access a PulseAudio sound server + via PulseAudio's native interface. + . + This package adds support for zeroconf (aka. Avahi, mdns) discovery of + PulseAudio sinks and sources by client applications. + +Package: libpulse-browse0-dbg +Section: debug +Architecture: any +Priority: extra +Depends: ${misc:Depends}, libpulse-browse0 (= ${binary:Version}) +Description: PulseAudio client libraries (zeroconf support) debugging symbols + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + This package contains detached debugging symbols for the PulseAudio native + interface zeroconf support client libraries. + +Package: libpulse-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libpulse0 (= ${binary:Version}), + libpulse-mainloop-glib0 (= ${binary:Version}), + libpulse-browse0 (= ${binary:Version}), + libx11-dev, + x11proto-core-dev, + libxt-dev, + libglib2.0-dev, + libavahi-client-dev +Description: PulseAudio client development headers and libraries + 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 + much better latency, mixing/re-sampling quality and overall architecture. + . + Headers and libraries for developing applications that access a PulseAudio + sound server via PulseAudio's native interface. --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/watch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/watch @@ -0,0 +1,8 @@ +# Control file for uscan +# Run the "uscan" command to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://0pointer.de/lennart/projects/pulseaudio/ pulseaudio-(.*)\.tar\.gz --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-esound-compat.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-esound-compat.install @@ -0,0 +1,6 @@ +usr/bin/esdcompat +usr/lib/pulse-*/modules/libprotocol-esound.so +usr/lib/pulse-*/modules/module-esound-compat-spawnfd.so +usr/lib/pulse-*/modules/module-esound-compat-spawnpid.so +usr/lib/pulse-*/modules/module-esound-protocol-tcp.so +usr/lib/pulse-*/modules/module-esound-protocol-unix.so --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/copyright +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/copyright @@ -0,0 +1,487 @@ +This package was debianized by CJ van den Berg on +Thu, 10 Aug 2006 15:59:43 +0200. + +It was downloaded from . + + Upstream Authors + ================ + + Lennart Poettering + Pierre Ossman , + through his employer Cendio + +Files: * +Copyright: + Copyright (C) 2004-2009 Lennart Poettering + Copyright (C) 2006-2007 Pierre Ossman for Cendio AB +License: LGPL-2.1+ + The upstream license clarifies pretty well that the sources of pulseaudio are + LGPL (please see LGPL license grant below), but that some parts will be + effectively GPL since they rely on GPL libraries, quoting the upstream + LICENSE: + + """All PulseAudio source files are licensed under the GNU Lesser General + Public License. (see file LGPL for details) + + However, the server side links to the GPL-only library 'libsamplerate' + which practically downgrades the license of the server part to GPL (see + file GPL for details), exercising section 3 of the LGPL. + + Hence you should treat the client library ('libpulse') of PulseAudio as + being LGPL licensed and the server part ('libpulsecore') as being GPL + licensed. Since the PulseAudio daemon and the modules link to + 'libpulsecore' they are of course also GPL licensed. + + -- Lennart Poettering, April 20th, 2006.""" + + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: src/pulsecore/g711.c +Copyright: + Copyright (C) Sun Microsystems, Inc +License: + This source code is a product of Sun Microsystems, Inc. and is provided + for unrestricted use. Users may copy or modify this source code without + charge. + + SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING + THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + + Sun source code is provided with no support and without any obligation on + the part of Sun Microsystems, Inc. to assist in its use, correction, + modification or enhancement. + + SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE + OR ANY PART THEREOF. + + In no event will Sun Microsystems, Inc. be liable for any lost revenue + or profits or other special, indirect and consequential damages, even if + Sun has been advised of the possibility of such damages. + +Files: src/pulsecore/g711.h +Copyright: + Copyright (C) 2001 Chris Bagwell +Licence: + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. This software is provided "as is" without express or + implied warranty. + +Files: src/pulsecore/poll.* +Copyright: + Copyright 2006 Pierre Ossman for Cendio AB + Copyright (C)1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc. +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/pulse/utf8.c +Copyright: + Copyright (C) 1999 Tom Tromey + Copyright (C) 2000 Red Hat, Inc. +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/bluetooth/ipc.*, src/modules/bluetooth/rtp.* +Copyright: + Copyright (C) 2004-2009 Marcel Holtmann +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/bluetooth/module-bluetooth-{device,discover}.c, + src/modules/bluetooth/bluetooth-util.* +Copyright: + Copyright (C) 2008-2009 Joao Paulo Rechi Vita +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2. + +File: src/modules/bluetooth/proximity-helper.c +Copyright: + Copyright (C) 2000-2001 Qualcomm Incorporated + Copyright (C) 2002-2003 Maxim Krasnyansky + Copyright (C) 2002-2007 Marcel Holtmann +License: GPL-2+ + On Debian systems, the complete text of the GPL-2 can be found in + /usr/share/common-licenses/GPL-2. + +Files: src/modules/bluetooth/sbc* +Copyright: + Copyright (C) 2004-2009 Marcel Holtmann + Copyright (C) 2004-2005 Henryk Ploetz + Copyright (C) 2005-2006 Brad Midgley +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/pulsecore/dbus-*.*, src/modules/module-hal-detect.c +Copyright: + Copyright 2006 Lennart Poettering + Copyright 2006 Shams E. King +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: src/modules/ladspa.h +Copyright: + Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan + Westerfeld. +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/module-always-sink.c, src/modules/rtp/rtsp_client.* +Copyright: + Copyright (C) 2008 Colin Guthrie +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/module-detect.c +Copyright: + Copyright 2006 Lennart Poettering + Copyright 2006 Pierre Ossman for Cendio AB + Copyright 2006 Diego Petteno +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/roap/*roap*, src/modules/rtp/headerlist.* +Copyright: + Copyright 2005-2007 Lennart Poettering + Copyright (C) 2008 Colin Guthrie +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/roap/base64.* +Copyright: + Copyright (C) 2008 Colin Guthrie + Copyright (C) Kungliga Tekniska Hogskolan +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/module-device-manager.c +Copyright: + Copyright 2006-2008 Lennart Poettering + Copyright 2009 Colin Guthrie +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/module-solaris.c +Copyright: + Copyright 2006 Lennart Poettering + Copyright 2006-2007 Pierre Ossman for Cendio AB + Copyright 2009 Finn Thain +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: src/modules/reserve.* +Copyright: + Copyright 2009 (C) Lennart Poettering +License: + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +Files: src/pulsecore/atomic.h +Copyright: + Copyright (C) 2006-2008 Lennart Poettering + Copyright (C) 2008 Nokia Corporation +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: src/pulsecore/core-util.c +Copyright: + Copyright (C) 2004-2006 Lennart Poettering + Copyright (C) 2004 Joe Marcus Clarke + Copyright (C) 2006-2007 Pierre Ossman for Cendio AB +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: src/pulsecore/ffmpeg/avcodec.h +Copyright: + Copyright (c) 2001 Fabrice Bellard +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: src/pulsecore/ffmpeg/resample2.c +Copyright: + Copyright (c) 2004 Michael Niedermayer +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: src/pulsecore/socket-util.c +Copyright: + Copyright (C) 2004-2006 Lennart Poettering + Copyright (C) 2004 Joe Marcus Clarke + Copyright (C) 2006-2007 Pierre Ossman for Cendio AB +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: man/xmltoman +Copyright: + Copyright (C) 2000-2002 Oliver Kurth + Copyright (C) 2003 Lennart Poettering +License: LGPL-2+ + On Debian systems, the complete text of the LGPL-2 can be found in + /usr/share/common-licenses/LGPL-2. + +File: po/ca.po +Copyright: + Copyright (C) 2008 Xavier Conde Rueda + Copyright (C) 2009 Agustí Grau , 2009. + Copyright (C) Judith Pintó Subirada + Copyright (C) 2009 Josep Torné Llavall + +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/cs.po +Copyright: + Copyright (C) 2008,2009 Petr Kovar +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/de.po +Copyright: + Copyright (C) 2008,2009 Fabian Affolter + Copyright (C) 2008,2009 Micha Pietsch +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/de_CH.po +Copyright: + Copyright (C) 2008, 2009 Fabian Affolter + Copyright (C) 2008, 2009 Micha Pietsch +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/el.po +Copyright: + Copyright (C) 2008 Dimitris Glezos +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/es.po +Copyright: + Copyright (C) 2009 Domingo Becker + Copyright (C) 2008 Hector Daniel Cabrera +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/fi.po +Copyright: + Copyright (C) 2009 Timo Jyrinki + Copyright (C) 2009 Ville-Pekka Vainio +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/fr.po +Copyright: + Copyright (C) 2008 Robert-Andre Mauchin + Copyright (C) 2008 Michael Ughetto + Copyright (C) 2008 Pablo Martin-Gomez + Copyright (C) 2009 Corentin Perard +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/gu.po +Copyright: + Copyright (C) 2009 Sweta Kothari +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/hi.po +Copyright: + Copyright (C) 2009 Rajesh Ranjan +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/it.po +Copyright: + Copyright (C) 2008,2009 Luca Ferretti + Copyright (C) 2009 Milo Casagrande + Copyright (C) 2009 ario_santagiuliana + Copyright (C) 2009 Milo Casagrande + +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/ja.po +Copyright: + Copyright (C) 2009 Hyu_gabaru Ryu_ichi +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/kn.po +Copyright: + Copyright (C) 2009 Shankar Prasad +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/mr.po +Copyright: + Copyright (C) 2009 Sandeep Shedmake + Copyright (C) 2009 Sandeep Shedmake +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/nl.po +Copyright: + Copyright (C) 2009 Geert Warrink +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/or.po +Copyright: + Copyright (C) 2009 Manoj Kumar Giri +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/pa.po +Copyright: + Copyright (C) 2009 Amanpreet Singh Alam + Copyright (C) 2009 Jaswinder Singh + Copyright (C) 2009 A S Alam +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/pl.po +Copyright: + Copyright (C) 2008 Piotr Drag +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/pt_BR.po +Copyright: + Copyright (C) 2008 Fabian Affolter +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/sr.po, po/sr@latin.po +Copyright: + Copyright (C) 2009 Igor Miletic (Игор Милетић) , 2009. + Copyright (C) 2009 Miloš Komarčević , 2009. +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/sv.po +Copyright: + Copyright (C) 2008 Daniel Nylander +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/ta.po +Copyright: + Copyright (C) 2009 I. Felix +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/te.po +Copyright: + Copyright (C) 2009 Krishna Babu K +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/uk.po +Copyright: + Copyright (C) 2009 Yuri Chornoivan +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +File: po/zh_CN.po +Copyright: + Copyright (C) 2008 闫丰刚 (sainry) +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: debian/* +Copyright: + Copyright 2006-2009 Sjoerd Simons + Copyright 2006-2008 CJ van den Berg +License: GPL-2+ + On Debian systems, the complete text of the GPL-2 can be found in + /usr/share/common-licenses/GPL-2. + +Files: src/pulsecore/cpu-*, src/pulsecore/remap*, + src/pulsecore/svolume_{arm,mmx,sse}.c +Copyright: + Copyright 2004-2006 Lennart Poettering + Copyright 2009 Wim Taymans +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + + +Files: src/pulsecore/sconv_sse.c +Copyright: + Copyright 2004-2006 Lennart Poettering + Copyright 2006 Pierre Ossman for Cendio AB +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + + +Files: src/pulsecore/usergroup.* +Copyright: + Copyright 2009 Ted Percival +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-esound-compat.links +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-esound-compat.links @@ -0,0 +1 @@ +usr/bin/esdcompat usr/bin/esd --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulse.conf +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulse.conf @@ -0,0 +1,18 @@ +# PulseAudio alsa plugin configuration file to set the pulseaudio plugin as +# default output for applications using alsa when pulseaudio is running. +hook_func.pulse_load_if_running { + lib "libasound_module_conf_pulse.so" + func "conf_pulse_hook_load_if_running" +} + +@hooks [ + { + func pulse_load_if_running + files [ + "/usr/share/alsa/pulse-alsa.conf" + "/etc/asound.conf" + "~/.asoundrc" + ] + errors false + } +] --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-module-gconf.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-module-gconf.install @@ -0,0 +1,2 @@ +usr/lib/pulseaudio/pulse/gconf-helper +usr/lib/pulse-*/modules/module-gconf.so --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.preinst +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.preinst @@ -0,0 +1,27 @@ +#!/bin/sh + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" lt "1:0.9.16~test1-0ubuntu1~ppa2"; then + if getent group pulse-rt > /dev/null ; then + delgroup --quiet --system pulse-rt > /dev/null || true + fi + fi + + if dpkg --compare-versions "$2" lt "1:0.9.21-0ubuntu1"; then + if [ -f /etc/X11/Xsession.d/70pulseaudio ]; then + rm /etc/X11/Xsession.d/70pulseaudio + fi + fi + ;; + abort-upgrade) + ;; + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.install @@ -0,0 +1,73 @@ +etc/pulse/default.pa +etc/pulse/system.pa +etc/pulse/daemon.conf +etc/dbus-1/system.d/pulseaudio-system.conf +etc/xdg/autostart/pulseaudio.desktop +etc/xdg/autostart/pulseaudio-kde.desktop +usr/bin/pulseaudio +usr/bin/start-pulseaudio-x11 +usr/bin/start-pulseaudio-kde +usr/lib/pulse-*/modules/libalsa-util.so +usr/lib/pulse-*/modules/libcli.so +usr/lib/pulse-*/modules/libprotocol-cli.so +usr/lib/pulse-*/modules/libprotocol-http.so +usr/lib/pulse-*/modules/libprotocol-native.so +usr/lib/pulse-*/modules/libprotocol-simple.so +usr/lib/pulse-*/modules/librtp.so +usr/lib/pulse-*/modules/module-alsa-sink.so +usr/lib/pulse-*/modules/module-alsa-source.so +usr/lib/pulse-*/modules/module-always-sink.so +usr/lib/pulse-*/modules/module-console-kit.so +usr/lib/pulse-*/modules/module-device-restore.so +usr/lib/pulse-*/modules/module-stream-restore.so +usr/lib/pulse-*/modules/module-cli-protocol-tcp.so +usr/lib/pulse-*/modules/module-cli-protocol-unix.so +usr/lib/pulse-*/modules/module-cli.so +usr/lib/pulse-*/modules/module-combine.so +usr/lib/pulse-*/modules/module-default-device-restore.so +usr/lib/pulse-*/modules/module-detect.so +usr/lib/pulse-*/modules/module-esound-sink.so +usr/lib/pulse-*/modules/module-http-protocol-tcp.so +usr/lib/pulse-*/modules/module-http-protocol-unix.so +usr/lib/pulse-*/modules/module-intended-roles.so +usr/lib/pulse-*/modules/module-ladspa-sink.so +usr/lib/pulse-*/modules/module-match.so +usr/lib/pulse-*/modules/module-mmkbd-evdev.so +usr/lib/pulse-*/modules/module-native-protocol-fd.so +usr/lib/pulse-*/modules/module-native-protocol-tcp.so +usr/lib/pulse-*/modules/module-native-protocol-unix.so +usr/lib/pulse-*/modules/module-udev-detect.so +usr/lib/pulse-*/modules/module-loopback.so +usr/share/alsa +usr/share/apport +usr/share/lintian/overrides/pulseaudio +usr/lib/pulse-*/modules/module-null-sink.so +usr/lib/pulse-*/modules/module-oss.so +usr/lib/pulse-*/modules/liboss-util.so +usr/lib/pulse-*/modules/module-pipe-sink.so +usr/lib/pulse-*/modules/module-pipe-source.so +usr/lib/pulse-*/modules/module-position-event-sounds.so +usr/lib/pulse-*/modules/module-remap-sink.so +usr/lib/pulse-*/modules/module-rescue-streams.so +usr/lib/pulse-*/modules/module-rtp-recv.so +usr/lib/pulse-*/modules/module-rtp-send.so +usr/lib/pulse-*/modules/module-simple-protocol-tcp.so +usr/lib/pulse-*/modules/module-simple-protocol-unix.so +usr/lib/pulse-*/modules/module-sine.so +usr/lib/pulse-*/modules/module-tunnel-sink.so +usr/lib/pulse-*/modules/module-tunnel-source.so +usr/lib/pulse-*/modules/module-suspend-on-idle.so +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-sine-source.so +usr/lib/pulse-*/modules/module-rygel-media-server.so +usr/lib/pulse-*/modules/module-device-manager.so +lib/udev/rules.d/90-pulseaudio.rules +usr/share/man/man5/default.pa.5 +usr/share/locale +usr/share/pulseaudio +usr/lib/libpulsecore-*.so +usr/lib/pm-utils/sleep.d/01PulseAudio --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/README.Debian +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/README.Debian @@ -0,0 +1,35 @@ +pulseaudio for Debian (and Ubuntu) +---------------------------------- + +The pulseaudio executable is installed suid root. This is the recommended +configuration as it allows pulseaudio to run with realtime priority. After +grabbing the realtime capability, pulseaudio drops all other root +privileges. Only users in the pulse-rt group are granted realtime +privileges in this way. It is highly recommended that all users that will +be running pulseaudio should be added to the pulse-rt group to prevent +skipping and dropouts in audio output. You should also enable the +high-priority option in /etc/pulse/daemon.conf to ensure that pulseaudio is +started with realtime priority. + +PLEASE NOTE: PulseAudio's default configuration uses high quality sample +rate conversion that may be overly CPU intensive. If PulseAudio's CPU usage +is unacceptable on your hardware, please change the resample-method option +in /etc/pulse/daemon.conf to either src-linear or trivial. See daemon.conf +for more details. + + -- CJ van den Berg , Mon, 28 Aug 2006 00:31:10 +0200 + + +In Ubuntu 9.10 and later releases, the default resampling option has been +set to speex-float-1. Also note that per-user session daemon invocation is +used (see comments in /etc/default/pulseaudio). If you wish to prevent per- +user session daemons from being invoked, remember to edit +/etc/pulse/client.conf (or create ~/.pulse/client.conf) and ensure that +"autospawn = no" is present and uncommented. + +In Ubuntu 10.04, CJ's caveat above regarding suid root is no longer +applicable thanks to a Linux 2.6.32 base and the use of RtKit. + +Please use "ubuntu-bug pulseaudio" to file defect reports. + + -- Daniel T Chen , Mon, 23 Nov 2009 07:57:30 -0500 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/libpulse-mainloop-glib0.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/libpulse-mainloop-glib0.install @@ -0,0 +1 @@ +usr/lib/libpulse-mainloop-glib.so.* --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-esound-compat.manpages +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-esound-compat.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/esdcompat.1 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-module-bluetooth.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-module-bluetooth.install @@ -0,0 +1,7 @@ +usr/lib/pulse-*/modules/module-bluetooth-proximity.so +usr/lib/pulse-*/modules/module-bluetooth-device.so +usr/lib/pulse-*/modules/module-bluetooth-discover.so +usr/lib/pulse-*/modules/libbluetooth-ipc.so +usr/lib/pulse-*/modules/libbluetooth-sbc.so +usr/lib/pulse-*/modules/libbluetooth-util.so +usr/lib/pulseaudio/pulse/proximity-helper --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/changelog +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/changelog @@ -0,0 +1,2498 @@ +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu17) maverick; urgency=low + + * No-change rebuild to pick up new j-a-c-k shlibs + + -- Luke Yelavich Wed, 21 Jul 2010 11:29:18 +0200 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu16) maverick; urgency=low + + * Include /usr/bin/start-pulseaudio-kde and its autostart file now that KDE + will be using PulseAudio by default in Maverick (LP: #563250) + * Also update 0057-load-module-x11-bell.patch to give its improvements to + /usr/bin/start-pulseaudio-kde as well + + -- Jonathan Thomas Mon, 07 Jun 2010 18:32:53 -0400 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu15) maverick; urgency=low + + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + bc7314f (name all threads for /proc/$PID/task/$TID/comm) + + d519ca4 (prevent crash on jack server shutdown) (LP: #538815) + + 65f89dc (fix bracketing in pa_rtp_recv()) + * debian/01PulseAudio: modify the ConsoleKit active seat checks in the + pm-utils hook so that: + - pre-suspend: all users' sink & source states are stored, then only + the active seat's sinks and sources are muted + - post-resume: all users' sink & source pre-suspend states are + restored + This resolves the issue where users' post-resume sink & source + states don't correspond with their pre-suspend ones. + (LP: #569395) + * debian/01PulseAudio: fix broken quoting and misuse of su -l. Merged + from lp:~hyperair/pulseaudio/fix-01Pulseaudio-quoting. Thanks, + Chow Loong Jin! (LP: #572391) + * debian/control: Update bzr branch for maverick. + + -- Daniel T Chen Sat, 08 May 2010 11:08:56 -0400 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu14) lucid; urgency=low + + * 0096-lp451635-handle-dove-x0-line-hp-swap.patch: Make the connector + work as intended: if 'Analog Output' is selected in the dropdown, + then 'Line HP Swap' is muted; if 'Analog Headphones' is selected, + then 'Line HP Swap' is unmuted. This better fits existing speaker + semantics and actually works. Many thanks to Tobin Davis for + helping chase this one. Really closes (LP: #451635) + + -- Daniel T Chen Fri, 26 Mar 2010 15:18:35 -0700 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu13) lucid; urgency=low + + [ Daniel T Chen ] + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + a7c1778 (don't pick monitor sources automatically for role-based + device selection). + + e8b83fa (handle asyncns failure when IPv6 is not supported in the + kernel). + * 0096-lp453966-handle-digmic-pt2.patch: Raise the priority of the + 'Digital Mic 1' digital input source for newer Dell laptops. + (LP: #453966) + * 0096-lp451635-handle-dove-x0-line-hp-swap.patch: Add 'Line HP Swap' + to the Headphone profile. (LP: #451635) + * debian/control: Update Vcs-Bzr to point to new branch that uses pack + repo format 2a. + + -- Daniel T Chen Thu, 25 Mar 2010 21:58:46 -0700 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu12) lucid; urgency=low + + * debian/pulseaudio.init: Remove udev from Required-* LSB headers + (LP: #432301) + * debian/patches/: + + 0095-cve-2009-1299.patch: Fix insecure temporary file creation; + pulled from upstream stable-queue d3efa43; CVE-2009-1299. + (LP: #509008) + + 0096-lp533877-handle-digmic.patch: Prefer the built-in digital + mic on newer Dells, e.g., XPS 1330. (stable-queue 29845be) + (LP: #533877) + + 0097-regenerate-configure.patch: Apply changes from stable-queue + f9b31fe (gobject linking) and d3efa43 above. + + -- Daniel T Chen Wed, 10 Mar 2010 18:53:51 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu11) lucid; urgency=low + + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + 522c44 (strip spaces from ALSA card/pcm names) + + 195069 (use pa_strip()) + + dd682d (reset max_rewind/max_request in sink while suspending) + + 30f28e (fix wrong counters by using pa_memblockq_pop_missing() for + all request handling) + + 0d1154 (rework how stream volumes affect sink volumes) + + -- Daniel T Chen Mon, 22 Feb 2010 00:22:50 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu10) lucid; urgency=low + + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + dfe27f (don't complain about missing SHM segments) + + 5ce18c (fix definition of INVALID_INDEX for vala) + + 6bbdd2 (fix definition of the GLib mainloop adapter for vala) + + 3f44bf (Use "Subwoofer" in channelmap) + + 117c99 (fix wrapping of port setting calls for vala) + + ddabaa (explicitly mention 'test' role in proplist) + + 8adf53 (increase verboseness when not restoring sink) + + 180589 (use sample name for unmodified fallback) + + f9b957 (don't queue cached sample when sink is suspended) + + b2e9fb (pass buffer_attr to recording streams) + + a469d4 (make devices resume for corked state to fix latency + miscalculation) (LP: #511558) + + 4a3210 (improve buffer_attrs logging) + * 0094-add-missing-mixer-paths-and-rerun-automake.patch has been + merged upstream (047e16f in the stable-queue branch), but we'll continue to + carry it until the next stable tarball is rolled. + + -- Daniel T Chen Sun, 21 Feb 2010 22:37:37 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu9) lucid; urgency=low + + * 0094-add-missing-mixer-paths-and-rerun-automake.patch: Fix missing paths + elements that broke volume control. + + -- Daniel T Chen Thu, 18 Feb 2010 23:56:42 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu8) lucid; urgency=low + + * Back out 307bd1 until we can roll a new tarball. Applying it to the + current source package requires all sorts of nasty hacks. + (LP: #523716) + * Drop 0094-autoconf.patch, as it's no longer needed + + -- Daniel T Chen Thu, 18 Feb 2010 07:32:58 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu7) lucid; urgency=low + + * debian/control: Since JACK has been approved for promotion back into + main, add its packages + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + 19fa81 (always fulfill write requests from the server) + + 96ec29 (store away fd type for pacmd) + + 6e064d (don't enter busy loop when reading from stdin very early) + + -- Daniel T Chen Wed, 17 Feb 2010 22:33:34 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu6) lucid; urgency=low + + [ Daniel T Chen ] + * pulseaudio.default: More clearly describe the conditions for + autospawn to function correctly given the recent login-speedup work. + (As a side effect, it now also lists what one needs to do to disable + PA.) + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + a631be (PA_SINK_INPUT_IS_LINKED typo fix) + + e8cb96 ('Desktop Speaker' handling) + + 7d6bab ('Shared Mic/Line in', 'Analog Source' handling) + + 0c836a ('Internal Mic' handling) + + 307bd1 (default output port names) + + f9b31f (gobject explicit linking) + + ff2474 (padsp handling of /dev/audio) + + 96592c (dbus timeout callback timer fix) + + 5e2af2 (logging of eventfd read failures) + * 0094-autoconf.patch: Rerun autoconf given explicit gobject link + addition; readd version string. + + [ Martin Pitt ] + * 0092-delay-gnome-autostart.patch: Push it out a little further; the X11 + bell is not crucial at desktop startup, and it keeps other programs from + doing more urgent initialization. + + -- Daniel T Chen Mon, 08 Feb 2010 12:42:02 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu5) lucid; urgency=low + + * Add bzr-builddeb configuration (merge mode). + * debian/control: Prefix the Debian git Vcs-* fields with XS-Debian-*, so + that debcheckout on Ubuntu will actually work. + * Add 0092-delay-gnome-autostart.patch: Delay applet startup by two seconds, + so that pulseaudio has started up enough to avoid starting it a second + time through autospawn. + + -- Martin Pitt Mon, 01 Feb 2010 18:12:13 -0800 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu4) lucid; urgency=low + + * debian/01PulseAudio: Break from state (re)store in the correct + place! + + -- Daniel T Chen Sun, 31 Jan 2010 13:44:57 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu3) lucid; urgency=low + + * debian/01PulseAudio: + + Fix su(1) -c quoting (LP: #515038) + + Now that PA only stores mixer state for the active CK seat, and + because the active ConsoleKit seat is the only one we care about, + we don't need to save all PA users' mixer states. Thus, we can + stop (re)storing state as soon as we've finished processing the + active ConsoleKit seat, thereby further optimizing the suspend/ + resume speed. + + -- Daniel T Chen Sun, 31 Jan 2010 13:16:46 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu2) lucid; urgency=low + + * debian/01PulseAudio: Use su(1) instead of sudo(8) + (LP: #489144, #498980). + * debian/patches/series: To trim the startup time, don't lazy-load + sounds by not applying 0005-load-sample-dir-lazy.patch. + * 0091-dont-load-cork-music-on-phone.patch: Refresh. + * 0057-load-module-x11-bell.patch: Don't explicitly load the daemon + since it will autospawn if necessary, and if the system or user + configuration has autospawn disabled it breaks that semantics + (LP: #513120). + + -- Daniel T Chen Fri, 29 Jan 2010 14:37:52 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu1) lucid; urgency=low + + * New snapshot of stable-queue branch as requested by upstream + * debian/patches/0099-back-out-8d3566.patch: Drop. Seeking is fixed + in the latest snapshot. + * debian/pulseaudio.default: Update instructions for using system + mode. + + -- Daniel T Chen Sun, 17 Jan 2010 22:51:57 -0500 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-24-gfa64-0ubuntu1) lucid; urgency=low + + * Reroll actual stable-queue tarball (arrrg!) + * debian/01PulseAudio: Rework pacmd bits (LP: #507941) + * debian/patches/: + + add: 0099-back-out-8d3566.patch (upstream says this commit causes + regressions) + - drop: 0099-change-configure-git-version-tag.patch (no longer + relevant) + + refresh: 0001-change-resample-and-buffering.patch + 0054-mute-iec958-optical-raw-for-audigyX.patch + 0090-disable-flat-volumes.patch + 0091-dont-load-cork-music-on-phone.patch + 0057-load-module-x11-bell.patch + + -- Daniel T Chen Fri, 15 Jan 2010 19:06:15 -0500 + +pulseaudio (1:0.9.22~0.9.21+341-g62bf-0ubuntu1) lucid; urgency=low + + * New snapshot based on stable-queue git branch (testing requested + specifically by upstream) + - LP: #164745, #173212, #201391, #204536, #207796, #210016, #221038, + - LP: #226342, #230408, #236423, #237443, #250059, #269585, #274304, + - LP: #274577, #275474, #277532, #277566, #277932, #278025, #280534, + - LP: #283049, #286816, #287036, #292732, #298011, #298301, #300290, + - LP: #302038, #311497, #311853, #324062, #339448, #344057, #348979, + - LP: #350829, #356206, #367379, #367544, #369822, #371897, #374846, + - LP: #375570, #381801, #399515, #402950, #403786, #408169, #409322, + - LP: #409723, #410326, #410446, #417695, #417976, #419271, #421072, + - LP: #422774, #423979, #424655, #425028, #427016, #431072, #432660, + - LP: #437640, #437996, #442191, #443306, #443389, #446719, #449762, + - LP: #455417, #461532, #464652, #483191, #497537, #503780 + * debian/patches/: + + add: 0099-change-configure-git-version-tag.patch: Match released + upstream 0.9.21 for shlibs and LIBPULSE_VERSION_INFO + - drop: 0004-set-tsched0.patch (no longer relevant) + 0050-revert-pacmd-poll-argv.patch (no longer relevant) + 0056-dont-bail-on-sound-class-modem.patch (merged) + 0056-ignore-sound-class-modem.patch (merged) + 0058-Backport-4c793.patch (merged) + 0059-Backport-978d3.patch (merged) + 0060-fix-implicit-func-decl-cpu-arm.patch (merged) + 0061-Backport-c5fdb.patch (merged) + 0070-dont-bail-on-sound-class-modem-devs.patch (merged) + + refresh: 0001-change-resample-and-buffering.patch + 0090-disable-flat-volumes.patch + 0091-dont-load-cork-music-on-phone.patch + 0057-load-module-x11-bell.patch + + -- Daniel T Chen Thu, 14 Jan 2010 20:33:05 -0500 + +pulseaudio (1:0.9.21-0ubuntu6) lucid; urgency=low + + * Backport fix from master HEAD: + + 0061-Backport-c5fdb.patch (LP: #502992) + * The following patches have been merged upstream, but we'll continue + to apply them here until the next upstream snapshot: + . 0056-ignore-sound-class-modem.patch + . 0060-fix-implicit-func-decl-cpu-arm.patch + + -- Daniel T Chen Tue, 05 Jan 2010 18:34:40 -0500 + +pulseaudio (1:0.9.21-0ubuntu5) lucid; urgency=low + + * Refresh 0060-fix-implicit-func-decl-cpu-arm.patch with more FTBFS- + on-armel fixes (all submitted upstream). + + -- Daniel T Chen Thu, 17 Dec 2009 00:01:49 -0500 + +pulseaudio (1:0.9.21-0ubuntu4) lucid; urgency=low + + * 0060-fix-implicit-func-decl-cpu-arm.patch: Fix FTBFS on armel. + + -- Daniel T Chen Wed, 16 Dec 2009 22:45:25 -0500 + +pulseaudio (1:0.9.21-0ubuntu3) lucid; urgency=low + + * 0070-dont-bail-on-sound-class-modem-devs.patch: Fix parameter + in function call. Thanks to Whoopie for spotting. + + -- Daniel T Chen Wed, 16 Dec 2009 20:13:43 -0500 + +pulseaudio (1:0.9.21-0ubuntu2) lucid; urgency=low + + * Fix LP: #394500, #450222: + + 0070-dont-bail-on-sound-class-modem-devs.patch: + + Add pa_udev_get_sysattr() helper function so that we can + retrieve pcm_class. + + Add short-circuit in is_card_busy(). Currently there is an + incorrect break out of the loop when an HDA modem is driven by + slmodemd/hsfmodem. An HDA modem resides in device 6 and will + not contain "closed\n" for + /proc/asound/card.../pcm.../sub.../status. + * 0058-Backport-4c793.patch: Use pa_stream pointers to hashmaps + instead of dynarrays. + * 0059-Backport-978d3.patch: Mark shared variables as volatile + to supress compiler optimizations. + + -- Daniel T Chen Sun, 06 Dec 2009 19:40:04 -0500 + +pulseaudio (1:0.9.21-0ubuntu1) lucid; urgency=low + + [ Daniel T Chen ] + * New upstream bugfix release + * debian/control: pulseaudio-module-raop must Depends + pulseaudio-module-zeroconf (LP: #484870). Thanks, Dominic Evans! + * Bump for 0.9.21: + + debian/libpulse0.shlibs + + debian/pulseaudio.shlibs + + debian/rules + * debian/pulseaudio.install: + debian/copyright: Amend for addition of: + + module-device-manager.so + * debian/README.Debian: Update for Ubuntu 9.04+. + * 0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch: + Drop, fixed upstream. + * 0051-fix-sigfpe-mcalign.patch: Drop, needs fixing in alsa-kernel + and alsa-lib. + + [ Chow Loong Jin ] + * debian/01PulseAudio: Add/modify functions to (re)store sink/source + state for (resume/)suspend (LP: #404986, #483900) + + [ Luke Yelavich ] + * Remove wrapper scripts and accessibility special case, to help with the + desktop startup time. The accessibility case should be solved in + speech-dispatcher by the time lucid ships. + - debian/patches/0006-a11y-special-case-disable.patch: Removed + - debian/70pulseaudio: Removed + - debian/pulse-session: Removed + - debian/pulseaudio.install: Re-add the xdg autostart desktop file + - debian/pulseaudio.preinst: Instead of removing the xdg autostart desktop + file on upgrade, remove the 70pulseaudio X Session script on upgrade + + -- Daniel T Chen Wed, 25 Nov 2009 16:34:54 -0500 + +pulseaudio (1:0.9.20-0ubuntu3) lucid; urgency=low + + * drop the enforced switch to ARMv6 in debian rules (we build for cortex-a8 + by default now). + * Make sure the arm specific assembler code builds properly with thumb + support by adding -Wa,-mimplicit-it=thumb instead until it is added to + the default compiler flags (fixes FTBFS). + + -- Oliver Grawert Wed, 25 Nov 2009 14:16:59 +0100 + +pulseaudio (1:0.9.20-0ubuntu2) lucid; urgency=low + + * Add 0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch + from Debian unstable (thanks, Sjoerd Simons!) + * Fix 0055-handle-Master-Front.patch to handle only front elements + based on comments from Lennart. The patch now does the right thing + despite linux still doing the wrong thing, but at least we handle + cases where linux will do the right thing. + + -- Daniel T Chen Sun, 15 Nov 2009 13:45:49 -0500 + +pulseaudio (1:0.9.20-0ubuntu1) lucid; urgency=low + + * New upstream bugfix release + + Fix BT validation (LP: #437293) + * debian/control: + + pulseaudio Provides pulseaudio-module-hal, pulseaudio-module-udev, + and pulseaudio-module-rygel-media-server for upgrades (really + fixes LP #477382) + * debian/patches/: + - 0002-work-around-suspend-on-idle-source-sink-race.patch: + - 0052-revert-sse2-optimize.patch: + - 0055-backport-alsa-bt-position-fixes-b3592a1.patch: + Remove; applied upstream + + 0054-mute-iec958-optical-raw-for-audigyX.patch: Refresh + + 0055-handle-Master-Front.patch: For new VIA-based HDA, handle + this mixer control until we've fixed it in linux (LP: #478868) + * Bump for 0.9.20: + + debian/libpulse0.shlibs + + debian/pulseaudio.shlibs + + debian/rules + + -- Daniel T Chen Thu, 12 Nov 2009 19:19:21 -0500 + +pulseaudio (1:0.9.19-2ubuntu2) lucid; urgency=low + + * debian/control: + + Promote pulseaudio-utils to Depends for pulseaudio so that the + pm-utils script is present (LP: #478182) + - Drop obsolete Depends on pulseaudio-module-udev for pulseaudio + (LP: #477382) + * debian/01PulseAudio: Don't fail suspend/resume when system-wide + daemon is running (LP: #476505) + + -- Daniel T Chen Fri, 06 Nov 2009 18:37:36 -0500 + +pulseaudio (1:0.9.19-2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - epoch (my stupid fault :S) + - Don't build against, and create jack package. Jack is not in main + - use speex-float-1 resampler to work better with lack of PREEMPT in + karmic's -generic kernel config, also change buffer size + - Add alsa configuration files to route alsa applications via pulseaudio + - Move libasound2-plugins from Recommends to Depends + - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio + daemons + - Make initscript more informative in the default case of per-user + sessions + - add status check for system wide pulseaudio instance + - create /var/run/pulse, and make restart more robust + - LSB {Required-*,Should-*} should specify hal instead of dbus, + since hal is required (and already requires dbus) + - indicate that the system pulseaudio instance is being started from the init + script + - Install more upstream man pages + - Link to pacat for parec man page + - check whether pulseaudio is running before preloading the padsp library + - Add DEB_OPT_FLAG = -O3 as per recommendation from + pulseaudio-discuss/2007-December/001017.html + - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load + - Generate a PO template on build + - add special case to disable pulseaudio loading if accessibility/speech + is being used + - the esd wrapper script should not load pulseaudio if pulseaudio is being + used as a system service + - add a pulseaudio apport hook + - fix some typos in README.Debian + - drop padevchooser(Recommends) and pavucontrol (Suggests) + - drop libasyncns-dev build dependency, its in universe + - add libudev-dev as a build-dependency + - Fix initialization of devices with modem subdevices + - Backport ALSA BlueTOoth position fixes from git HEAD + - Disable cork-music-on-phone + - Revert sse2 optimizations + - disable flat volume + - Handle div by zero attempts + - Mute IEC958 Optical Raw by default + - use tdd instead of gdbm + * debian/control: + - Dro packages, due to debian including the files in these packages in the + main pulseaudio package: pulseaudio-module-udev, + pulseaudio-module-udev-dbg, pulseaudio-module-rygel-media-server, + pulseaudio-module-rygel-media-server-dbg + - Add conflicts/replaces for pulseaudio-module-udev and + pulseaudio-module-rygel-media-server + - Add replaces for pulseaudio-module-hal to the pulseaudio package to handle + upgrades from hardy + - Remove rtkit from conflicts, and add it to recommends, as 2.6.32 has the + needed patches + + [ Daniel T Chen ] + * 0057-load-module-x11-bell.patch: Load module-x11-bell in the + start-pulseaudio-x11 script (LP: #301174) + + -- Luke Yelavich Fri, 06 Nov 2009 14:07:19 +1100 + +pulseaudio (0.9.19-2) unstable; urgency=low + + * Built with normal old-style hal support on kfreebsd and the hurd + * debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch: + + Added. Don't use O_CLOEXEC on platforms that don't support it. + (Closes: #550826) + * debian/pulseaudio.install: Install pulse udev rules so device profiles can + be matched with the few devices that need special tweaks + * debian/pulseaudio.install: Add the rygel media server plugin, such that + pulseaudio sources and sinks can be exposed over UPNP via rygel. + + -- Sjoerd Simons Sun, 25 Oct 2009 13:43:06 +0000 + +pulseaudio (0.9.19-1) unstable; urgency=low + + * New upstream release + * Remove patches that were merged upstream: + d/p/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch + d/p/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch + d/p/0003-svolume-tweak-constraints-for-32-bits.patch + * Only compile the ARMv6 optimized code with -march=armv6 (Closes: #546322) + * Depend on udev (>= 143) for device detection (Closes: #548821, #549001) + * Update various shlibs files to use 0.9.19 + + -- Sjoerd Simons Sat, 03 Oct 2009 18:22:56 +0100 + +pulseaudio (1:0.9.19-0ubuntu4) karmic; urgency=low + + * Remove 0053-fix-sigsegv-module-bluetooth-device.patch, as it did + more harm than good (reopens LP #437293). + * debian/01PulseAudio: Fix bashisms, and make suspend/resume actually + work with sudo -H -u (LP: #432096, #450461). + + -- Daniel T Chen Tue, 20 Oct 2009 10:29:04 -0400 + +pulseaudio (1:0.9.19-0ubuntu3) karmic; urgency=low + + [ Tony Espy ] + * debian/control: Add a Conflicts for rtkit so we force removal, and + hence get more testing coverage between now and Karmic final (LP: #452458). + + [ Daniel T Chen ] + * debian/patches/0056-ignore-sound-class-modem.patch: + + Apply patch from Whoopie to fix initialization of devices with + modem subdevices (LP: #394500, #450222) + + -- Tony Espy Thu, 15 Oct 2009 15:33:02 -0400 + +pulseaudio (1:0.9.19-0ubuntu2) karmic; urgency=low + + * debian/control: Drop rtkit from recommends, as the kernel patches have + not landed in karmic, so rtkit is currently useless. + + -- Luke Yelavich Wed, 14 Oct 2009 12:02:50 +1100 + +pulseaudio (1:0.9.19-0ubuntu1) karmic; urgency=low + + * New upstream bugfix release + * debian/: + . {libpulse0,pulseaudio}.shlibs: + . shlibs{,_pulseaudio}.local: + . rules: Update for new release + * debian + + pulseaudio.dirs: + . patches/0006-a11y-special-case-disable.patch: + . pulse-session: Use a system-wide flag to assist in fixing + alsactl store race. + * debian/patches/: + - 0060-backport-c194d.patch: Drop, subsumed by new release + + 0053-fix-sigsegv-module-bluetooth-device.patch: Don't strcmp + uninitialized memory (LP: #437293) + + 0055-backport-alsa-bt-position-fixes-b3592a1.patch: Apply the + following changesets from origin/master HEAD for fixes: + 40c1ca76c48147c7648e1f1a72cc2c747f3d0c9b, + 7b682c969025845f75cbc74a9f830ad2dec8a415, + c96d2d1117a7e59b351358c8cdd79ef465ddbd49, + b3592a160f0d2a28605048a81c0261bf7c45acbb + + 0091-dont-load-cork-music-on-phone.patch: Disable for Karmic; + it's confusing users (LP: #437638) + * Previous uploads resolved Launchpad bug reports: + - LP: #434003 (crashed with SIGILL in pa_smoother_translate() ) + - LP: #437638 (cpulimit.c: Received request to terminate) + + -- Daniel T Chen Tue, 06 Oct 2009 18:40:38 -0400 + +pulseaudio (0.9.18-1) unstable; urgency=low + + * New upstream release + * d/p/0001-tunnel-fix-parsing-of-sink-info-from-newer-servers.patch + + Added. Fix parsing of the sink info when using module-tunnel + From the upstream 0.9.18-stable branch + * d/p/0002-tunnel-fix-parsing-of-source-info-from-newer-servers.patch + + Added. Fix parsing of the source info when using module-tunnel + From the upstream 0.9.18-stable branch + * d/p/0003-svolume-tweak-constraints-for-32-bits.patch + + Added. Fixes gcc and the inline assembly using the same register. + From the upstream 0.9.18-stable branch + * debian/control: Build-Depend on libudev-dev instead of libhal-dev. + Pulseaudio now uses udev for device detection (Closes: #546721) + * debian/control: Enable hal->udev compat module + * Update various shlibs files to use 0.9.18 + * debian/pulseaudio.install, debian/rules: Add udev and loopback modules + * debian/pulseaudio-utils.install: Add pamon and parecord + * debian/pulseaudio.install: Add dbus configuration file for system-wide + pulse instance (Closes: #529989) + * debian/control: Bump libsndfile1-dev build-depend to >= 1.0.20. + (Closes: #546734) + * debian/rules: Add -march=armv6 to the CFLAGS on arm and armel + (Closes: #546322) + + -- Sjoerd Simons Sun, 27 Sep 2009 23:46:37 +0200 + +pulseaudio (1:0.9.18-0ubuntu3) karmic; urgency=low + + * debian/patches/: + + 0052-revert-sse2-optimize.patch: Revert 3d5a57 causing audio + anomalies (LP: #428619) + + -- Daniel T Chen Tue, 22 Sep 2009 22:19:42 -0400 + +pulseaudio (1:0.9.18-0ubuntu2) karmic; urgency=low + + * Remove epoch again, fixes FTBFs. + + -- Luke Yelavich Mon, 21 Sep 2009 11:12:00 +1000 + +pulseaudio (1:0.9.18-0ubuntu1) karmic; urgency=low + + [ Daniel T Chen ] + * New upstream bugfix release + * debian/patches/: + - 0052-backport-56b6e18030.patch: Drop + - 0053-fix-output-element.patch: Drop, applied upstream + - 0090-use-volume-ignore-for-analog-output.patch: Stop applying + this patch. Too many people are confused as to why PCM isn't + being changed when they adjust PA's volume. + + 0060-backport-c194d.patch: Backport fixes from 0.9.18-stable + branch (to changeset c194db71b0ff853b4f46df26e135edf63b215451) + + 0090-disable-flat-volumes.patch: Many people seem uncomfortable + with PA's new default volume adjustment routine, so disable it + in favour of the existing behaviour known in previous Ubuntu + releases. The downside is that the user again has many knobs to + fiddle; the upside is that applications can no longer drop the + volume floor. This addresses LP: #403859, #433209. + + [ Luke Yelavich ] + * debian/pulse-alsa.conf: Expose the pulse device to the ALSA name hint API. + Thanks to David Henningsson for the patch. + * Add epoch to shlibs version definitions. + + -- Luke Yelavich Mon, 21 Sep 2009 10:28:25 +1000 + +pulseaudio (0.9.17-1) unstable; urgency=low + + * New upstream release + * debian/copyright: updated + * Update various shlibs files to use 0.9.17 + + -- Sjoerd Simons Sat, 12 Sep 2009 10:27:46 +0100 + +pulseaudio (1:0.9.17-0ubuntu2) karmic; urgency=low + + * debian/patches/: + + 0051-fix-sigfpe-mcalign.patch: Handle div by zero attempts + (LP: #412224) + + 0052-backport-56b6e18030.patch: Backport fixes from git HEAD + (56b6e18030b5a467946bd0a5803ec119efccdc8a) + + 0053-fix-output-element.patch: Fix misspelling of Surround + + 0054-mute-iec958-optical-raw-for-audigyX.patch: Mute + IEC958 Optical Raw by default (LP: #400629, #408370) + + -- Daniel T Chen Thu, 17 Sep 2009 19:57:15 -0400 + +pulseaudio (1:0.9.17-0ubuntu1) karmic; urgency=low + + [ Daniel T Chen ] + * New upstream release + + [ Luke Yelavich ] + * debian/rules: refer to the 0.9.17 directory + * bump shlibs + + -- Luke Yelavich Mon, 14 Sep 2009 10:01:24 +1000 + +pulseaudio (0.9.16-1) unstable; urgency=low + + * New upstream release + * debian/copyright: updated + * debian/control: Remove the liboil build-dep + * debian/libpulse0.shlibs: Bump to >= 0.9.16 + * debian/pulseaudio.postinst: No longer make pulseaudio suid and no longer + create the pulse-rt group. Setting realtime priorities is now handled by + rtkit. + + -- Sjoerd Simons Thu, 10 Sep 2009 21:53:15 +0100 + +pulseaudio (1:0.9.16-0ubuntu1) karmic; urgency=low + + [ Daniel T Chen ] + * debian/patches/0090-use-volume-ignore-for-analog-output.patch: + + Realign volume control behaviour with existing Ubuntu releases, + i.e., disable volume = merge and use volume = ignore for + analog output + + [ Luke Yelavich ] + * New upstream release + * debian/patches/0057-introspect-version-fixes.patch (LP: #426210), + debian/patches/0056-alsa-rework.patch, + debian/patches/0055-llvm-clang-analyzer-fixes.patch, + 0054-volume-libpulse-backported-fixes.patch, + 0053-add-input-sources.patch, + debian/patches/0052-disable-cpu-limit.patch: Dropped, all applied upstream + * debian/patches/0051-reduce-lib-linking.patch: Drop, since we are not going + to be doing bi-arch pulseaudio packages for karmic + + -- Luke Yelavich Fri, 11 Sep 2009 09:24:39 +1000 + +pulseaudio (1:0.9.16~test7-14-g7ca81-0ubuntu2) karmic; urgency=low + + * debian/control: Fix missing pulseaudio-module-rygel-media-server + Depends thanks to lintian + * debian/patches/0054-use-sse2-volume.patch: + - Remove, resolved differently upstream (see below) + * debian/patches/0054-volume-libpulse-backported-fixes.patch: + + Add fixes from git HEAD: + e6a666d8d5fffbc9847b51b35349b88d74970079 (PA_BYTES_SNPRINT_MAX) + 5cf0c1e544a5fce97d514c793256b2e301277136 (rearrange functions) + 508c462841fd087528649ed1ca3646363387bb5d: + b5ac3839e18524524fa3e0da7ec68dbce16e8203 (remap/vol only SSE2) + 723499439f575f744f07c85a42b47d95cdc98de6 (init SSE2) + 3bbc5e6a4d0211d8cedd2fe6698c2e2c07d1c4b9 (add PA_VOLUME_INVALID) + cc6c4fe91f916451bbea9073619c11a6b122b684 (check pa_volume_t args) + 9755bfa58af0c27b478d5d8cc56013527a6f660b (drop expensive checks) + d000dd6f4b976894558613f69bdad2974cce7d1e (NULL chan map consist.) + 41a0dc1e9987ae00b605fd88bf887becbdf097d5 (log invalid fade/bal) + 08a4d57ce2f20173ea8a90e597a3ebcd28398242 (ok NULL proplist inv.) + * debian/patches/0055-llvm-clang-analyzer-fixes.patch: + + Add fixes from git HEAD: + f5046759cdd72daf5ba3b31c9dfc7b8d5be6bc9b.. + 7cc100d9e1d7093da44c8c83cbf61bb8c6000d9a + + -- Daniel T Chen Tue, 08 Sep 2009 18:21:00 -0400 + +pulseaudio (1:0.9.16~test7-14-g7ca81-0ubuntu1) karmic; urgency=low + + * New git snapshot of origin/master (0.9.16~test7-14-g7ca81) + fixes LP: #419658, #422451, #424127 + * debian/pulseaudio.install: add module-loopback + * debian/control: remove liboil*-dev build-dependency thanks to + included ASM optimisations + * debian/copyright: update; we've added module-loopback + * debian/patches/0052-disable-cpu-limit.patch: Disable cpu limit as + per 812be327836c93492ad389333bcc037566141eb8 + * debian/patches/0053-add-input-sources.patch: Add internal mic and + docking station as per 8cd635bc614834c13d0f1c586d472b4a52b98664 + * debian/patches/0054-use-sse2-volume.patch: Only use if SSE2 is + available. This is a workaround for LP: #418448, thanks "knarf"! + + -- Daniel T Chen Sun, 06 Sep 2009 14:23:15 -0400 + +pulseaudio (1:0.9.16~test6-3-g57e1-0ubuntu2) karmic; urgency=low + + * add -march=armv6 to compiler flags on armel, recent upstream changes + make pulse fail building on anything below v6 (what a very bad idea !) + + -- Oliver Grawert Thu, 27 Aug 2009 16:25:15 +0200 + +pulseaudio (1:0.9.16~test6-3-g57e1-0ubuntu1) karmic; urgency=low + + [ Daniel T Chen ] + * New git snapshot of origin/master (0.9.16~test6-3-g57e1) + * debian/patches/: + + 0050-revert-pacmd-poll-argv.patch: Retain, still seeing + excessive cpu usage with resume + - 0051-leave-hp-enabled.patch: Drop, applied upstream + + 0051-reduce-lib-linking.patch: Refresh and rename previous + 0052-reduce.. so that minimal changes are made + + [ Luke Yelavich ] + * debian/control: Promote rtkit from suggests to recommends + + -- Luke Yelavich Tue, 25 Aug 2009 09:44:32 +1000 + +pulseaudio (0.9.16~test5-1) experimental; urgency=low + + * New Upstream Version + + -- Sjoerd Simons Sat, 22 Aug 2009 21:59:34 +0100 + +pulseaudio (1:0.9.16~test5-0ubuntu2) karmic; urgency=low + + [ Daniel T Chen ] + * debian/patches/0051-leave-hp-enabled.patch: Leave + headphones enabled in the default analog mixer profiles + + [ Luke Yelavich ] + * debian/patches/0052-reduce-lib-linking.patch: Reduce the number of + libraries that the libpulse libraries are linked against as much as + possible, to lessen the work needed to make bi-arch libpulse packages + in the future + * Remove pulseaudio.desktop once again, as the a11y special case is + not being honoured, and we have the Xsession.d script to start pulse + for us, to avoid any races with other apps wanting to play sounds on + session startup + + -- Luke Yelavich Fri, 21 Aug 2009 15:48:31 +1000 + +pulseaudio (1:0.9.16~test5-0ubuntu1) karmic; urgency=low + + * New upstream release + * debian/patches/0050-backport-git-post-test4.patch: drop + * debian/patches/0050-revert-pacmd-poll-argv.patch: revert pacmd + changesets due to excessive cpu usage (poll()) with resume: + - aae7054b1c442e62cc1154d15a4b7a569d60d8f4 + - 5fcb8a3c0838a4ecdb00a0af09b6e1a358b114d0 + * debian/01PulseAudio: Escape hash when passed to sudo -u + (LP: #414385). Thanks, Christoph Kurrat and Dana Goyette! + * debian/pulseaudio.init: Add NetworkManager to + Should-St{art,op} to fix sink/source publishing with Avahi + (LP: #413443). Thanks, Martin-Éric Racine! + + -- Daniel T Chen Wed, 19 Aug 2009 17:43:48 -0400 + +pulseaudio (0.9.16~test4-1) experimental; urgency=low + + * New Upstream Version + + -- Sjoerd Simons Sun, 09 Aug 2009 18:24:46 +0100 + +pulseaudio (1:0.9.16~test4-0ubuntu6) karmic; urgency=low + + * Correct changelog entry for 1:0.9.16~test4-0ubuntu5 + (5fcb8a3c0838a4ecdb00a0af09b6e1a358b114d0 was _not_ + applied) + * Resync proper 0050-backport-git-post-test4.patch + from the ~ubuntu-audio-dev PPA branch + * debian/control: Drop libgdbm-dev; use tdb-dev instead + since it's upstream's approach + + -- Daniel T Chen Thu, 13 Aug 2009 22:49:07 -0400 + +pulseaudio (1:0.9.16~test4-0ubuntu5) karmic; urgency=low + + [ Daniel T Chen ] + * 0050-backport-git-post-test4.patch: Add the following changesets + from git (can be dropped with -test5): + + 51b3899348bf29dd88b56691aeea9f57895dfd14 + + 7d4916379bbf05384ad199004949cc220822aa5f + + 23a294c97e62e0bee9b17b1f8ad20a39e1ba15da + + d27e26dca0b492b1906b42b2d0f7decd38ed8ae3 + + 462cdf44b7fe36768c836c90761f6b8153290517 + + e8340345f6a102cd03b6676576bcd3879ead7aad + + 8998cba6839a46f11daec411c83a1b35723c5117 + + facae1f27504983d7eff7c7c3ffa864f7e002272 + + 9f53aa5546e7bf9246546c6dda5637d50679483c + + ef176ecb62a8f04bd14ca37e7c2a40469f0bb8ba + + 27b8cd783c2aedb23af8f88fc88632d5c4f387fd + + 5921324fd3c16e2b3d38d07b200febd90835f169 + + 286ab2f19370c7a0041897435614b2c6aadc8e70 + + 17d57415f5abad5b7c30301227054b4c899bc705 + + [ Luke Yelavich ] + * debian/pulseaudio.install: Also add previously dropped 70pulseaudio file + + -- Luke Yelavich Fri, 14 Aug 2009 10:29:16 +1000 + +pulseaudio (1:0.9.16~test4-0ubuntu4) karmic; urgency=low + + * debian/pulseaudio.install: ...and also re-add droped apport hook, and + alsa configuration files + + -- Luke Yelavich Fri, 07 Aug 2009 10:05:51 +0100 + +pulseaudio (1:0.9.16~test4-0ubuntu3) karmic; urgency=low + + * debian/pulseaudio.install: Also re-add pulse-session wrapper script + + -- Luke Yelavich Fri, 07 Aug 2009 09:41:15 +0100 + +pulseaudio (1:0.9.16~test4-0ubuntu2) karmic; urgency=low + + * debian/pulseaudio.install: + - Re-add the pm-utils script that was inadvertantly left out with the + previous Debian merge + - Add udev rules from upstream, needed for particular sound hardware + + -- Luke Yelavich Thu, 06 Aug 2009 18:49:12 +0100 + +pulseaudio (1:0.9.16~test4-0ubuntu1) karmic; urgency=low + + * New upstream release + * debian/patches/0008-clean-out-old-files.patch: Dropped, applied upstream + * debian/control: Fix pulseaudio-module-rygel-media-server debug package name + + -- Luke Yelavich Wed, 05 Aug 2009 12:02:18 +0100 + +pulseaudio (1:0.9.16~test3-0ubuntu1) karmic; urgency=low + + * New upstream release + * debian/pulseaudio.postinst: + - Do not create the pulse-rt group any more + - Do not make the pulseaudio binary suid root + * debian/pulseaudio.postrm: Do not try to remove the pulse-rt group + * debian/pulseaudio.preinst: Remove the pulse-rt group on upgrade + * debian/control: + - Suggest rtkit + - Renamed pulseaudio-module-hal and pulseaudio-module-hal-dbg to + pulseaudio-module-udev and pulseaudio-module-udev-dbg respectively + - pulseaudio-module-udev replaces pulseaudio-module-hal + - Bumped libudev-dev requirement to >= 143 + - Added build dependencies libICE-dev, libxi-dev, x11proto-core-dev + - Add new package for the rygel-media-server module + - Tighten libasound2-dev and libsndfile1-dev dependencies + * debian/pulseaudio.init: Change all hal references to udev + * debian/patches/0008-clean-out-old-files.patch: Remove non-existant files + from POTFILES.in, patch sent upstream + * Merge from Debian unstable, remaining changes: + - epoch (my stupid fault :S) + - Don't build against, and create jack package. Jack is not in main + - use speex-float-1 resampler to work better with lack of PREEMPT in + karmic's -generic kernel config, also change buffer size + - Add alsa configuration files to route alsa applications via pulseaudio + - Move libasound2-plugins from Recommends to Depends + - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio + daemons + - patch to fix source/sink and suspend-on-idle race + - Make initscript more informative in the default case of per-user + sessions + - add status check for system wide pulseaudio instance + - create /var/run/pulse, and make restart more robust + - LSB {Required-*,Should-*} should specify hal instead of dbus, + since hal is required (and already requires dbus) + - indicate that the system pulseaudio instance is being started from the init + script + - Install more upstream man pages + - Link to pacat for parec man page + - check whether pulseaudio is running before preloading the padsp library + - Add DEB_OPT_FLAG = -O3 as per recommendation from + pulseaudio-discuss/2007-December/001017.html + - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load + - Generate a PO template on build + - add special case to disable pulseaudio loading if accessibility/speech + is being used + - the esd wrapper script should not load pulseaudio if pulseaudio is being + used as a system service + - add a pulseaudio apport hook + - fix some typos in README.Debian + - drop padevchooser(Recommends) and pavucontrol (Suggests) + - drop libasyncns-dev build dependency, its in universe + - add libudev-dev as a build-dependency + + -- Luke Yelavich Tue, 04 Aug 2009 11:46:25 +0100 + +pulseaudio (0.9.16~test2~20090726git59659e1db-1) experimental; urgency=low + + * New Upstream Version + * Ack NMU (Was fixed upstream in this version) (Closes: #537351) + * Remove all patches, everything was merged upstream :) + * debian/copyright: updated + * debian/pulseaudio.install: Don't install the PolicyKit config file + * debian/control: Removed build-dep on libpolkit-dbus-dev + * Update various shlibs files to use 0.9.16 + * debian/pulseaudio.install: Install pulseaudio shared config files + * debian/pulseaudio.instal: Add module-intended-roles + * debian/control: Make pulseaudio-module-raop-dbg depend on + pulseaudio-module-raop + + -- Sjoerd Simons Tue, 28 Jul 2009 14:00:27 +0200 + +pulseaudio (0.9.15-4.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix race condition when reading /proc/self/exe and reloading the binary + that leads to arbitrary code execution as pulseaudio is suid root + + Use LDFLAGS to preload DSOs + + regenerate autofoo + (CVE-2009-1894; Closes: #537351). + + -- Nico Golde Fri, 24 Jul 2009 18:02:24 +0200 + +pulseaudio (1:0.9.15-4ubuntu3) karmic; urgency=low + + * debian/01PulseAudio: Mute sinks and sources prior to + suspend; unmute sinks and sources after resume (LP: #404986) + * debian/patches/series: Reenable glitch-free. + + -- Daniel T Chen Mon, 27 Jul 2009 22:06:34 -0400 + +pulseaudio (1:0.9.15-4ubuntu2) karmic; urgency=low + + * SECURITY UPDATE: root escalation from BIND_NOW re-execution. + - 0040-do-not-exec-for-bindnow.patch: use -Wl,-z,now instead of + performing a racey re-exec. + - CVE-2009-1894 + + -- Kees Cook Thu, 16 Jul 2009 10:03:46 -0700 + +pulseaudio (1:0.9.15-4ubuntu1) karmic; urgency=low + + [ Daniel T Chen ] + * debian/patches/0001_change_resample_and_buffering.patch: Bump + default resampler to speex-float-1 due to remaining audio + anomalies when playing DVDs (LP: #376374) + + [ Luke Yelavich ] + * Merge from Debian unstable, remaining changes: + - epoch (my stupid fault :S) + - Don't build against, and create jack package. Jack is not in main + - use speex-float-1 resampler to work better with lack of PREEMPT in + karmic's -generic kernel config, also change buffer size + - Add alsa configuration files to route alsa applications via pulseaudio + - Move libasound2-plugins from Recommends to Depends + - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio + daemons + - patch to fix source/sink and suspend-on-idle race + - Make initscript more informative in the default case of per-user + sessions + - add status check for system wide pulseaudio instance + - create /var/run/pulse, and make restart more robust + - LSB {Required-*,Should-*} should specify hal instead of dbus, + since hal is required (and already requires dbus) + - indicate that the system pulseaudio instance is being started from the init + script + - Install more upstream man pages + - Link to pacat for parec man page + - check whether pulseaudio is running before preloading the padsp library + - Add DEB_OPT_FLAG = -O3 as per recommendation from + pulseaudio-discuss/2007-December/001017.html + - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load + - disable glitch free (use tsched=0) + - Generate a PO template on build + - add special case to disable pulseaud * debian/patches/0090-fix-sw-mute-desync.patch: Dropped, as this is included + in the recently added patches in Debian.io loading if accessibility/speech + is being used + - the esd wrapper script should not load pulseaudio if pulseaudio is being + used as a system service + - add a pulseaudio apport hook + - fix some typos in README.Debian + - drop padevchooser(Recommends) and pavucontrol (Suggests) + - drop libasyncns-dev build dependency, its in universe + - add libudev-dev as a build-dependency + * debian/patches/0090-fix-sw-mute-desync.patch: Dropped, as this is included + in the recently added patches in Debian. + + -- Luke Yelavich Mon, 22 Jun 2009 11:17:06 +1000 + +pulseaudio (0.9.15-4) unstable; urgency=low + + * Synchronize our patches with Mandriva and Fedora (thanks to Colin Guthrie + and Lennart Poettering) + - 0002-util-if-NULL-is-passed-to-pa_path_get_filename-just-.patch + - 0003-alsa-don-t-hit-an-assert-when-invalid-module-argumen.patch + - 0004-alsa-fix-wording-we-are-speaking-of-card-profiles-no.patch + - 0005-alsa-initialize-buffer-size-before-number-of-periods.patch + - 0006-conf-remove-obsolete-module-idle-time-directive-from.patch + - 0007-core-make-sure-soft-mute-status-stays-in-sync-with-h.patch + + Ensure hw and software mute states stay in sync + (Closes: #525572, #522177) + - 0008-endian-fix-LE-BE-order-for-24-bit-accessor-functions.patch + - 0009-log-print-file-name-only-when-we-have-it.patch + - 0010-man-document-24bit-sample-types-in-man-page.patch + - 0011-man-document-log-related-daemon.conf-options.patch + - 0012-man-document-that-tsched-doesn-t-use-fragment-settin.patch + - 0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mute.patch + - 0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-devi.patch + - 0015-simple-protocol-don-t-hit-an-assert-when-we-call-con.patch + - 0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch + - 0017-rescue-streams-when-one-stream-move-fails-try-to-con.patch + - 0018-sample-correctly-pass-s24-32-formats.patch + - 0019-sample-util-fix-iteration-loop-when-adjusting-volume.patch + - 0020-sample-util-properly-allocate-silence-block-for-s24-.patch + - 0021-sconv-fix-a-few-minor-conversion-issues.patch + - 0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fails.patch + - 0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when-.patch + - 0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch + - 0025-core-cache-requested-latency-only-when-we-are-runnin.patch + - 0026-sample-fix-build-on-BE-archs.patch + - 0027-alsa-properly-convert-return-values-of-snd_strerror-.patch + - 0028-alsa-remove-debug-code.patch + + -- Sjoerd Simons Sun, 21 Jun 2009 15:40:33 +0100 + +pulseaudio (1:0.9.15-3ubuntu1) karmic; urgency=low + + [ Daniel T Chen ] + * debian/patches/0001_change_resample_and_buffering.patch: Bump + default resampler to ffmpeg. We cannot peg the cpu, and we cannot + have audio anomalies, so this change _should_ be regression-free + but needs extensive testing (LP: #376374). + * debian/patches/0090_fix_sw_mute_desync.patch: Backport from + git HEAD to resolve sw vol becoming muted on logout + (LP: #315971, #352732) + + [ Luke Yelavich ] + * Merge from Debian unstable, remaining changes: + - epoch (my stupid fault :S) + - Don't build against, and create jack package. Jack is not in main + - use ffmpeg resampler to work better with lack of PREEMPT in jaunty's + -generic kernel config, also change buffer size + - Add alsa configuration files to route alsa applications via pulseaudio + - Move libasound2-plugins from Recommends to Depends + - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio + daemons + - patch to fix source/sink and suspend-on-idle race + - Make initscript more informative in the default case of per-user + sessions + - add status check for system wide pulseaudio instance + - create /var/run/pulse, and make restart more robust + - LSB {Required-*,Should-*} should specify hal instead of dbus, + since hal is required (and already requires dbus) + - indicate that the system pulseaudio instance is being started from the init + script + - Install more upstream man pages + - Link to pacat for parec man page + - check whether pulseaudio is running before preloading the padsp library + - Add DEB_OPT_FLAG = -O3 as per recommendation from + pulseaudio-discuss/2007-December/001017.html + - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load + - disable glitch free (use tsched=0) + - Generate a PO template on build + - add special case to disable pulseaudio loading if accessibility/speech + is being used + - the esd wrapper script should not load pulseaudio if pulseaudio is being + used as a system service + - add a pulseaudio apport hook + - fix some typos in README.Debian + - drop padevchooser(Recommends) and pavucontrol (Suggests) + - drop libasyncns-dev build dependency, its in universe + - add libudev-dev as a build-dependency + + -- Luke Yelavich Tue, 09 Jun 2009 10:47:05 +1000 + +pulseaudio (0.9.15-3) unstable; urgency=low + + * Re-enable bluetooth support (Closes: #530514) + * No longer recommend padevchooser and let paprefs be a suggest + (Closes: #530810) + * 0001-alsa-allow-configuration-of-fallback-device-strings-.patch + - Added. Support alsa devices which only have the raw hw device, but no + front device even though they can do 2ch stereo (from upstream git) + * Add support for the status action in the init script, patch by Peter + Eisentraut (Closes: #527333) + * Change the libjack0.100.0-dev build-depend to libjack-dev as per request of + the debian multimedia maintainers (Closes: #527424) + * Prevent the default.pa manpage from being installed as part of the pa + locale (Closes: #508874) + + -- Sjoerd Simons Sun, 07 Jun 2009 22:30:33 +0100 + +pulseaudio (1:0.9.15-2ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining changes: + - epoch (my stupid fault :S) + - Don't build against, and create jack package. Jack is not in main + - use linear resampler to work better with lack of PREEMPT in jaunty's + -generic kernel config, also change buffer size + - Add alsa configuration files to route alsa applications via pulseaudio + - Move libasound2-plugins from Recommends to Depends + - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio + daemons + - patch to fix source/sink and suspend-on-idle race + - Make initscript more informative in the default case of per-user + sessions + - create /var/run/pulse, and make restart more robust + - add status check for system wide pulseaudio instance + - LSB {Required-*,Should-*} should specify hal instead of dbus, + since hal is required (and already requires dbus) + - indicate that the system pulseaudio instance is being started from the init + script + - Install more upstream man pages + - Link to pacat for parec man page + - check whether pulseaudio is running before preloading the padsp library + - Add DEB_OPT_FLAG = -O3 as per recommendation from + pulseaudio-discuss/2007-December/001017.html + - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load + - disable glitch free (use tsched=0) + - Generate a PO template on build + - add special case to disable pulseaudio loading if accessibility/speech + is being used + - the sd wrapper script should not load pulseaudio if pulseaudio is being + used as a system service + - add a pulseaudio apport hook + - fix some typos in README.Debian + - demote paprefs to suggests + - drop padevchooser(Recommends) and pavucontrol (Suggests) + - drop libasyncns-dev build dependency, its in universe + - add libudev-dev as a build-dependency + - Retain libbluetooth-dev build dependency + * debian/01Pulseaudio: Harvist users by UID, and not username, to ensure + that the script doesn't choak on characters not already considered as + used in a username (LP: #374694) + + -- Luke Yelavich Tue, 26 May 2009 23:33:42 +0200 + +pulseaudio (0.9.15-2) unstable; urgency=low + + * debian/control: Add strict dependencies from libpulse-dev to the various + libraries (Closes: #525759) + * Add local shlib files to ensure the correct dependencies get generated + (Closes: #528405) + + -- Sjoerd Simons Thu, 21 May 2009 00:54:38 +0100 + +pulseaudio (1:0.9.15-1ubuntu3) karmic; urgency=low + + * debian/control: libltdl7-dev -> libltdl-dev + + -- Luke Yelavich Mon, 11 May 2009 12:33:08 +1000 + +pulseaudio (1:0.9.15-1ubuntu2) karmic; urgency=low + + * debian/01PulseAudio: harvest users more robustly. Thanks, + Chow Loong Jin ! (LP: #202089) + * debian/control: pulseaudio depends on pulseaudio-module-hal + to fix LP: #326532 + + -- Daniel T Chen Thu, 09 Apr 2009 17:03:00 -0400 + +pulseaudio (1:0.9.15-1ubuntu1) karmic; urgency=low + + * Merge from unreleased Debian pulseaudio git, remaining changes: + - epoch (my stupid fault :S) + - Don't build against, and create jack package. Jack is not in main + - use linear resampler to work better with lack of PREEMPT in jaunty's + -generic kernel config, also change buffer size + - Add alsa configuration files to route alsa applications via pulseaudio + - Move libasound2-plugins from Recommends to Depends + - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio + daemons + - patch to fix source/sink and suspend-on-idle race + - Make initscript more informative in the default case of per-user + sessions + - create /var/run/pulse, and make restart more robust + - add status check for system wide pulseaudio instance + - LSB {Required-*,Should-*} should specify hal instead of dbus, + since hal is required (and already requires dbus) + - indicate that the system pulseaudio instance is being started from the init + script + - Install more upstream man pages + - Link to pacat for parec man page + - check whether pulseaudio is running before preloading the padsp library + - Add DEB_OPT_FLAG = -O3 as per recommendation from + pulseaudio-discuss/2007-December/001017.html + - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load + - disable glitch free (use tsched=0) + - Generate a PO template on build + - add special case to disable pulseaudio loading if accessibility/speech + is being used + - the sd wrapper script should not load pulseaudio if pulseaudio is being + used as a system service + - add a pulseaudio apport hook + - fix some typos in README.Debian + - demote paprefs to suggests + - drop padevchooser(Recommends) and pavucontrol (Suggests) + - drop libasyncns-dev build dependency, its in universe + * add libudev-dev as a build-dependency + + -- Luke Yelavich Tue, 05 May 2009 14:18:20 +1000 + +pulseaudio (0.9.15-1) unstable; urgency=low + + * debian/control: Build-Depend on libcap-dev instead of libcap2-dev + * New Upstream Version + * Fixes building on HPPA (Closes: #520378) + * Fixes building with recent libtool (Closes: #522716) + * Update copyright file + * Updated pulseaudio-module-hal.install, dbus-util became part of pulsecore + * Move debug package to the debug Section + * Done make shlibs files for modules in /usr/lib/pulse-0.9.15 + * Update standards-version to 3.8.1, no further changes + * Set priority of pulseaudio-module-raop-dbg to extra + * Change build-depend on libltdl7-dev to recent versions libltdl-dev + * Add Breaks to libpulse0 for old version of pavucontrol + * Temporarily disable bluetooth support as the needed bluez version is stuck + in the NEW queue + + -- Sjoerd Simons Sun, 19 Apr 2009 14:43:41 +0100 + +pulseaudio (0.9.15~test5-1) experimental; urgency=low + + * New Upstream Version + * debian/copyright: Updated + * debian/control: Build-Depends on libltdl7-dev + * debian/control: Build-Depends on libasound2-dev (>= 1.0.19) + * debian/rules: Use git format-patch instead of git-format-patch + * debian/patches/0001-load-module-gconf-earlier.patch: + - Removed. Merged upstream + * debian/pulseaudio.install: Update for new modules + * debian/pulseaudio-module-x11.install: Update for new modules + * Move libpulscore into the pulseaudio package + * debian/pulseaudio-module-bluetooth.install: Add the bluetooth-util module + library + * debian/pulseaudio.install: Add new modules + * debian/control: Add bulid-depends on libgtk2.0-dev and libxtst-dev + * debian/pulseaudio.shlibs, debian/libpulse0.shlibs: Update shlib files + * debian/pulseaudio.install: Add liboss-util.so oss module helper library + * debian/control, debian/pulseaudio-module-raop.install: Add RAOP module + + -- Sjoerd Simons Sun, 22 Mar 2009 23:06:50 +0000 + +pulseaudio (0.9.14-2) unstable; urgency=low + + [ Sjoerd Simons ] + * Build against libcap2-dev (Closes: #489060) + * Bump shlibs of libpulse0 (Closes: #514645) + * Bump soname of libpulsecore to 9 + * Wait up to 5 seconds for pulseaudio to stop. Fix suggested by Aron Griffis + (Closes: #488754, #498457) + * Don't put stop links in rc0 and rc6. Pulse doens't really need it. Patch + supplied by James Westby (Closes: #494959) + * Make the start option of the init script report the right status. Fix + suggested by Aron Griffis (Closes: #488752) + * Use per user esound sockets instead of a single one for all users + + [ Baptiste Mille-Mathias ] + * debian/control: + - create a separate package for bluetooth module (Closes: #513832) + * debian/pulseaudio-module-bluetooth.install + - put files for the separate bluetooth module package + * debian/pulseaudio.install + - remove files of the separate bluetooth module package + + [ Sjoerd Simons ] + * debian/control: Don't build the bluetooth module on non-linux systems + (Closes: #502837) + * debian/control: Make the bluetooth module conflict with older pulseaudio + versions + * Update standards version, no changes needed + * debian/copyright: Big update + + -- Sjoerd Simons Sun, 01 Mar 2009 15:53:27 +0000 + +pulseaudio (0.9.14-1) experimental; urgency=low + + * New Upstream Version + * 0002-load-module-gconf-earlier.patch renamed to + 0001-load-module-gconf-earlier.patch and updated + * 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch + - Removed, no longer applicable + * 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch + - Removed, fixed upstream + * 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch + - Removed, fixed upstream + * debian/patches/series + - Updated + + -- Sjoerd Simons Sun, 01 Feb 2009 12:47:55 +0000 + +pulseaudio (1:0.9.14-0ubuntu20) jaunty; urgency=low + + * debian/01PulseAudio: use pactl instead of pacmd (LP: #202089) + + -- Daniel T Chen Wed, 08 Apr 2009 18:54:30 -0400 + +pulseaudio (1:0.9.14-0ubuntu19) jaunty; urgency=low + + [ Daniel T Chen ] + * debian/pulseaudio.init: + - Fix inane stop() syntax (LP: #357201) + * Update backported (from git HEAD) fixes: + - 0091_workaround_alsa_horkage.patch + * Add new fixes: + - 0049_fix_sampling_rate_not_beyond_pa-rate-max.patch + + -- Luke Yelavich Thu, 09 Apr 2009 07:29:24 +1000 + +pulseaudio (1:0.9.14-0ubuntu18) jaunty; urgency=low + + * debian/apport-hook.py: Add apport hook + * debian/rules, debian/pulseaudio.install: Install apport hook + * LP: #357913 + + -- Matt Zimmerman Wed, 08 Apr 2009 20:14:17 +0100 + +pulseaudio (1:0.9.14-0ubuntu17) jaunty; urgency=low + + [ Daniel T Chen ] + * debian/pulseaudio.init: + - Actually create /var/run/pulse, and make handling of /restart + more robust (LP #317921) + - Add /status check for system-wide daemon instance + (LP: #298299) + * Backport from upstream git HEAD: + - 0046_ignore_hal_no_such_cap.patch, + - 0047_pick_up_all_cards.patch (LP: #353807), + - 0048_fix_stuck_prebuf.patch (LP: #355825) + + [ Luke Yelavich ] + * debian/control: Drop recommends from the pulseaudio-module-x11 package. if + they were dropped previously, they were re-added somehow, so lets get rid + of them once and for all. + + -- Luke Yelavich Tue, 07 Apr 2009 16:51:59 +1000 + +pulseaudio (1:0.9.14-0ubuntu16) jaunty; urgency=low + + * Introduce epoch to fix my stupidity in uploading a test release of + pulseaudio. + + -- Luke Yelavich Wed, 01 Apr 2009 14:04:33 +1100 + +pulseaudio (0.9.14-0ubuntu15) jaunty; urgency=low + + [ Daniel T Chen ] + * README.Debian: + pulse-session: + pulseaudio.default: Clarify function of system-wide check, and + make /usr/bin/pulse-session do the right thing if system-wide + is enabled (LP: #286966) + + [ Luke Yelavich ] + * Make the a11y no start special case per user, not system wide. + * Also make the esd wrapper script honour system wide pulseaudio. + + -- Luke Yelavich Mon, 30 Mar 2009 11:33:33 +1100 + +pulseaudio (0.9.14-0ubuntu14) jaunty; urgency=low + + * No-change rebuild to fix lpia shared library dependencies. + + -- Colin Watson Thu, 19 Mar 2009 13:57:35 +0000 + +pulseaudio (0.9.14-0ubuntu13) jaunty; urgency=low + + * debian/rules: Generate a PO template on build. Thanks to Timo Jyrinki for + the patch! (LP: #342159) + + -- Martin Pitt Mon, 16 Mar 2009 10:14:19 +0100 + +pulseaudio (0.9.14-0ubuntu12) jaunty; urgency=low + + * 0091_workaround_alsa_horkage.patch: + - Lower severity of logging level to prevent DoS on syslog + LP: #320875, #343254 + LP #330814 + + -- Daniel T Chen Sat, 14 Mar 2009 22:39:03 -0400 + +pulseaudio (0.9.14-0ubuntu11) jaunty; urgency=low + + [ Daniel T Chen ] + * Reenable 0030_set_tsched0.patch, which re-disables glitch-free; + too many users are reporting regressions and audio aberrations. + * Adjust 0003_change_resample_and_buffering.patch to use linear + resampler to work better with lack of PREEMPT in jaunty's + -generic kernel config (LP: #207135, #322250, #332761, #335955, + LP: #336965). + * Last upload, specifically 0091_workaround_alsa_horkage, fixes: + LP: #235990, #237443, #279847, #317997, #323185, #330814, + LP: #334874. + * sudo -H change in ubuntu6 fixed LP: #312505. + * Closing old bugs fixed in 0.9.11+: LP: #187963, #193520, #211052. + * Refresh 0006_regen-autotools.patch. + * Add 0043_load_sample_dir_lazy.patch to cache + /usr/share/sounds/ubuntu/stereo/* in default.pa. + * debian/: + - control: Build against libcap2-dev (LP: #339448); + - copyright: Update copyright from Debian's 0.9.14-2; + - rules: Add DEB_OPT_FLAG = -O3 as per recommendation from + pulseaudio-discuss/2007-December/001017.html. + * Refresh fixes from git HEAD: + - 0038_handle_errno_properly.patch, + - 0091_workaround_alsa_horkage.patch, + - 0092_fix_null_pointer_access.patch. + + [ Luke Yelavich ] + * Add a special case to prevent Pulseaudio from being started when the + blindness accessibility profile has been enabled from the Ubuntu live CD, + and for an accessibility install. Unfortunately Pulseaudio and speech do + not currently work very well with each other, and its too late in + the cycle to solve this problem any other way. + + -- Luke Yelavich Tue, 10 Mar 2009 09:00:40 +1100 + +pulseaudio (0.9.14-0ubuntu10) jaunty; urgency=low + + [ Daniel T Chen ] + * 0030_set_tsched0.patch: Disable this patch, which has the effect of + reenabling glitch-free. Depends on 0091_workaround_alsa_horkage. + * 0091_workaround_alsa_horkage.patch: Rework ALSA delay handling. + + [ Luke Yelavich ] + * debian/control: re-add the vcs bzr URL for Ubuntu's pulseaudio packaging + as it got lost somewhere along the way + + -- Luke Yelavich Mon, 02 Mar 2009 10:40:11 +1100 + +pulseaudio (0.9.14-0ubuntu9) jaunty; urgency=low + + * PulseAudio does not need to be started before gdm, especially since we use + user sessions by default. + + -- Scott James Remnant Fri, 27 Feb 2009 01:27:20 +0000 + +pulseaudio (0.9.14-0ubuntu8) jaunty; urgency=low + + [ Daniel T Chen ] + * Backport fixes from git HEAD: + - 0041_clarify_cmdline_opts.patch, + - 0042_fix_selem_init.patch + + [ Luke Yelavich ] + * 0001_more_translatable_strings.patch: Make the .desktop file and PolicyKit + files translatable, thanks to Gabor Kelemen Tue, 24 Feb 2009 13:46:25 +1100 + +pulseaudio (0.9.14-0ubuntu7) jaunty; urgency=low + + [ Luke Yelavich ] + * 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch: Dropped, + no longer applicable, as evident in Debian's pulseaudio git branch. + + [ Daniel T Chen ] + * 0004_enable_autospawn.patch: Renamed from .."disable".. for clarity, + and actually apply it. + * 0012_clarify_driver_error_redirect_to_alsa_devs.patch: Clarify + logging message for 'linux' source package and ALSA developers + instead of PulseAudio developers in alsa-util.c, too. + - This patch can be tweaked, since upstream has now applied it to + git HEAD + * Backport fixes from git HEAD: + - 0035_fix_module-detect_access.patch, + - 0036_increase_memblock_imports.patch, + - 0037_fill_silence_fail_import_memblock.patch, + - 0038_handle_errno_properly.patch, + - 0039_add_validity_checks.patch, + - 0040_legacy_fixes.patch + + -- Daniel T Chen Thu, 19 Feb 2009 19:34:03 -0500 + +pulseaudio (0.9.14-0ubuntu6) jaunty; urgency=low + + * 0004_disable_autospawn.patch: Disable this patch. Doing so + allows the daemon to spawn if not already running, which + works around LP: #191027, #204272 + * 0012_clarify_driver_error_redirect_to_alsa_devs.patch: + - Only log POLL* being set if tsched is used so that syslog + isn't filled with innocuous messages when we set tsched=0 + (see 0030 below) (LP: #323712), + - Hint 'linux' source package instead of 'alsa-driver' for + Launchpad bug reports, + - The debug-specific portion is only applicable to 0.9.14; + 0.9.15 enables a rate limiting module by default to work + around this (and other) issues + * 0029_fix_suspend_on_idle_null_race.patch: Handle sink case, + too + * 0030_set_tsched0.patch: Work around a shedload of (driver) + bugs by falling back to interrupt-based buffer semantics + (LP: #190754, #292880, #295519, #298494, #301755, #302964, + LP: #319118, #323976, #324103, #326205, #326864) + * Backport fixes from git HEAD: + - 0031_fix_6chan_map.patch, + - 0032_reinit_proplist.patch, + - 0033_fix_pa-gcc-packedmalloc.patch, + - 0034_bt_fixes.patch + * Make invoking the stop target in the initscript not fail an + upgrade (LP: #317921) + * Previous upload (0.9.14-0ubuntu3) fixed LP: #321357 + * 01PulseAudio: use sudo -H to ensure that $HOME is, in fact, + the user's when invoking pacmd for suspend/resume + + -- Daniel T Chen Sun, 15 Feb 2009 02:35:26 -0500 + +pulseaudio (0.9.14-0ubuntu5) jaunty; urgency=low + + * Add fixes from git HEAD: + - 0028_fix_uninit_rtp_resamp.patch, + - 0029_fix_suspend_on_idle_null_race.patch + + -- Daniel T Chen Thu, 12 Feb 2009 18:28:42 -0500 + +pulseaudio (0.9.14-0ubuntu4) jaunty; urgency=low + + * Add fixes from git HEAD: + - 0023_work_around_dlsym_retval_mistyping.patch, + - 0024_fix_sink_source_calls_in_suspended.patch, + - 0025_shortcut_pa-sink-process-rewind.patch, + - 0026_reset_rewind-requested_when_suspend.patch, + - 0027_fix_piped_pacmd.patch + + -- Daniel T Chen Wed, 04 Feb 2009 19:36:09 -0500 + +pulseaudio (0.9.14-0ubuntu3) jaunty; urgency=low + + [ Daniel T Chen ] + * Add fixes from git HEAD: + - 0014_fix_avail-min_calc.patch, + - 0015_no_pa-asyncq-push_fail.patch, + - 0016_dont_rely_pa-sink-running-idle_for_optim.patch, + - 0017_fix_hsp_rate_chan.patch, + - 0018_dont_restore_mute_vol_when_already_set.patch, + - 0019_fix_mem_leak_in_pa-alsa-open-by-device-string.patch, + - 0020_ask_for_same_frag_set_when_resuming_oss_dev.patch, + - 0021_add_missing_const.patch, + - 0022_dont_hit_assert_in_esound-sink_when_latency_queried.patch + + [ Luke Yelavich ] + * Re-instate /etc/X11/Xsession.d/70pulseaudio, to again load pulseaudio + earlier in the X session, to aleviate a pulse/login-sound race condition + (LP: #322374) + + -- Luke Yelavich Mon, 02 Feb 2009 15:27:55 +0100 + +pulseaudio (0.9.14-0ubuntu2) jaunty; urgency=low + + * Add fixes from trunk: + - 0012_clarify_driver_error_redirect_to_alsa_devs.patch + * Add 0013_add_padsp_wrapper_check.patch (LP: #269939) + * debian/pulseaudio.manpages: + debian/pulseaudio-esound-compat.manpages: + debian/pulseaudio-utils.links: + - Install upstream man pages (LP: #219669, #318660), + - Link to pacat for parec man page (LP: #294628) + + -- Daniel T Chen Thu, 22 Jan 2009 02:57:54 -0500 + +pulseaudio (0.9.14-0ubuntu1) jaunty; urgency=low + + * New upstream release. (LP: #317502, #317613) + * Dropped patches, all in upstream release. + - 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch + - 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch + - 0005-Fix-two-typos-that-broke-tunnels.patch + - 0008_regen_autotools.patch + - 0009_shm-arch-indep.patch + - 0010_check_before_using_environment.patch + - 0011_load_restore_before_other_modules.patch + - 0013_dont_hit_assert_issuing_two_rewinds_in_single_iter.patch + - 0014_retry_without_snd-pcm-no-auto-format.patch + - 0015_use_fionread.patch + - 0016_add_pa-source-message-get-latency.patch + - 0017_allow_dev_dsp_w-ok.patch + - 0019_fix_macro_pa-unlikely.patch + - 0020_catch_driver_errors.patch + - 0022_fix_return_val_dump-resample-methods.patch + - 0023_use_gdbm-nolock.patch + - 0024_dont_mix_front-center_into_rear.patch + - 0025_drop_cap-nice_properly.patch + - 0027_handle_multicast_sdp_with_same_ip_ttl_as_rtp.patch + - 0029_add_minor_fixes.patch + - 0030_dont_drop_client_data.patch + - 0031_use_fragsize_for_record_stream_latency.patch + * Bumped shlibs for libpulse0. + * Package libpulsecore8 -> libpulsecore9. + * Add libdbus-glib-1-dev to build-depends. + * Regression fix: + - pulse.conf: Always honour ~/.asoundrc and /etc/asound.conf with highest + priority, thanks to Daniel T Chen. (LP: #295832) + + -- Luke Yelavich Mon, 19 Jan 2009 14:45:36 +1100 + +pulseaudio (0.9.13-2ubuntu7) UNRELEASED; urgency=low + + * Add fixes from 0.9.14: + - 0030_dont_drop_client_data.patch, + - 0031_use_fragsize_for_record_stream_latency.patch, + - 0032_fix_suspend_sinks_sources.patch (LP: #317613) + + -- Daniel T Chen Thu, 15 Jan 2009 17:26:14 -0500 + +pulseaudio (0.9.13-2ubuntu6) jaunty; urgency=low + + * debian/control: Package pulseaudio-module-x11, + Recommends: gnome-audio | ubuntu-sounds. + + -- Luke Yelavich Tue, 13 Jan 2009 16:15:48 +1100 + +pulseaudio (0.9.13-2ubuntu5) jaunty; urgency=low + + [ Daniel T Chen ] + * Add fixes from git: + - 0015_use_fionread.patch, + - 0016_add_pa-source-message-get-latency.patch, + - 0017_allow_dev_dsp_w-ok.patch, + - 0018_fix_return_val_pa-frame-aligned.patch, + - 0019_fix_macro_pa-unlikely.patch, + - 0020_catch_driver_errors.patch (LP: #312373), + - 0021_convert_to_pa-bool-t.patch, + - 0022_fix_return_val_dump-resample-methods.patch, + - 0023_use_gdbm-nolock.patch, + - 0024_dont_mix_front-center_into_rear.patch, + - 0025_drop_cap-nice_properly.patch, + - 0027_handle_multicast_sdp_with_same_ip_ttl_as_rtp.patch, + - 0028_prefer_mixer_controls_with_vols.patch (LP: #281605), + - 0029_add_minor_fixes.patch + * Forward-port workaround from hardy branch for source/sink and + suspend-on-idle race (LP: #203654): + - 0026_work_around_suspend-on-idle_source_sink_race.patch + * debian/control: Drop padevchooser(Recommends) and pavucontrol + (Suggests) completely - functionality has been subsumed by + jaunty's gnome-volume-control. + * debian/pulseaudio.init: + - Make initscript more informative in the default case of per-user + sessions (LP: #259522), + - Make initscript retry (until three-second timeout) if stopping + fails when restarting (LP: #244414), + - LSB {Required-*,Should-*} should specify hal instead of dbus, + since hal is required (and already requires dbus) (LP: #244679) + * Previous upload contains patches to close: + LP: #193491, #268891, #295164, #298301 + + [ Luke Yelavich ] + * 0008_regen_autotools.patch: Pull some libtool 2.2 updates from git, + and regenerate autotools glue. + * debian/rules: Add --enable-static to force creation of libpulse.a, + a side-effect of messing with the autotools files. This shouldn't + be needed for the 0.9.14 release. + + -- Luke Yelavich Fri, 09 Jan 2009 17:05:38 +1100 + +pulseaudio (0.9.13-2ubuntu4) jaunty; urgency=low + + * Demote paprefs to suggests (LP: #309422) + * Add fixes from git: + - 0010_check_before_using_environment.patch, + - 0011_load_restore_before_other_modules.patch, + - 0012_dont_hit_assert_checking_for_idleness.patch, + - 0013_dont_hit_assert_issuing_two_rewinds_in_single_iter.patch, + - 0014_retry_without_snd-pcm-no-auto-format.patch. + + -- Daniel T Chen Sun, 28 Dec 2008 23:43:01 -0500 + +pulseaudio (0.9.13-2ubuntu3) jaunty; urgency=low + + * Add pm-utils sleep hook to suspend (and resume) users' pulseaudio + daemons (LP: #202089). Based on a patch by + Chow Loong Jin . + + -- Daniel T Chen Mon, 08 Dec 2008 22:11:32 -0800 + +pulseaudio (0.9.13-2ubuntu2) jaunty; urgency=low + + * debian/patches/0009_shm-arch-indep.patch: + - Make shm marker architecture independant, taken from git. + + -- Luke Yelavich Mon, 01 Dec 2008 12:06:00 +1100 + +pulseaudio (0.9.13-2ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental, remaining changes: + - Don't build against, and create jack package. Jack is not in main. + - Remove --disable-per-user-esound-socket from configure flags, as we still + want per user esound sockets. + - Remove stop links from rc0 and rc6. + - Change default resample algorithm and bubffer size. + - Add alsa configuration files to route alsa applications via pulseaudio. + - Move libasound2-plugins from Recommends to Depends. + - debian/pulseaudio.preinst: When upgrading from intrepid, remove + /etc/X11/Xsession.d/70pulseaudio, as this was used to minimize a race + condition when starting GNOME in intrepid. This race should not exist in + jaunty once libcanberra is built to use pulseaudio as a backend. + - Do not spawn a pulseaudio server if clients fail to find a running server. + - Regenerate autotools files for ubuntu. + + -- Luke Yelavich Wed, 19 Nov 2008 10:44:03 +1100 + +pulseaudio (0.9.13-2) experimental; urgency=low + + * Rename libpulsecore5 to libpulsecore8 to correctly reflect the soname + (Closes: #503612) + * 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch + - Fix rounding errors on 32 bit machines. From upstream git + * 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch + - Properly remove dbus filters when unloading the bluetooth module + * 0005-Fix-two-typos-that-broke-tunnels.patch + - Fix tunnels. From upstream git + + -- Sjoerd Simons Sun, 16 Nov 2008 18:13:05 +0000 + +pulseaudio (0.9.13-1ubuntu3) jaunty; urgency=low + + * Build-depend on libltdl7-dev to make the armel buildd happy. + + -- Matthias Klose Wed, 19 Nov 2008 16:26:45 +0000 + +pulseaudio (0.9.13-1ubuntu2) jaunty; urgency=low + + * Drop libasyncns-dev again. Its in universe, and we will worry about + whether we really need it again later. + + -- Luke Yelavich Tue, 18 Nov 2008 15:47:20 +1100 + +pulseaudio (0.9.13-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Don't build against, and create jack package. Jack is not in main. + - Remove --disable-per-user-esound-socket from configure flags, as we still + want per user esound sockets. + - Remove stop links from rc0 and rc6. + - Change default resample algorithm and bubffer size. + - Add alsa configuration files to route alsa applications via pulseaudio. + - Move libasound2-plugins from Recommends to Depends. + * debian/pulseaudio.preinst: When upgrading from intrepid, remove + /etc/X11/Xsession.d/70pulseaudio, as this was used to minimize a race + condition when starting GNOME in intrepid. This race should not exist in + jaunty once libcanberra is built to use pulseaudio as a backend. + * Do not spawn a pulseaudio server if clients fail to find a running server. + * Remove explicit version dependency for libspeex-dev to allow the package + to be built for now. + * Regenerate autotools files to work with Ubuntu's newer libtool/libltdl. + * debian/control: libpulsecore5 -> libpulsecore8 to match the library + soname. + + -- Luke Yelavich Tue, 04 Nov 2008 15:46:00 +1100 + +pulseaudio (0.9.13-1) experimental; urgency=low + + [ Bas Zoetekouw ] + * debian/control: Build-Depend on libasound2-dev (>= 1.0.17) + * debian/pulseaudio-module-x11.install: No longer install an xdg autostart + file + * debian/pulseaudio.install: Install system.pa config file and various new + pulseaudio modules + * debian/rules: Add --disable-per-user-esound-socket to configure flags + + [ Sjoerd Simons ] + * New Upstream Version + * Fixes FTBTS on GNU/kFreeBSD (Closes: #497624) + * Dropped patches for things that have been fixed upstream: + - 0003-Define-PULSE_INTERNAL.patch + - 0005-Reduce-RT-prio-logging-severity.patch + - 0006-fix-iteration-over-random-devices.patch + * rename 0003-load-module-gconf-earlier.patch to + 0002-load-module-gconf-earlier.patch + * rename 0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch + to 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch + * rename 0004-load-module-gconf-earlier.patch to + 0003-load-module-gconf-earlier.patch + * 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch + - Dropped, not necessary anymore, the --disable-per-user-esound-socket + configure flag now has the same result + * debian/control: Add libspeexdsp-dev (>= 1.2~rc1) to Build-Depends + * debian/control: Add Build-Depends on libpolkit-dbus-dev and + libbluetooth-dev + * debian/pulseaudio.install: Install various new modules. Including bluetooth + and polkit, which will move into a separate package later. + * debian/pulseaudio.install: Install the new pulseaudio xdg autostart file + * debian/control: add a depend on consolekit. Might be downgrade to a + recommend later + * debian/control: Set the maintainer to the pkg-pulseaudio mailinglist + * debian/control: Add libgdbm-dev to build-depends + * debian/control: Add intltool to build-depends + + -- Sjoerd Simons Sun, 19 Oct 2008 21:05:13 +0100 + +pulseaudio (0.9.10-3) unstable; urgency=low + + * debian/patches/0006-fix-iteration-over-random-devices.patch + - Added. Iterate over the various random devices if opening fails + (Closes: #491270) + + -- Sjoerd Simons Sat, 30 Aug 2008 14:24:51 +0100 + +pulseaudio (0.9.10-2ubuntu9) intrepid; urgency=low + + * debian/70pulseaudio && debian/pulse-session: Use a wrapper script + to start pulseaudio at the Xsession.d phase of the login process. + The wrapper script is necessary to execute processes that need to + be loaded after pulseaudio, such as the X session manager. This + works around a race condition involving pulseaudio and canberra-gtk-play + and the GNOME login sound. (LP: #274124) + * debian/pulseaudio.preinst: Remove /etc/xdg/autostart/pulseaudio.desktop + if it exists. We don't want pulseaudio started more than once. + + -- Luke Yelavich Mon, 20 Oct 2008 13:26:28 +1100 + +pulseaudio (0.9.10-2ubuntu8) intrepid; urgency=low + + * debian/pulseaudio.desktop: Use a slightly modified version of the + pulseaudio desktop file from more recent versions, and place it in + /etc/xdg/autostart, to start pulseaudio earlier in the GNOME desktop + initialization. This should avoid a race condition between the login + sound being played, and pulseaudio being loaded. (LP: #274124) + + -- Luke Yelavich Fri, 10 Oct 2008 15:22:51 +1100 + +pulseaudio (0.9.10-2ubuntu7) intrepid; urgency=low + + * Fix some errors in the pid file handling patch, thanks to Mandriva. + * debian/pulse.conf: Do not use an absolute path when referring to the + pulse alsa plugin, as this breaks bi-arch configurations. libasound2 + and lib32/64asound2 now include ldconfig files to include the alsa-plugins + path for the architecture in use. + + -- Luke Yelavich Wed, 08 Oct 2008 11:20:17 +1100 + +pulseaudio (0.9.10-2ubuntu6) intrepid; urgency=low + + * debian/pulse-alsa.conf: extend configuration to include "pulse" + definitions for buggy ALSA applications (e.g., Skype). (LP: #258581) + + -- Conn O Griofa Tue, 23 Sep 2008 16:12:19 +0100 + +pulseaudio (0.9.10-2ubuntu5) intrepid; urgency=low + + * debian/control: Bump libasound2-plugins from recommends to depends to be + sure that nobody's audio set up for alsa applications is broken. + + -- Luke Yelavich Tue, 23 Sep 2008 23:07:23 +1000 + +pulseaudio (0.9.10-2ubuntu4) intrepid; urgency=low + + * debian/pulse.conf, debian/pulse-alsa.conf. Asoundrc configuration files + to allow the use of pulseaudio as the default output for applications + using alsa, when pulseaudio is running. + * debian/patches/0015-Change-resampler-and-buffering.patch: Change the + resample method used as well as the buffer size. + * Some patches taken from Mandriva's pulseaudio package. See comments in + patch headers for more details: + - 0007-Perfer-client.conf-over-X11-property-variables.patch + - 0008-Also-link-libpulsecore.la-to-some-libraries-needed.patch + - 0009-Rejig-r2495-slightly-and-directly-compile-the-necess.patch + - 0010-Do-not-invalidate-the-cookie-if-no-file-was-specifie.patch + - 0011-fix-error-path-spotted-by-Coling-Guthrie.patch + - 0012-Change-policykit-policy-to-allow-high-priority-and-d.patch + - 0013-More-robust-pid-file-handling.patch + - 0014-Disable-hotplug-sound-as-it-interferes-with-too-many.patch + + -- Luke Yelavich Tue, 23 Sep 2008 16:02:48 +1000 + +pulseaudio (0.9.10-2ubuntu3) intrepid; urgency=low + + * Remove stop links from rc0 and rc6 (LP: #254254): + - debian/rules: change DEB_UPDATE_RCD_PARAMS to + start 25 2 3 4 5 . stop 15 1 . + + -- Cesare Tirabassi Mon, 04 Aug 2008 19:22:43 +0200 + +pulseaudio (0.9.10-2ubuntu2) intrepid; urgency=low + + * debian/patches/0006-pcspkr-last.patch: Load the PC speaker as a sink + after all other sound card sinks have been loaded. (LP: #242966) + * debian/patches/0007-relibtoolize.patch: Regenerate relevant libtool + bits, because even though libltdl7 is supposed to be API-compatible + with libltdl3, the package FTBFs without regeneration. + + -- Luke Yelavich Tue, 29 Jul 2008 16:07:18 +1000 + +pulseaudio (0.9.10-2ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. + * Patches + + 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch: + continue to disable this patch, as we want user sockets to be + the default in the conffile; + - 0050-Reduce-RT-highprio-log-to-info: absorbed into Debian unstable; + - 0051-Reduce-pa_pid_file_create-Daemon-already-running-log-spam: + removed as per discussion with Sjoerd, as it can confuse human + debugging; + * Packaging + + MaintainerField and Vcs munging; + + Don't generate or install the jackd module; + + Use multiuser semantics. + + -- Daniel T Chen Wed, 14 May 2008 15:47:31 -0400 + +pulseaudio (0.9.10-2) unstable; urgency=low + + * debian/patches/0003-Define-PULSE_INTERNAL.patch + - Added. Let the daemon put PULSE_INTERNAL in its environment so things + can detect when called from within pulseaudio + * debian/patches/0004-load-module-gconf-earlier.patch + - Added. Load module-gconf before module-volume-restore and + module-device-restore. Otherwise setting virtual sinks/sources as default + won't be persistent + * debian/patches/0005-Reduce-RT-prio-logging-severity.patch + - Added. Reduce the priority of the RT warnings. Not running with RT + priorities is the default. + + -- Sjoerd Simons Sat, 10 May 2008 22:16:12 +0200 + +pulseaudio (0.9.10-1ubuntu1) hardy; urgency=low + + [ Daniel T Chen ] + * Merge from Debian unstable: + * Patches + + 0050-Reduce-RT-highprio-log-to-info: + + 0051-Reduce-pa_pid_file_create-Daemon-already-running-log-spam: + Retain to prevent innocuous messages from spamming user log; + - 0052-Add-extra-checks-to-padsp-debug-calls: + - 0053-Handle-channel-map-failure: + - 0054-Invoke-pa_ltdl_done-conditionally: + - 0055-fix_record_stream_moved: Merged in new upstream version. + * Packaging + + control: Adhere to DebianMaintainerField spec, and add a + Vcs-Bzr entry; + + control: + + pulseaudio-module-jack.install: Don't generate or install the + jackd module; + + pulseaudio.init: + + rules: Use multiuser semantics. + + [ Luke Yelavich ] + * FFe granted. (LP: #211592) + + -- Luke Yelavich Mon, 07 Apr 2008 10:40:01 +1000 + +pulseaudio (0.9.10-1) unstable; 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 + * debian/patches: Add patch to fix RPATHs. + + 0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch + * debian/control: + + Make libpulsecore5-dbg depend on libpulsecore5, instead of pulseaudio. + + Make libpulse-browse0-dbg depend on libpulse-browse0. + * Update Standards-Version to 3.7.3 (no changes required). + + [ Petter Reinholdtsen ] + * debian/pulseaudio.init: Fix problems with LSB header in init.d script. + (Closes: #470934) + + -- CJ van den Berg Sun, 30 Mar 2008 20:11:02 +0200 + +pulseaudio (0.9.9-1ubuntu4) hardy; urgency=low + + * Patch from Thorvald Natvig to fix protocol error when moving source outputs. + (LP: #194756) + + -- Luke Yelavich Fri, 28 Mar 2008 15:58:55 +1100 + +pulseaudio (0.9.9-1ubuntu3) hardy; urgency=low + + * Patches: + - Apply (new) patch to handle channel mapping failure. From + upstream SVN changeset 2105. (LP: #178442) + - Apply (new) patch to invoke pa_ltdl_done() conditionally. + From upstream SVN changeset 2111. + + -- Daniel T Chen Mon, 18 Feb 2008 18:40:28 -0500 + +pulseaudio (0.9.9-1ubuntu2) hardy; urgency=low + + * Packaging: + - Add versioned dependency on sysv-rc to pulseaudio for LTS->LTS. + Thanks, Steve Langasek (LP: #187469)! + * Patches: + - Apply (new) patch from Mandriva adding checks to debug calls, + preventing crashes, with padsp. + + -- Daniel T Chen Wed, 30 Jan 2008 20:43:29 -0500 + +pulseaudio (0.9.9-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Packaging: + + pulseaudio-module-x11 does not recommend an audio theme, + + no jack packages, + + pulseaudio-utils long description clarification, + + multiuser initscript semantics (Teardown spec), + + Vcs-Bzr entry and DebianMaintainerField mangling; + - Patches: + + omit 0001-Set-ESD-socket-to-tmp-.., + + omit socket parameter in 0007-Change-config-.. to apply + cleanly given above 0001-Set-ESD-socket omission, + + lower verboseness of some log messages, + + drop backported CVE-2008-008 fix (already in 0.9.9). + + -- Daniel T Chen Fri, 25 Jan 2008 16:04:34 -0500 + +pulseaudio (0.9.9-1) unstable; urgency=high + + * New Upstream Version. + * Fixes CVE-2008-008: Assert that dropping permissions succeeds. + * Priority high because it fixes a security issue. + + -- Sjoerd Simons Thu, 24 Jan 2008 12:44:55 +0100 + +pulseaudio (0.9.8-2ubuntu3) hardy; urgency=low + + * [SECURITY] Apply (new) patch fixing unchecked setuid() return + values. Patch backported from upstream 0.9.9. + * References: + CVE-2008-0008 + https://bugzilla.novell.com/show_bug.cgi?id=347822 + https://bugzilla.redhat.com/show_bug.cgi?id=425481 + + -- Daniel T Chen Wed, 23 Jan 2008 20:11:25 -0500 + +pulseaudio (0.9.8-2ubuntu2) hardy; urgency=low + + * Apply (new) 0051-Reduce-pa_pid_file_create.. patch that lowers the + "Daemon already running", "pa_pid_file_create() failed", and + "setrlimit(..Operation not permitted" levels to prevent spamming + /var/log/syslog. Normal users not in the pulse-rt group don't need + this level of verbosity, and the "errors" are innocuous given per- + user session invocation. (These changes really close LP #83137 and + duplicates.) + * Thanks to Sjoerd Simons for the insight. + + -- Daniel T Chen Tue, 08 Jan 2008 06:36:42 -0500 + +pulseaudio (0.9.8-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Packaging: + + pulseaudio-module-x11 does not recommend an audio theme, + + no jack packages, + + pulseaudio-utils long description clarification, + + multiuser initscript semantics (Teardown spec), + + Vcs-Bzr entry and DebianMaintainerField mangling; + - Patches: + + omit 0001-Set-ESD-socket-to-tmp-.., + + omit socket parameter in 0007-Change-config-.. to apply + cleanly given above 0001-Set-ESD-socket omission, + + apply (new) 0050-Reduce-RT-highprio-log-to-info.patch + (LP: #83137 and duplicates). + + -- Daniel T Chen Fri, 04 Jan 2008 21:46:57 +0000 + +pulseaudio (0.9.8-2) unstable; urgency=low + + * Bump shlibs of libpulse and libpulse-browse. Upstream has started + versioning symbols. + * debian/p.../0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch + - Added. Don't send fields/opcodes adding in protocol version 12 to + clients using version 11. (Closes: #458556) + * debian/p.../0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch + - Added. Add dummy implementations of the opcodes added in protocol + version 12. + * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch + - Removed. Obsoleted by the two previous patches + * debian/p.../0005-make-sure-to-create-.pulse-before-using-any-config.patch + - Renamed to 0004-make-sure-to-create-.pulse-before-using-any-config.patch + * debian/p.../0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch + - Added. Don't fail to load if esd, gconf or x11-publish fail. + (Closes: 456590, #456505) + * debian/patches/0008-Fix-compilation-on-non-linux-platforms.patch + - Added. Fixes compliation on non-linux platforms such as GNU/kFreeBSD. + Thanks to Aurelien Jarno for the patch (Closes: #454197) + + -- Sjoerd Simons Fri, 04 Jan 2008 16:12:27 +0100 + +pulseaudio (0.9.8-1ubuntu3) hardy; urgency=low + + * debian/control: Drop Recommendation of ubuntu-sounds entirely; it's wrong + for derivatives, and theming should be done with seeds and derivative + specific meta packages. + + -- Martin Pitt Mon, 10 Dec 2007 14:37:37 +0100 + +pulseaudio (0.9.8-1ubuntu2) hardy; urgency=low + + * debian/control: Make pulseaudio-module-x11 recommend ubuntu-sounds, + not gnome-audio. + + -- Daniel T Chen Thu, 06 Dec 2007 07:12:07 -0500 + +pulseaudio (0.9.8-1ubuntu1) hardy; urgency=low + + "Hail our new PulseAudio overlords (part two)." + + * Merge from Debian unstable. + * Ubuntu-specific changes: + - debian/control: + + Don't build-depend on libjack0.100.0-dev or build jack module + packages, + + Update pulseaudio's Recommends and Suggests to accomodate + existing promoted main packages, + + Explicitly mention pasuspender in pulseaudio-utils's long + description, + + Add Vcs-Bzr URI, + + Adhere to DebianMaintainerField; + - debian/rules: Use multiuser for update-rc.d; + - debian/patches/series: Retain the exclusion of + 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch. + * Dropped Ubuntu-specific change (absorbed into Debian source): + debian/patches/0002-Double-esound-maximum-sample-size.patch. + + -- Daniel T Chen Tue, 04 Dec 2007 00:56:08 +0000 + +pulseaudio (0.9.8-1) unstable; urgency=low + + [ CJ van den Berg ] + * New upstream version. + * debian/overrides/pulseaudio: Remove override for setuid-binary. + * debian/control: + + Change the priority of all -dbg packages to extra. + + Stop recommending libao-pulse. libao2 has built-in pulseaudio support. + + Make pulseaudio conflict libltdl3 < 1.5.24-1 (Closes: #451638) + + Change XS-Vcs-* tags to Vcs-*. + + Add libpulsecore5-dbg package. + + Rename gstreamer plugin package in recommends. + + Add Homepage field. + + Bump libpulsecore so version number to 5. + + Conflict with all pre libpulsecore split packages. + * debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch: + - Dropped, merged upstream. + * debian/p..s/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch: + - Dropped, merged upstream. + * debian/patches/0002-Double-esound-maximum-sample-size.patch: + + Added, from Ubuntu. + * debian/p..s/0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch: + + Added, svn commit r2074 from upstream. + * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch: + + Added, fixes protocol errors in module-tunnel. + * debian/pa..es/0005-make-sure-to-create-.pulse-before-using-any-config.patch: + + Added, fixes module-volume-restore so that volumes are restored across + daemon restarts. + * debian/pulseaudio.manpages: Add manpages default.pa.5, pulse-client.conf.5 + and pulse-daemon.conf.5 + * debian/pulseaudio-utils.manpages: Add manpages pabrowse.1, pacat.1, + pacmd.1, pactl.1, padsp.1, paplay.1, pasuspender.1 and pax11publish.1 + * debian/pulseaudio.default: Add a description of the preferred method of + running the daemon. + + [Daniel T Chen] + * debian/control: Add lsb-base (>= 3) to pulseaudio's dependencies. + * debian/pulseaudio.init: LSB-ify. + + -- CJ van den Berg Thu, 22 Nov 2007 02:33:51 +0100 + +pulseaudio (0.9.7-3ubuntu2) hardy; urgency=low + + * Disable 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch. We + do want per-user esd sockets in Ubuntu. This unbreaks multiuser support + and matches the patch that we did to esound for the very same reason: + every user needs its own esd socket path to have them not conflict to each + other. + + -- Martin Pitt Tue, 20 Nov 2007 22:30:35 +0100 + +pulseaudio (0.9.7-3ubuntu1) hardy; urgency=low + + "Hail our new PulseAudio overlords (part one)." + + * Merge from Debian unstable. + * Apply Ubuntu-specific changes: + - debian/control: + + drop libasyncns-dev and libjack0.100.0-dev build-dependencies + since we don't build the jack plugin [yet]; + + add versioned lsb-base dependency to pulseaudio; + + keep pulseaudio installable by demoting some recommended + packages to suggested [retain libasound2-plugins, + libgstreamer-plugins-pulse0.10-0, and + pulseaudio-esound-compat. pulseaudio-module-hal, + pulseaudio-module-x11, libao-pulse, paprefs, and + padevchooser are currently in universe]; + + adhere to DebianMaintainerField spec; + - debian/rules: + + use multiuser instead of defaults in DEB_UPDATE_RCD_PARAMS. + * Drop obsolete Ubuntu-specific change: + - src/pulsecore/protocol-esound.c: applied upstream. + + -- Daniel T Chen Sat, 17 Nov 2007 00:10:48 +0000 + +pulseaudio (0.9.7-3) unstable; urgency=low + + [ CJ van den Berg ] + * debian/control: Add depends on -utils to -module-x11. (Closes: #450840) + + [ Sjoerd Simons ] + * Set pulseaudio setuid in postinst if the permissions aren't overriden by + dpkg-statoverride, instead of having the binary with suid perms in the deb + + -- Sjoerd Simons Fri, 16 Nov 2007 18:41:28 +0100 + +pulseaudio (0.9.7-2) unstable; urgency=low + + * Use pulseaudio (<< 0.9.7) instead of pulseaudio (< 0.9.7) in + -esound-compat + * debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch: + + Added. Fix pa_readlink to put a \0 directly after the link string. Fixes + issues with clients using the alsa compatibility layer + * deb/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch: + + Added. Define __NR_eventfd. Fixes FTBS on arm, because libc6-dev does + define SYS_eventfd but older versions of linux-libc-dev don't define + __NR_eventfd yet. + + -- Sjoerd Simons Sun, 04 Nov 2007 13:53:09 +0100 + +pulseaudio (0.9.7-1) unstable; urgency=low + + * New Upstream Version. (Closes: #446026, #436409) + * Drop all patches. All patches are merged upstream. + * debian/control: + + Replace ${Source-Version} with ${binary:Version}. + + Add XS-Vcs-* tags. + + Conflict pulseaudio < 0.9.7 in -esound-compat due to moved manpage. + * debian/rules: + + Add list-missing to catch new modules + + Remove all .la files. + * debian/overrides/pulseaudio: Update libpulsecore so version. + * debian/pulseaudio.install: + + Add new module-default-device-restore.so. + + Add new module-suspend-on-idle.so. + + Add new module-remap-sink.so. + + Add new module-ladspa-sink.so. + - Remove module-oss-mmap.so, removed upstream. + * debian/pulseaudio-module-x11.install: Add new module-x11-xsmp.so. + * debian/pulseaudio-module-zeroconf.install: Add new module-zeroconf- + discover.so. + * debian/pulseaudio-utils.install: Add pasuspender utility. + * debian/pulseaudio-esound-compat.links: Move esd link to pulseaudio- + esound-compat. + * debian/pulseaudio-esound-compat.manpages: Move esdcompat manpage to + pulseaudio-esound-compat. + * debian/libpulse0.shlibs: Add minimum version of 0.9.7 to libpulse0 shlibs. + * debian/patches: + + Added 0001-Set-ESD-socket-to-tmp-.esd-socket-to- match-up-with.patch + + -- CJ van den Berg Wed, 31 Oct 2007 15:31:44 +0100 + +pulseaudio (0.9.6-2) unstable; urgency=low + + * debian/control: + - Add -dbg packages. + - Make libcap-dev and libasound-dev arch specific build deps. + - Add recommends gnome-audio to pulseaudio-module-x11. (Closes: #437393) + - Make pulseaudio-module-zeroconf recommend avahi-daemon. + - Make pulseaudio-utils suggest avahi-daemon. (for pabrowse) + * debian/rules: + - Generate arch specific install files. (Closes: #430366) + - Install init script to start at 25 and stop at 15. (Closes: #428046) + * debian/overrides/pulseaudio: Update libpulsecore override to new + soversion. + * debian/copyright: Update e-mail address for Lennart Poettering. + * debian/patches: Reformat patch series. Add two new patches. + + 0003-Backported-padsp-improvements-from-upstream-trunk.patch + + 0004-New-realtime-safe-and-transport-free-JACK-module.patch + + -- CJ van den Berg Sun, 02 Sep 2007 20:22:19 +0200 + +pulseaudio (0.9.6-1ubuntu2) gutsy; urgency=low + + * fix esound max samplesize again to make sure teh login sound is playable + on networked connections. + + -- Oliver Grawert Thu, 28 Jun 2007 15:31:28 +0200 + +pulseaudio (0.9.6-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: + + Add lsb-base (>= 3) to pulseaudio's dependencies, + + Adhere to DebianMaintainerField policy, + + Don't build-depend on libjack0.100.0-dev or libasyncns-dev, + - debian/patches/: Remove all Ubuntu-created patches (merged + upstream). + + -- Daniel T Chen Mon, 28 May 2007 22:30:44 +0100 + +pulseaudio (0.9.6-1) unstable; urgency=low + + * New Upstream Version. + + Fix remote DOS vulnerabilities. (CVE-2007-1804) + + Add support for suspended alsa sinks and sources. + + Correct parameter handling in esdcompat. (Closes: #414355) + + Handle ALSA frame size changes. (Closes: #423887) + + Don't unload module-hal-detect if HAL doesn't report any devices. + (Closes: #395893) + * debian/patches: Remove all patches merged upstream. + - 02_ifexists_else_endif.dpatch + - 03_r1352_firefox_workaround.dpatch + - 04_r1373_JavaSound_support.dpatch + - 05_t28_wrong-endian-convert.dpatch + - 06_pulseaudio-0.9.5-suspend.dpatch + * debian/rules: Port to CDBS. + * debian/patches: Rework patch series for quilt. + * debian/control: Add libatomic-ops-dev to Build-Depends. + + -- CJ van den Berg Mon, 28 May 2007 00:53:28 +0200 + +pulseaudio (0.9.5-7ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: + + Add lsb-base (>= 3) to pulseaudio's dependencies, + + Adhere to DebianMaintainerField policy, + - debian/patches/: + + Add 10_fix_DoS_vulns.dpatch (pA ticket 67) and + 11_disallow_excessively_high_sampling_rates.dpatch, + + Drop 06_fix_suspend.dpatch in favour of + 06_pulseaudio-0.9.5-suspend.dpatch, + + Retain 07_fix_esdcompat_bashism.dpatch and + 09_fix_esd_max_samplesize.dpatch. + + -- Daniel T Chen Fri, 25 May 2007 01:32:39 -0400 + +pulseaudio (0.9.5-7) unstable; urgency=low + + * debian/control: Make pulseaudio-module-hal depend on hal, not just + libhal. (Closes: #411501) + + -- CJ van den Berg Mon, 19 Feb 2007 22:11:48 +0100 + +pulseaudio (0.9.5-6) unstable; urgency=low + + * debian/patches/06_pulseaudio-0.9.5-suspend.dpatch: + + Added. Handle -ESTRPIPE correctly. Allows pulseaudio to survive suspend + operations on ALSA devices (e.g. s2disk). Thanks to Tobias Diedrich. + (Closes: #406768) + + -- CJ van den Berg Mon, 12 Feb 2007 11:24:50 +0100 + +pulseaudio (0.9.5-5ubuntu4) feisty; urgency=low + + * add 09_fix_esd_max_samplesize.dpatch to make sure the login and logout + gnome sounds can be processed on remote connections. + + -- Oliver Grawert Tue, 6 Mar 2007 14:14:08 +0100 + +pulseaudio (0.9.5-5ubuntu3) feisty; urgency=low + + * debian/control: + - Add lsb-base (>= 3) to pulseaudio's dependencies, + - Adhere to DebianMaintainerField policy, + - Pull in fix from Debian's 0.9.5-7 adding hal to + pulseaudio-module-hal's dependencies, + * debian/pulseaudio.init: LSB-ify. + + -- Daniel T Chen Sun, 25 Feb 2007 02:30:31 -0500 + +pulseaudio (0.9.5-5ubuntu2) feisty; urgency=low + + * added 06_fix_suspend.dpatch from http://pulseaudio.org/ticket/26 + * added 07_fix_esdcompat_bashism.dpatch to avoid esdcompat trying to + shift an empty $1 on POSIX shells + + -- Oliver Grawert Tue, 30 Jan 2007 23:50:57 +0100 + +pulseaudio (0.9.5-5ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining change: + - debian/{control,rules}: Don't use jack or asyncns. + + -- Daniel T Chen Mon, 29 Jan 2007 10:36:35 -0500 + +pulseaudio (0.9.5-5) unstable; urgency=low + + * debian/control: Make Build-deps more specific. (Closes: #401111) + * debian/pulseaudio.init: Make sure files in /var/run/pulse exist before + calling chown and chmod. (Closes: #405869) + + -- CJ van den Berg Mon, 8 Jan 2007 23:02:53 +0100 + +pulseaudio (0.9.5-4ubuntu2) feisty; urgency=low + + * disable libasyncns to fix ftbfs + + -- Oliver Grawert Sat, 20 Jan 2007 11:10:59 +0100 + +pulseaudio (0.9.5-4ubuntu1) feisty; urgency=low + + * merge from debian unstable + * keep jack removal + + -- Oliver Grawert Tue, 28 Nov 2006 19:51:21 +0100 + +pulseaudio (0.9.5-4) unstable; urgency=low + + * Add comment about resampling methods and CPU consumption to + README.Debian (Closes: #391455) + * debian/patches/03_r1352_firefox_workaround.dpatch: + + Added. Fix padsp to work with firefox. Patch created from + SVN revision 1352. + * debian/patches/04_r1373_JavaSound_support.dpatch: + + Added. Fix padsp to work with JavaSound. Patch created from + SVN revision 1373. + * debian/patches/05_t28_wrong-endian-convert.dpatch: + + Added. Add additional sample conversions to sconv.c to support + BE <-> LE network audio. + Patch from http://www.pulseaudio.org/ticket/28 + + -- CJ van den Berg Wed, 18 Oct 2006 23:10:47 +0200 + +pulseaudio (0.9.5-3ubuntu1) feisty; urgency=low + + * indeed remove the jack plugin from debian/control as well + + -- Oliver Grawert Tue, 14 Nov 2006 21:05:29 +0100 + +pulseaudio (0.9.5-3ubuntu0) feisty; urgency=low + + * initial package + * disable jack + * disable asyncns + + -- Oliver Grawert Sun, 12 Nov 2006 20:00:18 +0100 + +pulseaudio (0.9.5-3) unstable; urgency=low + + * Add support for .ifexists configuration directive. + * Make default.pa use ifexists when loading optional modules. + * Recommend instead of Depend on pulseaudio-module-hal. (Closes: #391232) + * Recommend libasound2-plugins instead of -plugins-pulse. (Closes: #391254) + + -- CJ van den Berg Fri, 6 Oct 2006 01:12:05 +0200 + +pulseaudio (0.9.5-2) unstable; urgency=low + + * Add myself to uploaders + * Put libpulse-dev and libpulse0 in the right sections. + + -- Sjoerd Simons Tue, 3 Oct 2006 15:49:12 +0200 + +pulseaudio (0.9.5-1) unstable; urgency=low + + * Initial release (Closes: #378626) + + -- CJ van den Berg Mon, 28 Aug 2006 00:31:10 +0200 + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-module-x11.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-module-x11.install @@ -0,0 +1,2 @@ +usr/lib/pulse-*/modules/module-x11*.so +usr/share/lintian/overrides/pulseaudio-module-x11 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.init +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.init @@ -0,0 +1,83 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: pulseaudio esound +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: udev NetworkManager +# Should-Stop: udev NetworkManager +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: Start the PulseAudio sound server +# Description: System mode startup script for +# the PulseAudio sound server. +### END INIT INFO + +DAEMON=/usr/bin/pulseaudio +PIDDIR=/var/run/pulse +PIDFILE=$PIDDIR/pid +DAEMONUSER=pulse +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +PULSEAUDIO_SYSTEM_START=0 +DISALLOW_MODULE_LOADING=1 +test -f /etc/default/pulseaudio && . /etc/default/pulseaudio +if [ "$PULSEAUDIO_SYSTEM_START" != "1" ]; then + log_warning_msg "PulseAudio configured for per-user sessions" + exit 0 +fi + +pulseaudio_start () { + log_daemon_msg "Starting system PulseAudio Daemon" + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER:$DAEMONUSER $PIDDIR + fi + start-stop-daemon -x $DAEMON -p $PIDFILE --start -- --system --daemonize --high-priority --log-target=syslog --disallow-module-loading=$DISALLOW_MODULE_LOADING + status=$? + if [ -e /var/run/pulse/.esd_auth ]; then + chown pulse:pulse-access /var/run/pulse/.esd_auth + chmod 640 /var/run/pulse/.esd_auth + fi + if [ -e /var/run/pulse/.pulse-cookie ]; then + chown pulse:pulse-access /var/run/pulse/.pulse-cookie + chmod 640 /var/run/pulse/.pulse-cookie + fi + log_end_msg ${status} +} + +pulseaudio_stop () { + log_daemon_msg "Stopping system PulseAudio Daemon" + start-stop-daemon -p $PIDFILE --stop --retry 5 || echo -n "...which is not running" + log_end_msg $? +} + +case "$1" in + start|stop) + pulseaudio_${1} + ;; + restart|reload|force-reload) + if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then + pulseaudio_stop + pulseaudio_start + fi + ;; + force-stop) + pulseaudio_stop + killall pulseaudio || true + sleep 2 + killall -9 pulseaudio || true + ;; + status) + status_of_proc -p $PIDFILE "$DAEMON" "system-wide PulseAudio" && exit 0 || exit $? + ;; + *) + echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|reload|force-reload|status}" + exit 1 + ;; +esac + +exit 0 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-module-raop.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-module-raop.install @@ -0,0 +1 @@ +usr/lib/pulse-*/modules/*raop* --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-utils.links +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-utils.links @@ -0,0 +1 @@ +usr/share/man/man1/pacat.1.gz usr/share/man/man1/parec.1.gz --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.manpages +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.manpages @@ -0,0 +1,3 @@ +debian/tmp/usr/share/man/man1/pulseaudio.1 +debian/tmp/usr/share/man/man5/pulse-client.conf.5 +debian/tmp/usr/share/man/man5/pulse-daemon.conf.5 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-module-jack.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-module-jack.install @@ -0,0 +1,2 @@ +usr/lib/pulse-*/modules/module-jack-sink.so +usr/lib/pulse-*/modules/module-jack-source.so --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/rules +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/rules @@ -0,0 +1,54 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +common-build-arch:: + grep -v -e alsa -e evdev -e udev debian/pulseaudio.install > \ + debian/pulseaudio.install.kfreebsd-i386 + grep -v -e alsa -e evdev -e udev debian/pulseaudio.install > \ + debian/pulseaudio.install.kfreebsd-amd64 + +common-install-arch:: + find $(DEB_DESTDIR) -name "*.la" -delete + mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian + cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian + mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa + cp -a $(CURDIR)/debian/*.conf $(CURDIR)/debian/tmp/usr/share/alsa + install -D -m755 $(CURDIR)/debian/01PulseAudio $(CURDIR)/debian/tmp/usr/lib/pm-utils/sleep.d/01PulseAudio + install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks + cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py + +common-configure-arch:: +ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel")) + make -C src libpulsecore_0.9.21_la-svolume_arm.lo CFLAGS+=-Wa,-mimplicit-it=thumb +endif + +pulseaudio-install-arch:: + dh_installman --language=C debian/tmp/usr/share/man/man5/default.pa.5 + +common-binary-post-install-arch:: list-missing + +clean:: + rm -f debian/pulseaudio.install.kfreebsd-i386 + rm -f debian/pulseaudio.install.kfreebsd-amd64 + +update-patch-series: + mkdir -p $(CURDIR)/debian/patches + rm -f $(CURDIR)/debian/patches/*.patch + git format-patch -o $(CURDIR)/debian/patches patches ^upstream | \ + xargs -n 1 basename > $(CURDIR)/debian/patches/series + for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \ + do \ + lines=$$(cat $$patch | wc -l) ; \ + head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \ + mv $${patch}.chomped $$patch ; \ + done + +DEB_OPT_FLAG = -O3 +DEB_CONFIGURE_EXTRA_FLAGS = --enable-static +DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.21/modules +DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp +DEB_UPDATE_RCD_PARAMS = start 50 2 3 4 5 . stop 15 1 . --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/compat +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/compat @@ -0,0 +1 @@ +5 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/libpulse0.shlibs +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/libpulse0.shlibs @@ -0,0 +1,3 @@ +libpulse 0 libpulse0 (>= 0.9.16) +libpulse-simple 0 libpulse0 +libpulsecommon 0.9.21 libpulse0 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/libpulse-dev.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/libpulse-dev.install @@ -0,0 +1,6 @@ +usr/lib/libpulse.so +usr/lib/libpulse-simple.so +usr/lib/libpulse-browse.so +usr/lib/libpulse-mainloop-glib.so +usr/lib/pkgconfig/* +usr/include/pulse/* --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-module-zeroconf.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-module-zeroconf.install @@ -0,0 +1,3 @@ +usr/lib/pulse-*/modules/libavahi-wrap.so +usr/lib/pulse-*/modules/module-zeroconf-discover.so +usr/lib/pulse-*/modules/module-zeroconf-publish.so --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.default +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.default @@ -0,0 +1,22 @@ +# Start the PulseAudio sound server in system mode. +# (enables the pulseaudio init script - requires that users be in the +# pulse-access group) +# System mode is not the recommended way to run PulseAudio as it has some +# limitations (such as no shared memory access) and could potentially allow +# users to disconnect or redirect each others' audio streams. The +# recommended way to run PulseAudio is as a per-session daemon. For GNOME/KDE/ +# Xfce sessions in Ubuntu Lucid/10.04, /etc/xdg/autostart/pulseaudio.desktop +# handles this function of automatically starting PulseAudio on login, and for +# it to work correctly your user must *not* have "autospawn = no" set in +# ~/.pulse/client.conf (or in /etc/pulse/client.conf). By default, autospawn +# is enabled. For other sessions, you can simply start PulseAudio with +# "pulseaudio --daemonize". +# 0 = don't start in system mode, 1 = start in system mode +PULSEAUDIO_SYSTEM_START=0 + +# Prevent users from dynamically loading modules into the PulseAudio sound +# server. Dynamic module loading enhances the flexibilty of the PulseAudio +# system, but may pose a security risk. +# 0 = no, 1 = yes +DISALLOW_MODULE_LOADING=1 + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/libpulse-browse0.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/libpulse-browse0.install @@ -0,0 +1 @@ +usr/lib/libpulse-browse.so.* --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio-module-lirc.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio-module-lirc.install @@ -0,0 +1 @@ +usr/lib/pulse-*/modules/module-lirc.so --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.dirs +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.dirs @@ -0,0 +1 @@ +var/lib/pulseaudio --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/01PulseAudio +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/01PulseAudio @@ -0,0 +1,98 @@ +#! /bin/sh + +. "${PM_FUNCTIONS}" + +test_pulse_system() { + getent passwd pulse | awk -F: '{print $3}' +} + +get_pulse_users() { + PULSE_SYSTEM_USER=$(test_pulse_system) + if [ -z "${PULSE_SYSTEM_USER}" ]; then + ps -C pulseaudio -o uid= | tr -d ' ' + else + ps -C pulseaudio -o uid= | tr -d ' ' | sed s/${PULSE_SYSTEM_USER}// + fi +} + +# $1 = sink|source +# $2 = username +save_pulse_state() { + su "${2}" -c -- "pacmd list-${1}s" | \ + sed -n "s/^[[:space:]*]*//; /\(index\|mute\)/p" | \ + (index=""; + while read field value; do + if [ ${field%:} = "index" ]; then + index=${value} + else + savestate pulse:"${2}":${1}${index} ${value} + fi + done) +} + +# $1 = sink|source +# $2 = username +restore_pulse_state() { + su "${2}" -c -- "pacmd list-${1}s" | \ + sed -n "s/^[[:space:]*]*index: //p" | \ + while read index; do + if state_exists pulse:"${2}":${1}${index}; then + su "${2}" -c -- "pacmd \ + set-${1}-mute \ + ${index} \ + $(restorestate pulse:"${2}":${1}${index})" + fi + done +} + +# $1 = sink|source +# $2 = username +mute_pulse() { + su "${2}" -c -- "pacmd list-${1}s" | \ + sed -n "s/^[[:space:]*]*//; /\(index\|mute\)/p" | \ + (index=""; + while read field value; do + if [ ${field%:} = "index" ]; then + index=${value} + su "${2}" -c -- "pacmd \ + set-${1}-mute ${index} yes" + fi + done) +} + +suspend_pulse() { + for i in $(get_pulse_users); do + THIS_USER="$(getent passwd ${i} | cut -f1 -d:)" + save_pulse_state sink "${THIS_USER}" + save_pulse_state source "${THIS_USER}" + su "${THIS_USER}" -c -- 'pacmd suspend true' > /dev/null 2>&1 + done + for i in $(get_pulse_users); do + THIS_USER="$(getent passwd ${i} | cut -f1 -d:)" + if su "${THIS_USER}" -c -- 'ck-list-sessions | grep "active = TRUE"' > /dev/null 2>&1; then + mute_pulse sink "${THIS_USER}" + mute_pulse source "${THIS_USER}" + break + fi + done +} + +resume_pulse() { + for i in $(get_pulse_users); do + THIS_USER="$(getent passwd ${i} | cut -f1 -d:)" + restore_pulse_state sink "${THIS_USER}" + restore_pulse_state source "${THIS_USER}" + su "${THIS_USER}" -c -- 'pacmd suspend false' > /dev/null 2>&1 + done +} + +case $1 in + hibernate|suspend) + suspend_pulse + ;; + thaw|resume) + resume_pulse + ;; + *) exit $NA + ;; +esac --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/libpulse0.install +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/libpulse0.install @@ -0,0 +1,4 @@ +etc/pulse/client.conf +usr/lib/libpulse.so.* +usr/lib/libpulse-simple.so.* +usr/lib/libpulsecommon-*.so --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulse-alsa.conf +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulse-alsa.conf @@ -0,0 +1,27 @@ +# This file is referred to by /usr/share/alsa/pulse.conf to set pulseaudio as +# the default output plugin for applications using alsa when PulseAudio is +# running. + +pcm.!default { + type pulse +} + +ctl.!default { + type pulse +} + +pcm.pulse { + type pulse + hint { + show { + @func refer + name defaults.namehint.basic + } + description "Playback/recording through the PulseAudio sound server" + } +} + +ctl.pulse { + type pulse +} + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/pulseaudio.postrm +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/pulseaudio.postrm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "purge" ] ; then + deluser --quiet --system pulse > /dev/null || true + delgroup --quiet --system pulse-access > /dev/null || true +fi + +exit 0 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/apport-hook.py +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/apport-hook.py @@ -0,0 +1,15 @@ +'''apport package hook for pulseaudio + +(c) 2009 Canonical Ltd. +Author: +Matt Zimmerman + +''' + +from apport.hookutils import * +import re + +def add_info(report): + attach_alsa(report) + recent_syslog(re.compile(r'pulseaudio\[')) + attach_conffiles(report, 'pulseaudio') --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/manpages/pulseaudio.1 +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/manpages/pulseaudio.1 @@ -0,0 +1,97 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH PULSEAUDIO "1" "August 2006" "pulseaudio 0.9.5" "User Commands" +.SH NAME +pulseaudio \- manual page for pulseaudio 0.9.5 +.SH DESCRIPTION +pulseaudio [options] +.SS "COMMANDS:" +.TP +\fB\-h\fR, \fB\-\-help\fR +Show this help +.TP +\fB\-\-version\fR +Show version +.TP +\fB\-\-dump\-conf\fR +Dump default configuration +.TP +\fB\-\-dump\-modules\fR +Dump list of available modules +.TP +\fB\-k\fR \fB\-\-kill\fR +Kill a running daemon +.TP +\fB\-\-check\fR +Check for a running daemon +.SS "OPTIONS:" +.TP +\fB\-\-system\fR[=\fIBOOL\fR] +Run as system\-wide instance +.TP +\fB\-D\fR, \fB\-\-daemonize\fR[=\fIBOOL\fR] +Daemonize after startup +.TP +\fB\-\-fail\fR[=\fIBOOL\fR] +Quit when startup fails +.TP +\fB\-\-high\-priority\fR[=\fIBOOL\fR] +Try to set high process priority +(only available as root) +.TP +\fB\-\-disallow\-module\-loading\fR[=\fIBOOL\fR] +Disallow module loading after startup +.TP +\fB\-\-exit\-idle\-time\fR=\fISECS\fR +Terminate the daemon when idle and this +time passed +.TP +\fB\-\-module\-idle\-time\fR=\fISECS\fR +Unload autoloaded modules when idle and +this time passed +.TP +\fB\-\-scache\-idle\-time\fR=\fISECS\fR +Unload autoloaded samples when idle and +this time passed +.TP +\fB\-\-log\-level\fR[=\fILEVEL\fR] +Increase or set verbosity level +.TP +\fB\-v\fR +Increase the verbosity level +.HP +\fB\-\-log\-target=\fR{auto,syslog,stderr} Specify the log target +.TP +\fB\-p\fR, \fB\-\-dl\-search\-path\fR=\fIPATH\fR +Set the search path for dynamic shared +objects (plugins) +.TP +\fB\-\-resample\-method\fR=\fI[METHOD]\fR +Use the specified resampling method +(one of src\-sinc\-medium\-quality, +src\-sinc\-best\-quality,src\-sinc\-fastest +src\-zero\-order\-hold,src\-linear,trivial) +.TP +\fB\-\-use\-pid\-file\fR[=\fIBOOL\fR] +Create a PID file +.TP +\fB\-\-no\-cpu\-limit\fR[=\fIBOOL\fR] +Do not install CPU load limiter on +platforms that support it. +.TP +\fB\-\-disable\-shm\fR[=\fIBOOL\fR] +Disable shared memory support. +.SS "STARTUP SCRIPT:" +.TP +\fB\-L\fR, \fB\-\-load=\fR"MODULE ARGUMENTS" +Load the specified plugin module with +the specified argument +.TP +\fB\-F\fR, \fB\-\-file\fR=\fIFILENAME\fR +Run the specified script +.TP +\fB\-C\fR +Open a command line on the running TTY +after startup +.TP +\fB\-n\fR +Don't load default script file --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/manpages/esdcompat.1 +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/manpages/esdcompat.1 @@ -0,0 +1,55 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH PULSEAUDIO "1" "August 2006" "pulseaudio esd wrapper 0.9.5" "User Commands" +.SH NAME +pulseaudio \- manual page for pulseaudio esd wrapper 0.9.5 +.SH SYNOPSIS +.B esdcompat +[\fIoptions\fR] +.SH DESCRIPTION +pulseaudio esd wrapper 0.9.5 +.TP +\fB\-v\fR \fB\-\-version\fR +print version information +.TP +\fB\-h\fR \fB\-\-help\fR +show this help +.PP +Ignored directives: +.TP +\fB\-tcp\fR +use tcp/ip sockets in addition to unix domain +.TP +\fB\-promiscuous\fR +don't require authentication +.TP +\fB\-d\fR DEVICE +force esd to use sound device DEVICE +.TP +\fB\-b\fR +run server in 8 bit sound mode +.TP +\fB\-r\fR RATE +run server at sample rate of RATE +.TP +\fB\-as\fR SECS +free audio device after SECS of inactivity +.TP +\fB\-unix\fR +use unix domain sockets instead of tcp/ip +.TP +\fB\-public\fR +make tcp/ip access public (other than localhost) +.TP +\fB\-terminate\fR +terminate esd daemone after last client exits +.TP +\fB\-nobeeps\fR +disable startup beeps +.TP +\fB\-trust\fR +start esd even if use of /tmp/.esd can be insecure +.TP +\fB\-port\fR PORT +listen for connections at PORT (only for tcp/ip) +.HP +\fB\-bind\fR ADDRESS binds to ADDRESS (only for tcp/ip) --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0057-load-module-x11-bell.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0057-load-module-x11-bell.patch @@ -0,0 +1,33 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/daemon/start-pulseaudio-x11.in +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/daemon/start-pulseaudio-x11.in 2010-01-17 18:54:19.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/daemon/start-pulseaudio-x11.in 2010-06-07 23:56:08.123227001 -0400 +@@ -21,11 +21,10 @@ + + [ -z "$PULSE_SERVER" ] + +-@PA_BINARY@ --start "$@" +- + if [ x"$DISPLAY" != x ] ; then + + @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null ++ @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null + @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null + + if [ x"$SESSION_MANAGER" != x ] ; then +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/daemon/start-pulseaudio-kde.in +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/daemon/start-pulseaudio-kde.in 2010-06-07 23:56:56.123227001 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/daemon/start-pulseaudio-kde.in 2010-06-07 23:57:21.503227002 -0400 +@@ -21,10 +21,9 @@ + + [ -z "$PULSE_SERVER" ] + +-@PA_BINARY@ --start "$@" +- + if [ x"$DISPLAY" != x ] ; then + + @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null ++ @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null + + fi --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0097-regenerate-configure.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0097-regenerate-configure.patch @@ -0,0 +1,276 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/config.h.in +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/config.h.in 2010-02-18 22:47:49.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/config.h.in 2010-02-18 23:28:42.000000000 -0500 +@@ -92,9 +92,18 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_EXECINFO_H + ++/* Define to 1 if you have the `fchmod' function. */ ++#undef HAVE_FCHMOD ++ ++/* Define to 1 if you have the `fchown' function. */ ++#undef HAVE_FCHOWN ++ + /* Define to 1 if you have the `fork' function. */ + #undef HAVE_FORK + ++/* Define to 1 if you have the `fstat' function. */ ++#undef HAVE_FSTAT ++ + /* Have gdbm? */ + #undef HAVE_GDBM + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/configure +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/configure 2010-02-18 22:47:49.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/configure 2010-02-18 23:28:42.000000000 -0500 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.21-32-g8478. ++# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.21-63-gd3efa-dirty. + # + # Report bugs to . + # +@@ -701,8 +701,8 @@ + # Identity of this package. + PACKAGE_NAME='pulseaudio' + PACKAGE_TARNAME='pulseaudio' +-PACKAGE_VERSION='0.9.21-32-g8478' +-PACKAGE_STRING='pulseaudio 0.9.21-32-g8478' ++PACKAGE_VERSION='0.9.21-63-gd3efa-dirty' ++PACKAGE_STRING='pulseaudio 0.9.21-63-gd3efa-dirty' + PACKAGE_BUGREPORT='mzchyfrnhqvb (at) 0pointer (dot) net' + PACKAGE_URL='' + +@@ -1697,7 +1697,7 @@ + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures pulseaudio 0.9.21-32-g8478 to adapt to many kinds of systems. ++\`configure' configures pulseaudio 0.9.21-63-gd3efa-dirty to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1767,7 +1767,7 @@ + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of pulseaudio 0.9.21-32-g8478:";; ++ short | recursive ) echo "Configuration of pulseaudio 0.9.21-63-gd3efa-dirty:";; + esac + cat <<\_ACEOF + +@@ -1978,7 +1978,7 @@ + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-pulseaudio configure 0.9.21-32-g8478 ++pulseaudio configure 0.9.21-63-gd3efa-dirty + generated by GNU Autoconf 2.65 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -2442,7 +2442,7 @@ + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by pulseaudio $as_me 0.9.21-32-g8478, which was ++It was created by pulseaudio $as_me 0.9.21-63-gd3efa-dirty, which was + generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ +@@ -2756,6 +2756,9 @@ + as_fn_append ac_func_list " strtof" + as_fn_append ac_func_list " chmod" + as_fn_append ac_func_list " chown" ++as_fn_append ac_func_list " fstat" ++as_fn_append ac_func_list " fchown" ++as_fn_append ac_func_list " fchmod" + as_fn_append ac_func_list " clock_gettime" + as_fn_append ac_func_list " getaddrinfo" + as_fn_append ac_func_list " getgrgid_r" +@@ -3341,7 +3344,7 @@ + + # Define the identity of the package. + PACKAGE='pulseaudio' +- VERSION='0.9.21-32-g8478' ++ VERSION='0.9.21-63-gd3efa-dirty' + + + cat >>confdefs.h <<_ACEOF +@@ -6408,13 +6411,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6411: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6414: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6414: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6417: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6417: output\"" >&5) ++ (eval echo "\"\$as_me:6420: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7616,7 +7619,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7619 "configure"' > conftest.$ac_ext ++ echo '#line 7622 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -9174,11 +9177,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9177: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9180: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9181: \$? = $ac_status" >&5 ++ echo "$as_me:9184: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9513,11 +9516,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9516: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9519: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9520: \$? = $ac_status" >&5 ++ echo "$as_me:9523: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9618,11 +9621,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9621: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9624: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9625: \$? = $ac_status" >&5 ++ echo "$as_me:9628: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9673,11 +9676,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9676: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9679: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9680: \$? = $ac_status" >&5 ++ echo "$as_me:9683: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12057,7 +12060,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12060 "configure" ++#line 12063 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12153,7 +12156,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12156 "configure" ++#line 12159 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14847,6 +14850,12 @@ + + + ++ ++ ++ ++ ++ ++ + for ac_func in mkfifo + do : + ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo" +@@ -18957,12 +18966,12 @@ + pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 ") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 gobject-2.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags " gconf-2.0 >= 2.4.0 " 2>/dev/null` ++ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags " gconf-2.0 >= 2.4.0 gobject-2.0 " 2>/dev/null` + else + pkg_failed=yes + fi +@@ -18975,12 +18984,12 @@ + pkg_cv_GCONF_LIBS="$GCONF_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 ") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 gobject-2.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs " gconf-2.0 >= 2.4.0 " 2>/dev/null` ++ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs " gconf-2.0 >= 2.4.0 gobject-2.0 " 2>/dev/null` + else + pkg_failed=yes + fi +@@ -18999,9 +19008,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " gconf-2.0 >= 2.4.0 "` ++ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 "` + else +- GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " gconf-2.0 >= 2.4.0 "` ++ GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 "` + fi + # Put the nasty error message in config.log where it belongs + echo "$GCONF_PKG_ERRORS" >&5 +@@ -21059,7 +21068,7 @@ + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by pulseaudio $as_me 0.9.21-32-g8478, which was ++This file was extended by pulseaudio $as_me 0.9.21-63-gd3efa-dirty, which was + generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -21125,7 +21134,7 @@ + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-pulseaudio config.status 0.9.21-32-g8478 ++pulseaudio config.status 0.9.21-63-gd3efa-dirty + configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0093-backport-fixes-stable-queue-head.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0093-backport-fixes-stable-queue-head.patch @@ -0,0 +1,2261 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-mixer.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/alsa-mixer.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-mixer.c 2010-05-08 11:05:05.000000000 -0400 +@@ -1783,8 +1783,7 @@ + { "analog-output-headphones", N_("Analog Headphones") }, + { "analog-output-lfe-on-mono", N_("Analog Output (LFE)") }, + { "analog-output-mono", N_("Analog Mono Output") }, +- { "analog-output-headphones-2", N_("Analog Headphones 2") }, +- { "analog-output-speaker", N_("Analog Speaker") } ++ { "analog-output-speaker", N_("Analog Speakers") } + }; + + pa_alsa_element *e; +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-05-08 11:05:40.000000000 -0400 +@@ -277,6 +277,31 @@ + [Option Digital Input Source:Digital Mic 2] + name = input-microphone + ++;;; 'Analog Source' ++ ++[Element Analog Source] ++enumeration = select ++ ++[Option Analog Source:Mic] ++name = input-microphone ++ ++[Option Analog Source:Line in] ++name = input-linein ++ ++[Option Analog Source:Aux] ++name = input ++ ++;;; 'Shared Mic/Line in' ++ ++[Element Shared Mic/Line in] ++enumeration = select ++ ++[Option Shared Mic/Line in:Mic in] ++name = input-microphone ++ ++[Option Shared Mic/Line in:Line in] ++name = input-linein ++ + ;;; Various Boosts + + [Element Capture Boost] +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -0,0 +1,99 @@ ++# This file is part of PulseAudio. ++# ++# 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.1 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. ++ ++; Path for mixers that have a 'Desktop Speaker' control ++; ++; See analog-output.conf.common for an explanation on the directives ++ ++[General] ++priority = 101 ++name = analog-output-speaker ++ ++[Element Hardware Master] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Master] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Master Mono] ++switch = off ++volume = off ++ ++; This profile path is intended to control the desktop speaker, not ++; the headphones. But it should not hurt if we leave the headphone ++; jack enabled nonetheless. ++[Element Headphone] ++switch = mute ++volume = zero ++ ++[Element Headphone2] ++switch = mute ++volume = zero ++ ++[Element Speaker] ++switch = off ++volume = off ++ ++[Element Desktop Speaker] ++required = any ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Front] ++switch = mute ++volume = merge ++override-map.1 = all-front ++override-map.2 = front-left,front-right ++ ++[Element Rear] ++switch = mute ++volume = merge ++override-map.1 = all-rear ++override-map.2 = rear-left,rear-right ++ ++[Element Surround] ++switch = mute ++volume = merge ++override-map.1 = all-rear ++override-map.2 = rear-left,rear-right ++ ++[Element Side] ++switch = mute ++volume = merge ++override-map.1 = all-side ++override-map.2 = side-left,side-right ++ ++[Element Center] ++switch = mute ++volume = merge ++override-map.1 = all-center ++override-map.2 = all-center,all-center ++ ++[Element LFE] ++switch = mute ++volume = merge ++override-map.1 = lfe ++override-map.2 = lfe,lfe ++ ++.include analog-output.conf.common +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2010-05-08 11:05:05.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -20,6 +20,7 @@ + + [General] + priority = 89 ++name = analog-output-headphones + + [Element Hardware Master] + switch = mute +@@ -61,6 +62,10 @@ + switch = off + volume = off + ++[Element Desktop Speaker] ++switch = off ++volume = off ++ + [Element Front] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2010-05-08 11:05:05.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2010-05-08 11:05:34.000000000 -0400 +@@ -20,6 +20,7 @@ + + [General] + priority = 90 ++name = analog-output-headphones + + [Element Hardware Master] + switch = mute +@@ -61,6 +62,10 @@ + switch = off + volume = off + ++[Element Desktop Speaker] ++switch = off ++volume = off ++ + [Element Front] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -58,6 +58,10 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Desktop Speaker] ++switch = off ++volume = off ++ + [Element Front] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-mono.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-mono.conf 2010-05-08 11:05:05.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-mono.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -59,6 +59,10 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Desktop Speaker] ++switch = off ++volume = off ++ + [Element Front] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-speaker.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2010-05-08 11:05:05.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -20,6 +20,7 @@ + + [General] + priority = 100 ++name = analog-output-speaker + + [Element Hardware Master] + switch = mute +@@ -61,6 +62,10 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Desktop Speaker] ++switch = off ++volume = off ++ + [Element Front] + switch = mute + volume = merge +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output.conf 2010-05-08 11:05:05.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf 2010-05-08 11:05:34.000000000 -0400 +@@ -59,6 +59,10 @@ + switch = mute + volume = off + ++[Element Desktop Speaker] ++switch = mute ++volume = off ++ + [Element Front] + switch = mute + volume = merge +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/profile-sets/default.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/profile-sets/default.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/profile-sets/default.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -62,42 +62,42 @@ + [Mapping analog-mono] + device-strings = hw:%f + channel-map = mono +-paths-output = analog-output analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono ++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono + paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line + priority = 1 + + [Mapping analog-stereo] + device-strings = front:%f hw:%f + channel-map = left,right +-paths-output = analog-output analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono ++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono + paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line + priority = 10 + + [Mapping analog-surround-40] + device-strings = surround40:%f + channel-map = front-left,front-right,rear-left,rear-right +-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono ++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono + priority = 7 + direction = output + + [Mapping analog-surround-41] + device-strings = surround41:%f + channel-map = front-left,front-right,rear-left,rear-right,lfe +-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono ++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono + priority = 8 + direction = output + + [Mapping analog-surround-50] + device-strings = surround50:%f + channel-map = front-left,front-right,rear-left,rear-right,front-center +-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono ++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono + priority = 7 + direction = output + + [Mapping analog-surround-51] + device-strings = surround51:%f + channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe +-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono ++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono + priority = 8 + direction = output + +@@ -105,7 +105,7 @@ + device-strings = surround71:%f + channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right + description = Analog Surround 7.1 +-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono ++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono + priority = 7 + direction = output + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/sink-input.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/sink-input.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/sink-input.c 2010-05-08 11:05:05.000000000 -0400 +@@ -1086,7 +1086,7 @@ + if (p) + pa_proplist_update(i->proplist, mode, p); + +- if (PA_SINK_IS_LINKED(i->state)) { ++ if (PA_SINK_INPUT_IS_LINKED(i->state)) { + pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_PROPLIST_CHANGED], i); + pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index); + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-aux.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-aux.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-aux.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -32,6 +32,10 @@ + switch = off + volume = off + ++[Element Internal Mic] ++switch = off ++volume = off ++ + [Element Line] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-fm.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-fm.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-fm.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -32,6 +32,10 @@ + switch = off + volume = off + ++[Element Internal Mic] ++switch = off ++volume = off ++ + [Element Line] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -0,0 +1,67 @@ ++# This file is part of PulseAudio. ++# ++# 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.1 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. ++ ++; For devices where a 'Internal Mic' element exists ++; ++; See analog-output.conf.common for an explanation on the directives ++ ++[General] ++priority = 90 ++name = analog-input-microphone ++ ++[Element Capture] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Mic] ++switch = off ++volume = off ++ ++[Element Internal Mic] ++required = any ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Line] ++switch = off ++volume = off ++ ++[Element Aux] ++switch = off ++volume = off ++ ++[Element Video] ++switch = off ++volume = off ++ ++[Element Mic/Line] ++switch = off ++volume = off ++ ++[Element TV Tuner] ++switch = off ++volume = off ++ ++[Element FM] ++switch = off ++volume = off ++ ++.include analog-input.conf.common ++.include analog-input-mic.conf.common +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-linein.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-linein.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-linein.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -31,6 +31,10 @@ + switch = off + volume = off + ++[Element Internal Mic] ++switch = off ++volume = off ++ + [Element Line] + required = any + switch = mute +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic-line.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-mic-line.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic-line.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -32,6 +32,10 @@ + switch = off + volume = off + ++[Element Internal Mic] ++switch = off ++volume = off ++ + [Element Line] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-mic.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -35,6 +35,10 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Internal Mic] ++switch = off ++volume = off ++ + [Element Line] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -32,6 +32,10 @@ + switch = off + volume = off + ++[Element Internal Mic] ++switch = off ++volume = off ++ + [Element Line] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-video.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-video.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-video.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -31,6 +31,10 @@ + switch = off + volume = off + ++[Element Internal Mic] ++switch = off ++volume = off ++ + [Element Line] + switch = off + volume = off +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf 2010-05-08 11:05:05.000000000 -0400 +@@ -32,6 +32,9 @@ + [Element Mic] + required-absent = any + ++[Element Internal Mic] ++required-absent = any ++ + [Element Line] + required-absent = any + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/dbus-util.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/dbus-util.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/dbus-util.c 2010-05-08 11:05:05.000000000 -0400 +@@ -44,17 +44,16 @@ + }; + + struct timeout_data { +- pa_dbus_wrap_connection *c; ++ pa_dbus_wrap_connection *connection; + DBusTimeout *timeout; + }; + + static void dispatch_cb(pa_mainloop_api *ea, pa_defer_event *ev, void *userdata) { + DBusConnection *conn = userdata; + +- if (dbus_connection_dispatch(conn) == DBUS_DISPATCH_COMPLETE) { ++ if (dbus_connection_dispatch(conn) == DBUS_DISPATCH_COMPLETE) + /* no more data to process, disable the deferred */ + ea->defer_enable(ev, 0); +- } + } + + /* DBusDispatchStatusFunction callback for the pa mainloop */ +@@ -131,13 +130,17 @@ + struct timeout_data *d = userdata; + + pa_assert(d); +- pa_assert(d->c); ++ pa_assert(d->connection); + + if (dbus_timeout_get_enabled(d->timeout)) { +- dbus_timeout_handle(d->timeout); ++ /* Restart it for the next scheduled time. We do this before ++ * calling dbus_timeout_handle() to make sure that the time ++ * event is still around. */ ++ ea->time_restart(e, pa_timeval_rtstore(&tv, ++ pa_timeval_load(t) + dbus_timeout_get_interval(d->timeout) * PA_USEC_PER_MSEC, ++ d->connection->use_rtclock)); + +- /* restart it for the next scheduled time */ +- ea->time_restart(e, pa_timeval_rtstore(&tv, pa_timeval_load(t) + dbus_timeout_get_interval(d->timeout) * PA_USEC_PER_MSEC, d->c->use_rtclock)); ++ dbus_timeout_handle(d->timeout); + } + } + +@@ -207,7 +210,7 @@ + return FALSE; + + d = pa_xnew(struct timeout_data, 1); +- d->c = c; ++ d->connection = c; + d->timeout = timeout; + ev = c->mainloop->time_new(c->mainloop, pa_timeval_rtstore(&tv, pa_rtclock_now() + dbus_timeout_get_interval(timeout) * PA_USEC_PER_MSEC, c->use_rtclock), handle_time_event, d); + c->mainloop->time_set_destroy(ev, time_event_destroy_cb); +@@ -236,15 +239,15 @@ + struct timeval tv; + + pa_assert(d); +- pa_assert(d->c); ++ pa_assert(d->connection); + pa_assert(timeout); + + pa_assert_se(ev = dbus_timeout_get_data(timeout)); + +- if (dbus_timeout_get_enabled(timeout)) { +- d->c->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, pa_rtclock_now() + dbus_timeout_get_interval(timeout) * PA_USEC_PER_MSEC, d->c->use_rtclock)); +- } else +- d->c->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, PA_USEC_INVALID, d->c->use_rtclock)); ++ if (dbus_timeout_get_enabled(timeout)) ++ d->connection->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, pa_rtclock_now() + dbus_timeout_get_interval(timeout) * PA_USEC_PER_MSEC, d->connection->use_rtclock)); ++ else ++ d->connection->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, PA_USEC_INVALID, d->connection->use_rtclock)); + } + + static void wakeup_main(void *userdata) { +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/fdsem.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/fdsem.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/fdsem.c 2010-05-08 11:05:05.000000000 -0400 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + + #ifndef HAVE_PIPE +@@ -159,7 +160,12 @@ + uint64_t u; + + if ((r = read(f->efd, &u, sizeof(u))) != sizeof(u)) { +- pa_assert(r < 0 && errno == EINTR); ++ ++ if (r >= 0 || errno != EINTR) { ++ pa_log_error("Invalid read from eventfd: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); ++ pa_assert_not_reached(); ++ } ++ + continue; + } + r = (ssize_t) u; +@@ -167,7 +173,12 @@ + #endif + + if ((r = read(f->fds[0], &x, sizeof(x))) <= 0) { +- pa_assert(r < 0 && errno == EINTR); ++ ++ if (r >= 0 || errno != EINTR) { ++ pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); ++ pa_assert_not_reached(); ++ } ++ + continue; + } + +@@ -192,14 +203,22 @@ + uint64_t u = 1; + + if ((r = write(f->efd, &u, sizeof(u))) != sizeof(u)) { +- pa_assert(r < 0 && errno == EINTR); ++ if (r >= 0 || errno != EINTR) { ++ pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); ++ pa_assert_not_reached(); ++ } ++ + continue; + } + } else + #endif + + if ((r = write(f->fds[1], &x, 1)) != 1) { +- pa_assert(r < 0 && errno == EINTR); ++ if (r >= 0 || errno != EINTR) { ++ pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); ++ pa_assert_not_reached(); ++ } ++ + continue; + } + +@@ -228,7 +247,12 @@ + uint64_t u; + + if ((r = read(f->efd, &u, sizeof(u))) != sizeof(u)) { +- pa_assert(r < 0 && errno == EINTR); ++ ++ if (r >= 0 || errno != EINTR) { ++ pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); ++ pa_assert_not_reached(); ++ } ++ + continue; + } + +@@ -237,7 +261,12 @@ + #endif + + if ((r = read(f->fds[0], &x, sizeof(x))) <= 0) { +- pa_assert(r < 0 && errno == EINTR); ++ ++ if (r >= 0 || errno != EINTR) { ++ pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); ++ pa_assert_not_reached(); ++ } ++ + continue; + } + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/padsp.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/padsp.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/padsp.c 2010-05-08 11:05:05.000000000 -0400 +@@ -1458,11 +1458,11 @@ + return _open(filename, flags, mode); + } + +- if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0)) ++ if (filename && dsp_cloak_enable() && (pa_streq(filename, "/dev/dsp") || pa_streq(filename, "/dev/adsp") || pa_streq(filename, "/dev/audio"))) + r = dsp_open(flags, &_errno); +- else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0) ++ else if (filename && mixer_cloak_enable() && pa_streq(filename, "/dev/mixer")) + r = mixer_open(flags, &_errno); +- else if (filename && sndstat_cloak_enable() && strcmp(filename, "/dev/sndstat") == 0) ++ else if (filename && sndstat_cloak_enable() && pa_streq(filename, "/dev/sndstat")) + r = sndstat_open(flags, &_errno); + else { + function_exit(); +@@ -2383,15 +2383,21 @@ + return 0; + } + ++static pa_bool_t is_audio_device_node(const char *path) { ++ return ++ pa_streq(path, "/dev/dsp") || ++ pa_streq(path, "/dev/adsp") || ++ pa_streq(path, "/dev/audio") || ++ pa_streq(path, "/dev/sndstat") || ++ pa_streq(path, "/dev/mixer"); ++} ++ + int access(const char *pathname, int mode) { + + debug(DEBUG_LEVEL_VERBOSE, __FILE__": access(%s)\n", pathname?pathname:"NULL"); + + if (!pathname || +- (strcmp(pathname, "/dev/dsp") != 0 && +- strcmp(pathname, "/dev/adsp") != 0 && +- strcmp(pathname, "/dev/sndstat") != 0 && +- strcmp(pathname, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(pathname)) { + LOAD_ACCESS_FUNC(); + return _access(pathname, mode); + } +@@ -2417,10 +2423,7 @@ + + if (!pathname || + !buf || +- ( strcmp(pathname, "/dev/dsp") != 0 && +- strcmp(pathname, "/dev/adsp") != 0 && +- strcmp(pathname, "/dev/sndstat") != 0 && +- strcmp(pathname, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(pathname)) { + debug(DEBUG_LEVEL_VERBOSE, __FILE__": stat(%s)\n", pathname?pathname:"NULL"); + LOAD_STAT_FUNC(); + return _stat(pathname, buf); +@@ -2474,10 +2477,7 @@ + + if (!pathname || + !buf || +- ( strcmp(pathname, "/dev/dsp") != 0 && +- strcmp(pathname, "/dev/adsp") != 0 && +- strcmp(pathname, "/dev/sndstat") != 0 && +- strcmp(pathname, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(pathname)) { + LOAD_STAT64_FUNC(); + return _stat64(pathname, buf); + } +@@ -2519,10 +2519,7 @@ + } + + if (!filename || +- ( strcmp(filename, "/dev/dsp") != 0 && +- strcmp(filename, "/dev/adsp") != 0 && +- strcmp(filename, "/dev/sndstat") != 0 && +- strcmp(filename, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(filename)) { + LOAD_OPEN64_FUNC(); + return _open64(filename, flags, mode); + } +@@ -2539,10 +2536,7 @@ + + if (!pathname || + !buf || +- ( strcmp(pathname, "/dev/dsp") != 0 && +- strcmp(pathname, "/dev/adsp") != 0 && +- strcmp(pathname, "/dev/sndstat") != 0 && +- strcmp(pathname, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(pathname)) { + LOAD_XSTAT_FUNC(); + return ___xstat(ver, pathname, buf); + } +@@ -2562,10 +2556,7 @@ + + if (!pathname || + !buf || +- ( strcmp(pathname, "/dev/dsp") != 0 && +- strcmp(pathname, "/dev/adsp") != 0 && +- strcmp(pathname, "/dev/sndstat") != 0 && +- strcmp(pathname, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(pathname)) { + LOAD_XSTAT64_FUNC(); + return ___xstat64(ver, pathname, buf); + } +@@ -2591,10 +2582,7 @@ + + if (!filename || + !mode || +- ( strcmp(filename, "/dev/dsp") != 0 && +- strcmp(filename, "/dev/adsp") != 0 && +- strcmp(filename, "/dev/sndstat") != 0 && +- strcmp(filename, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(filename)) { + LOAD_FOPEN_FUNC(); + return _fopen(filename, mode); + } +@@ -2634,10 +2622,7 @@ + + if (!filename || + !mode || +- ( strcmp(filename, "/dev/dsp") != 0 && +- strcmp(filename, "/dev/adsp") != 0 && +- strcmp(filename, "/dev/sndstat") != 0 && +- strcmp(filename, "/dev/mixer") != 0 )) { ++ !is_audio_device_node(filename)) { + LOAD_FOPEN64_FUNC(); + return _fopen64(filename, mode); + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacat.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/pacat.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacat.c 2010-05-08 11:05:05.000000000 -0400 +@@ -195,28 +195,41 @@ + + pa_assert(sndfile); + +- if (pa_stream_begin_write(s, &data, &length) < 0) { +- pa_log(_("pa_stream_begin_write() failed: %s"), pa_strerror(pa_context_errno(context))); +- quit(1); +- return; +- } ++ for (;;) { ++ size_t data_length = length; + +- if (readf_function) { +- size_t k = pa_frame_size(&sample_spec); ++ if (pa_stream_begin_write(s, &data, &data_length) < 0) { ++ pa_log(_("pa_stream_begin_write() failed: %s"), pa_strerror(pa_context_errno(context))); ++ quit(1); ++ return; ++ } + +- if ((bytes = readf_function(sndfile, data, (sf_count_t) (length/k))) > 0) +- bytes *= (sf_count_t) k; ++ if (readf_function) { ++ size_t k = pa_frame_size(&sample_spec); + +- } else +- bytes = sf_read_raw(sndfile, data, (sf_count_t) length); ++ if ((bytes = readf_function(sndfile, data, (sf_count_t) (data_length/k))) > 0) ++ bytes *= (sf_count_t) k; + +- if (bytes > 0) +- pa_stream_write(s, data, (size_t) bytes, NULL, 0, PA_SEEK_RELATIVE); +- else +- pa_stream_cancel_write(s); ++ } else ++ bytes = sf_read_raw(sndfile, data, (sf_count_t) data_length); + +- if (bytes < (sf_count_t) length) +- start_drain(); ++ if (bytes > 0) ++ pa_stream_write(s, data, (size_t) bytes, NULL, 0, PA_SEEK_RELATIVE); ++ else ++ pa_stream_cancel_write(s); ++ ++ /* EOF? */ ++ if (bytes < (sf_count_t) data_length) { ++ start_drain(); ++ break; ++ } ++ ++ /* Request fulfilled */ ++ if ((size_t) bytes >= length) ++ break; ++ ++ length -= bytes; ++ } + } + } + +@@ -460,7 +473,7 @@ + } + + } else { +- if (pa_stream_connect_record(stream, device, latency > 0 ? &buffer_attr : NULL, flags) < 0) { ++ if (pa_stream_connect_record(stream, device, &buffer_attr, flags) < 0) { + pa_log(_("pa_stream_connect_record() failed: %s"), pa_strerror(pa_context_errno(c))); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacmd.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/pacmd.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacmd.c 2010-05-08 11:05:05.000000000 -0400 +@@ -45,13 +45,6 @@ + + int main(int argc, char*argv[]) { + +- enum { +- WATCH_STDIN, +- WATCH_STDOUT, +- WATCH_SOCKET, +- N_WATCH +- }; +- + pid_t pid ; + int fd = -1; + int ret = 1, i; +@@ -60,7 +53,10 @@ + size_t ibuf_index, ibuf_length, obuf_index, obuf_length; + char *cli; + pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed; +- struct pollfd pollfd[N_WATCH]; ++ struct pollfd pollfd[3]; ++ struct pollfd *watch_socket, *watch_stdin, *watch_stdout; ++ ++ int stdin_type = 0, stdout_type = 0, fd_type = 0; + + setlocale(LC_ALL, ""); + bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); +@@ -128,32 +124,53 @@ + ibuf_eof = TRUE; + } + +- pa_zero(pollfd); +- +- pollfd[WATCH_STDIN].fd = STDIN_FILENO; +- pollfd[WATCH_STDOUT].fd = STDOUT_FILENO; +- pollfd[WATCH_SOCKET].fd = fd; +- + for (;;) { ++ struct pollfd *p; ++ + if (ibuf_eof && + obuf_eof && + ibuf_length <= 0 && + obuf_length <= 0) + break; + +- pollfd[WATCH_STDIN].events = pollfd[WATCH_STDOUT].events = pollfd[WATCH_SOCKET].events = 0; ++ if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) { ++ shutdown(fd, SHUT_WR); ++ ibuf_closed = TRUE; ++ } ++ ++ if (obuf_length <= 0 && obuf_eof && !obuf_closed) { ++ shutdown(fd, SHUT_RD); ++ obuf_closed = TRUE; ++ } ++ ++ pa_zero(pollfd); + +- if (obuf_length > 0) +- pollfd[WATCH_STDOUT].events |= POLLOUT; +- else if (!obuf_eof) +- pollfd[WATCH_SOCKET].events |= POLLIN; +- +- if (ibuf_length > 0) +- pollfd[WATCH_SOCKET].events |= POLLOUT; +- else if (!ibuf_eof) +- pollfd[WATCH_STDIN].events |= POLLIN; ++ p = pollfd; + +- if (poll(pollfd, N_WATCH, -1) < 0) { ++ if (ibuf_length > 0 || (!obuf_eof && obuf_length <= 0)) { ++ watch_socket = p++; ++ watch_socket->fd = fd; ++ watch_socket->events = ++ (ibuf_length > 0 ? POLLOUT : 0) | ++ (!obuf_eof && obuf_length <= 0 ? POLLIN : 0); ++ } else ++ watch_socket = NULL; ++ ++ if (!ibuf_eof && ibuf_length <= 0) { ++ watch_stdin = p++; ++ watch_stdin->fd = STDIN_FILENO; ++ watch_stdin->events = POLLIN; ++ } else ++ watch_stdin = NULL; ++ ++ if (obuf_length > 0) { ++ watch_stdout = p++; ++ watch_stdout->fd = STDOUT_FILENO; ++ watch_stdout->events = POLLOUT; ++ } else ++ watch_stdout = NULL; ++ ++ if (poll(pollfd, p-pollfd, -1) < 0) { + + if (errno == EINTR) + continue; +@@ -162,82 +179,80 @@ + goto fail; + } + +- if (pollfd[WATCH_STDIN].revents & POLLIN) { +- ssize_t r; +- pa_assert(!ibuf_length); +- +- if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), NULL)) <= 0) { +- if (r < 0) { +- pa_log(_("read(): %s"), strerror(errno)); +- goto fail; ++ if (watch_stdin) { ++ if (watch_stdin->revents & POLLIN) { ++ ssize_t r; ++ pa_assert(ibuf_length <= 0); ++ ++ if ((r = pa_read(STDIN_FILENO, ibuf, sizeof(ibuf), &stdin_type)) <= 0) { ++ if (r < 0) { ++ pa_log(_("read(): %s"), strerror(errno)); ++ goto fail; ++ } ++ ++ ibuf_eof = TRUE; ++ } else { ++ ibuf_length = (size_t) r; ++ ibuf_index = 0; + } +- ++ } else if (watch_stdin->revents & POLLHUP) + ibuf_eof = TRUE; +- } else { +- ibuf_length = (size_t) r; +- ibuf_index = 0; +- } + } + +- if (pollfd[WATCH_SOCKET].revents & POLLIN) { +- ssize_t r; +- pa_assert(!obuf_length); +- +- if ((r = pa_read(fd, obuf, sizeof(obuf), NULL)) <= 0) { +- if (r < 0) { +- pa_log(_("read(): %s"), strerror(errno)); +- goto fail; ++ if (watch_socket) { ++ if (watch_socket->revents & POLLIN) { ++ ssize_t r; ++ pa_assert(obuf_length <= 0); ++ ++ if ((r = pa_read(fd, obuf, sizeof(obuf), &fd_type)) <= 0) { ++ if (r < 0) { ++ pa_log(_("read(): %s"), strerror(errno)); ++ goto fail; ++ } ++ ++ obuf_eof = TRUE; ++ } else { ++ obuf_length = (size_t) r; ++ obuf_index = 0; + } +- ++ } else if (watch_socket->revents & POLLHUP) + obuf_eof = TRUE; +- } else { +- obuf_length = (size_t) r; +- obuf_index = 0; +- } + } + +- if (pollfd[WATCH_STDOUT].revents & POLLHUP) { +- obuf_eof = TRUE; +- obuf_length = 0; +- } else if (pollfd[WATCH_STDOUT].revents & POLLOUT) { +- ssize_t r; +- pa_assert(obuf_length); +- +- if ((r = pa_write(STDOUT_FILENO, obuf + obuf_index, obuf_length, NULL)) < 0) { +- pa_log(_("write(): %s"), strerror(errno)); +- goto fail; +- } ++ if (watch_stdout) { ++ if (watch_stdout->revents & POLLHUP) { ++ obuf_eof = TRUE; ++ obuf_length = 0; ++ } else if (watch_stdout->revents & POLLOUT) { ++ ssize_t r; ++ pa_assert(obuf_length > 0); + +- obuf_length -= (size_t) r; +- obuf_index += obuf_index; +- } ++ if ((r = pa_write(STDOUT_FILENO, obuf + obuf_index, obuf_length, &stdout_type)) < 0) { ++ pa_log(_("write(): %s"), strerror(errno)); ++ goto fail; ++ } + +- if (pollfd[WATCH_SOCKET].revents & POLLHUP) { +- ibuf_eof = TRUE; +- ibuf_length = 0; +- } if (pollfd[WATCH_SOCKET].revents & POLLOUT) { +- ssize_t r; +- pa_assert(ibuf_length); +- +- if ((r = pa_write(fd, ibuf + ibuf_index, ibuf_length, NULL)) < 0) { +- pa_log(_("write(): %s"), strerror(errno)); +- goto fail; ++ obuf_length -= (size_t) r; ++ obuf_index += obuf_index; + } +- +- ibuf_length -= (size_t) r; +- ibuf_index += obuf_index; + } + +- if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) { +- pa_close(STDIN_FILENO); +- shutdown(fd, SHUT_WR); +- ibuf_closed = TRUE; +- } ++ if (watch_socket) { ++ if (watch_socket->revents & POLLHUP) { ++ ibuf_eof = TRUE; ++ ibuf_length = 0; ++ } if (watch_socket->revents & POLLOUT) { ++ ssize_t r; ++ pa_assert(ibuf_length > 0); + +- if (obuf_length <= 0 && obuf_eof && !obuf_closed) { +- shutdown(fd, SHUT_RD); +- pa_close(STDOUT_FILENO); +- obuf_closed = TRUE; ++ if ((r = pa_write(fd, ibuf + ibuf_index, ibuf_length, &fd_type)) < 0) { ++ pa_log(_("write(): %s"), strerror(errno)); ++ goto fail; ++ } ++ ++ ibuf_length -= (size_t) r; ++ ibuf_index += obuf_index; ++ } + } + } + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/shm.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/shm.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/shm.c 2010-05-08 11:05:05.000000000 -0400 +@@ -286,7 +286,7 @@ + segment_name(fn, sizeof(fn), m->id = id); + + if ((fd = shm_open(fn, O_RDONLY, 0)) < 0) { +- if (errno != EACCES) ++ if (errno != EACCES && errno != ENOENT) + pa_log("shm_open() failed: %s", pa_cstrerror(errno)); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/vala/libpulse.vapi +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/vala/libpulse.vapi 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/vala/libpulse.vapi 2010-05-08 11:05:05.000000000 -0400 +@@ -46,7 +46,7 @@ + [CCode (cname="PA_CHECK_VERSION")] + public bool CHECK_VERSION(int major, int minor, int micro); + +- [CCode (cname="INVALID_INDEX")] ++ [CCode (cname="PA_INVALID_INDEX")] + public const uint32 INVALID_INDEX; + + [CCode (cname="pa_free_cb_t")] +@@ -879,11 +879,11 @@ + } + + [Compact] +- [CCode (cname="pa_glib_mainloop", cprefix="pa_glib_mainloop_", free_function="pa_glib_mainloop_free")] ++ [CCode (cheader_filename="pulse/glib-mainloop.h", cname="pa_glib_mainloop", cprefix="pa_glib_mainloop_", free_function="pa_glib_mainloop_free")] + public class GLibMainLoop { + + [CCode (cname="pa_glib_mainloop_new")] +- public GLibMainLoop(); ++ public GLibMainLoop(MainContext? c = null); + + public unowned MainLoopApi get_api(); + } +@@ -1024,7 +1024,7 @@ + public Operation? suspend_sink_by_index(uint32 idx, bool suspend, SuccessCb? cb = null); + + public Operation? set_sink_port_by_name(string name, string port, SuccessCb? cb = null); +- public Operation? set_sink_port_by_index(string idx, string port, SuccessCb? cb = null); ++ public Operation? set_sink_port_by_index(uint32 idx, string port, SuccessCb? cb = null); + + public Operation? get_source_info_by_name(string name, SourceInfoCb cb); + public Operation? get_source_info_by_index(uint32 idx, SourceInfoCb cb); +@@ -1039,7 +1039,7 @@ + public Operation? suspend_source_by_index(uint32 idx, bool suspend, SuccessCb? cb = null); + + public Operation? set_source_port_by_name(string name, string port, SuccessCb? cb = null); +- public Operation? set_source_port_by_index(string idx, string port, SuccessCb? cb = null); ++ public Operation? set_source_port_by_index(uint32 idx, string port, SuccessCb? cb = null); + + public Operation? get_server_info(ServerInfoCb cb); + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-stream-restore.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-stream-restore.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-stream-restore.c 2010-05-08 11:05:05.000000000 -0400 +@@ -394,7 +394,7 @@ + return PA_HOOK_OK; + + if (new_data->sink) +- pa_log_debug("Not restoring device for stream %s, because already set.", name); ++ pa_log_debug("Not restoring device for stream %s, because already set to '%s'.", name, new_data->sink->name); + else if ((e = read_entry(u, name))) { + pa_sink *s = NULL; + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/channelmap.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulse/channelmap.c 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/channelmap.c 2010-05-08 11:05:05.000000000 -0400 +@@ -112,7 +112,7 @@ + [PA_CHANNEL_POSITION_REAR_LEFT] = N_("Rear Left"), + [PA_CHANNEL_POSITION_REAR_RIGHT] = N_("Rear Right"), + +- [PA_CHANNEL_POSITION_LFE] = N_("Low Frequency Emmiter"), ++ [PA_CHANNEL_POSITION_LFE] = N_("Subwoofer"), + + [PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER] = N_("Front Left-of-center"), + [PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] = N_("Front Right-of-center"), +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/proplist.h +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulse/proplist.h 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/proplist.h 2010-05-08 11:05:05.000000000 -0400 +@@ -59,7 +59,7 @@ + /** For streams: an XDG icon name for the media. e.g. "audio-x-mp3" */ + #define PA_PROP_MEDIA_ICON_NAME "media.icon_name" + +-/** For streams: logic role of this media. One of the strings "video", "music", "game", "event", "phone", "animation", "production", "a11y" */ ++/** For streams: logic role of this media. One of the strings "video", "music", "game", "event", "phone", "animation", "production", "a11y", "test" */ + #define PA_PROP_MEDIA_ROLE "media.role" + + /** For event sound streams: XDG event sound name. e.g. "message-new-email" (Event sound streams are those with media.role set to "event") */ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-scache.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/core-scache.c 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-scache.c 2010-05-08 11:05:05.000000000 -0400 +@@ -310,7 +310,8 @@ + return -1; + + merged = pa_proplist_new(); +- pa_proplist_setf(merged, PA_PROP_MEDIA_NAME, "Sample %s", name); ++ pa_proplist_sets(merged, PA_PROP_MEDIA_NAME, name); ++ pa_proplist_sets(merged, PA_PROP_EVENT_ID, name); + + if (e->lazy && !e->memchunk.memblock) { + pa_channel_map old_channel_map = e->channel_map; +@@ -350,7 +351,12 @@ + if (p) + pa_proplist_update(merged, PA_UPDATE_REPLACE, p); + +- if (pa_play_memchunk(sink, &e->sample_spec, &e->channel_map, &e->memchunk, pass_volume ? &r : NULL, merged, sink_input_idx) < 0) ++ if (pa_play_memchunk(sink, ++ &e->sample_spec, &e->channel_map, ++ &e->memchunk, ++ pass_volume ? &r : NULL, ++ merged, ++ PA_SINK_INPUT_NO_CREATE_ON_SUSPEND|PA_SINK_INPUT_KILL_ON_SUSPEND, sink_input_idx) < 0) + goto fail; + + pa_proplist_free(merged); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memblockq.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.c 2010-05-08 11:05:05.000000000 -0400 +@@ -173,7 +173,8 @@ + const pa_channel_map *map, + pa_memblockq *q, + pa_cvolume *volume, +- pa_proplist *p) { ++ pa_proplist *p, ++ pa_sink_input_flags_t flags) { + + memblockq_stream *u = NULL; + pa_sink_input_new_data data; +@@ -198,6 +199,7 @@ + pa_sink_input_new_data_set_channel_map(&data, map); + pa_sink_input_new_data_set_volume(&data, volume); + pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p); ++ data.flags |= flags; + + pa_sink_input_new(&u->sink_input, sink->core, &data); + pa_sink_input_new_data_done(&data); +@@ -237,6 +239,7 @@ + pa_memblockq *q, + pa_cvolume *volume, + pa_proplist *p, ++ pa_sink_input_flags_t flags, + uint32_t *sink_input_index) { + + pa_sink_input *i; +@@ -245,7 +248,7 @@ + pa_assert(ss); + pa_assert(q); + +- if (!(i = pa_memblockq_sink_input_new(sink, ss, map, q, volume, p))) ++ if (!(i = pa_memblockq_sink_input_new(sink, ss, map, q, volume, p, flags))) + return -1; + + pa_sink_input_put(i); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.h +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memblockq.h 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.h 2010-05-08 11:05:05.000000000 -0400 +@@ -31,17 +31,19 @@ + const pa_channel_map *map, + pa_memblockq *q, + pa_cvolume *volume, +- pa_proplist *p); ++ pa_proplist *p, ++ pa_sink_input_flags_t flags); + + void pa_memblockq_sink_input_set_queue(pa_sink_input *i, pa_memblockq *q); + + int pa_play_memblockq( +- pa_sink *sink, +- const pa_sample_spec *ss, +- const pa_channel_map *map, +- pa_memblockq *q, +- pa_cvolume *cvolume, +- pa_proplist *p, +- uint32_t *sink_input_index); ++ pa_sink *sink, ++ const pa_sample_spec *ss, ++ const pa_channel_map *map, ++ pa_memblockq *q, ++ pa_cvolume *cvolume, ++ pa_proplist *p, ++ pa_sink_input_flags_t flags, ++ uint32_t *sink_input_index); + + #endif +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memchunk.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.c 2010-05-08 11:05:05.000000000 -0400 +@@ -43,6 +43,7 @@ + const pa_memchunk *chunk, + pa_cvolume *volume, + pa_proplist *p, ++ pa_sink_input_flags_t flags, + uint32_t *sink_input_index) { + + pa_memblockq *q; +@@ -59,7 +60,7 @@ + + pa_assert_se(pa_memblockq_push(q, chunk) >= 0); + +- if ((r = pa_play_memblockq(sink, ss, map, q, volume, p, sink_input_index)) < 0) { ++ if ((r = pa_play_memblockq(sink, ss, map, q, volume, p, flags, sink_input_index)) < 0) { + pa_memblockq_free(q); + return r; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.h +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memchunk.h 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.h 2010-05-08 11:05:05.000000000 -0400 +@@ -26,12 +26,13 @@ + #include + + int pa_play_memchunk( +- pa_sink *sink, +- const pa_sample_spec *ss, +- const pa_channel_map *map, +- const pa_memchunk *chunk, +- pa_cvolume *cvolume, +- pa_proplist *p, +- uint32_t *sink_input_index); ++ pa_sink *sink, ++ const pa_sample_spec *ss, ++ const pa_channel_map *map, ++ const pa_memchunk *chunk, ++ pa_cvolume *cvolume, ++ pa_proplist *p, ++ pa_sink_input_flags_t flags, ++ uint32_t *sink_input_index); + + #endif +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-suspend-on-idle.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-suspend-on-idle.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-suspend-on-idle.c 2010-05-08 11:05:05.000000000 -0400 +@@ -145,8 +145,9 @@ + pa_assert(data); + pa_assert(u); + +- if (data->flags & PA_SINK_INPUT_START_CORKED) +- return PA_HOOK_OK; ++ /* We need to resume the audio device here even for ++ * PA_SINK_INPUT_START_CORKED, since we need the device parameters ++ * to be fully available while the stream is set up. */ + + if ((d = pa_hashmap_get(u->device_infos, data->sink))) + resume(d); +@@ -161,9 +162,6 @@ + pa_assert(data); + pa_assert(u); + +- if (data->flags & PA_SOURCE_OUTPUT_START_CORKED) +- return PA_HOOK_OK; +- + if (data->source->monitor_of) + d = pa_hashmap_get(u->device_infos, data->source->monitor_of); + else +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-native.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/protocol-native.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-native.c 2010-05-08 11:05:05.000000000 -0400 +@@ -858,6 +858,18 @@ + + pa_assert(s); + ++ /* pa_log("Client requested: maxlength=%li bytes tlength=%li bytes minreq=%li bytes prebuf=%li bytes", */ ++ /* (long) s->buffer_attr.maxlength, */ ++ /* (long) s->buffer_attr.tlength, */ ++ /* (long) s->buffer_attr.minreq, */ ++ /* (long) s->buffer_attr.prebuf); */ ++ ++ /* pa_log("Client requested: maxlength=%lu ms tlength=%lu ms minreq=%lu ms prebuf=%lu ms", */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.maxlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.tlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.minreq, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.prebuf, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC)); */ ++ + /* This function will be called from the main thread, before as + * well as after the sink input has been activated using + * pa_sink_input_put()! That means it may not touch any +@@ -984,6 +996,12 @@ + if (s->buffer_attr.prebuf == (uint32_t) -1 || + s->buffer_attr.prebuf > max_prebuf) + s->buffer_attr.prebuf = max_prebuf; ++ ++ /* pa_log("Client accepted: maxlength=%lu ms tlength=%lu ms minreq=%lu ms prebuf=%lu ms", */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.maxlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.tlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.minreq, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ ++ /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.prebuf, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC)); */ + } + + /* Called from main context */ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-sink.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/alsa-sink.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-sink.c 2010-05-08 11:06:35.000000000 -0400 +@@ -79,7 +79,7 @@ + #define TSCHED_MIN_WAKEUP_USEC (4*PA_USEC_PER_MSEC) /* 4ms -- Wakeup at least this long before the buffer runs empty*/ + + #define SMOOTHER_MIN_INTERVAL (2*PA_USEC_PER_MSEC) /* 2ms -- min smoother update interval */ +-#define SMOOTHER_MAX_INTERVAL (200*PA_USEC_PER_MSEC) /* 200ms -- max smoother update inteval */ ++#define SMOOTHER_MAX_INTERVAL (200*PA_USEC_PER_MSEC) /* 200ms -- max smoother update interval */ + + #define VOLUME_ACCURACY (PA_VOLUME_NORM/100) /* don't require volume adjustments to be perfectly correct. don't necessarily extend granularity in software unless the differences get greater than this level */ + +@@ -876,6 +876,14 @@ + u->alsa_rtpoll_item = NULL; + } + ++ /* We reset max_rewind/max_request here to make sure that while we ++ * are suspended the old max_request/max_rewind values set before ++ * the suspend can influence the per-stream buffer of newly ++ * created streams, without their requirements having any ++ * influence on them. */ ++ pa_sink_set_max_rewind_within_thread(u->sink, 0); ++ pa_sink_set_max_request_within_thread(u->sink, 0); ++ + pa_log_info("Device suspended..."); + + return 0; +@@ -933,6 +941,7 @@ + } + + pa_sink_set_max_request_within_thread(u->sink, u->hwbuf_size - u->hwbuf_unused); ++ pa_sink_set_max_rewind_within_thread(u->sink, u->hwbuf_size); + + return 0; + } +@@ -1908,7 +1917,7 @@ + + pa_alsa_dump(PA_LOG_DEBUG, u->pcm_handle); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("alsa-sink", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-util.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/alsa-util.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-util.c 2010-05-08 11:05:05.000000000 -0400 +@@ -874,12 +874,12 @@ + pa_proplist_setf(p, "alsa.card", "%i", card); + + if (snd_card_get_name(card, &cn) >= 0) { +- pa_proplist_sets(p, "alsa.card_name", cn); ++ pa_proplist_sets(p, "alsa.card_name", pa_strip(cn)); + free(cn); + } + + if (snd_card_get_longname(card, &lcn) >= 0) { +- pa_proplist_sets(p, "alsa.long_card_name", lcn); ++ pa_proplist_sets(p, "alsa.long_card_name", pa_strip(lcn)); + free(lcn); + } + +@@ -937,8 +937,11 @@ + if (alsa_subclass_table[subclass]) + pa_proplist_sets(p, "alsa.subclass", alsa_subclass_table[subclass]); + +- if ((n = snd_pcm_info_get_name(pcm_info))) +- pa_proplist_sets(p, "alsa.name", n); ++ if ((n = snd_pcm_info_get_name(pcm_info))) { ++ char *t = pa_xstrdup(n); ++ pa_proplist_sets(p, "alsa.name", pa_strip(t)); ++ pa_xfree(t); ++ } + + if ((id = snd_pcm_info_get_id(pcm_info))) + pa_proplist_sets(p, "alsa.id", id); +@@ -1331,6 +1334,5 @@ + return FALSE; + } + +- + return TRUE; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-util.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/core-util.c 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-util.c 2010-05-08 11:05:42.000000000 -0400 +@@ -126,6 +126,9 @@ + #define MSG_NOSIGNAL 0 + #endif + ++#define NEWLINE "\r\n" ++#define WHITESPACE "\n\r \t" ++ + static pa_strlist *recorded_env = NULL; + + #ifdef OS_IS_WIN32 +@@ -830,9 +833,6 @@ + return pa_xstrndup(current, l); + } + +-/* What is interpreted as whitespace? */ +-#define WHITESPACE " \t\n" +- + /* Split a string into words. Otherwise similar to pa_split(). */ + char *pa_split_spaces(const char *c, const char **state) { + const char *current = *state ? *state : c; +@@ -1189,7 +1189,27 @@ + char* pa_strip_nl(char *s) { + pa_assert(s); + +- s[strcspn(s, "\r\n")] = 0; ++ s[strcspn(s, NEWLINE)] = 0; ++ return s; ++} ++ ++char *pa_strip(char *s) { ++ char *e, *l = NULL; ++ ++ /* Drops trailing whitespace. Modifies the string in ++ * place. Returns pointer to first non-space character */ ++ ++ s += strspn(s, WHITESPACE); ++ ++ for (e = s; *e; e++) ++ if (!strchr(WHITESPACE, *e)) ++ l = e; ++ ++ if (l) ++ *(l+1) = 0; ++ else ++ *s = 0; ++ + return s; + } + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-util.h +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/core-util.h 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-util.h 2010-05-08 11:05:05.000000000 -0400 +@@ -102,6 +102,7 @@ + char *pa_split_spaces(const char *c, const char **state); + + char *pa_strip_nl(char *s); ++char *pa_strip(char *s); + + const char *pa_sig2str(int sig) PA_GCC_PURE; + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-esound.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/protocol-esound.c 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-esound.c 2010-05-08 11:05:05.000000000 -0400 +@@ -462,7 +462,7 @@ + + c->protocol->n_player++; + +- pa_atomic_store(&c->playback.missing, (int) pa_memblockq_missing(c->input_memblockq)); ++ pa_atomic_store(&c->playback.missing, (int) pa_memblockq_pop_missing(c->input_memblockq)); + + pa_sink_input_put(c->sink_input); + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-simple.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/protocol-simple.c 2010-05-08 11:04:51.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-simple.c 2010-05-08 11:05:05.000000000 -0400 +@@ -574,7 +574,7 @@ + + pa_iochannel_socket_set_rcvbuf(io, l); + +- pa_atomic_store(&c->playback.missing, (int) pa_memblockq_missing(c->input_memblockq)); ++ pa_atomic_store(&c->playback.missing, (int) pa_memblockq_pop_missing(c->input_memblockq)); + + pa_sink_input_put(c->sink_input); + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/sink.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/sink.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/sink.c 2010-05-08 11:05:05.000000000 -0400 +@@ -1162,6 +1162,46 @@ + return usec; + } + ++static pa_cvolume* cvolume_remap_minimal_impact( ++ pa_cvolume *v, ++ const pa_cvolume *template, ++ const pa_channel_map *from, ++ const pa_channel_map *to) { ++ ++ pa_cvolume t; ++ ++ pa_assert(v); ++ pa_assert(template); ++ pa_assert(from); ++ pa_assert(to); ++ ++ pa_return_val_if_fail(pa_cvolume_compatible_with_channel_map(v, from), NULL); ++ pa_return_val_if_fail(pa_cvolume_compatible_with_channel_map(template, to), NULL); ++ ++ /* Much like pa_cvolume_remap(), but tries to minimize impact when ++ * mapping from sink input to sink volumes: ++ * ++ * If template is a possible remapping from v it is used instead ++ * of remapping anew. ++ * ++ * If the channel maps don't match we set an all-channel volume on ++ * the sink to ensure that changing a volume on one stream has no ++ * effect that cannot be compensated for in another stream that ++ * does not have the same channel map as the sink. */ ++ ++ if (pa_channel_map_equal(from, to)) ++ return v; ++ ++ t = *template; ++ if (pa_cvolume_equal(pa_cvolume_remap(&t, to, from), v)) { ++ *v = *template; ++ return v; ++ } ++ ++ pa_cvolume_set(v, to->channels, pa_cvolume_max(v)); ++ return v; ++} ++ + /* Called from main context */ + static void compute_reference_ratios(pa_sink *s) { + uint32_t idx; +@@ -1289,7 +1329,7 @@ + pa_cvolume remapped; + + remapped = i->volume; +- pa_cvolume_remap(&remapped, &i->channel_map, &s->channel_map); ++ cvolume_remap_minimal_impact(&remapped, &s->real_volume, &i->channel_map, &s->channel_map); + pa_cvolume_merge(&s->real_volume, &s->real_volume, &remapped); + } + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-intended-roles.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-intended-roles.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-intended-roles.c 2010-05-08 11:05:05.000000000 -0400 +@@ -123,6 +123,7 @@ + return PA_HOOK_OK; + } + ++ /* @todo: favour the highest priority device, not the first one we find? */ + PA_IDXSET_FOREACH(s, c->sinks, idx) { + if (s == def) + continue; +@@ -173,12 +174,16 @@ + } + + PA_IDXSET_FOREACH(s, c->sources, idx) { ++ if (s->monitor_of) ++ continue; ++ + if (s == def) + continue; + + if (!PA_SOURCE_IS_LINKED(pa_source_get_state(s))) + continue; + ++ /* @todo: favour the highest priority device, not the first one we find? */ + if (role_match(s->proplist, role)) { + new_data->source = s; + new_data->save_source = FALSE; +@@ -242,6 +247,9 @@ + pa_assert(u); + pa_assert(u->on_hotplug); + ++ if (source->monitor_of) ++ return PA_HOOK_OK; ++ + PA_IDXSET_FOREACH(so, c->source_outputs, idx) { + const char *role; + +@@ -315,6 +323,7 @@ + continue; + + /* Try to find some other fitting sink */ ++ /* @todo: favour the highest priority device, not the first one we find? */ + PA_IDXSET_FOREACH(d, c->sinks, jdx) { + if (d == def || d == sink) + continue; +@@ -370,6 +379,7 @@ + } + + /* Try to find some other fitting source */ ++ /* @todo: favour the highest priority device, not the first one we find? */ + PA_IDXSET_FOREACH(d, c->sources, jdx) { + if (d == def || d == source) + continue; +@@ -377,7 +387,8 @@ + if (!PA_SOURCE_IS_LINKED(pa_source_get_state(d))) + continue; + +- if (role_match(d->proplist, role) && !source->monitor_of == !d->monitor_of) { ++ /* If moving from a monitor, move to another monitor */ ++ if (!source->monitor_of == !d->monitor_of && role_match(d->proplist, role)) { + pa_source_output_move_to(so, d, FALSE); + break; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/socket-client.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/socket-client.c 2010-05-08 11:04:52.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/socket-client.c 2010-05-08 11:05:05.000000000 -0400 +@@ -389,7 +389,8 @@ + goto fail; + + if (res->ai_addr) +- sockaddr_prepare(c, res->ai_addr, res->ai_addrlen); ++ if (sockaddr_prepare(c, res->ai_addr, res->ai_addrlen) < 0) ++ goto fail; + + asyncns_freeaddrinfo(res); + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-source.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/alsa-source.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-source.c 2010-05-08 11:06:35.000000000 -0400 +@@ -1744,7 +1744,7 @@ + + pa_alsa_dump(PA_LOG_DEBUG, u->pcm_handle); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("alsa-source", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/bluetooth/module-bluetooth-device.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/bluetooth/module-bluetooth-device.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/bluetooth/module-bluetooth-device.c 2010-05-08 11:06:35.000000000 -0400 +@@ -2041,7 +2041,7 @@ + } + #endif + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("bluetooth", thread_func, u))) { + pa_log_error("Failed to create IO thread"); + stop_thread(u); + return -1; +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/jack/module-jack-sink.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/jack/module-jack-sink.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/jack/module-jack-sink.c 2010-05-08 11:06:35.000000000 -0400 +@@ -147,6 +147,7 @@ + pa_sample_spec ss; + + /* Humm, we're not RUNNING, hence let's write some silence */ ++ /* This can happen if we're paused, or during shutdown (when we're unlinked but jack is still running). */ + + ss = u->sink->sample_spec; + ss.channels = 1; +@@ -197,6 +198,7 @@ + return pa_sink_process_msg(o, code, data, offset, memchunk); + } + ++/* JACK Callback: This is called when JACK needs some data */ + static int jack_process(jack_nframes_t nframes, void *arg) { + struct userdata *u = arg; + unsigned c; +@@ -250,6 +252,7 @@ + pa_log_debug("Thread shutting down"); + } + ++/* JACK Callback: This is called when JACK triggers an error */ + static void jack_error_func(const char*t) { + char *s; + +@@ -258,6 +261,7 @@ + pa_xfree(s); + } + ++/* JACK Callback: This is called when JACK is set up */ + static void jack_init(void *arg) { + struct userdata *u = arg; + +@@ -267,6 +271,7 @@ + pa_make_realtime(u->core->realtime_priority+4); + } + ++/* JACK Callback: This is called when JACK kicks us */ + static void jack_shutdown(void* arg) { + struct userdata *u = arg; + +@@ -274,6 +279,7 @@ + pa_asyncmsgq_post(u->jack_msgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_ON_SHUTDOWN, NULL, 0, NULL, NULL); + } + ++/* JACK Callback: This is called when JACK changes the buffer size */ + static int jack_buffer_size(jack_nframes_t nframes, void *arg) { + struct userdata *u = arg; + +@@ -413,7 +419,7 @@ + jack_set_thread_init_callback(u->client, jack_init, u); + jack_set_buffer_size_callback(u->client, jack_buffer_size, u); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("jack-sink", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +@@ -475,12 +481,12 @@ + if (!(u = m->userdata)) + return; + +- if (u->client) +- jack_client_close(u->client); +- + if (u->sink) + pa_sink_unlink(u->sink); + ++ if (u->client) ++ jack_client_close(u->client); ++ + if (u->thread) { + pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); + pa_thread_free(u->thread); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/jack/module-jack-source.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/jack/module-jack-source.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/jack/module-jack-source.c 2010-05-08 11:06:35.000000000 -0400 +@@ -363,7 +363,7 @@ + jack_on_shutdown(u->client, jack_shutdown, u); + jack_set_thread_init_callback(u->client, jack_init, u); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("jack-source", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +@@ -425,12 +425,12 @@ + if (!(u = m->userdata)) + return; + +- if (u->client) +- jack_client_close(u->client); +- + if (u->source) + pa_source_unlink(u->source); + ++ if (u->client) ++ jack_client_close(u->client); ++ + if (u->thread) { + pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); + pa_thread_free(u->thread); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-combine.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-combine.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-combine.c 2010-05-08 11:06:35.000000000 -0400 +@@ -1304,7 +1304,7 @@ + u->sink_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_EARLY, (pa_hook_cb_t) sink_unlink_hook_cb, u); + u->sink_state_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_STATE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_state_changed_hook_cb, u); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("combine", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-esound-sink.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-esound-sink.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-esound-sink.c 2010-05-08 11:06:35.000000000 -0400 +@@ -628,7 +628,7 @@ + /* Reserve space for the response */ + u->read_data = pa_xmalloc(u->read_length = sizeof(int32_t)); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("esound-sink", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-null-sink.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-null-sink.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-null-sink.c 2010-05-08 11:06:35.000000000 -0400 +@@ -317,7 +317,7 @@ + pa_sink_set_max_rewind(u->sink, nbytes); + pa_sink_set_max_request(u->sink, nbytes); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("null-sink", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-pipe-sink.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-pipe-sink.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-pipe-sink.c 2010-05-08 11:06:35.000000000 -0400 +@@ -307,7 +307,7 @@ + pollfd->fd = u->fd; + pollfd->events = pollfd->revents = 0; + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("pipe-sink", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-pipe-source.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-pipe-source.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-pipe-source.c 2010-05-08 11:06:35.000000000 -0400 +@@ -291,7 +291,7 @@ + pollfd->fd = u->fd; + pollfd->events = pollfd->revents = 0; + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("pipe-source", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-sine-source.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-sine-source.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-sine-source.c 2010-05-08 11:06:35.000000000 -0400 +@@ -274,7 +274,7 @@ + pa_source_set_rtpoll(u->source, u->rtpoll); + pa_source_set_fixed_latency(u->source, u->block_usec); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("sine-source", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-tunnel.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-tunnel.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-tunnel.c 2010-05-08 11:06:35.000000000 -0400 +@@ -2014,7 +2014,7 @@ + u->fragsize = (uint32_t) -1; + #endif + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("module-tunnel", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/oss/module-oss.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/oss/module-oss.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/oss/module-oss.c 2010-05-08 11:06:35.000000000 -0400 +@@ -1456,7 +1456,7 @@ + + pa_memchunk_reset(&u->memchunk); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("oss", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/raop/module-raop-sink.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/raop/module-raop-sink.c 2010-05-08 11:06:18.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/raop/module-raop-sink.c 2010-05-08 11:06:35.000000000 -0400 +@@ -620,7 +620,7 @@ + pa_raop_client_set_callback(u->raop, on_connection, u); + pa_raop_client_set_closed_callback(u->raop, on_close, u); + +- if (!(u->thread = pa_thread_new(thread_func, u))) { ++ if (!(u->thread = pa_thread_new("raop-sink", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/rtp/rtp.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/rtp/rtp.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/rtp/rtp.c 2010-05-08 11:06:35.000000000 -0400 +@@ -278,8 +278,8 @@ + pa_memchunk_reset(&c->memchunk); + } + +- for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) { +- if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) ++ for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) ++ if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) { + memcpy(tstamp, CMSG_DATA(cm), sizeof(struct timeval)); + found_tstamp = TRUE; + break; +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/thread-mainloop.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulse/thread-mainloop.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/thread-mainloop.c 2010-05-08 11:06:35.000000000 -0400 +@@ -146,7 +146,7 @@ + + pa_assert(!m->thread || !pa_thread_is_running(m->thread)); + +- if (!(m->thread = pa_thread_new(thread, m))) ++ if (!(m->thread = pa_thread_new("threaded-ml", thread, m))) + return -1; + + return 0; +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/lock-autospawn.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/lock-autospawn.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/lock-autospawn.c 2010-05-08 11:06:35.000000000 -0400 +@@ -246,7 +246,7 @@ + static int start_thread(void) { + + if (!thread) +- if (!(thread = pa_thread_new(thread_func, NULL))) ++ if (!(thread = pa_thread_new("autospawn", thread_func, NULL))) + return -1; + + return 0; +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/thread-posix.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/thread-posix.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/thread-posix.c 2010-05-08 11:06:35.000000000 -0400 +@@ -28,6 +28,10 @@ + #include + #include + ++#ifdef __linux__ ++#include ++#endif ++ + #include + #include + #include +@@ -42,6 +46,7 @@ + void *userdata; + pa_atomic_t running; + pa_bool_t joined; ++ char *name; + }; + + struct pa_tls { +@@ -53,9 +58,11 @@ + + pa_assert(t); + +- if (!t->thread_func) ++ if (!t->thread_func) { + /* This is a foreign thread, we need to free the struct */ ++ pa_xfree(t->name); + pa_xfree(t); ++ } + } + + PA_STATIC_TLS_DECLARE(current_thread, thread_free_cb); +@@ -64,6 +71,10 @@ + pa_thread *t = userdata; + pa_assert(t); + ++#ifdef __linux__ ++ prctl(PR_SET_NAME, t->name); ++#endif ++ + t->id = pthread_self(); + + PA_STATIC_TLS_SET(current_thread, t); +@@ -75,12 +86,13 @@ + return NULL; + } + +-pa_thread* pa_thread_new(pa_thread_func_t thread_func, void *userdata) { ++pa_thread* pa_thread_new(const char *name, pa_thread_func_t thread_func, void *userdata) { + pa_thread *t; + + pa_assert(thread_func); + + t = pa_xnew0(pa_thread, 1); ++ t->name = pa_xstrdup(name); + t->thread_func = thread_func; + t->userdata = userdata; + +@@ -110,6 +122,8 @@ + pa_assert(t); + + pa_thread_join(t); ++ ++ pa_xfree(t->name); + pa_xfree(t); + } + +@@ -155,6 +169,36 @@ + t->userdata = userdata; + } + ++void pa_thread_set_name(pa_thread *t, const char *name) { ++ pa_assert(t); ++ ++ pa_xfree(t->name); ++ t->name = pa_xstrdup(name); ++ ++#ifdef __linux__ ++ prctl(PR_SET_NAME, name); ++#endif ++} ++ ++const char *pa_thread_get_name(pa_thread *t) { ++ pa_assert(t); ++ ++#ifdef __linux__ ++ if (!t->name) { ++ t->name = pa_xmalloc(17); ++ ++ if (prctl(PR_GET_NAME, t->name) >= 0) ++ t->name[16] = 0; ++ else { ++ pa_xfree(t->name); ++ t->name = NULL; ++ } ++ } ++#endif ++ ++ return t->name; ++} ++ + void pa_thread_yield(void) { + #ifdef HAVE_PTHREAD_YIELD + pthread_yield(); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/thread.h +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/thread.h 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/thread.h 2010-05-08 11:06:35.000000000 -0400 +@@ -35,7 +35,7 @@ + + typedef void (*pa_thread_func_t) (void *userdata); + +-pa_thread* pa_thread_new(pa_thread_func_t thread_func, void *userdata); ++pa_thread* pa_thread_new(const char *name, pa_thread_func_t thread_func, void *userdata); + void pa_thread_free(pa_thread *t); + int pa_thread_join(pa_thread *t); + int pa_thread_is_running(pa_thread *t); +@@ -45,6 +45,9 @@ + void* pa_thread_get_data(pa_thread *t); + void pa_thread_set_data(pa_thread *t, void *userdata); + ++const char *pa_thread_get_name(pa_thread *t); ++void pa_thread_set_name(pa_thread *t, const char *name); ++ + typedef struct pa_tls pa_tls; + + pa_tls* pa_tls_new(pa_free_cb_t free_cb); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/asyncmsgq-test.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/tests/asyncmsgq-test.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/asyncmsgq-test.c 2010-05-08 11:06:35.000000000 -0400 +@@ -80,7 +80,7 @@ + + pa_assert_se(q = pa_asyncmsgq_new(0)); + +- pa_assert_se(t = pa_thread_new(the_thread, q)); ++ pa_assert_se(t = pa_thread_new("test", the_thread, q)); + + printf("Operation A post\n"); + pa_asyncmsgq_post(q, NULL, OPERATION_A, NULL, 0, NULL, NULL); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/asyncq-test.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/tests/asyncq-test.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/asyncq-test.c 2010-05-08 11:06:35.000000000 -0400 +@@ -73,8 +73,8 @@ + + pa_assert_se(q = pa_asyncq_new(0)); + +- pa_assert_se(t1 = pa_thread_new(producer, q)); +- pa_assert_se(t2 = pa_thread_new(consumer, q)); ++ pa_assert_se(t1 = pa_thread_new("producer", producer, q)); ++ pa_assert_se(t2 = pa_thread_new("consumer", consumer, q)); + + pa_thread_free(t1); + pa_thread_free(t2); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/flist-test.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/tests/flist-test.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/flist-test.c 2010-05-08 11:06:35.000000000 -0400 +@@ -87,7 +87,7 @@ + flist = pa_flist_new(0); + + for (i = 0; i < THREADS_MAX; i++) { +- threads[i] = pa_thread_new(thread_func, pa_sprintf_malloc("Thread #%i", i+1)); ++ threads[i] = pa_thread_new("test", thread_func, pa_sprintf_malloc("Thread #%i", i+1)); + assert(threads[i]); + } + +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/lock-autospawn-test.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/tests/lock-autospawn-test.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/lock-autospawn-test.c 2010-05-08 11:06:35.000000000 -0400 +@@ -88,10 +88,10 @@ + int main(int argc, char**argv) { + pa_thread *a, *b, *c, *d; + +- pa_assert_se((a = pa_thread_new(thread_func, PA_INT_TO_PTR(1)))); +- pa_assert_se((b = pa_thread_new(thread_func2, PA_INT_TO_PTR(2)))); +- pa_assert_se((c = pa_thread_new(thread_func2, PA_INT_TO_PTR(3)))); +- pa_assert_se((d = pa_thread_new(thread_func, PA_INT_TO_PTR(4)))); ++ pa_assert_se((a = pa_thread_new("test1", thread_func, PA_INT_TO_PTR(1)))); ++ pa_assert_se((b = pa_thread_new("test2", thread_func2, PA_INT_TO_PTR(2)))); ++ pa_assert_se((c = pa_thread_new("test3", thread_func2, PA_INT_TO_PTR(3)))); ++ pa_assert_se((d = pa_thread_new("test4", thread_func, PA_INT_TO_PTR(4)))); + + pa_thread_join(a); + pa_thread_join(b); +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/thread-test.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/tests/thread-test.c 2010-05-08 11:06:19.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/tests/thread-test.c 2010-05-08 11:06:35.000000000 -0400 +@@ -102,7 +102,7 @@ + tls = pa_tls_new(pa_xfree); + + for (i = 0; i < THREADS_MAX; i++) { +- t[i] = pa_thread_new(thread_func, pa_sprintf_malloc("Thread #%i", i+1)); ++ t[i] = pa_thread_new("test", thread_func, pa_sprintf_malloc("Thread #%i", i+1)); + assert(t[i]); + } + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0090-disable-flat-volumes.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0090-disable-flat-volumes.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/daemon/daemon.conf.in 2010-01-15 19:16:30.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in 2010-01-15 19:17:37.000000000 -0500 +@@ -54,7 +54,7 @@ + ; enable-remixing = yes + ; enable-lfe-remixing = no + +-; flat-volumes = yes ++flat-volumes = no + + ; rlimit-fsize = -1 + ; rlimit-data = -1 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0001-change-resample-and-buffering.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0001-change-resample-and-buffering.patch @@ -0,0 +1,21 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/daemon/daemon.conf.in 2010-01-15 18:21:18.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in 2010-01-15 19:16:30.000000000 -0500 +@@ -50,7 +50,7 @@ + ; log-time = no + ; log-backtrace = 0 + +-; resample-method = speex-float-3 ++resample-method = speex-float-1 + ; enable-remixing = yes + ; enable-lfe-remixing = no + +@@ -77,5 +77,5 @@ + ; default-sample-channels = 2 + ; default-channel-map = front-left,front-right + +-; default-fragments = 4 +-; default-fragment-size-msec = 25 ++default-fragments = 8 ++default-fragment-size-msec = 10 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0096-lp453966-handle-digmic-pt2.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0096-lp453966-handle-digmic-pt2.patch @@ -0,0 +1,20 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-03-18 19:31:29.000000000 -0400 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-03-18 19:33:32.000000000 -0400 +@@ -272,12 +272,12 @@ + [Element Digital Input Source] + enumeration = select + +-[Option Digital Input Source:Analog Inputs] +-name = input +- + [Option Digital Input Source:Digital Mic 1] + name = input-microphone + ++[Option Digital Input Source:Analog Inputs] ++name = input ++ + [Option Digital Input Source:Digital Mic 2] + name = input-microphone + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0092-delay-gnome-autostart.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0092-delay-gnome-autostart.patch @@ -0,0 +1,10 @@ +Description: Delay applet startup by some seconds, so that pulseaudio has started up enough to avoid starting it a second time through autospawn. +Index: pulseaudio/src/daemon/pulseaudio.desktop.in +=================================================================== +--- pulseaudio.orig/src/daemon/pulseaudio.desktop.in 2010-02-01 18:10:40.000000000 -0800 ++++ pulseaudio/src/daemon/pulseaudio.desktop.in 2010-02-01 18:10:48.000000000 -0800 +@@ -8,3 +8,4 @@ + Type=Application + Categories= + GenericName= ++X-GNOME-Autostart-Delay=8 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch @@ -0,0 +1,26 @@ +From c6bb9dd1df10c49b11ac65db138fc3f34757bb41 Mon Sep 17 00:00:00 2001 +From: Clint Adams +Date: Sun, 25 Oct 2009 12:35:14 +0000 +Subject: [PATCH] Work around some platforms not having O_CLOEXEC + +--- + src/modules/module-cli.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/modules/module-cli.c b/src/modules/module-cli.c +index 6bd0f4f..b1adb52 100644 +--- a/src/modules/module-cli.c ++++ b/src/modules/module-cli.c +@@ -105,7 +105,12 @@ int pa__init(pa_module*m) { + * of log messages, particularly because if stdout and stderr are + * dup'ed they share the same O_NDELAY, too. */ + ++#ifdef O_CLOEXEC + if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) { ++#else ++ if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0) { ++ pa_make_fd_cloexec(fd); ++#endif + io = pa_iochannel_new(m->core->mainloop, fd, fd); + pa_log_debug("Managed to open /dev/tty."); + } else { --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0090-use-volume-ignore-for-analog-output.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0090-use-volume-ignore-for-analog-output.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.16~test7-14-g7ca81/src/modules/alsa/mixer/paths/analog-output.conf.common +=================================================================== +--- pulseaudio-0.9.16~test7-14-g7ca81.orig/src/modules/alsa/mixer/paths/analog-output.conf.common 2009-09-08 23:31:52.000000000 -0400 ++++ pulseaudio-0.9.16~test7-14-g7ca81/src/modules/alsa/mixer/paths/analog-output.conf.common 2009-09-08 23:32:29.000000000 -0400 +@@ -95,7 +95,7 @@ + + [Element PCM] + switch = mute +-volume = merge ++volume = ignore + override-map.1 = all + override-map.2 = all-left,all-right + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0003-add-padsp-wrapper-check.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0003-add-padsp-wrapper-check.patch @@ -0,0 +1,21 @@ +Index: pulseaudio-0.9.14/src/utils/padsp +=================================================================== +--- pulseaudio-0.9.14.orig/src/utils/padsp 2009-01-21 18:14:59.000000000 -0500 ++++ pulseaudio-0.9.14/src/utils/padsp 2009-01-21 18:24:06.000000000 -0500 +@@ -75,10 +75,12 @@ + + shift $(( $OPTIND - 1 )) + +-if [ x"$LD_PRELOAD" = x ] ; then +- LD_PRELOAD="libpulsedsp.so" +-else +- LD_PRELOAD="$LD_PRELOAD libpulsedsp.so" ++if `pgrep -f /usr/bin/pulseaudio 1>/dev/null` ; then ++ if [ x"$LD_PRELOAD" = x ] ; then ++ LD_PRELOAD="libpulsedsp.so" ++ else ++ LD_PRELOAD="$LD_PRELOAD libpulsedsp.so" ++ fi + fi + + export LD_PRELOAD --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0055-handle-Master-Front.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0055-handle-Master-Front.patch @@ -0,0 +1,83 @@ +Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf +=================================================================== +--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2009-11-12 19:26:22.000000000 -0500 ++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2009-11-12 19:26:38.000000000 -0500 +@@ -33,6 +33,12 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Master Front] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = front-left,front-right ++ + [Element Master Mono] + switch = off + volume = off +Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones.conf +=================================================================== +--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2009-11-12 19:26:22.000000000 -0500 ++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2009-11-12 19:26:38.000000000 -0500 +@@ -33,6 +33,12 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Master Front] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = front-left,front-right ++ + [Element Master Mono] + switch = off + volume = off +Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-mono.conf +=================================================================== +--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-mono.conf 2009-11-12 19:26:22.000000000 -0500 ++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-mono.conf 2009-11-12 19:26:38.000000000 -0500 +@@ -31,6 +31,10 @@ + switch = off + volume = off + ++[Element Master Front] ++switch = off ++volume = off ++ + [Element Master Mono] + required = any + switch = mute +Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-speaker.conf +=================================================================== +--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2009-11-12 19:26:22.000000000 -0500 ++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2009-11-12 19:26:38.000000000 -0500 +@@ -33,6 +33,12 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Master Front] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = front-left,front-right ++ + [Element Master Mono] + switch = off + volume = off +Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output.conf +=================================================================== +--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output.conf 2009-11-12 19:26:22.000000000 -0500 ++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output.conf 2009-11-12 19:26:38.000000000 -0500 +@@ -34,6 +34,12 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Master Front] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = front-left,front-right ++ + [Element Master Mono] + switch = off + volume = off --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0005-load-sample-dir-lazy.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0005-load-sample-dir-lazy.patch @@ -0,0 +1,12 @@ +Index: pulseaudio-0.9.14/src/daemon/default.pa.in +=================================================================== +--- pulseaudio-0.9.14.orig/src/daemon/default.pa.in 2009-03-08 00:18:26.000000000 -0500 ++++ pulseaudio-0.9.14/src/daemon/default.pa.in 2009-03-08 00:19:30.000000000 -0500 +@@ -26,6 +26,7 @@ + #load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav + #load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav + #load-sample-lazy pulse-access /usr/share/sounds/generic.wav ++load-sample-dir-lazy /usr/share/sounds/ubuntu/stereo + + .fail + --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/series +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/series @@ -0,0 +1,18 @@ +0001-change-resample-and-buffering.patch +0003-add-padsp-wrapper-check.patch +#0005-load-sample-dir-lazy.patch +0007-esd-honour-system-pulseaudio.patch +#0090-use-volume-ignore-for-analog-output.patch +0054-mute-iec958-optical-raw-for-audigyX.patch +0090-disable-flat-volumes.patch +0091-dont-load-cork-music-on-phone.patch +0057-load-module-x11-bell.patch +0055-handle-Master-Front.patch +0092-delay-gnome-autostart.patch +0093-backport-fixes-stable-queue-head.patch +0094-add-missing-mixer-paths-and-rerun-automake.patch +0095-cve-2009-1299.patch +0096-lp533877-handle-digmic.patch +0096-lp453966-handle-digmic-pt2.patch +0096-lp451635-handle-dove-x0-line-hp-swap.patch +0097-regenerate-configure.patch --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0095-cve-2009-1299.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0095-cve-2009-1299.patch @@ -0,0 +1,63 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-util.c +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/core-util.c 2010-03-10 18:40:25.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-util.c 2010-03-10 18:41:11.000000000 -0500 +@@ -199,7 +199,7 @@ + /** Creates a directory securely */ + int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) { + struct stat st; +- int r, saved_errno; ++ int r, saved_errno, fd; + + pa_assert(dir); + +@@ -217,16 +217,45 @@ + if (r < 0 && errno != EEXIST) + return -1; + +-#ifdef HAVE_CHOWN ++#ifdef HAVE_FSTAT ++ if ((fd = open(dir, ++#ifdef O_CLOEXEC ++ O_CLOEXEC| ++#endif ++#ifdef O_NOCTTY ++ O_NOCTTY| ++#endif ++#ifdef O_NOFOLLOW ++ O_NOFOLLOW| ++#endif ++ O_RDONLY)) < 0) ++ goto fail; ++ ++ if (fstat(fd, &st) < 0) { ++ pa_assert_se(pa_close(fd) >= 0); ++ goto fail; ++ } ++ ++ if (!S_ISDIR(st.st_mode)) { ++ pa_assert_se(pa_close(fd) >= 0); ++ errno = EEXIST; ++ goto fail; ++ } ++ ++#ifdef HAVE_FCHOWN + if (uid == (uid_t)-1) + uid = getuid(); + if (gid == (gid_t)-1) + gid = getgid(); +- (void) chown(dir, uid, gid); ++ (void) fchown(fd, uid, gid); ++#endif ++ ++#ifdef HAVE_FCHMOD ++ (void) fchmod(fd, m); + #endif + +-#ifdef HAVE_CHMOD +- chmod(dir, m); ++ pa_assert_se(pa_close(fd) >= 0); ++ + #endif + + #ifdef HAVE_LSTAT --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0091-dont-load-cork-music-on-phone.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0091-dont-load-cork-music-on-phone.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/daemon/default.pa.in +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/daemon/default.pa.in 2010-01-28 19:41:35.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/daemon/default.pa.in 2010-01-28 19:41:43.000000000 -0500 +@@ -114,7 +114,7 @@ + load-module module-position-event-sounds + + ### Cork music streams when a phone stream is active +-load-module module-cork-music-on-phone ++#load-module module-cork-music-on-phone + + # X11 modules should not be started from default.pa so that one daemon + # can be shared by multiple sessions. --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch @@ -0,0 +1,14 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-output.conf.common +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/modules/alsa/mixer/paths/analog-output.conf.common 2010-01-15 18:21:18.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-output.conf.common 2010-01-15 19:17:12.000000000 -0500 +@@ -121,6 +121,9 @@ + name = output-bass-boost-off + priority = 10 + ++[Element IEC958 Optical Raw] ++switch = off ++ + ;;; 'Analog Output' + + [Element Analog Output] --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0096-lp533877-handle-digmic.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0096-lp533877-handle-digmic.patch @@ -0,0 +1,15 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-03-10 18:53:09.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-03-10 18:53:28.000000000 -0500 +@@ -62,6 +62,10 @@ + [Element Input Source] + enumeration = select + ++[Option Input Source:Digital Mic] ++name = input-microphone ++priority = 20 ++ + [Option Input Source:Mic] + name = input-microphone + priority = 20 --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0007-esd-honour-system-pulseaudio.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0007-esd-honour-system-pulseaudio.patch @@ -0,0 +1,17 @@ +diff -urN pulseaudio-0.9.14/src/daemon/esdcompat.in pulseaudio-0.9.14.new/src/daemon/esdcompat.in +--- pulseaudio-0.9.14/src/daemon/esdcompat.in 2009-03-27 10:24:57.000000000 +1100 ++++ pulseaudio-0.9.14.new/src/daemon/esdcompat.in 2009-03-27 10:30:36.000000000 +1100 +@@ -24,6 +24,13 @@ + exit 1 + } + ++PULSEAUDIO_SYSTEM_START=0 ++test -f /etc/default/pulseaudio && . /etc/default/pulseaudio ++ ++if [ ! $PULSEAUDIO_SYSTEM_START -eq 0 ]; then ++ exit 0 ++fi ++ + ARGS=" --log-target=syslog" + + while [ "$#" -gt "0" ]; do --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch @@ -0,0 +1,115 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/Makefile.am 2010-02-18 22:47:49.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.am 2010-02-18 23:28:42.000000000 -0500 +@@ -109,6 +109,7 @@ + + ALSA_PROFILES = \ + modules/alsa/mixer/profile-sets/default.conf \ ++ modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf + +@@ -117,6 +118,7 @@ + modules/alsa/mixer/paths/analog-input.conf \ + modules/alsa/mixer/paths/analog-input.conf.common \ + modules/alsa/mixer/paths/analog-input-fm.conf \ ++ modules/alsa/mixer/paths/analog-input-internal-mic.conf \ + modules/alsa/mixer/paths/analog-input-linein.conf \ + modules/alsa/mixer/paths/analog-input-mic.conf \ + modules/alsa/mixer/paths/analog-input-mic.conf.common \ +@@ -126,6 +128,7 @@ + modules/alsa/mixer/paths/analog-output.conf \ + modules/alsa/mixer/paths/analog-output-speaker.conf \ + modules/alsa/mixer/paths/analog-output.conf.common \ ++ modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \ + modules/alsa/mixer/paths/analog-output-headphones.conf \ + modules/alsa/mixer/paths/analog-output-headphones-2.conf \ + modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.in +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/Makefile.in 2010-02-18 22:47:49.000000000 -0500 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.in 2010-02-18 23:28:42.000000000 -0500 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -290,16 +290,7 @@ + DIST_COMMON = $(am__pulseinclude_HEADERS_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \ +- $(top_srcdir)/m4/acx_lirc.m4 $(top_srcdir)/m4/acx_pthread.m4 \ +- $(top_srcdir)/m4/attributes.m4 \ +- $(top_srcdir)/m4/check_define.m4 $(top_srcdir)/m4/iconv.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ +- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ +- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ +- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ +- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ +- $(top_srcdir)/m4/tls.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -336,7 +327,7 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) $(modlibexec_LTLIBRARIES) \ + $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = +-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) + @HAVE_HAL_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) + @HAVE_UDEV_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) + @HAVE_DBUS_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +@@ -2369,7 +2360,6 @@ + JACK_LIBS = @JACK_LIBS@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ +-LDFLAGS_NOUNDEFINED = @LDFLAGS_NOUNDEFINED@ + LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@ + LIBASYNCNS_LIBS = @LIBASYNCNS_LIBS@ + LIBICONV = @LIBICONV@ +@@ -2437,9 +2427,6 @@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ + PREOPEN_MODS = @PREOPEN_MODS@ +-PTHREAD_CC = @PTHREAD_CC@ +-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +-PTHREAD_LIBS = @PTHREAD_LIBS@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -2461,7 +2448,6 @@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-acx_pthread_config = @acx_pthread_config@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -2581,6 +2567,7 @@ + ################################### + ALSA_PROFILES = \ + modules/alsa/mixer/profile-sets/default.conf \ ++ modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf + +@@ -2589,6 +2576,7 @@ + modules/alsa/mixer/paths/analog-input.conf \ + modules/alsa/mixer/paths/analog-input.conf.common \ + modules/alsa/mixer/paths/analog-input-fm.conf \ ++ modules/alsa/mixer/paths/analog-input-internal-mic.conf \ + modules/alsa/mixer/paths/analog-input-linein.conf \ + modules/alsa/mixer/paths/analog-input-mic.conf \ + modules/alsa/mixer/paths/analog-input-mic.conf.common \ +@@ -2598,6 +2586,7 @@ + modules/alsa/mixer/paths/analog-output.conf \ + modules/alsa/mixer/paths/analog-output-speaker.conf \ + modules/alsa/mixer/paths/analog-output.conf.common \ ++ modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \ + modules/alsa/mixer/paths/analog-output-headphones.conf \ + modules/alsa/mixer/paths/analog-output-headphones-2.conf \ + modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/patches/0096-lp451635-handle-dove-x0-line-hp-swap.patch +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/patches/0096-lp451635-handle-dove-x0-line-hp-swap.patch @@ -0,0 +1,28 @@ +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2010-03-26 12:51:15.000000000 -0700 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2010-03-26 13:22:26.000000000 -0700 +@@ -51,6 +51,9 @@ + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Line HP Swap] ++switch = on ++ + ; This profile path is intended to control the first headphones, not + ; the second headphones. But it should not hurt if we leave the second + ; headphone jack enabled nonetheless. +Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf +=================================================================== +--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output.conf 2010-03-26 12:51:15.000000000 -0700 ++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf 2010-03-26 14:08:57.000000000 -0700 +@@ -44,6 +44,9 @@ + switch = off + volume = off + ++[Element Line HP Swap] ++switch = off ++ + ; This profile path is intended to control the default output, not the + ; headphones. But it should not hurt if we leave the headphone jack + ; enabled nonetheless. --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/overrides/pulseaudio +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/overrides/pulseaudio @@ -0,0 +1,2 @@ +pulseaudio: script-not-executable ./etc/pulse/default.pa +pulseaudio: description-starts-with-package-name --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/overrides/pulseaudio-module-x11 +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/overrides/pulseaudio-module-x11 @@ -0,0 +1 @@ +pulseaudio-module-x11: desktop-entry-lacks-main-category /etc/xdg/autostart/pulseaudio-module-xsmp.desktop --- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/debian/overrides/pulseaudio-utils +++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/debian/overrides/pulseaudio-utils @@ -0,0 +1,3 @@ +pulseaudio-utils: no-shlibs-control-file usr/lib/libpulsedsp.so +pulseaudio-utils: postinst-must-call-ldconfig usr/lib/libpulsedsp.so +pulseaudio-utils: package-name-doesnt-match-sonames libpulsedsp