--- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulse.conf +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-jack.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-jack.install @@ -0,0 +1,3 @@ +usr/lib/pulse-*/modules/module-jack-sink.so +usr/lib/pulse-*/modules/module-jack-source.so +usr/lib/pulse-*/modules/module-jackdbus-detect.so --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/libpulse0.shlibs +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse0.shlibs @@ -0,0 +1,3 @@ +libpulse 0 libpulse0 (>= 0.9.16) +libpulse-simple 0 libpulse0 +libpulsecommon 0.9.22 libpulse0 --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.dirs +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio.dirs @@ -0,0 +1 @@ +var/lib/pulseaudio --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-x11-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-x11-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-utils.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse0-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse0-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.manpages +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-jack.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-jack.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/libpulse0.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse0.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-bluetooth-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-bluetooth-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.default +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-gconf-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-gconf-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/shlibs_pulseaudio.local +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-dev.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-dev.install @@ -0,0 +1,2 @@ +usr/lib/libpulsecore.so +usr/include/pulsecore/* --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-utils-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-utils-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.shlibs +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio.shlibs @@ -0,0 +1 @@ +libpulsecore 0.9.22 pulseaudio --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-x11.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse-browse0.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-browse0.install @@ -0,0 +1 @@ +usr/lib/libpulse-browse.so.* --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/shlibs.local +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse-browse0.shlibs +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-browse0.shlibs @@ -0,0 +1 @@ +libpulse-browse 0 libpulse-browse0 (>= 0.9.8) --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-utils.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-utils.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-jack-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-jack-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/libpulse-mainloop-glib0.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-mainloop-glib0.install @@ -0,0 +1 @@ +usr/lib/libpulse-mainloop-glib.so.* --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-utils.manpages +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse-dev.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse-browse0.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-browse0.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/01PulseAudio +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-esound-compat.manpages +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-esound-compat.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/esdcompat.1 --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-bluetooth.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-bluetooth.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/libpulse-dev.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-lirc.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-lirc.install @@ -0,0 +1 @@ +usr/lib/pulse-*/modules/module-lirc.so --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-lirc.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-lirc.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-zeroconf-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-zeroconf-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/libpulse0.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/copyright +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-esound-compat-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-esound-compat-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-esound-compat.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-gconf.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-gconf.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/apport-hook.py +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-lirc-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-lirc-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/changelog +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/changelog @@ -0,0 +1,2789 @@ +pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu4) oneiric; urgency=low + + [ David Henningsson ] + * Fix missing Internal/Front/Rear mics on Nvidia chipsets (LP: #771739) + + [ Luke Yelavich ] + * debian/control: Update Vcs-Bzr field + + -- David Henningsson Thu, 28 Apr 2011 10:31:42 +0200 + +pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu3) natty; urgency=low + + [ David Henningsson ] + * Add separate profile for Nvidia to make it easier to select the right + codec out of four (LP: #716371) + * Add workaround to make it possible to control the volume of some + USB headsets (LP: #749856, LP: #671560) + + [ Luke Yelavich ] + * debian/control: Demote pulseaudio-module-raop to suggests, as it is + causing various issues, including crashers, (LP: #742281, #743073) + and re-opens (LP #688272) + * Pull some bugfixes from the stable-queue branch: + - 4fa7495 (vala: Some bugfixes for the vala bindings) + - ea0a2a6 (vala: delegate FreeCb does not have a target.) + - 64985aa (vala: move GLibMainLoop class into separate file to fix linker + errors) + - 9f52c10 (vala: Fix path error in the last commit.) + - 1ade8df (build-sys: Link binaries linking libpulse to libpulsecommon too) + - c25207f (build-sys: Link binaries linking libpulsecommon to libpulse too) + - 4be49ae (build-sys: Link lirc libraries in right order) + - fd5b282 (module-jack-sink/source: protect against null return in + jack_get_ports) (LP: #733424) + - 93e7a19 (vala: ChannelMap has no destroy function.) + * debian/patches/0097-explicitly-link-libraries.patch: Dropped, applied + upstream + * debian/control, debian/rules: Add dh-autoreconf + + -- Luke Yelavich Mon, 11 Apr 2011 16:58:14 +1000 + +pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu2) natty; urgency=low + + * Update to latest stable queue patches: + - 09770e5 (module-loopback: Add adjust_time to valid args + - 90c5520 (Limit rate adjustments to small, inaudible jumps + - 4620039 (module-rtp-recv: Use new algorithm for adjusting sample rate + - 2bfc032 (module-rtp-recv: Average the estimated real sample rate + - 2ee4ec5 (module-rtp-recv: Remove smoother from write index (LP: #569378) + - a8cd9d2 (conf: Make system.pa use udev-detect and not hal-detect. + - b872254 (volume: Add a PA_VOLUME_UI_MAX define for the recommended max + volume to show in UIs) + * 0210-PulseAudio-added-IT-block-to-fix-thumb-conditional-i.patch: + - added IT block to fix thumb conditional instruction build error messages + * debian/rules: Remove CFLAGS that are specific to arm, the above patch + makes those redundant (LP: #721498) + * debian/control: Add a dependency on pulseaudio-module-raop + + -- Luke Yelavich Thu, 10 Mar 2011 07:15:02 +1100 + +pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu1) natty; urgency=low + + [ David Henningsson ] + * debian/patches/020x patches - add PulseAudio input mixer rewrite. + This will cause several HDA chips to have better named and controlled + sliders on the input side. + + [ Luke Yelavich ] + * New upstream snapshot based on stable queue: + - 67d1888 (client: Don't update smoother while corked) + - 6b280e9 (Fighting rewinds: Reduce calls to handle_seek) + - 3aeb047 (Fighting rewinds: Seek and write data in the same message) + - 1e1b299 (Core: Fix incorrect check of return value) + - 4080725 (tunnel: Fix automatic names when source/sink_name argument is + missing.) + - ec5a785 (ratelimit: fix log levels of log suppression messages) + + -- Luke Yelavich Fri, 18 Feb 2011 13:50:30 +1100 + +pulseaudio (1:0.9.22+stable-queue-18-geb966-0ubuntu2) natty; urgency=low + + * Fix FTBFS with ld.gold. + + -- Matthias Klose Wed, 19 Jan 2011 06:57:29 +0100 + +pulseaudio (1:0.9.22+stable-queue-18-geb966-0ubuntu1) natty; urgency=low + + [ Daniel T Chen ] + * debian/control: pulseaudio-module-zeroconf Depends on avahi-daemon + (LP: #689093) + * debian/patches/0101-update-stable-queue.patch: Apply 84c8b23c to + resolve incorrect header being used for libsndfile seen with pacat + --file-format (LP: #660504) + * debian/patches/0104-Load-RAOP-Zeroconf-by-default.patch: Follow + recommendation by Martin-Éric Racine to conditionally load support + by default for streaming to an Apple Airport Express (LP: #688272) + * debian/pulseaudio-utils.links: Also add pamon(1) and parecord(1) + (Closes: #599696) + + [ David Henningsson ] + * debian/pulse-alsa.conf: Add name hint for default pcm device, + indicating that PulseAudio is active. + + [ Luke Yelavich ] + * New upstream snapshot based on the stable queue branch: + - eb966f7 (build-sys: Make --disable-dbus actually work.) + - 8f8d247 (build-sys: Mention dbus support in the summary) + - b3ff4f4 (build-sys: Put in specific warnings when there is no udev or + DBUS support) + - 862bbee (console-kit: Console Kit support is dependent on DBUS and is + thus optional.) + - 7cb1401 (padsp: wrap __open_2 and __open64_2) + - 6f870f5 (fix bug about get source-output status) + - 4269b05 (Fix typos) + - 1c83b03 (Further clarify src- and speex- references in pulse-daemon.conf) + - 84c8b23 (Fix return value of pa_sndfile_format_from_string) + - d963b86 (core: Fix variable "has_whined" value bug) + - 52e3268 (trivial: Mention speex as a resampler reference in + pulse-daemon.conf) + - 3e6af07 (module-loopback: Prevent an infinite loop when rate adjusting + is disabled + * 0101-update-stable-queue.patch and + #0102-autoreconf.patch: + - Disable for now, since latest stable queue are roled into the snapshot + tarball + + -- Luke Yelavich Fri, 14 Jan 2011 10:03:49 -0600 + +pulseaudio (1:0.9.22-0ubuntu3) natty; urgency=low + + * debian/pulseaudio-module-jack.install: Ship the jackdbus-detect module + + -- Luke Yelavich Wed, 08 Dec 2010 17:57:18 +1100 + +pulseaudio (1:0.9.22-0ubuntu2) natty; urgency=low + + * 0101-update-stable-queue.patch, update to latest stable queue: + - 205cad6 (jack: Add module-jackdbus-detect + - e9deb97 (build-sys: Include the .version file in the distribution + tarball) + - a1f1255 (build-sys: Fix make distcheck failure due to udev rules + fixed install path) + - 675cc0a (build-sys: Replace dummy Makefiles with proper Makefile.am's) + - bd769fa (rescue-streams: Fix segfault in some conditions) + - f6574c8 (volume: Add explicit checks for ARMv6 instructions) + * 0102-autoreconf.patch: Re-generate autotools pieces for the above update + * 0103-JACK-Load-module-jackdbus-detect-in-default.pa.patch: Enable jackdbus + module by default for now, hopefully longer term there will be a better + way to turn this module on/off + + -- Luke Yelavich Wed, 08 Dec 2010 16:58:27 +1100 + +pulseaudio (1:0.9.22-0ubuntu1) natty; urgency=low + + * New upstream release, based on the stable-queue branch + * Drop following patches, as applied upstream: + - 0101-alsa-mixer-add-profile-for-Native-Instruments-Koreco.patch + - 0102-intended-roles-Mark-devices-with-a-form-factor-of-he.patch + * debian/rules: + - Disable --as-needed due to a circular dependency for libpulsecommon + - Adjust filenames/paths for 0.9.22 + + -- Luke Yelavich Fri, 26 Nov 2010 13:44:10 +1100 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-98-ga8d7-0ubuntu3) natty; urgency=low + + * 0101-alsa-mixer-add-profile-for-Native-Instruments-Koreco.patch: Also + adjust src/Makefile.in, so that the new profile actually gets shipped + + -- Luke Yelavich Fri, 05 Nov 2010 14:27:34 -0400 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-98-ga8d7-0ubuntu2) natty; urgency=low + + * debian/control: Update Vcs-Bzr field + * Pull latest fixes from stable queue: + - 8a30d4c (alsa-mixer: add profile for Native Instruments Korecontroller) + - 848dd37 (intended-roles: Mark devices with a form factor of 'headset' as + being appropriate for 'phone' streams) + + -- Luke Yelavich Fri, 05 Nov 2010 10:40:47 -0400 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-98-ga8d7-0ubuntu1) natty; urgency=low + + * New upstream snapshot, based on the stable-queue branch + * debian/patches: Drop the following patches as they are applied upstream, + or were created to regenerate autotools files/package version + - 0090-use-volume-ignore-for-analog-output.patch + - 0093-backport-fixes-stable-queue-head.patch + - 0094-add-missing-mixer-paths-and-rerun-automake.patch + - 0095-cve-2009-1299.patch + - 0097-regenerate-configure.patch + - 0098-tarball-version.patch + - 0192-stream-restore-Clear-the-save_sink-save_source-flags.patch + - 0193-augment-properties-Search-for-.desktop-files-in-subf.patch + - 0194-device-manager-Ensure-that-sinks-sources-populate-th.patch + - 0195-SSE-MMX-ARM-Fix-high-frequency-noise-with-unusual-nu.patch + * debian/control: Update Vcs-Bzr link + * 0097-explicitly-link-libraries.patch: Patch to explicitly link pulseaudio + tests binaries against pulseaudio libraries, due to gcc 4.5 and new + binutils in natty enforcing explicit linking + + -- Luke Yelavich Fri, 29 Oct 2010 12:39:27 -0400 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu21.1) maverick-proposed; urgency=low + + * 0195-SSE-MMX-ARM-Fix-high-frequency-noise-with-unusual-nu.patch: + - Pull fix from the upstream stable-queue branch a8d76e9 to Fix a high + frequency noise with an nunusual number of channels, when either SSE, + MMX, or ARM optimized volume scaling code is used. (LP: #445849) + + -- Luke Yelavich Thu, 14 Oct 2010 16:38:46 +1100 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu21) maverick; urgency=low + + * Add 0192-stream-restore-Clear-the-save_sink-save_source-flags.patch + Clear the save_sink/save_source flags on apply_entry. + * Add 0193-augment-properties-Search-for-.desktop-files-in-subf.patch + Search for .desktop files in subfolders too. + * Add 0194-device-manager-Ensure-that-sinks-sources-populate-th.patch + Ensure that sinks/sources populate the device manager lists in order + of their priority. + + -- Jonathan Riddell Sun, 03 Oct 2010 20:38:24 +0100 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu20) maverick; urgency=low + + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + 2c564f2 (xcb: Ensure the XCB connection is valid before using it.) + + 5c0bc09 (xcb: xcb_get_setup() can return 0, so make sure we check it before using) + + 165cb87 (x11: Use the default screen for X11 properties.) + (LP: #640127) + + -- Daniel T Chen Sat, 18 Sep 2010 08:46:31 -0400 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu19) maverick; urgency=low + + * Removed packaging for a patch that was being tested locally, as the + patch is not going into maverick. Fixes FTBFS + + -- Luke Yelavich Wed, 15 Sep 2010 14:38:38 +1000 + +pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu18) maverick; urgency=low + + [ Emmet Hikory ] + * Drop 0001-change-resample-and-buffering.patch + * debian/rules: Add arch-specific build-time configuration patching system + - set resample-method to speex-fixed-1 and fragments to 2 for armel + - set resample-method to speex-float-1 and fragments to 8 for other arches + - Closes LP: #623242 + + [ Luke Yelavich ] + * debian/rules: + - Back up src/daemon/daemon.conf.in, restoring on package clean, allowing + the package to be built more than once, and keeping the diff sane + - Disable flat volumes via regular expression instead of a patch, to + prevent the mess that goes with touching a file multiple times, and + with multiple methods + * 0093-backport-fixes-stable-queue-head.patch: Backport the following + changesets from the stable-queue branch: + + 6c8660a (alsa: Fix assertion on mmap_write (triggered via a52 plugin)) + + aaae99d (alsa: disable rewinds when using ALSA plugins) + + 4a1072e (udev: fix hex decoding) + + 2b88634 (x11: Partially convert to XCB.) + + 9375019 (alsa: resume smoother after unsuspend) + + 4fb02d8 (alsa: increase the smoother window) + + e2ef3a1 (alsa: don't make use of tsched related variables when tsched is + disabled) + + 514fd1e (add rewind-safeguard parameter) + + 8748ebd (alsa-sink: Get rid of a compiler warning regarding + rewind_safeguard type.) + + a65825f (alsa: Set the rewind safeguard proportionally to sample spec) + + 3d9b710 (smoother: avoid losing precision) + + 1503b8c (alsa-source: refactor smoother and device start) + + 74c117f (alsa-time-test: make test usable for capture too) + + 1c29f55 (alsa: work around slightly broken _delay implementations) + + 1ff360c (alsa: make defines for smoother configuration) + + 28f4aeb (alsa-mixer: add profile for Traktor Kontrol S4) + + eef247b (alsa: Only set the 'first' flag to false when we actually call + snd_pcm_start()) + * debian/control: Add libxcb-atom1-dev and libx11-xcb-dev to build depends + * debian/patches/0090-disable-flat-volumes.patch: Drop, as per above + * debian/patches/0097-regenerate-configure.patch: Refreshed + * debian/patches/0098-tarball-version.patch: Ensure the version string for + pulseaudio internally stays the same, in case the build process wants + to regenerate autotools files + * debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch: + - Remove the patch to Makefile.in, easier to do it all at once in a + single patch later in the series + + -- Luke Yelavich Wed, 15 Sep 2010 13:57:55 +1000 + +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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-bluetooth.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/README.Debian +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio.init +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse-mainloop-glib0-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-mainloop-glib0-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-x11.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-x11.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-raop.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-raop.install @@ -0,0 +1 @@ +usr/lib/pulse-*/modules/*raop* --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/compat +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/compat @@ -0,0 +1 @@ +5 --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.preinst +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulse-alsa.conf +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulse-alsa.conf @@ -0,0 +1,34 @@ +# 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 + hint { + show { + @func refer + name defaults.namehint.basic + } + description "Playback/recording through the PulseAudio sound server" + } +} + +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+stable-queue-24-g67d18.orig/debian/pulseaudio.postinst +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-raop.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-raop.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio.postrm +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-esound-compat.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-esound-compat.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/watch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse-mainloop-glib0.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-mainloop-glib0.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/control +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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, libxcb-atom1-dev, libx11-xcb-dev, + dh-buildinfo, automake, autoconf, libtool, dh-autoreconf +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://bazaar.launchpad.net/~ubuntu-audio-dev/pulseaudio/ubuntu.oneiric +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, pulseaudio-module-raop +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}, 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+stable-queue-24-g67d18.orig/debian/pulseaudio-module-raop-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-raop-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-zeroconf.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/pulseaudio-utils.links +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-utils.links @@ -0,0 +1,3 @@ +usr/share/man/man1/pacat.1.gz usr/share/man/man1/pamon.1.gz +usr/share/man/man1/pacat.1.gz usr/share/man/man1/parec.1.gz +usr/share/man/man1/pacat.1.gz usr/share/man/man1/parecord.1.gz --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-esound-compat.links +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-esound-compat.links @@ -0,0 +1 @@ +usr/bin/esdcompat usr/bin/esd --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-gconf.install +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/libpulse-browse0-dbg.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/libpulse-browse0-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/rules +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/rules @@ -0,0 +1,79 @@ +#!/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 +include /usr/share/cdbs/1/rules/autoreconf.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 + +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 + rm -f debian/stamp-post-patches +# rm -f .version + if test -f $(CURDIR)/debian/daemon.conf.in; then \ + mv $(CURDIR)/debian/daemon.conf.in $(CURDIR)/src/daemon/daemon.conf.in; \ + fi +# -find $(CURDIR)/ -name "*-symdef.h" | xargs rm + +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 +LDFLAGS += -Wl,--no-as-needed +DEB_CONFIGURE_EXTRA_FLAGS = --enable-static +DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.22/modules +DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp +DEB_UPDATE_RCD_PARAMS = start 50 2 3 4 5 . stop 15 1 . + +# Dynamically patch default configuration file +ifeq ($(DEB_HOST_ARCH),armel) +RESAMPLE_METHOD := speex-fixed-1 +DEFAULT_FRAGMENTS := 2 +DEFAULT_FRAGMENT_SIZE_MSEC := 10 +else +RESAMPLE_METHOD := speex-float-1 +DEFAULT_FRAGMENTS := 8 +DEFAULT_FRAGMENT_SIZE_MSEC := 10 +endif + +post-patches:: debian/stamp-post-patches + +debian/stamp-post-patches: + cp $(CURDIR)/src/daemon/daemon.conf.in $(CURDIR)/debian/daemon.conf.in + sed -i -e 's/; \(resample-method =\).*/\1 $(RESAMPLE_METHOD)/' \ + -e 's/; \(default-fragments =\).*/\1 $(DEFAULT_FRAGMENTS)/' \ + -e 's/; \(default-fragment-size-msec =\).*/\1 $(DEFAULT_FRAGMENT_SIZE_MSEC)/' \ + -e 's/; flat-volumes = yes/flat-volumes = no/' \ + $(CURDIR)/src/daemon/daemon.conf.in + touch debian/stamp-post-patches --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/pulseaudio-module-zeroconf.debhelper.log +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/pulseaudio-module-zeroconf.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/overrides/pulseaudio-module-x11 +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/overrides/pulseaudio-utils +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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 --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/overrides/pulseaudio +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/manpages/pulseaudio.1 +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/manpages/esdcompat.1 +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0219-vala-delegate-FreeCb-does-not-have-a-target.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0219-vala-delegate-FreeCb-does-not-have-a-target.patch @@ -0,0 +1,25 @@ +From ea0a2a603c970a5ae59a3b2a49ed189997c91ece Mon Sep 17 00:00:00 2001 +From: Sean McNamara +Date: Fri, 25 Mar 2011 01:28:10 -0400 +Subject: [PATCH 02/33] vala: delegate FreeCb does not have a target. + +--- + vala/libpulse.vapi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi +index aed526a..8304911 100644 +--- a/vala/libpulse.vapi ++++ b/vala/libpulse.vapi +@@ -49,7 +49,7 @@ namespace PulseAudio { + [CCode (cname="PA_INVALID_INDEX")] + public const uint32 INVALID_INDEX; + +- [CCode (cname="pa_free_cb_t")] ++ [CCode (cname="pa_free_cb_t", has_target=false)] + public delegate void FreeCb(void *p); + + [CCode (cname="pa_sample_format_t", cprefix="PA_SAMPLE_")] +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0226-vala-ChannelMap-has-no-destroy-function.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0226-vala-ChannelMap-has-no-destroy-function.patch @@ -0,0 +1,25 @@ +From 93e7a19ee67f172980f96447d50beca996fcfc8c Mon Sep 17 00:00:00 2001 +From: Sean McNamara +Date: Wed, 30 Mar 2011 13:41:02 -0400 +Subject: [PATCH 33/33] vala: ChannelMap has no destroy function. + +--- + vala/libpulse.vapi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi +index 4315988..06f412d 100644 +--- a/vala/libpulse.vapi ++++ b/vala/libpulse.vapi +@@ -373,7 +373,7 @@ namespace PulseAudio { + public unowned CVolume? dec(Volume minus = 1); + } + +- [CCode (cname="pa_channel_map")] ++ [CCode (cname="pa_channel_map",has_destroy_function=false)] + public struct ChannelMap { + public uint8 channels; + public ChannelPosition map[]; +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0223-build-sys-Link-binaries-linking-libpulsecommon-to-li.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0223-build-sys-Link-binaries-linking-libpulsecommon-to-li.patch @@ -0,0 +1,234 @@ +From c25207fc1736eb3964358c4c3e2f9b030c0727f1 Mon Sep 17 00:00:00 2001 +From: Jyri Sarha +Date: Fri, 26 Nov 2010 18:38:26 +0200 +Subject: [PATCH 30/33] build-sys: Link binaries linking libpulsecommon to libpulse too + +Build fails if a symbol is removed from from libpulsecommon. Linking +explicitly to libpulse fixes the problem. +--- + src/Makefile.am | 64 +++++++++++++++++++++++++++--------------------------- + 1 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index b530a26..1058f18 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -385,7 +385,7 @@ thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + utf8_test_SOURCES = tests/utf8-test.c + utf8_test_CFLAGS = $(AM_CFLAGS) +-utf8_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++utf8_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + get_binary_name_test_SOURCES = tests/get-binary-name-test.c +@@ -395,52 +395,52 @@ get_binary_name_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + ipacl_test_SOURCES = tests/ipacl-test.c + ipacl_test_CFLAGS = $(AM_CFLAGS) +-ipacl_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++ipacl_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + ipacl_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + hook_list_test_SOURCES = tests/hook-list-test.c + hook_list_test_CFLAGS = $(AM_CFLAGS) +-hook_list_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++hook_list_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + hook_list_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + memblock_test_SOURCES = tests/memblock-test.c + memblock_test_CFLAGS = $(AM_CFLAGS) +-memblock_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++memblock_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + memblock_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + thread_test_SOURCES = tests/thread-test.c + thread_test_CFLAGS = $(AM_CFLAGS) +-thread_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++thread_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + thread_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + flist_test_SOURCES = tests/flist-test.c + flist_test_CFLAGS = $(AM_CFLAGS) +-flist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++flist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + flist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + asyncq_test_SOURCES = tests/asyncq-test.c + asyncq_test_CFLAGS = $(AM_CFLAGS) +-asyncq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++asyncq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + asyncq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + asyncmsgq_test_SOURCES = tests/asyncmsgq-test.c + asyncmsgq_test_CFLAGS = $(AM_CFLAGS) +-asyncmsgq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++asyncmsgq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + asyncmsgq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + queue_test_SOURCES = tests/queue-test.c + queue_test_CFLAGS = $(AM_CFLAGS) +-queue_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++queue_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + queue_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + rtpoll_test_SOURCES = tests/rtpoll-test.c + rtpoll_test_CFLAGS = $(AM_CFLAGS) +-rtpoll_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++rtpoll_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + rtpoll_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + mcalign_test_SOURCES = tests/mcalign-test.c + mcalign_test_CFLAGS = $(AM_CFLAGS) +-mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + pacat_simple_SOURCES = tests/pacat-simple.c +@@ -455,12 +455,12 @@ parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + strlist_test_SOURCES = tests/strlist-test.c + strlist_test_CFLAGS = $(AM_CFLAGS) +-strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + close_test_SOURCES = tests/close-test.c + close_test_CFLAGS = $(AM_CFLAGS) +-close_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++close_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + close_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + voltest_SOURCES = tests/voltest.c +@@ -470,7 +470,7 @@ voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + vector_test_SOURCES = tests/vector-test.c + vector_test_CFLAGS = $(AM_CFLAGS) +-vector_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++vector_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + vector_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + channelmap_test_SOURCES = tests/channelmap-test.c +@@ -480,12 +480,12 @@ channelmap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h + cpulimit_test_CFLAGS = $(AM_CFLAGS) +-cpulimit_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++cpulimit_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h + cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2 +-cpulimit_test2_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++cpulimit_test2_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES) +@@ -495,7 +495,7 @@ mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + memblockq_test_SOURCES = tests/memblockq-test.c + memblockq_test_CFLAGS = $(AM_CFLAGS) +-memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + sync_playback_SOURCES = tests/sync-playback.c +@@ -504,72 +504,72 @@ sync_playback_CFLAGS = $(AM_CFLAGS) + sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + interpol_test_SOURCES = tests/interpol-test.c +-interpol_test_LDADD = $(AM_LDADD) libpulse.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++interpol_test_LDADD = $(AM_LDADD) libpulse.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + interpol_test_CFLAGS = $(AM_CFLAGS) + interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + sig2str_test_SOURCES = tests/sig2str-test.c +-sig2str_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++sig2str_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + sig2str_test_CFLAGS = $(AM_CFLAGS) + sig2str_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + resampler_test_SOURCES = tests/resampler-test.c +-resampler_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++resampler_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + resampler_test_CFLAGS = $(AM_CFLAGS) + resampler_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + mix_test_SOURCES = tests/mix-test.c +-mix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++mix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + mix_test_CFLAGS = $(AM_CFLAGS) + mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + remix_test_SOURCES = tests/remix-test.c +-remix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++remix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + remix_test_CFLAGS = $(AM_CFLAGS) + remix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + smoother_test_SOURCES = tests/smoother-test.c +-smoother_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++smoother_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + smoother_test_CFLAGS = $(AM_CFLAGS) + smoother_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + envelope_test_SOURCES = tests/envelope-test.c +-envelope_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++envelope_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + envelope_test_CFLAGS = $(AM_CFLAGS) + envelope_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + proplist_test_SOURCES = tests/proplist-test.c +-proplist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++proplist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + proplist_test_CFLAGS = $(AM_CFLAGS) + proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + rtstutter_SOURCES = tests/rtstutter.c +-rtstutter_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++rtstutter_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + rtstutter_CFLAGS = $(AM_CFLAGS) + rtstutter_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + stripnul_SOURCES = tests/stripnul.c +-stripnul_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++stripnul_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + stripnul_CFLAGS = $(AM_CFLAGS) + stripnul_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + lock_autospawn_test_SOURCES = tests/lock-autospawn-test.c +-lock_autospawn_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++lock_autospawn_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + lock_autospawn_test_CFLAGS = $(AM_CFLAGS) + lock_autospawn_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + prioq_test_SOURCES = tests/prioq-test.c +-prioq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++prioq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + prioq_test_CFLAGS = $(AM_CFLAGS) + prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + sigbus_test_SOURCES = tests/sigbus-test.c +-sigbus_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++sigbus_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + sigbus_test_CFLAGS = $(AM_CFLAGS) + sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + gtk_test_SOURCES = tests/gtk-test.c +-gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + gtk_test_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) + gtk_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(GTK20_LIBS) + +@@ -579,7 +579,7 @@ alsa_time_test_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) + alsa_time_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(ASOUNDLIB_LIBS) + + usergroup_test_SOURCES = tests/usergroup-test.c +-usergroup_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la ++usergroup_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + usergroup_test_CFLAGS = $(AM_CFLAGS) + usergroup_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0103-JACK-Load-module-jackdbus-detect-in-default.pa.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0103-JACK-Load-module-jackdbus-detect-in-default.pa.patch @@ -0,0 +1,29 @@ +From e5a6af86fa3463b186db528c259ad76d97d7110f Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Tue, 30 Nov 2010 22:11:48 +0100 +Subject: [PATCH 2/2] JACK: Load module-jackdbus-detect in default.pa + +Signed-off-by: David Henningsson +--- + src/daemon/default.pa.in | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in +index 00c000e..e896385 100755 +--- a/src/daemon/default.pa.in ++++ b/src/daemon/default.pa.in +@@ -62,6 +62,11 @@ load-module module-detect + load-module module-bluetooth-discover + .endif + ++### Automatically connect sink and source if JACK server is present ++.ifexists module-jackdbus-detect@PA_SOEXT@ ++load-module module-jackdbus-detect ++.endif ++ + ### Load several protocols + .ifexists module-esound-protocol-unix@PA_SOEXT@ + load-module module-esound-protocol-unix +-- +1.7.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0215-module-rtp-recv-Remove-smoother-from-write-index.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0215-module-rtp-recv-Remove-smoother-from-write-index.patch @@ -0,0 +1,92 @@ +From 2ee4ec507cd4105fcddeaf706749524ddeb1ebf5 Mon Sep 17 00:00:00 2001 +From: Maarten Bosmans +Date: Wed, 12 Jan 2011 07:31:26 +0100 +Subject: [PATCH 5/7] module-rtp-recv: Remove smoother from write index + +It isn't necessary anymore with the new algorithm. The slow adjust of the +smoother was even detrimental to the accuracy of the rate estimate. +--- + src/modules/rtp/module-rtp-recv.c | 24 +++--------------------- + 1 files changed, 3 insertions(+), 21 deletions(-) + +diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c +index baf5b50..d214cbc 100644 +--- a/src/modules/rtp/module-rtp-recv.c ++++ b/src/modules/rtp/module-rtp-recv.c +@@ -52,7 +52,6 @@ + #include + #include + #include +-#include + #include + #include + +@@ -104,7 +103,6 @@ struct session { + + pa_atomic_t timestamp; + +- pa_smoother *smoother; + pa_usec_t intended_latency; + pa_usec_t sink_latency; + +@@ -197,10 +195,9 @@ static void sink_input_suspend_within_thread(pa_sink_input* i, pa_bool_t b) { + pa_sink_input_assert_ref(i); + pa_assert_se(s = i->userdata); + +- if (b) { +- pa_smoother_pause(s->smoother, pa_rtclock_now()); ++ if (b) + pa_memblockq_flush_read(s->memblockq); +- } else ++ else + s->first_packet = FALSE; + } + +@@ -269,11 +266,6 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + } else + pa_rtclock_from_wallclock(&now); + +- pa_smoother_put(s->smoother, pa_timeval_load(&now), pa_bytes_to_usec((uint64_t) pa_memblockq_get_write_index(s->memblockq), &s->sink_input->sample_spec)); +- +- /* Tell the smoother that we are rolling now, in case it is still paused */ +- pa_smoother_resume(s->smoother, pa_timeval_load(&now), TRUE); +- + if (pa_memblockq_push(s->memblockq, &chunk) < 0) { + pa_log_warn("Queue overrun"); + pa_memblockq_seek(s->memblockq, (int64_t) chunk.length, PA_SEEK_RELATIVE, TRUE); +@@ -297,7 +289,7 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + + pa_log_debug("Updating sample rate"); + +- wi = pa_smoother_get(s->smoother, pa_timeval_load(&now)); ++ wi = pa_bytes_to_usec((uint64_t) pa_memblockq_get_write_index(s->memblockq), &s->sink_input->sample_spec); + ri = pa_bytes_to_usec((uint64_t) pa_memblockq_get_read_index(s->memblockq), &s->sink_input->sample_spec); + + pa_log_debug("wi=%lu ri=%lu", (unsigned long) wi, (unsigned long) ri); +@@ -508,14 +500,6 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in + s->sdp_info = *sdp_info; + s->rtpoll_item = NULL; + s->intended_latency = LATENCY_USEC; +- s->smoother = pa_smoother_new( +- PA_USEC_PER_SEC*5, +- PA_USEC_PER_SEC*2, +- TRUE, +- TRUE, +- 10, +- pa_timeval_load(&now), +- TRUE); + s->last_rate_update = pa_timeval_load(&now); + s->last_latency = LATENCY_USEC; + s->estimated_rate = (double) sink->sample_spec.rate; +@@ -619,8 +603,6 @@ static void session_free(struct session *s) { + pa_sdp_info_destroy(&s->sdp_info); + pa_rtp_context_destroy(&s->rtp_context); + +- pa_smoother_free(s->smoother); +- + pa_xfree(s); + } + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0221-vala-Fix-path-error-in-the-last-commit.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0221-vala-Fix-path-error-in-the-last-commit.patch @@ -0,0 +1,25 @@ +From 9f52c1064651667f48877f54ae002e97eecd6289 Mon Sep 17 00:00:00 2001 +From: Colin Guthrie +Date: Sat, 26 Mar 2011 12:42:43 +0000 +Subject: [PATCH 04/33] vala: Fix path error in the last commit. + +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c764f18..691f093 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,7 +41,7 @@ noinst_DATA = + vapidir = $(datadir)/vala/vapi + vapi_DATA = \ + vala/libpulse.deps vala/libpulse.vapi \ +- libpulse-mainloop-glib.deps libpulse-mainloop-glib.vapi ++ vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libpulse.pc libpulse-simple.pc +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0096-lp533877-handle-digmic.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0096-lp533877-handle-digmic.patch @@ -0,0 +1,15 @@ +Index: pulseaudio-0.9.22/src/modules/alsa/mixer/paths/analog-input.conf.common +=================================================================== +--- pulseaudio-0.9.22.orig/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-11-25 19:45:22.000000000 -0500 ++++ pulseaudio-0.9.22/src/modules/alsa/mixer/paths/analog-input.conf.common 2010-12-18 08:42:33.000000000 -0500 +@@ -66,6 +66,10 @@ + name = input-microphone + priority = 20 + ++[Option Input Source:Digital Mic] ++name = input-microphone ++priority = 20 ++ + [Option Input Source:Mic] + name = input-microphone + priority = 20 --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0211-module-loopback-Add-adjust_time-to-valid-args.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0211-module-loopback-Add-adjust_time-to-valid-args.patch @@ -0,0 +1,24 @@ +From 09770e577991d49cf826bdf80b0f9559f1e67820 Mon Sep 17 00:00:00 2001 +From: Maarten Bosmans +Date: Sun, 16 Jan 2011 01:42:20 +0100 +Subject: [PATCH 1/7] module-loopback: Add adjust_time to valid args + +--- + src/modules/module-loopback.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c +index 265a469..ca06314 100644 +--- a/src/modules/module-loopback.c ++++ b/src/modules/module-loopback.c +@@ -102,6 +102,7 @@ struct userdata { + static const char* const valid_modargs[] = { + "source", + "sink", ++ "adjust_time", + "latency_msec", + "format", + "rate", +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0201-alsa-mixer-Add-a-few-well-known-descriptions.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0201-alsa-mixer-Add-a-few-well-known-descriptions.patch @@ -0,0 +1,44 @@ +From 729223d4c2c8e56e1e4bf838ee9aa11d36f2d90a Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Mon, 20 Dec 2010 11:13:37 +0100 +Subject: [PATCH 1/6] alsa-mixer: Add a few well-known descriptions + +Add front mic, rear mic, and docking line-in. These are likely to be +present on modern hda chips, for reference see +linux-2.6/sound/pci/hda/hda_codec.c:hda_get_input_pin_label + +Signed-off-by: David Henningsson +--- + src/modules/alsa/alsa-mixer.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +index 1ede8cf..eb50ae2 100644 +--- a/src/modules/alsa/alsa-mixer.c ++++ b/src/modules/alsa/alsa-mixer.c +@@ -1701,8 +1701,11 @@ static int option_verify(pa_alsa_option *o) { + { "input", N_("Input") }, + { "input-docking", N_("Docking Station Input") }, + { "input-docking-microphone", N_("Docking Station Microphone") }, ++ { "input-docking-linein", N_("Docking Station Line-In") }, + { "input-linein", N_("Line-In") }, + { "input-microphone", N_("Microphone") }, ++ { "input-microphone-front", N_("Front Microphone") }, ++ { "input-microphone-rear", N_("Rear Microphone") }, + { "input-microphone-external", N_("External Microphone") }, + { "input-microphone-internal", N_("Internal Microphone") }, + { "input-radio", N_("Radio") }, +@@ -1776,6 +1779,10 @@ static int path_verify(pa_alsa_path *p) { + static const struct description_map well_known_descriptions[] = { + { "analog-input", N_("Analog Input") }, + { "analog-input-microphone", N_("Analog Microphone") }, ++ { "analog-input-microphone-front", N_("Front Microphone") }, ++ { "analog-input-microphone-rear", N_("Rear Microphone") }, ++ { "analog-input-microphone-dock", N_("Docking Station Microphone") }, ++ { "analog-input-microphone-internal", N_("Internal Microphone") }, + { "analog-input-linein", N_("Analog Line-In") }, + { "analog-input-radio", N_("Analog Radio") }, + { "analog-input-video", N_("Analog Video") }, +-- +1.7.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0216-conf-Make-system.pa-use-udev-detect-and-not-hal-dete.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0216-conf-Make-system.pa-use-udev-detect-and-not-hal-dete.patch @@ -0,0 +1,46 @@ +From a8cd9d288006c317d087bad9c4e0d2f399110184 Mon Sep 17 00:00:00 2001 +From: Colin Guthrie +Date: Thu, 3 Mar 2011 09:37:16 +0000 +Subject: [PATCH 6/7] conf: Make system.pa use udev-detect and not hal-detect. + +Also fix a left over reference to HAL in default.pa +--- + src/daemon/default.pa.in | 2 +- + src/daemon/system.pa.in | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in +index 15e253f..1768c31 100755 +--- a/src/daemon/default.pa.in ++++ b/src/daemon/default.pa.in +@@ -39,7 +39,7 @@ load-module module-card-restore + load-module module-augment-properties + + ### Load audio drivers statically (it's probably better to not load +-### these drivers manually, but instead use module-hal-detect -- ++### these drivers manually, but instead use module-udev-detect -- + ### see below -- for doing this automatically) + #load-module module-alsa-sink + #load-module module-alsa-source device=hw:1,0 +diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in +index 27e4281..4b1227f 100755 +--- a/src/daemon/system.pa.in ++++ b/src/daemon/system.pa.in +@@ -20,11 +20,11 @@ + # mode. + + ### Automatically load driver modules depending on the hardware available +-.ifexists module-hal-detect@PA_SOEXT@ +-load-module module-hal-detect ++.ifexists module-udev-detect@PA_SOEXT@ ++load-module module-udev-detect + .else + ### Alternatively use the static hardware detection module (for systems that +-### lack HAL support) ++### lack udev support) + load-module module-detect + .endif + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0213-module-rtp-recv-Use-new-algorithm-for-adjusting-samp.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0213-module-rtp-recv-Use-new-algorithm-for-adjusting-samp.patch @@ -0,0 +1,91 @@ +From 46200391f3a2f02b951cee40d7b6ddd2e7b9258a Mon Sep 17 00:00:00 2001 +From: Maarten Bosmans +Date: Wed, 12 Jan 2011 07:24:58 +0100 +Subject: [PATCH 3/7] module-rtp-recv: Use new algorithm for adjusting sample rate + +--- + src/modules/rtp/module-rtp-recv.c | 44 ++++++++++++++++++++++++------------ + 1 files changed, 29 insertions(+), 15 deletions(-) + +diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c +index 491be4d..20d7044 100644 +--- a/src/modules/rtp/module-rtp-recv.c ++++ b/src/modules/rtp/module-rtp-recv.c +@@ -109,6 +109,7 @@ struct session { + pa_usec_t sink_latency; + + pa_usec_t last_rate_update; ++ pa_usec_t last_latency; + }; + + struct userdata { +@@ -286,11 +287,11 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + pa_atomic_store(&s->timestamp, (int) now.tv_sec); + + if (s->last_rate_update + RATE_UPDATE_INTERVAL < pa_timeval_load(&now)) { +- pa_usec_t wi, ri, render_delay, sink_delay = 0, latency, fix; +- unsigned fix_samples; ++ pa_usec_t wi, ri, render_delay, sink_delay = 0, latency; + uint32_t base_rate = s->sink_input->sink->sample_spec.rate; + uint32_t current_rate = s->sink_input->sample_spec.rate; + uint32_t new_rate; ++ double estimated_rate; + + pa_log_debug("Updating sample rate"); + +@@ -314,19 +315,31 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + + pa_log_debug("Write index deviates by %0.2f ms, expected %0.2f ms", (double) latency/PA_USEC_PER_MSEC, (double) s->intended_latency/PA_USEC_PER_MSEC); + +- /* Calculate deviation */ +- if (latency < s->intended_latency) +- fix = s->intended_latency - latency; +- else +- fix = latency - s->intended_latency; +- +- /* How many samples is this per second? */ +- fix_samples = (unsigned) (fix * (pa_usec_t) s->sink_input->thread_info.sample_spec.rate / (pa_usec_t) RATE_UPDATE_INTERVAL); +- +- if (latency < s->intended_latency) +- new_rate = current_rate - fix_samples; +- else +- new_rate = current_rate + fix_samples; ++ /* The buffer is filling with some unknown rate R̂ samples/second. If the rate of reading in ++ * the last T seconds was Rⁿ, then the increase in buffer latency ΔLⁿ = Lⁿ - Lⁿ⁻ⁱ in that ++ * same period is ΔLⁿ = (TR̂ - TRⁿ) / R̂, giving the estimated target rate ++ * T ++ * R̂ = ─────────────── Rⁿ . (1) ++ * T - (Lⁿ - Lⁿ⁻ⁱ) ++ * ++ * Setting the sample rate to R̂ results in the latency being constant (if the estimate of R̂ ++ * is correct). But there is also the requirement to keep the buffer at a predefined target ++ * latency L̂. So instead of setting Rⁿ⁺ⁱ to R̂ immediately, the strategy will be to reduce R ++ * from Rⁿ⁺ⁱ to R̂ in a steps of T seconds, where Rⁿ⁺ⁱ is chosen such that in the total time ++ * aT the latency is reduced from Lⁿ to L̂. This strategy translates to the requirements ++ * ₐ R̂ - Rⁿ⁺ʲ a-j+1 j-1 ++ * Σ T ────────── = L̂ - Lⁿ with Rⁿ⁺ʲ = ───── Rⁿ⁺ⁱ + ───── R̂ . ++ * ʲ⁼ⁱ R̂ a a ++ * Solving for Rⁿ⁺ⁱ gives ++ * T - ²∕ₐ₊₁(L̂ - Lⁿ) ++ * Rⁿ⁺ⁱ = ───────────────── R̂ . (2) ++ * T ++ * Together Equations (1) and (2) specify the algorithm used below, where a = 7 is used. ++ */ ++ estimated_rate = (double) current_rate * (double) RATE_UPDATE_INTERVAL / (double) (RATE_UPDATE_INTERVAL + s->last_latency - latency); ++ pa_log_debug("Estimated target rate: %.0f Hz", estimated_rate); ++ new_rate = (uint32_t) ((double) (RATE_UPDATE_INTERVAL + latency/4 - s->intended_latency/4) / (double) RATE_UPDATE_INTERVAL * estimated_rate); ++ s->last_latency = latency; + + if (new_rate < (uint32_t) (base_rate*0.8) || new_rate > (uint32_t) (base_rate*1.25)) { + pa_log_warn("Sample rates too different, not adjusting (%u vs. %u).", base_rate, new_rate); +@@ -488,6 +501,7 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in + pa_timeval_load(&now), + TRUE); + s->last_rate_update = pa_timeval_load(&now); ++ s->last_latency = LATENCY_USEC; + pa_atomic_store(&s->timestamp, (int) now.tv_sec); + + if ((fd = mcast_socket((const struct sockaddr*) &sdp_info->sa, sdp_info->salen)) < 0) +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/series +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/series @@ -0,0 +1,43 @@ +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 +0091-dont-load-cork-music-on-phone.patch +0057-load-module-x11-bell.patch +0055-handle-Master-Front.patch +0092-delay-gnome-autostart.patch +0096-lp533877-handle-digmic.patch +0096-lp453966-handle-digmic-pt2.patch +0096-lp451635-handle-dove-x0-line-hp-swap.patch +#0101-update-stable-queue.patch +#0102-autoreconf.patch +0103-JACK-Load-module-jackdbus-detect-in-default.pa.patch +0104-Load-RAOP-Zeroconf-by-default.patch +0105-gold.patch +0201-alsa-mixer-Add-a-few-well-known-descriptions.patch +0202-alsa-mixer-add-required-any-and-required-for-enum-op.patch +0203-alsa-mixer-always-round-towards-0-dB.patch +0204-alsa-mixer-Add-new-paths-for-Internal-Mic-Front-Mic-.patch +0205-alsa-mixer-Fixup-Mic-Line-analog-input-paths-to-work.patch +0206-alsa-mixer-Make-sure-capture-source-and-input-source.patch +0209-alsa-mixer-Fix-makefile-in.patch +0210-PulseAudio-added-IT-block-to-fix-thumb-conditional-i.patch +0211-module-loopback-Add-adjust_time-to-valid-args.patch +0212-Limit-rate-adjustments-to-small-inaudible-jumps.patch +0213-module-rtp-recv-Use-new-algorithm-for-adjusting-samp.patch +0214-module-rtp-recv-Average-the-estimated-real-sample-ra.patch +0215-module-rtp-recv-Remove-smoother-from-write-index.patch +0216-conf-Make-system.pa-use-udev-detect-and-not-hal-dete.patch +0217-volume-Add-a-PA_VOLUME_UI_MAX-define-for-the-recomme.patch +0218-vala-Some-bugfixes-for-the-vala-bindings.patch +0219-vala-delegate-FreeCb-does-not-have-a-target.patch +0220-vala-move-GLibMainLoop-class-into-separate-file-to-f.patch +0221-vala-Fix-path-error-in-the-last-commit.patch +0222-build-sys-Link-binaries-linking-libpulse-to-libpulse.patch +0223-build-sys-Link-binaries-linking-libpulsecommon-to-li.patch +0224-build-sys-Link-lirc-libraries-in-right-order.patch +0225-module-jack-sink-source-protect-against-null-return-.patch +0226-vala-ChannelMap-has-no-destroy-function.patch +0001-alsa-mixer-Add-separate-profile-for-Nvidia.patch +0001-alsa-mixer-Add-workaround-for-some-USB-headsets.patch --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0218-vala-Some-bugfixes-for-the-vala-bindings.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0218-vala-Some-bugfixes-for-the-vala-bindings.patch @@ -0,0 +1,87 @@ +From 4fa7495a3114bb5841751537154215ebd229adf0 Mon Sep 17 00:00:00 2001 +From: Alexander Kurtz +Date: Thu, 24 Mar 2011 21:35:17 +0000 +Subject: [PATCH 01/33] vala: Some bugfixes for the vala bindings + + 1. PA uses Vala's "Posix" package (see line 23 of libpulse.vapi). + These dependencies have to be declared in the *.deps file. + + 2. Fix obvious copy/paste error. + + 3. Rename the parameter to match the C function. This simplifies + understanding what this parameter means. + + 4. According to the official documentation the "dev" parameter + for playback/capture streams on connection may be NULL and this + is the default. Change the method definition accordingly. +--- + Makefile.am | 3 ++- + vala/libpulse.deps | 1 + + vala/libpulse.vapi | 8 ++++---- + 3 files changed, 7 insertions(+), 5 deletions(-) + create mode 100644 vala/libpulse.deps + +diff --git a/Makefile.am b/Makefile.am +index a8a9eaa..3439c89 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -28,6 +28,7 @@ EXTRA_DIST = \ + doxygen/doxygen.conf.in \ + README \ + todo \ ++ vala/libpulse.deps \ + vala/libpulse.vapi + + SUBDIRS = src doxygen man po +@@ -36,7 +37,7 @@ MAINTAINERCLEANFILES = + noinst_DATA = + + vapidir = $(datadir)/vala/vapi +-vapi_DATA = vala/libpulse.vapi ++vapi_DATA = vala/libpulse.deps vala/libpulse.vapi + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libpulse.pc libpulse-simple.pc +diff --git a/vala/libpulse.deps b/vala/libpulse.deps +new file mode 100644 +index 0000000..b3188f7 +--- /dev/null ++++ b/vala/libpulse.deps +@@ -0,0 +1 @@ ++posix +diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi +index 21c0f7c..aed526a 100644 +--- a/vala/libpulse.vapi ++++ b/vala/libpulse.vapi +@@ -237,7 +237,7 @@ namespace PulseAudio { + [CCode (cname="PA_CHANNELS_MAX")] + public const int CHANNELS_MAX; + +- [CCode (cname="PA_CHANNELS_MAX")] ++ [CCode (cname="PA_RATE_MAX")] + public const int RATE_MAX; + + [CCode (cname="pa_cvolume")] +@@ -854,7 +854,7 @@ namespace PulseAudio { + public int iterate(bool block = true, out int retval = null); + public int run(out int retval = null); + public unowned MainLoopApi get_api(); +- public void quit(int r); ++ public void quit(int retval); + public void wakeup(); + public void set_poll_func(PollFunc poll_func); + } +@@ -1194,8 +1194,8 @@ namespace PulseAudio { + public int is_suspended(); + public int is_corked(); + +- public int connect_playback(string dev, BufferAttr? a = null, Flags flags = 0, CVolume? volume = null, Stream? sync_stream = null); +- public int connect_record(string dev, BufferAttr? a = null, Flags flags = 0); ++ public int connect_playback(string? dev = null, BufferAttr? a = null, Flags flags = 0, CVolume? volume = null, Stream? sync_stream = null); ++ public int connect_record(string? dev = null, BufferAttr? a = null, Flags flags = 0); + public int connect_upload(size_t length); + public int disconnect(); + public int finish_upload(); +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0001-alsa-mixer-Add-workaround-for-some-USB-headsets.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0001-alsa-mixer-Add-workaround-for-some-USB-headsets.patch @@ -0,0 +1,100 @@ +From 6f41a4140013dac7737847bb5eddc78906eb09b7 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Tue, 5 Apr 2011 11:37:59 +0200 +Subject: [PATCH] alsa-mixer: Add workaround for some USB headsets + +This is a workaround - these usb headsets have one output volume +control only, labeled "Speaker". This causes the default profile +set to not control the volume at all, which is a bug. Workaround +that by creating a separate profile set. + +Signed-off-by: David Henningsson +--- + src/Makefile.am | 3 +- + .../alsa/mixer/profile-sets/90-pulseaudio.rules | 3 ++ + .../alsa/mixer/profile-sets/usb-headset.conf | 35 ++++++++++++++++++++ + 3 files changed, 40 insertions(+), 1 deletions(-) + create mode 100644 src/modules/alsa/mixer/profile-sets/usb-headset.conf + +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/src/Makefile.am 2011-04-05 13:19:10.556010980 +0200 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.am 2011-04-05 13:20:34.968010925 +0200 +@@ -114,7 +114,8 @@ + modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \ +- modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf ++ modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \ ++ modules/alsa/mixer/profile-sets/usb-headset.conf + + ALSA_PATHS = \ + modules/alsa/mixer/paths/analog-input-aux.conf \ +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules +=================================================================== +--- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules 2011-04-05 13:20:04.280010945 +0200 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules 2011-04-05 13:20:34.968010925 +0200 +@@ -20,6 +20,9 @@ + ACTION!="change", GOTO="pulseaudio_end" + KERNEL!="card*", GOTO="pulseaudio_end" + ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="01ab", ENV{PULSE_PROFILE_SET}="usb-headset.conf" ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="0a0c", ENV{PULSE_PROFILE_SET}="usb-headset.conf" ++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1395", ATTRS{idProduct}=="0002", ENV{PULSE_PROFILE_SET}="usb-headset.conf" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1978", ENV{PULSE_PROFILE_SET}="native-instruments-audio8dj.conf" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="0839", ENV{PULSE_PROFILE_SET}="native-instruments-audio4dj.conf" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="baff", ENV{PULSE_PROFILE_SET}="native-instruments-traktorkontrol-s4.conf" +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/usb-headset.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/usb-headset.conf 2011-04-05 13:20:34.972010925 +0200 +@@ -0,0 +1,35 @@ ++# 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. ++ ++; This is a workaround - these usb headsets have one output volume control only, labeled "Speaker". ++; This causes the default profile set to not control the volume at all, which is a bug. ++ ++[General] ++auto-profiles = yes ++ ++[Mapping analog-mono] ++device-strings = hw:%f ++channel-map = mono ++paths-output = analog-output-speaker ++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-speaker ++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 +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.in +=================================================================== +--- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/src/Makefile.in 2011-04-05 13:20:49.356010915 +0200 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.in 2011-04-05 13:21:45.760010878 +0200 +@@ -2650,7 +2650,8 @@ + modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \ + modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \ +- modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf ++ modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \ ++ modules/alsa/mixer/profile-sets/usb-headset.conf + + ALSA_PATHS = \ + modules/alsa/mixer/paths/analog-input-aux.conf \ --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0090-disable-flat-volumes.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0225-module-jack-sink-source-protect-against-null-return-.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0225-module-jack-sink-source-protect-against-null-return-.patch @@ -0,0 +1,120 @@ +From fd5b282f51ab69d32b4ee3fcd1f8ed7fc3004ff6 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Mon, 28 Mar 2011 15:16:12 +0200 +Subject: [PATCH 32/33] module-jack-sink/source: protect against null return in jack_get_ports + +Just picking up a crash report from Ubuntu, here's the result. + +-- +David Henningsson, Canonical Ltd. +http://launchpad.net/~diwic + +From 934c52c79bb6faed56a64d6e15f9b285f687afee Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Mon, 28 Mar 2011 14:30:44 +0200 +Subject: [PATCH] module-jack-sink/source: protect against null return in jack_get_ports + +According to jack_get_ports documentation, it seems like returning NULL +is valid, and that it should be freed using jack_free. + +Reported-by: Grayson Peddie +BugLink: http://bugs.launchpad.net/bugs/733424 +Signed-off-by: David Henningsson +--- + src/modules/jack/module-jack-sink.c | 13 ++++++++----- + src/modules/jack/module-jack-source.c | 13 ++++++++----- + 2 files changed, 16 insertions(+), 10 deletions(-) + +diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c +index 08a8bef..706f358 100644 +--- a/src/modules/jack/module-jack-sink.c ++++ b/src/modules/jack/module-jack-sink.c +@@ -343,8 +343,9 @@ int pa__init(pa_module*m) { + ports = jack_get_ports(u->client, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsInput); + + channels = 0; +- for (p = ports; *p; p++) +- channels++; ++ if (ports) ++ for (p = ports; *p; p++) ++ channels++; + + if (!channels) + channels = m->core->default_sample_spec.channels; +@@ -432,7 +433,7 @@ int pa__init(pa_module*m) { + if (do_connect) { + for (i = 0, p = ports; i < ss.channels; i++, p++) { + +- if (!*p) { ++ if (!p || !*p) { + pa_log("Not enough physical output ports, leaving unconnected."); + break; + } +@@ -448,7 +449,8 @@ int pa__init(pa_module*m) { + + pa_sink_put(u->sink); + +- free(ports); ++ if (ports) ++ jack_free(ports); + pa_modargs_free(ma); + + return 0; +@@ -457,7 +459,8 @@ fail: + if (ma) + pa_modargs_free(ma); + +- free(ports); ++ if (ports) ++ jack_free(ports); + + pa__done(m); + +diff --git a/src/modules/jack/module-jack-source.c b/src/modules/jack/module-jack-source.c +index 6b12840..8453bd9 100644 +--- a/src/modules/jack/module-jack-source.c ++++ b/src/modules/jack/module-jack-source.c +@@ -289,8 +289,9 @@ int pa__init(pa_module*m) { + ports = jack_get_ports(u->client, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsOutput); + + channels = 0; +- for (p = ports; *p; p++) +- channels++; ++ if (ports) ++ for (p = ports; *p; p++) ++ channels++; + + if (!channels) + channels = m->core->default_sample_spec.channels; +@@ -376,7 +377,7 @@ int pa__init(pa_module*m) { + if (do_connect) { + for (i = 0, p = ports; i < ss.channels; i++, p++) { + +- if (!*p) { ++ if (!p || !*p) { + pa_log("Not enough physical output ports, leaving unconnected."); + break; + } +@@ -393,7 +394,8 @@ int pa__init(pa_module*m) { + + pa_source_put(u->source); + +- free(ports); ++ if (ports) ++ jack_free(ports); + pa_modargs_free(ma); + + return 0; +@@ -402,7 +404,8 @@ fail: + if (ma) + pa_modargs_free(ma); + +- free(ports); ++ if (ports) ++ jack_free(ports); + + pa__done(m); + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0202-alsa-mixer-add-required-any-and-required-for-enum-op.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0202-alsa-mixer-add-required-any-and-required-for-enum-op.patch @@ -0,0 +1,261 @@ +From ae83e51c82a747332494bf10c245281e49343fe3 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Mon, 20 Dec 2010 12:29:27 +0100 +Subject: [PATCH 2/6] alsa-mixer: add required-any and required-* for enum options + +Now you can add required-any to elements in a path and the path +will be valid as long as at least one of the elements are present. +Also you can have required, required-any and required-absent in +element options, causing a path to be unsupported if an option is +(not) present (simplified example: to skip line in path if +"Capture source" doesn't have a "Line In" option). + +Signed-off-by: David Henningsson +--- + src/modules/alsa/alsa-mixer.c | 90 +++++++++++++++++--- + src/modules/alsa/alsa-mixer.h | 8 ++ + .../alsa/mixer/paths/analog-output.conf.common | 5 + + 3 files changed, 91 insertions(+), 12 deletions(-) + +diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +index eb50ae2..2c47319 100644 +--- a/src/modules/alsa/alsa-mixer.c ++++ b/src/modules/alsa/alsa-mixer.c +@@ -1018,6 +1018,38 @@ static int check_required(pa_alsa_element *e, snd_mixer_elem_t *me) { + if (e->required_absent == PA_ALSA_REQUIRED_ANY && (has_switch || has_volume || has_enumeration)) + return -1; + ++ if (e->required_any != PA_ALSA_REQUIRED_IGNORE) { ++ switch (e->required_any) { ++ case PA_ALSA_REQUIRED_VOLUME: ++ e->path->req_any_present |= (e->volume_use != PA_ALSA_VOLUME_IGNORE); ++ break; ++ case PA_ALSA_REQUIRED_SWITCH: ++ e->path->req_any_present |= (e->switch_use != PA_ALSA_SWITCH_IGNORE); ++ break; ++ case PA_ALSA_REQUIRED_ENUMERATION: ++ e->path->req_any_present |= (e->enumeration_use != PA_ALSA_ENUMERATION_IGNORE); ++ break; ++ case PA_ALSA_REQUIRED_ANY: ++ e->path->req_any_present |= ++ (e->volume_use != PA_ALSA_VOLUME_IGNORE) || ++ (e->switch_use != PA_ALSA_SWITCH_IGNORE) || ++ (e->enumeration_use != PA_ALSA_ENUMERATION_IGNORE); ++ break; ++ } ++ } ++ ++ if (e->enumeration_use == PA_ALSA_ENUMERATION_SELECT) { ++ pa_alsa_option *o; ++ PA_LLIST_FOREACH(o, e->options) { ++ e->path->req_any_present |= (o->required_any != PA_ALSA_REQUIRED_IGNORE) && ++ (o->alsa_idx >= 0); ++ if (o->required != PA_ALSA_REQUIRED_IGNORE && o->alsa_idx < 0) ++ return -1; ++ if (o->required_absent != PA_ALSA_REQUIRED_IGNORE && o->alsa_idx >= 0) ++ return -1; ++ } ++ } ++ + return 0; + } + +@@ -1190,9 +1222,6 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) { + + } + +- if (check_required(e, me) < 0) +- return -1; +- + if (e->switch_use == PA_ALSA_SWITCH_SELECT) { + pa_alsa_option *o; + +@@ -1224,6 +1253,9 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) { + } + } + ++ if (check_required(e, me) < 0) ++ return -1; ++ + return 0; + } + +@@ -1478,20 +1510,23 @@ static int element_parse_required( + + pa_alsa_path *p = userdata; + pa_alsa_element *e; ++ pa_alsa_option *o; + pa_alsa_required_t req; + + pa_assert(p); + +- if (!(e = element_get(p, section, TRUE))) { ++ e = element_get(p, section, TRUE); ++ o = option_get(p, section); ++ if (!e && !o) { + pa_log("[%s:%u] Required makes no sense in '%s'", filename, line, section); + return -1; + } + + if (pa_streq(rvalue, "ignore")) + req = PA_ALSA_REQUIRED_IGNORE; +- else if (pa_streq(rvalue, "switch")) ++ else if (pa_streq(rvalue, "switch") && e) + req = PA_ALSA_REQUIRED_SWITCH; +- else if (pa_streq(rvalue, "volume")) ++ else if (pa_streq(rvalue, "volume") && e) + req = PA_ALSA_REQUIRED_VOLUME; + else if (pa_streq(rvalue, "enumeration")) + req = PA_ALSA_REQUIRED_ENUMERATION; +@@ -1502,10 +1537,28 @@ static int element_parse_required( + return -1; + } + +- if (pa_streq(lvalue, "required-absent")) +- e->required_absent = req; +- else +- e->required = req; ++ if (pa_streq(lvalue, "required-absent")) { ++ if (e) ++ e->required_absent = req; ++ if (o) ++ o->required_absent = req; ++ } ++ else if (pa_streq(lvalue, "required-any")) { ++ if (e) { ++ e->required_any = req; ++ e->path->has_req_any = TRUE; ++ } ++ if (o) { ++ o->required_any = req; ++ o->element->path->has_req_any = TRUE; ++ } ++ } ++ else { ++ if (e) ++ e->required = req; ++ if (o) ++ o->required = req; ++ } + + return 0; + } +@@ -1757,7 +1810,10 @@ static int element_verify(pa_alsa_element *e) { + + pa_assert(e); + ++// pa_log_debug("Element %s, path %s: r=%d, r-any=%d, r-abs=%d", e->alsa_name, e->path->name, e->required, e->required_any, e->required_absent); + if ((e->required != PA_ALSA_REQUIRED_IGNORE && e->required == e->required_absent) || ++ (e->required_any != PA_ALSA_REQUIRED_IGNORE && e->required_any == e->required_absent) || ++ (e->required_absent == PA_ALSA_REQUIRED_ANY && e->required_any != PA_ALSA_REQUIRED_IGNORE) || + (e->required_absent == PA_ALSA_REQUIRED_ANY && e->required != PA_ALSA_REQUIRED_IGNORE)) { + pa_log("Element %s cannot be required and absent at the same time.", e->alsa_name); + return -1; +@@ -1836,6 +1892,7 @@ pa_alsa_path* pa_alsa_path_new(const char *fname, pa_alsa_direction_t direction) + { "override-map.2", element_parse_override_map, NULL, NULL }, + /* ... later on we might add override-map.3 and so on here ... */ + { "required", element_parse_required, NULL, NULL }, ++ { "required-any", element_parse_required, NULL, NULL }, + { "required-absent", element_parse_required, NULL, NULL }, + { "direction", element_parse_direction, NULL, NULL }, + { "direction-try-other", element_parse_direction_try_other, NULL, NULL }, +@@ -2079,11 +2136,13 @@ int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, pa_bool_t ignore_dB) { + min_dB[t] += e->min_dB; + max_dB[t] += e->max_dB; + } +- } else ++ } else { + /* Hmm, there's another element before us + * which cannot do dB volumes, so we we need + * to 'neutralize' this slider */ + e->volume_use = PA_ALSA_VOLUME_ZERO; ++ pa_log_info("Zeroing volume of '%s' on path '%s'", e->alsa_name, p->name); ++ } + } + } else if (p->has_volume) + /* We can't use this volume, so let's ignore it */ +@@ -2096,6 +2155,12 @@ int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, pa_bool_t ignore_dB) { + p->has_mute = TRUE; + } + ++ if (p->has_req_any && !p->req_any_present) { ++ p->supported = FALSE; ++ pa_log_debug("Skipping path '%s', none of required-any elements preset.", p->name); ++ return -1; ++ } ++ + path_drop_unsupported(p); + path_make_options_unique(p); + path_create_settings(p); +@@ -2141,13 +2206,14 @@ void pa_alsa_element_dump(pa_alsa_element *e) { + pa_alsa_option *o; + pa_assert(e); + +- pa_log_debug("Element %s, direction=%i, switch=%i, volume=%i, enumeration=%i, required=%i, required_absent=%i, mask=0x%llx, n_channels=%u, override_map=%s", ++ pa_log_debug("Element %s, direction=%i, switch=%i, volume=%i, enumeration=%i, required=%i, required_any=%i, required_absent=%i, mask=0x%llx, n_channels=%u, override_map=%s", + e->alsa_name, + e->direction, + e->switch_use, + e->volume_use, + e->enumeration_use, + e->required, ++ e->required_any, + e->required_absent, + (long long unsigned) e->merged_mask, + e->n_channels, +diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h +index a0d4fcb..a6499b6 100644 +--- a/src/modules/alsa/alsa-mixer.h ++++ b/src/modules/alsa/alsa-mixer.h +@@ -111,6 +111,10 @@ struct pa_alsa_option { + char *name; + char *description; + unsigned priority; ++ ++ pa_alsa_required_t required; ++ pa_alsa_required_t required_any; ++ pa_alsa_required_t required_absent; + }; + + /* And element wraps one specific ALSA element. A series of elements * +@@ -128,6 +132,7 @@ struct pa_alsa_element { + pa_alsa_enumeration_use_t enumeration_use; + + pa_alsa_required_t required; ++ pa_alsa_required_t required_any; + pa_alsa_required_t required_absent; + + pa_bool_t override_map:1; +@@ -163,6 +168,9 @@ struct pa_alsa_path { + pa_bool_t has_mute:1; + pa_bool_t has_volume:1; + pa_bool_t has_dB:1; ++ /* These two are used during probing only */ ++ pa_bool_t has_req_any:1; ++ pa_bool_t req_any_present:1; + + long min_volume, max_volume; + double min_dB, max_dB; +diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common +index 6131da5..ffd1b41 100644 +--- a/src/modules/alsa/mixer/paths/analog-output.conf.common ++++ b/src/modules/alsa/mixer/paths/analog-output.conf.common +@@ -63,10 +63,15 @@ + ; # by the option name, resp. on/off if the element is a switch. + ; name = ... # Logical name to use in the path identifier + ; priority = ... # Priority if this is made into a device port ++; required = ignore | enumeration | any # In this element, this option must exist or the path will be invalid. ("any" is an alias for "enumeration".) ++; required-any = ignore | enumeration | any # In this element, either this or another option must exist (or an element) ++; required-absent = ignore | enumeration | any # In this element, this option must not exist or the path will be invalid + ; + ; [Element ...] # For each element that we shall control + ; required = ignore | switch | volume | enumeration | any # If set, require this element to be of this kind and available, + ; # otherwise don't consider this path valid for the card ++; required-any = ignore | switch | volume | enumeration | any # If set, at least one of the elements with required-any in this ++; # path must be present, otherwise this path is invalid for the card + ; required-absent = ignore | switch | volume # If set, require this element to not be of this kind and not + ; # available, otherwise don't consider this path valid for the card + ; +-- +1.7.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0007-esd-honour-system-pulseaudio.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0055-handle-Master-Front.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0105-gold.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0105-gold.patch @@ -0,0 +1,22 @@ +--- pulseaudio-0.9.22+stable-queue-18-geb966.orig/src/Makefile.in ++++ pulseaudio-0.9.22+stable-queue-18-geb966/src/Makefile.in +@@ -3015,7 +3015,7 @@ + pulse/volume.c pulse/volume.h pulse/xmalloc.c pulse/xmalloc.h \ + $(am__append_25) + libpulse_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(am__append_26) +-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la ++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la $(DBUS_LIBS) + libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) \ + -version-info $(LIBPULSE_VERSION_INFO) $(am__append_27) + libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h +--- pulseaudio-0.9.22+stable-queue-18-geb966.orig/src/Makefile.am ++++ pulseaudio-0.9.22+stable-queue-18-geb966/src/Makefile.am +@@ -780,7 +780,7 @@ + pulse/xmalloc.c pulse/xmalloc.h + + libpulse_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la ++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la $(DBUS_LIBS) + libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO) + + if HAVE_X11 --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0210-PulseAudio-added-IT-block-to-fix-thumb-conditional-i.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0210-PulseAudio-added-IT-block-to-fix-thumb-conditional-i.patch @@ -0,0 +1,27 @@ +From 683187ea4f27bc3222a58d3bb94f334e32670c86 Mon Sep 17 00:00:00 2001 +From: Kurt Taylor +Date: Fri, 18 Feb 2011 14:30:03 +0000 +Subject: [PATCH] PulseAudio: added IT block to fix thumb conditional instruction build error messages + +See: http://pulseaudio.org/ticket/914 + +Tweaked-By: Arun Raghavan +--- + src/pulsecore/svolume_arm.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c +index 3973e51..c2830cf 100644 +--- a/src/pulsecore/svolume_arm.c ++++ b/src/pulsecore/svolume_arm.c +@@ -39,6 +39,7 @@ + + #define MOD_INC() \ + " subs r0, r6, %2 \n\t" \ ++ " itt cs \n\t" \ + " addcs r0, %1 \n\t" \ + " movcs r6, r0 \n\t" + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0204-alsa-mixer-Add-new-paths-for-Internal-Mic-Front-Mic-.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0204-alsa-mixer-Add-new-paths-for-Internal-Mic-Front-Mic-.patch @@ -0,0 +1,522 @@ +From 9030819690d9f98b2c8aac5796a7c2faaa41dadb Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Wed, 5 Jan 2011 13:27:53 +0100 +Subject: [PATCH 4/6] alsa-mixer: Add new paths for Internal Mic, Front Mic, Rear Mic and Dock Mic + +Signed-off-by: David Henningsson +--- + src/Makefile.am | 5 +- + .../alsa/mixer/paths/analog-input-dock-mic.conf | 79 +++++++++++++++++++ + .../alsa/mixer/paths/analog-input-front-mic.conf | 79 +++++++++++++++++++ + .../mixer/paths/analog-input-internal-mic.conf | 80 +++++++++++++++----- + .../alsa/mixer/paths/analog-input-mic.conf.common | 74 +++++-------------- + .../alsa/mixer/paths/analog-input-rear-mic.conf | 79 +++++++++++++++++++ + src/modules/alsa/mixer/profile-sets/default.conf | 4 +- + 7 files changed, 321 insertions(+), 79 deletions(-) + create mode 100644 src/modules/alsa/mixer/paths/analog-input-dock-mic.conf + create mode 100644 src/modules/alsa/mixer/paths/analog-input-front-mic.conf + create mode 100644 src/modules/alsa/mixer/paths/analog-input-rear-mic.conf + +diff --git a/src/Makefile.am b/src/Makefile.am +index ec301da..05ec250 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -120,9 +120,12 @@ ALSA_PATHS = \ + 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-dock-mic.conf \ ++ modules/alsa/mixer/paths/analog-input-front-mic.conf \ ++ modules/alsa/mixer/paths/analog-input-internal-mic.conf \ ++ modules/alsa/mixer/paths/analog-input-rear-mic.conf \ + modules/alsa/mixer/paths/analog-input-mic.conf.common \ + modules/alsa/mixer/paths/analog-input-mic-line.conf \ + modules/alsa/mixer/paths/analog-input-tvtuner.conf \ +diff --git a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf +new file mode 100644 +index 0000000..df8567e +--- /dev/null ++++ b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf +@@ -0,0 +1,79 @@ ++# 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 'Dock Mic' or 'Dock Mic Boost' element exists ++; ++; See analog-output.conf.common for an explanation on the directives ++ ++[General] ++priority = 80 ++name = analog-input-microphone-dock ++ ++[Element Dock Mic Boost] ++required-any = any ++switch = select ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Option Dock Mic Boost:on] ++name = input-boost-on ++ ++[Option Dock Mic Boost:off] ++name = input-boost-off ++ ++[Element Dock Mic] ++required-any = any ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Capture] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Input Source] ++enumeration = select ++ ++[Option Input Source:Dock Mic] ++name = analog-input-microphone-dock ++ ++[Element Capture Source] ++enumeration = select ++ ++[Option Capture Source:Dock Mic] ++name = analog-input-microphone-dock ++ ++[Element Mic] ++switch = off ++volume = off ++ ++[Element Internal Mic] ++switch = off ++volume = off ++ ++[Element Front Mic] ++switch = off ++volume = off ++ ++[Element Rear Mic] ++switch = off ++volume = off ++ ++.include analog-input-mic.conf.common +diff --git a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf +new file mode 100644 +index 0000000..516b487 +--- /dev/null ++++ b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf +@@ -0,0 +1,79 @@ ++# 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 'Front Mic' or 'Front Mic Boost' element exists ++; ++; See analog-output.conf.common for an explanation on the directives ++ ++[General] ++priority = 90 ++name = analog-input-microphone-front ++ ++[Element Front Mic Boost] ++required-any = any ++switch = select ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Option Front Mic Boost:on] ++name = input-boost-on ++ ++[Option Front Mic Boost:off] ++name = input-boost-off ++ ++[Element Front Mic] ++required-any = any ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Capture] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Input Source] ++enumeration = select ++ ++[Option Input Source:Front Mic] ++name = analog-input-microphone-front ++ ++[Element Capture Source] ++enumeration = select ++ ++[Option Capture Source:Front Mic] ++name = analog-input-microphone-front ++ ++[Element Mic] ++switch = off ++volume = off ++ ++[Element Internal Mic] ++switch = off ++volume = off ++ ++[Element Rear Mic] ++switch = off ++volume = off ++ ++[Element Dock Mic] ++switch = off ++volume = off ++ ++.include analog-input-mic.conf.common +diff --git a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf +index 70cd512..3e45bcf 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf +@@ -14,54 +14,94 @@ + # 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 ++; For devices where a 'Internal Mic' or 'Internal Mic Boost' element exists ++; 'Int Mic' and 'Int Mic Boost' are for compatibility with kernels < 2.6.38 + ; + ; See analog-output.conf.common for an explanation on the directives + + [General] +-priority = 90 +-name = analog-input-microphone ++priority = 89 ++name = analog-input-microphone-internal + +-[Element Capture] +-switch = mute ++[Element Internal Mic Boost] ++required-any = any ++switch = select + volume = merge + override-map.1 = all + override-map.2 = all-left,all-right + +-[Element Mic] +-switch = off +-volume = off ++[Option Internal Mic Boost:on] ++name = input-boost-on ++ ++[Option Internal Mic Boost:off] ++name = input-boost-off ++ ++[Element Int Mic Boost] ++required-any = any ++switch = select ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Option Int Mic Boost:on] ++name = input-boost-on ++ ++[Option Int Mic Boost:off] ++name = input-boost-off ++ + + [Element Internal Mic] +-required = any ++required-any = any + switch = mute + volume = merge + override-map.1 = all + override-map.2 = all-left,all-right + +-[Element Line] +-switch = off +-volume = off ++[Element Int Mic] ++required-any = any ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right + +-[Element Aux] +-switch = off +-volume = off ++[Element Capture] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Input Source] ++enumeration = select ++ ++[Option Input Source:Internal Mic] ++name = analog-input-microphone-internal ++ ++[Option Input Source:Int Mic] ++name = analog-input-microphone-internal + +-[Element Video] ++[Element Capture Source] ++enumeration = select ++ ++[Option Capture Source:Internal Mic] ++name = analog-input-microphone-internal ++ ++[Option Capture Source:Int Mic] ++name = analog-input-microphone-internal ++ ++[Element Mic] + switch = off + volume = off + +-[Element Mic/Line] ++[Element Dock Mic] + switch = off + volume = off + +-[Element TV Tuner] ++[Element Front Mic] + switch = off + volume = off + +-[Element FM] ++[Element Rear Mic] + switch = off + volume = off + +-.include analog-input.conf.common + .include analog-input-mic.conf.common +diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common +index 9bddd48..1ffe59f 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common ++++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common +@@ -18,64 +18,26 @@ + ; + ; See analog-output.conf.common for an explanation on the directives + +-;;; 'Mic Select' ++[Element Line] ++switch = off ++volume = off + +-[Element Mic Select] +-enumeration = select ++[Element Aux] ++switch = off ++volume = off + +-[Option Mic Select:Mic1] +-name = input-microphone +-priority = 20 ++[Element Video] ++switch = off ++volume = off + +-[Option Mic Select:Mic2] +-name = input-microphone +-priority = 19 ++[Element Mic/Line] ++switch = off ++volume = off + +-;;; Various Boosts ++[Element TV Tuner] ++switch = off ++volume = off + +-[Element Mic Boost (+20dB)] +-switch = select +-volume = merge +- +-[Option Mic Boost (+20dB):on] +-name = input-boost-on +- +-[Option Mic Boost (+20dB):off] +-name = input-boost-off +- +-[Element Mic Boost] +-switch = select +-volume = merge +- +-[Option Mic Boost:on] +-name = input-boost-on +- +-[Option Mic Boost:off] +-name = input-boost-off +- +-[Element Front Mic Boost] +-switch = select +- +-[Option Front Mic Boost:on] +-name = input-boost-on +- +-[Option Front Mic Boost:off] +-name = input-boost-off +- +-[Element Rear Mic Boost] +-switch = select +- +-[Option Rear Mic Boost:on] +-name = input-boost-on +- +-[Option Rear Mic Boost:off] +-name = input-boost-off +- +-[Element Int Mic Boost] +-switch = select +- +-[Option Int Mic Boost:on] +-name = input-boost-on +- +-[Option Int Mic Boost:off] +-name = input-boost-off ++[Element FM] ++switch = off ++volume = off +diff --git a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf +new file mode 100644 +index 0000000..45f7730 +--- /dev/null ++++ b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf +@@ -0,0 +1,79 @@ ++# 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 'Rear Mic' or 'Rear Mic Boost' element exists ++; ++; See analog-output.conf.common for an explanation on the directives ++ ++[General] ++priority = 89 ++name = analog-input-microphone-rear ++ ++[Element Rear Mic Boost] ++required-any = any ++switch = select ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Option Rear Mic Boost:on] ++name = input-boost-on ++ ++[Option Rear Mic Boost:off] ++name = input-boost-off ++ ++[Element Rear Mic] ++required-any = any ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Capture] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right ++ ++[Element Input Source] ++enumeration = select ++ ++[Option Input Source:Rear Mic] ++name = analog-input-microphone-rear ++ ++[Element Capture Source] ++enumeration = select ++ ++[Option Capture Source:Rear Mic] ++name = analog-input-microphone-rear ++ ++[Element Mic] ++switch = off ++volume = off ++ ++[Element Internal Mic] ++switch = off ++volume = off ++ ++[Element Front Mic] ++switch = off ++volume = off ++ ++[Element Dock Mic] ++switch = off ++volume = off ++ ++.include analog-input-mic.conf.common +diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf +index 5d352f1..24a8d98 100644 +--- a/src/modules/alsa/mixer/profile-sets/default.conf ++++ b/src/modules/alsa/mixer/profile-sets/default.conf +@@ -63,14 +63,14 @@ auto-profiles = yes + device-strings = hw:%f + channel-map = 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 ++paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic 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-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 ++paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic 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] +-- +1.7.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0205-alsa-mixer-Fixup-Mic-Line-analog-input-paths-to-work.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0205-alsa-mixer-Fixup-Mic-Line-analog-input-paths-to-work.patch @@ -0,0 +1,235 @@ +From f020db16c8797522d67433791a2f3a34ab2f5520 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Wed, 5 Jan 2011 14:03:15 +0100 +Subject: [PATCH 5/6] alsa-mixer: Fixup "Mic"/"Line"/"analog-input" paths to work with the new paths + +Signed-off-by: David Henningsson +--- + .../alsa/mixer/paths/analog-input-linein.conf | 25 ++++++- + src/modules/alsa/mixer/paths/analog-input-mic.conf | 73 ++++++++++++++----- + .../alsa/mixer/paths/analog-input-mic.conf.common | 7 ++ + src/modules/alsa/mixer/paths/analog-input.conf | 28 +++++++- + 4 files changed, 111 insertions(+), 22 deletions(-) + +diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf +index 57568cc..9362227 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-linein.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf +@@ -36,12 +36,27 @@ switch = off + volume = off + + [Element Line] +-required = any ++required-any = any + switch = mute + volume = merge + override-map.1 = all + override-map.2 = all-left,all-right + ++[Element Input Source] ++enumeration = select ++ ++[Option Input Source:Line] ++name = analog-input-linein ++required-any = any ++ ++[Element Capture Source] ++enumeration = select ++ ++[Option Capture Source:Line] ++name = analog-input-linein ++required-any = any ++ ++ + [Element Aux] + switch = off + volume = off +@@ -62,4 +77,10 @@ volume = off + switch = off + volume = off + +-.include analog-input.conf.common ++[Element Mic Jack Mode] ++enumeration = select ++ ++[Option Mic Jack Mode:Line In] ++priority = 19 ++required-any = any ++name = input-linein +diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf +index 9b8b75a..8565ebe 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf +@@ -14,54 +14,89 @@ + # 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 'Mic' element exists ++; For devices where a 'Mic' or 'Mic Boost' element exists + ; + ; See analog-output.conf.common for an explanation on the directives + + [General] +-priority = 100 ++priority = 89 + name = analog-input-microphone + +-[Element Capture] +-switch = mute ++[Element Mic Boost] ++required-any = any ++switch = select + volume = merge + override-map.1 = all + override-map.2 = all-left,all-right + ++[Option Mic Boost:on] ++name = input-boost-on ++ ++[Option Mic Boost:off] ++name = input-boost-off ++ + [Element Mic] +-required = any ++required-any = any + switch = mute + volume = merge + override-map.1 = all + override-map.2 = all-left,all-right + +-[Element Internal Mic] +-switch = off +-volume = off ++[Element Capture] ++switch = mute ++volume = merge ++override-map.1 = all ++override-map.2 = all-left,all-right + +-[Element Line] +-switch = off +-volume = off ++[Element Input Source] ++enumeration = select + +-[Element Aux] +-switch = off +-volume = off ++[Option Input Source:Mic] ++name = analog-input-microphone ++ ++[Element Capture Source] ++enumeration = select ++ ++[Option Capture Source:Mic] ++name = analog-input-microphone ++ ++;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)" ++ ++[Element Mic Select] ++enumeration = select + +-[Element Video] ++[Option Mic Select:Mic1] ++name = input-microphone ++priority = 20 ++ ++[Option Mic Select:Mic2] ++name = input-microphone ++priority = 19 ++ ++[Element Mic Boost (+20dB)] ++switch = select ++volume = merge ++ ++[Option Mic Boost (+20dB):on] ++name = input-boost-on ++ ++[Option Mic Boost (+20dB):off] ++name = input-boost-off ++ ++[Element Front Mic] + switch = off + volume = off + +-[Element Mic/Line] ++[Element Internal Mic] + switch = off + volume = off + +-[Element TV Tuner] ++[Element Rear Mic] + switch = off + volume = off + +-[Element FM] ++[Element Dock Mic] + switch = off + volume = off + +-.include analog-input.conf.common + .include analog-input-mic.conf.common +diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common +index 1ffe59f..4bebc29 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common ++++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common +@@ -41,3 +41,10 @@ volume = off + [Element FM] + switch = off + volume = off ++ ++[Element Mic Jack Mode] ++enumeration = select ++ ++[Option Mic Jack Mode:Mic In] ++priority = 19 ++name = input-microphone +diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf +index 3050738..b86c356 100644 +--- a/src/modules/alsa/mixer/paths/analog-input.conf ++++ b/src/modules/alsa/mixer/paths/analog-input.conf +@@ -32,9 +32,36 @@ override-map.2 = all-left,all-right + [Element Mic] + required-absent = any + ++[Element Dock Mic] ++required-absent = any ++ ++[Element Dock Mic Boost] ++required-absent = any ++ ++[Element Front Mic] ++required-absent = any ++ ++[Element Front Mic Boost] ++required-absent = any ++ ++[Element Int Mic] ++required-absent = any ++ ++[Element Int Mic Boost] ++required-absent = any ++ + [Element Internal Mic] + required-absent = any + ++[Element Internal Mic Boost] ++required-absent = any ++ ++[Element Rear Mic] ++required-absent = any ++ ++[Element Rear Mic Boost] ++required-absent = any ++ + [Element Line] + required-absent = any + +@@ -54,4 +81,3 @@ required-absent = any + required-absent = any + + .include analog-input.conf.common +-.include analog-input-mic.conf.common +-- +1.7.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0222-build-sys-Link-binaries-linking-libpulse-to-libpulse.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0222-build-sys-Link-binaries-linking-libpulse-to-libpulse.patch @@ -0,0 +1,98 @@ +From 1ade8dfe43e82d0c131b04368a8aca929e4c4a06 Mon Sep 17 00:00:00 2001 +From: Jyri Sarha +Date: Fri, 26 Nov 2010 18:38:25 +0200 +Subject: [PATCH 29/33] build-sys: Link binaries linking libpulse to libpulsecommon too + +Build appeared to fails when a new function is added to +libpulsecommon. This is because build uses libpulsecommon that is +installed into system instead of the one that is being built. Explicit +linking to libpulsecommon fixes the problem. +--- + src/Makefile.am | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9f1a89a..b530a26 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -375,7 +375,7 @@ endif + + mainloop_test_SOURCES = tests/mainloop-test.c + mainloop_test_CFLAGS = $(AM_CFLAGS) +-mainloop_test_LDADD = $(AM_LDADD) libpulse.la ++mainloop_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + thread_mainloop_test_SOURCES = tests/thread-mainloop-test.c +@@ -390,7 +390,7 @@ utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + get_binary_name_test_SOURCES = tests/get-binary-name-test.c + get_binary_name_test_CFLAGS = $(AM_CFLAGS) +-get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la ++get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + get_binary_name_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + ipacl_test_SOURCES = tests/ipacl-test.c +@@ -444,12 +444,12 @@ mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMICR + mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + pacat_simple_SOURCES = tests/pacat-simple.c +-pacat_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la ++pacat_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la libpulsecommon-@PA_MAJORMINORMICRO@.la + pacat_simple_CFLAGS = $(AM_CFLAGS) + pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + parec_simple_SOURCES = tests/parec-simple.c +-parec_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la ++parec_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la libpulsecommon-@PA_MAJORMINORMICRO@.la + parec_simple_CFLAGS = $(AM_CFLAGS) + parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + +@@ -465,7 +465,7 @@ close_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + voltest_SOURCES = tests/voltest.c + voltest_CFLAGS = $(AM_CFLAGS) +-voltest_LDADD = $(AM_LDADD) libpulse.la ++voltest_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + vector_test_SOURCES = tests/vector-test.c +@@ -475,7 +475,7 @@ vector_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + channelmap_test_SOURCES = tests/channelmap-test.c + channelmap_test_CFLAGS = $(AM_CFLAGS) +-channelmap_test_LDADD = $(AM_LDADD) libpulse.la ++channelmap_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + channelmap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h +@@ -499,7 +499,7 @@ memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore-@PA_MAJORMINORMI + memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + sync_playback_SOURCES = tests/sync-playback.c +-sync_playback_LDADD = $(AM_LDADD) libpulse.la ++sync_playback_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la + sync_playback_CFLAGS = $(AM_CFLAGS) + sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + +@@ -569,7 +569,7 @@ sigbus_test_CFLAGS = $(AM_CFLAGS) + sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + + gtk_test_SOURCES = tests/gtk-test.c +-gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la ++gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la libpulsecommon-@PA_MAJORMINORMICRO@.la + gtk_test_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) + gtk_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(GTK20_LIBS) + +@@ -579,7 +579,7 @@ alsa_time_test_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) + alsa_time_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(ASOUNDLIB_LIBS) + + usergroup_test_SOURCES = tests/usergroup-test.c +-usergroup_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la ++usergroup_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la + usergroup_test_CFLAGS = $(AM_CFLAGS) + usergroup_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0091-dont-load-cork-music-on-phone.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0212-Limit-rate-adjustments-to-small-inaudible-jumps.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0212-Limit-rate-adjustments-to-small-inaudible-jumps.patch @@ -0,0 +1,176 @@ +From 90c5520e03bbccf6c1d9f87221d3742cc70b53ed Mon Sep 17 00:00:00 2001 +From: Maarten Bosmans +Date: Fri, 7 Jan 2011 01:25:55 +0100 +Subject: [PATCH 2/7] Limit rate adjustments to small, inaudible jumps +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The same logic is applied to the sample rate adjustments in module-rtp-recv, +module-loopback and module-combine: + - Each time an adjustment is made, the new rate can differ at most 2‰ from the + old rate. Such a step is equal to 3.5 cents (a cent is 1/100th of a + semitone) and as 5 cents is generally considered the smallest observable + difference in pitch, this results in inaudible adjustments. + - The sample rate of the stream can only differ from the rate of the + corresponding sink by 25%. As these adjustments are meant to account for + very small clock drifts, any large deviation from the base rate suggests + something is seriously wrong. + - If the calculated rate is within 20Hz of the base rate, set it to the base + rate. This saves CPU because no resampling is necessary. +--- + src/modules/module-combine.c | 26 ++++++++++++++++---------- + src/modules/module-loopback.c | 18 +++++++++++++++--- + src/modules/rtp/module-rtp-recv.c | 34 +++++++++++++++++++++------------- + 3 files changed, 52 insertions(+), 26 deletions(-) + +diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c +index bcea229..3104ed6 100644 +--- a/src/modules/module-combine.c ++++ b/src/modules/module-combine.c +@@ -217,23 +217,29 @@ static void adjust_rates(struct userdata *u) { + base_rate = u->sink->sample_spec.rate; + + PA_IDXSET_FOREACH(o, u->outputs, idx) { +- uint32_t r = base_rate; ++ uint32_t new_rate = base_rate; ++ uint32_t current_rate = o->sink_input->sample_spec.rate; + + if (!o->sink_input || !PA_SINK_IS_OPENED(pa_sink_get_state(o->sink))) + continue; + +- if (o->total_latency < target_latency) +- r -= (uint32_t) ((((double) (target_latency - o->total_latency))/(double)u->adjust_time)*(double)r); +- else if (o->total_latency > target_latency) +- r += (uint32_t) ((((double) (o->total_latency - target_latency))/(double)u->adjust_time)*(double)r); ++ if (o->total_latency != target_latency) ++ new_rate += (uint32_t) (((double) o->total_latency - (double) target_latency) / (double) u->adjust_time * (double) new_rate); + +- if (r < (uint32_t) (base_rate*0.9) || r > (uint32_t) (base_rate*1.1)) { +- pa_log_warn("[%s] sample rates too different, not adjusting (%u vs. %u).", o->sink_input->sink->name, base_rate, r); +- pa_sink_input_set_rate(o->sink_input, base_rate); ++ if (new_rate < (uint32_t) (base_rate*0.8) || new_rate > (uint32_t) (base_rate*1.25)) { ++ pa_log_warn("[%s] sample rates too different, not adjusting (%u vs. %u).", o->sink_input->sink->name, base_rate, new_rate); ++ new_rate = base_rate; + } else { +- pa_log_info("[%s] new rate is %u Hz; ratio is %0.3f; latency is %0.0f usec.", o->sink_input->sink->name, r, (double) r / base_rate, (float) o->total_latency); +- pa_sink_input_set_rate(o->sink_input, r); ++ if (base_rate < new_rate + 20 && new_rate < base_rate + 20) ++ new_rate = base_rate; ++ /* Do the adjustment in small steps; 2‰ can be considered inaudible */ ++ if (new_rate < (uint32_t) (current_rate*0.998) || new_rate > (uint32_t) (current_rate*1.002)) { ++ pa_log_info("[%s] new rate of %u Hz not within 2‰ of %u Hz, forcing smaller adjustment", o->sink_input->sink->name, new_rate, current_rate); ++ new_rate = PA_CLAMP(new_rate, (uint32_t) (current_rate*0.998), (uint32_t) (current_rate*1.002)); ++ } ++ pa_log_info("[%s] new rate is %u Hz; ratio is %0.3f; latency is %0.2f msec.", o->sink_input->sink->name, new_rate, (double) new_rate / base_rate, (double) o->total_latency / PA_USEC_PER_MSEC); + } ++ pa_sink_input_set_rate(o->sink_input, new_rate); + } + + pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_UPDATE_LATENCY, NULL, (int64_t) avg_total_latency, NULL); +diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c +index ca06314..e0277c1 100644 +--- a/src/modules/module-loopback.c ++++ b/src/modules/module-loopback.c +@@ -167,13 +167,13 @@ static void adjust_rates(struct userdata *u) { + + buffer_latency = pa_bytes_to_usec(buffer, &u->sink_input->sample_spec); + +- pa_log_info("Loopback overall latency is %0.2f ms + %0.2f ms + %0.2f ms = %0.2f ms", ++ pa_log_debug("Loopback overall latency is %0.2f ms + %0.2f ms + %0.2f ms = %0.2f ms", + (double) u->latency_snapshot.sink_latency / PA_USEC_PER_MSEC, + (double) buffer_latency / PA_USEC_PER_MSEC, + (double) u->latency_snapshot.source_latency / PA_USEC_PER_MSEC, + ((double) u->latency_snapshot.sink_latency + buffer_latency + u->latency_snapshot.source_latency) / PA_USEC_PER_MSEC); + +- pa_log_info("Should buffer %zu bytes, buffered at minimum %zu bytes", ++ pa_log_debug("Should buffer %zu bytes, buffered at minimum %zu bytes", + u->latency_snapshot.max_request*2, + u->latency_snapshot.min_memblockq_length); + +@@ -186,9 +186,21 @@ static void adjust_rates(struct userdata *u) { + else + new_rate = base_rate + (((u->latency_snapshot.min_memblockq_length - u->latency_snapshot.max_request*2) / fs) *PA_USEC_PER_SEC)/u->adjust_time; + +- pa_log_info("Old rate %lu Hz, new rate %lu Hz", (unsigned long) old_rate, (unsigned long) new_rate); ++ if (new_rate < (uint32_t) (base_rate*0.8) || new_rate > (uint32_t) (base_rate*1.25)) { ++ pa_log_warn("Sample rates too different, not adjusting (%u vs. %u).", base_rate, new_rate); ++ new_rate = base_rate; ++ } else { ++ if (base_rate < new_rate + 20 && new_rate < base_rate + 20) ++ new_rate = base_rate; ++ /* Do the adjustment in small steps; 2‰ can be considered inaudible */ ++ if (new_rate < (uint32_t) (old_rate*0.998) || new_rate > (uint32_t) (old_rate*1.002)) { ++ pa_log_info("New rate of %u Hz not within 2‰ of %u Hz, forcing smaller adjustment", new_rate, old_rate); ++ new_rate = PA_CLAMP(new_rate, (uint32_t) (old_rate*0.998), (uint32_t) (old_rate*1.002)); ++ } ++ } + + pa_sink_input_set_rate(u->sink_input, new_rate); ++ pa_log_debug("[%s] Updated sampling rate to %lu Hz.", u->sink_input->sink->name, (unsigned long) new_rate); + + pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time); + } +diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c +index 1a05f57..491be4d 100644 +--- a/src/modules/rtp/module-rtp-recv.c ++++ b/src/modules/rtp/module-rtp-recv.c +@@ -288,6 +288,9 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + if (s->last_rate_update + RATE_UPDATE_INTERVAL < pa_timeval_load(&now)) { + pa_usec_t wi, ri, render_delay, sink_delay = 0, latency, fix; + unsigned fix_samples; ++ uint32_t base_rate = s->sink_input->sink->sample_spec.rate; ++ uint32_t current_rate = s->sink_input->sample_spec.rate; ++ uint32_t new_rate; + + pa_log_debug("Updating sample rate"); + +@@ -309,7 +312,7 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + else + latency = wi - ri; + +- pa_log_debug("Write index deviates by %0.2f ms, expected %0.2f ms", (double) latency/PA_USEC_PER_MSEC, (double) s->intended_latency/PA_USEC_PER_MSEC); ++ pa_log_debug("Write index deviates by %0.2f ms, expected %0.2f ms", (double) latency/PA_USEC_PER_MSEC, (double) s->intended_latency/PA_USEC_PER_MSEC); + + /* Calculate deviation */ + if (latency < s->intended_latency) +@@ -320,19 +323,24 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + /* How many samples is this per second? */ + fix_samples = (unsigned) (fix * (pa_usec_t) s->sink_input->thread_info.sample_spec.rate / (pa_usec_t) RATE_UPDATE_INTERVAL); + +- /* Check if deviation is in bounds */ +- if (fix_samples > s->sink_input->sample_spec.rate*.50) +- pa_log_debug("Hmmm, rate fix is too large (%lu Hz), not applying.", (unsigned long) fix_samples); +- else { +- /* Fix up rate */ +- if (latency < s->intended_latency) +- s->sink_input->sample_spec.rate -= fix_samples; +- else +- s->sink_input->sample_spec.rate += fix_samples; +- +- if (s->sink_input->sample_spec.rate > PA_RATE_MAX) +- s->sink_input->sample_spec.rate = PA_RATE_MAX; ++ if (latency < s->intended_latency) ++ new_rate = current_rate - fix_samples; ++ else ++ new_rate = current_rate + fix_samples; ++ ++ if (new_rate < (uint32_t) (base_rate*0.8) || new_rate > (uint32_t) (base_rate*1.25)) { ++ pa_log_warn("Sample rates too different, not adjusting (%u vs. %u).", base_rate, new_rate); ++ new_rate = base_rate; ++ } else { ++ if (base_rate < new_rate + 20 && new_rate < base_rate + 20) ++ new_rate = base_rate; ++ /* Do the adjustment in small steps; 2‰ can be considered inaudible */ ++ if (new_rate < (uint32_t) (current_rate*0.998) || new_rate > (uint32_t) (current_rate*1.002)) { ++ pa_log_info("New rate of %u Hz not within 2‰ of %u Hz, forcing smaller adjustment", new_rate, current_rate); ++ new_rate = PA_CLAMP(new_rate, (uint32_t) (current_rate*0.998), (uint32_t) (current_rate*1.002)); ++ } + } ++ s->sink_input->sample_spec.rate = new_rate; + + pa_assert(pa_sample_spec_valid(&s->sink_input->sample_spec)); + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0096-lp451635-handle-dove-x0-line-hp-swap.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0001-alsa-mixer-Add-separate-profile-for-Nvidia.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0001-alsa-mixer-Add-separate-profile-for-Nvidia.patch @@ -0,0 +1,221 @@ +From 8438e14d1101f195e4c1a5dff41fdbacbc9366df Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Tue, 8 Mar 2011 10:51:33 +0100 +Subject: [PATCH] alsa-mixer: Add separate profile for Nvidia + +This is a profile for all Nvidia cards - some Nvidia cards have four HDMI codecs, +and which ones are working seems to vary a lot between GPU boards. In addition, +Nvidia makes southbridges as well, so we need to keep the existing analog profiles. +(And by not adding all these extra profiles to default.conf, we make sure +there is no performance hit for non-Nvidia cards.) + +Once we have proper jack detection, there would probably be room for improvement here. + +Signed-off-by: David Henningsson +--- + src/Makefile.am | 1 + + .../alsa/mixer/profile-sets/90-pulseaudio.rules | 1 + + src/modules/alsa/mixer/profile-sets/nvidia.conf | 160 ++++++++++++++++++++ + 3 files changed, 162 insertions(+), 0 deletions(-) + create mode 100644 src/modules/alsa/mixer/profile-sets/nvidia.conf + +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/src/Makefile.am 2011-03-14 13:02:17.205663627 +0100 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.am 2011-03-14 13:02:17.535663651 +0100 +@@ -109,6 +109,7 @@ + + ALSA_PROFILES = \ + modules/alsa/mixer/profile-sets/default.conf \ ++ modules/alsa/mixer/profile-sets/nvidia.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 \ +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules +=================================================================== +--- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules 2011-03-14 13:00:42.375663641 +0100 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules 2011-03-14 13:02:17.535663651 +0100 +@@ -25,5 +25,6 @@ + SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="baff", ENV{PULSE_PROFILE_SET}="native-instruments-traktorkontrol-s4.conf" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="4711", ENV{PULSE_PROFILE_SET}="native-instruments-korecontroller.conf" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf" ++ATTRS{vendor}=="0x10de", ENV{PULSE_PROFILE_SET}="nvidia.conf" + + LABEL="pulseaudio_end" +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/nvidia.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/modules/alsa/mixer/profile-sets/nvidia.conf 2011-03-14 13:02:17.535663651 +0100 +@@ -0,0 +1,160 @@ ++# 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. ++ ++; This is a profile for all Nvidia cards - some Nvidia cards have four HDMI codecs, ++; and which ones are working seems to vary a lot between GPU boards. In addition, ++; Nvidia makes southbridges as well, so we need to keep the existing analog profiles. ++; (And by not adding all these extra profiles to default.conf, we make sure ++; there is no performance hit for non-Nvidia cards.) ++ ++; Once we have proper jack detection, there would probably be room for improvement here. ++ ++[General] ++auto-profiles = yes ++ ++[Mapping analog-mono] ++device-strings = hw:%f ++channel-map = 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-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic 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-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono ++paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic 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-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-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-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-desktop-speaker analog-output-lfe-on-mono ++priority = 8 ++direction = output ++ ++[Mapping analog-surround-71] ++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-desktop-speaker analog-output-lfe-on-mono ++priority = 7 ++direction = output ++ ++[Mapping iec958-stereo] ++device-strings = iec958:%f ++channel-map = left,right ++priority = 5 ++ ++[Mapping iec958-surround-40] ++device-strings = iec958:%f ++channel-map = front-left,front-right,rear-left,rear-right ++priority = 1 ++ ++[Mapping iec958-ac3-surround-40] ++device-strings = a52:%f ++channel-map = front-left,front-right,rear-left,rear-right ++priority = 2 ++direction = output ++ ++[Mapping iec958-ac3-surround-51] ++device-strings = a52:%f ++channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe ++priority = 3 ++direction = output ++ ++[Mapping hdmi-stereo] ++device-strings = hdmi:%f ++channel-map = left,right ++priority = 4 ++direction = output ++ ++[Mapping hdmi-surround] ++description = Digital Surround 5.1 (HDMI) ++device-strings = hdmi:%f ++channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe ++priority = 3 ++direction = output ++ ++[Mapping hdmi-stereo-extra1] ++description = Digital Stereo (HDMI) nr 2 ++device-strings = hdmi:%f,1 ++channel-map = left,right ++priority = 2 ++direction = output ++ ++[Mapping hdmi-surround-extra1] ++description = Digital Surround 5.1 (HDMI) nr 2 ++device-strings = hdmi:%f,1 ++channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe ++priority = 1 ++direction = output ++ ++[Mapping hdmi-stereo-extra2] ++description = Digital Stereo (HDMI) nr 3 ++device-strings = hdmi:%f,2 ++channel-map = left,right ++priority = 2 ++direction = output ++ ++[Mapping hdmi-surround-extra2] ++description = Digital Surround 5.1 (HDMI) nr 3 ++device-strings = hdmi:%f,2 ++channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe ++priority = 1 ++direction = output ++ ++[Mapping hdmi-stereo-extra3] ++description = Digital Stereo (HDMI) nr 4 ++device-strings = hdmi:%f,3 ++channel-map = left,right ++priority = 2 ++direction = output ++ ++[Mapping hdmi-surround-extra3] ++description = Digital Surround 5.1 (HDMI) nr 4 ++device-strings = hdmi:%f,3 ++channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe ++priority = 1 ++direction = output ++ ++ ++; An example for defining multiple-sink profiles ++#[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo] ++#description = Foobar ++#output-mappings = analog-stereo iec958-stereo ++#input-mappings = analog-stereo +Index: pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.in +=================================================================== +--- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/src/Makefile.in 2011-03-14 13:06:15.535663640 +0100 ++++ pulseaudio-0.9.22+stable-queue-24-g67d18/src/Makefile.in 2011-03-14 13:07:01.315663627 +0100 +@@ -2645,6 +2645,7 @@ + ################################### + ALSA_PROFILES = \ + modules/alsa/mixer/profile-sets/default.conf \ ++ modules/alsa/mixer/profile-sets/nvidia.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 \ --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0214-module-rtp-recv-Average-the-estimated-real-sample-ra.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0214-module-rtp-recv-Average-the-estimated-real-sample-ra.patch @@ -0,0 +1,72 @@ +From 2bfc0322c975f573e6aea136db1cf99c6dcb11fd Mon Sep 17 00:00:00 2001 +From: Maarten Bosmans +Date: Sun, 16 Jan 2011 01:27:29 +0100 +Subject: [PATCH 4/7] module-rtp-recv: Average the estimated real sample rate + +--- + src/modules/rtp/module-rtp-recv.c | 26 ++++++++++++++++++++++---- + 1 files changed, 22 insertions(+), 4 deletions(-) + +diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c +index 20d7044..baf5b50 100644 +--- a/src/modules/rtp/module-rtp-recv.c ++++ b/src/modules/rtp/module-rtp-recv.c +@@ -110,6 +110,8 @@ struct session { + + pa_usec_t last_rate_update; + pa_usec_t last_latency; ++ double estimated_rate; ++ double avg_estimated_rate; + }; + + struct userdata { +@@ -291,7 +293,7 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + uint32_t base_rate = s->sink_input->sink->sample_spec.rate; + uint32_t current_rate = s->sink_input->sample_spec.rate; + uint32_t new_rate; +- double estimated_rate; ++ double estimated_rate, alpha = 0.02; + + pa_log_debug("Updating sample rate"); + +@@ -334,11 +336,25 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) { + * T - ²∕ₐ₊₁(L̂ - Lⁿ) + * Rⁿ⁺ⁱ = ───────────────── R̂ . (2) + * T +- * Together Equations (1) and (2) specify the algorithm used below, where a = 7 is used. ++ * In the code below a = 7 is used. ++ * ++ * Equation (1) is not directly used in (2), but instead an exponentially weighted average ++ * of the estimated rate R̂ is used. This average R̅ is defined as ++ * R̅ⁿ = α R̂ⁿ + (1-α) R̅ⁿ⁻ⁱ . ++ * Because it is difficult to find a fixed value for the coefficient α such that the ++ * averaging is without significant lag but oscillations are filtered out, a heuristic is ++ * used. When the successive estimates R̂ⁿ do not change much then α→1, but when there is a ++ * sudden spike in the estimated rate α→0, such that the deviation is given little weight. + */ + estimated_rate = (double) current_rate * (double) RATE_UPDATE_INTERVAL / (double) (RATE_UPDATE_INTERVAL + s->last_latency - latency); +- pa_log_debug("Estimated target rate: %.0f Hz", estimated_rate); +- new_rate = (uint32_t) ((double) (RATE_UPDATE_INTERVAL + latency/4 - s->intended_latency/4) / (double) RATE_UPDATE_INTERVAL * estimated_rate); ++ if (fabs(s->estimated_rate - s->avg_estimated_rate) > 1) { ++ double ratio = (estimated_rate + s->estimated_rate - 2*s->avg_estimated_rate) / (s->estimated_rate - s->avg_estimated_rate); ++ alpha = PA_CLAMP(2 * (ratio + fabs(ratio)) / (4 + ratio*ratio), 0.02, 0.8); ++ } ++ s->avg_estimated_rate = alpha * estimated_rate + (1-alpha) * s->avg_estimated_rate; ++ s->estimated_rate = estimated_rate; ++ pa_log_debug("Estimated target rate: %.0f Hz, using average of %.0f Hz (α=%.3f)", estimated_rate, s->avg_estimated_rate, alpha); ++ new_rate = (uint32_t) ((double) (RATE_UPDATE_INTERVAL + latency/4 - s->intended_latency/4) / (double) RATE_UPDATE_INTERVAL * s->avg_estimated_rate); + s->last_latency = latency; + + if (new_rate < (uint32_t) (base_rate*0.8) || new_rate > (uint32_t) (base_rate*1.25)) { +@@ -502,6 +518,8 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in + TRUE); + s->last_rate_update = pa_timeval_load(&now); + s->last_latency = LATENCY_USEC; ++ s->estimated_rate = (double) sink->sample_spec.rate; ++ s->avg_estimated_rate = (double) sink->sample_spec.rate; + pa_atomic_store(&s->timestamp, (int) now.tv_sec); + + if ((fd = mcast_socket((const struct sockaddr*) &sdp_info->sa, sdp_info->salen)) < 0) +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0209-alsa-mixer-Fix-makefile-in.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0209-alsa-mixer-Fix-makefile-in.patch @@ -0,0 +1,15 @@ +Index: pulseaudio-0.9.22+stable-queue-18-geb966/src/Makefile.in +=================================================================== +--- pulseaudio-0.9.22+stable-queue-18-geb966.orig/src/Makefile.in 2011-02-02 13:16:23.076223003 +0100 ++++ pulseaudio-0.9.22+stable-queue-18-geb966/src/Makefile.in 2011-02-02 13:17:47.240223015 +0100 +@@ -2656,7 +2656,10 @@ + 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-dock-mic.conf \ ++ modules/alsa/mixer/paths/analog-input-front-mic.conf \ + modules/alsa/mixer/paths/analog-input-internal-mic.conf \ ++ modules/alsa/mixer/paths/analog-input-rear-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 \ --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0057-load-module-x11-bell.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0203-alsa-mixer-always-round-towards-0-dB.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0203-alsa-mixer-always-round-towards-0-dB.patch @@ -0,0 +1,65 @@ +From 57030817e1a7c0b2dd7329a2b0a98d6c81d3d2da Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Wed, 5 Jan 2011 12:36:59 +0100 +Subject: [PATCH 3/6] alsa-mixer: always round towards 0 dB + +Always round towards 0 dB. Also add a few debug comments to aid +troubleshooting. + +Signed-off-by: David Henningsson +--- + src/modules/alsa/alsa-mixer.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +index 2c47319..b3fcbec 100644 +--- a/src/modules/alsa/alsa-mixer.c ++++ b/src/modules/alsa/alsa-mixer.c +@@ -714,19 +714,20 @@ static int element_set_volume(pa_alsa_element *e, snd_mixer_t *m, const pa_chann + + if (e->has_dB) { + long value = to_alsa_dB(f); ++ int rounding = value > 0 ? -1 : +1; + + if (e->direction == PA_ALSA_DIRECTION_OUTPUT) { + /* If we call set_play_volume() without checking first + * if the channel is available, ALSA behaves ver + * strangely and doesn't fail the call */ + if (snd_mixer_selem_has_playback_channel(me, c)) { +- if ((r = snd_mixer_selem_set_playback_dB(me, c, value, +1)) >= 0) ++ if ((r = snd_mixer_selem_set_playback_dB(me, c, value, rounding)) >= 0) + r = snd_mixer_selem_get_playback_dB(me, c, &value); + } else + r = -1; + } else { + if (snd_mixer_selem_has_capture_channel(me, c)) { +- if ((r = snd_mixer_selem_set_capture_dB(me, c, value, +1)) >= 0) ++ if ((r = snd_mixer_selem_set_capture_dB(me, c, value, rounding)) >= 0) + r = snd_mixer_selem_get_capture_dB(me, c, &value); + } else + r = -1; +@@ -2108,6 +2109,7 @@ int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, pa_bool_t ignore_dB) { + pa_log_debug("Probe of element '%s' failed.", e->alsa_name); + return -1; + } ++ pa_log_debug("Probe of element '%s' succeeded (volume=%d, switch=%d, enumeration=%d).", e->alsa_name, e->volume_use, e->switch_use, e->enumeration_use); + + if (ignore_dB) + e->has_dB = FALSE; +@@ -2144,10 +2146,11 @@ int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, pa_bool_t ignore_dB) { + pa_log_info("Zeroing volume of '%s' on path '%s'", e->alsa_name, p->name); + } + } +- } else if (p->has_volume) ++ } else if (p->has_volume) { + /* We can't use this volume, so let's ignore it */ + e->volume_use = PA_ALSA_VOLUME_IGNORE; +- ++ pa_log_info("Ignoring volume of '%s' on path '%s' (missing dB info)", e->alsa_name, p->name); ++ } + p->has_volume = TRUE; + } + +-- +1.7.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0224-build-sys-Link-lirc-libraries-in-right-order.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0224-build-sys-Link-lirc-libraries-in-right-order.patch @@ -0,0 +1,30 @@ +From 4be49ae94b19367dc2f40f5807a825b8f6244983 Mon Sep 17 00:00:00 2001 +From: Jyri Sarha +Date: Fri, 26 Nov 2010 18:38:27 +0200 +Subject: [PATCH 31/33] build-sys: Link lirc libraries in right order + +Wrong order of libraries causes libtool to link primarily from lirc +library location and not from $(libdir) location in install +phase. This is a problem if you have an older version pulseaudio libs +installed under same directory as liblirc and you are building a +newer version with some other directory prefix. +--- + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 1058f18..cc38db2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1505,7 +1505,7 @@ module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) + + module_lirc_la_SOURCES = modules/module-lirc.c + module_lirc_la_LDFLAGS = $(MODULE_LDFLAGS) +-module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la ++module_lirc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIRC_LIBS) + module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS) + + # Linux evdev +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0003-add-padsp-wrapper-check.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0206-alsa-mixer-Make-sure-capture-source-and-input-source.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0206-alsa-mixer-Make-sure-capture-source-and-input-source.patch @@ -0,0 +1,229 @@ +From 72c52d0fdbef462e1c404a80543039afdc122338 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Wed, 19 Jan 2011 15:40:56 +0100 +Subject: [PATCH 6/6] alsa-mixer: Make sure capture source and input source use right path + +Make sure that mic and line (with common names) use the specific +path instead of the analog-input one. + +Signed-off-by: David Henningsson +--- + .../alsa/mixer/paths/analog-input-dock-mic.conf | 2 + + .../alsa/mixer/paths/analog-input-front-mic.conf | 2 + + .../mixer/paths/analog-input-internal-mic.conf | 4 ++ + src/modules/alsa/mixer/paths/analog-input-mic.conf | 2 + + .../alsa/mixer/paths/analog-input-rear-mic.conf | 2 + + .../alsa/mixer/paths/analog-input.conf.common | 45 -------------------- + 6 files changed, 12 insertions(+), 45 deletions(-) + +diff --git a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf +index df8567e..74826a9 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf +@@ -53,12 +53,14 @@ enumeration = select + + [Option Input Source:Dock Mic] + name = analog-input-microphone-dock ++required-any = any + + [Element Capture Source] + enumeration = select + + [Option Capture Source:Dock Mic] + name = analog-input-microphone-dock ++required-any = any + + [Element Mic] + switch = off +diff --git a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf +index 516b487..6c58ece 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf +@@ -53,12 +53,14 @@ enumeration = select + + [Option Input Source:Front Mic] + name = analog-input-microphone-front ++required-any = any + + [Element Capture Source] + enumeration = select + + [Option Capture Source:Front Mic] + name = analog-input-microphone-front ++required-any = any + + [Element Mic] + switch = off +diff --git a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf +index 3e45bcf..70a1cd1 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf +@@ -75,18 +75,22 @@ enumeration = select + + [Option Input Source:Internal Mic] + name = analog-input-microphone-internal ++required-any = any + + [Option Input Source:Int Mic] + name = analog-input-microphone-internal ++required-any = any + + [Element Capture Source] + enumeration = select + + [Option Capture Source:Internal Mic] + name = analog-input-microphone-internal ++required-any = any + + [Option Capture Source:Int Mic] + name = analog-input-microphone-internal ++required-any = any + + [Element Mic] + switch = off +diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf +index 8565ebe..d88028b 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf +@@ -53,12 +53,14 @@ enumeration = select + + [Option Input Source:Mic] + name = analog-input-microphone ++required-any = any + + [Element Capture Source] + enumeration = select + + [Option Capture Source:Mic] + name = analog-input-microphone ++required-any = any + + ;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)" + +diff --git a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf +index 45f7730..75ed61b 100644 +--- a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf ++++ b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf +@@ -53,12 +53,14 @@ enumeration = select + + [Option Input Source:Rear Mic] + name = analog-input-microphone-rear ++required-any = any + + [Element Capture Source] + enumeration = select + + [Option Capture Source:Rear Mic] + name = analog-input-microphone-rear ++required-any = any + + [Element Mic] + switch = off +diff --git a/src/modules/alsa/mixer/paths/analog-input.conf.common b/src/modules/alsa/mixer/paths/analog-input.conf.common +index 0b2cfd9..9416577 100644 +--- a/src/modules/alsa/mixer/paths/analog-input.conf.common ++++ b/src/modules/alsa/mixer/paths/analog-input.conf.common +@@ -66,42 +66,18 @@ enumeration = select + name = input-microphone + priority = 20 + +-[Option Input Source:Mic] +-name = input-microphone +-priority = 20 +- + [Option Input Source:Microphone] + name = input-microphone + priority = 20 + +-[Option Input Source:Front Mic] +-name = input-microphone +-priority = 19 +- + [Option Input Source:Front Microphone] + name = input-microphone + priority = 19 + +-[Option Input Source:Int Mic] +-name = input-microphone +-priority = 19 +- +-[Option Input Source:Internal Mic] +-name = input-microphone +-priority = 19 +- +-[Option Input Source:Rear Mic] +-name = input-microphone +-priority = 19 +- + [Option Input Source:Internal Mic 1] + name = input-microphone + priority = 19 + +-[Option Input Source:Line] +-name = input-linein +-priority = 18 +- + [Option Input Source:Line-In] + name = input-linein + priority = 18 +@@ -135,21 +111,12 @@ name = input + [Option Capture Source:Line/Mic] + name = input + +-[Option Capture Source:Mic] +-name = input-microphone +- + [Option Capture Source:Microphone] + name = input-microphone + +-[Option Capture Source:Int Mic] +-name = input-microphone-internal +- + [Option Capture Source:Int DMic] + name = input-microphone-internal + +-[Option Capture Source:Internal Mic] +-name = input-microphone-internal +- + [Option Capture Source:iMic] + name = input-microphone-internal + +@@ -159,15 +126,9 @@ name = input-microphone-internal + [Option Capture Source:Internal Microphone] + name = input-microphone-internal + +-[Option Capture Source:Front Mic] +-name = input-microphone +- + [Option Capture Source:Front Microphone] + name = input-microphone + +-[Option Capture Source:Rear Mic] +-name = input-microphone +- + [Option Capture Source:Mic1] + name = input-microphone + +@@ -198,9 +159,6 @@ name = input-linein + [Option Capture Source:Analog] + name = input + +-[Option Capture Source:Line] +-name = input-linein +- + [Option Capture Source:Line-In] + name = input-linein + +@@ -261,9 +219,6 @@ name = input + [Option Capture Source:Docking-Station] + name = input-docking + +-[Option Capture Source:Dock Mic] +-name = input-docking-microphone +- + ;;; 'Mic Jack Mode' + + [Element Mic Jack Mode] +-- +1.7.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0220-vala-move-GLibMainLoop-class-into-separate-file-to-f.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0220-vala-move-GLibMainLoop-class-into-separate-file-to-f.patch @@ -0,0 +1,101 @@ +From 64985aa9bb46b447973f4051d065afd9035e48ca Mon Sep 17 00:00:00 2001 +From: Alexander Kurtz +Date: Sat, 26 Mar 2011 11:26:46 +0000 +Subject: [PATCH 03/33] vala: move GLibMainLoop class into separate file to fix linker errors + +Vala uses the name of the *.vapi file to determine the libraries to link +against. Since the pa_glib_mainloop_*() functions are in a separate +library (libpulse-mainloop-glib.so) the corresponding objects in the +Vala bindings have to be in a separate *.vapi file. + +If you are compiling an app without the GLib integration you could use: + $ valac --pkg=libpulse test.vala +but if you do use GLib you can use: + $ valac --pkg=libpulse-mainloop-glib test.vala +(libpulse is a dep of the libpulse-mainloop-glib so no need to specify +it explicitly) +--- + Makefile.am | 8 ++++++-- + vala/libpulse-mainloop-glib.deps | 1 + + vala/libpulse-mainloop-glib.vapi | 13 +++++++++++++ + vala/libpulse.vapi | 10 ---------- + 4 files changed, 20 insertions(+), 12 deletions(-) + create mode 100644 vala/libpulse-mainloop-glib.deps + create mode 100644 vala/libpulse-mainloop-glib.vapi + +diff --git a/Makefile.am b/Makefile.am +index 3439c89..c764f18 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -29,7 +29,9 @@ EXTRA_DIST = \ + README \ + todo \ + vala/libpulse.deps \ +- vala/libpulse.vapi ++ vala/libpulse.vapi \ ++ vala/libpulse-mainloop-glib.deps \ ++ vala/libpulse-mainloop-glib.vapi + + SUBDIRS = src doxygen man po + +@@ -37,7 +39,9 @@ MAINTAINERCLEANFILES = + noinst_DATA = + + vapidir = $(datadir)/vala/vapi +-vapi_DATA = vala/libpulse.deps vala/libpulse.vapi ++vapi_DATA = \ ++ vala/libpulse.deps vala/libpulse.vapi \ ++ libpulse-mainloop-glib.deps libpulse-mainloop-glib.vapi + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libpulse.pc libpulse-simple.pc +diff --git a/vala/libpulse-mainloop-glib.deps b/vala/libpulse-mainloop-glib.deps +new file mode 100644 +index 0000000..69bebf3 +--- /dev/null ++++ b/vala/libpulse-mainloop-glib.deps +@@ -0,0 +1 @@ ++libpulse +diff --git a/vala/libpulse-mainloop-glib.vapi b/vala/libpulse-mainloop-glib.vapi +new file mode 100644 +index 0000000..a54cb45 +--- /dev/null ++++ b/vala/libpulse-mainloop-glib.vapi +@@ -0,0 +1,13 @@ ++using GLib; ++ ++namespace PulseAudio { ++ [Compact] ++ [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(MainContext? c = null); ++ ++ public unowned MainLoopApi get_api(); ++ } ++} +diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi +index 8304911..4315988 100644 +--- a/vala/libpulse.vapi ++++ b/vala/libpulse.vapi +@@ -879,16 +879,6 @@ namespace PulseAudio { + } + + [Compact] +- [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(MainContext? c = null); +- +- public unowned MainLoopApi get_api(); +- } +- +- [Compact] + [CCode (cname="pa_operation", cprefix="pa_operation_", unref_function="pa_operation_unref", ref_function="pa_operation_ref")] + public class Operation { + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0005-load-sample-dir-lazy.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0092-delay-gnome-autostart.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0217-volume-Add-a-PA_VOLUME_UI_MAX-define-for-the-recomme.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0217-volume-Add-a-PA_VOLUME_UI_MAX-define-for-the-recomme.patch @@ -0,0 +1,50 @@ +From b872254762285597d94dd9174b8c1426dd263062 Mon Sep 17 00:00:00 2001 +From: Colin Guthrie +Date: Thu, 3 Mar 2011 12:04:31 +0000 +Subject: [PATCH 7/7] volume: Add a PA_VOLUME_UI_MAX define for the recommended max volume to show in UIs + +This value is not a technical upper limit, it's just a 'sensible' +value that is not crazy high, but also allows software amplification +above 0dB (aka 100%) for very quiet audio sources. + +We recommend that a comprehensive volume control UI should allow +users to set volumes up to this limit, although of course should +deal gracefully if the user has set the volume even higher than this +without resulting in a feedback loop that effectively limits the +upper volume. + +The value chosen is +11dB. This was selected somewhat subjectively +and is very similar to the current 150% that gnome-volume-control +uses (which is ~+10.57dB). + +On the plus side, we now recommend that everyone allows +'Volumes up to 11' which is pretty awesome. +http://en.wikipedia.org/wiki/Up_to_eleven + +https://tango.0pointer.de/pipermail/pulseaudio-discuss/2010-April/006945.html +https://tango.0pointer.de/pipermail/pulseaudio-discuss/2010-April/006950.html +--- + src/pulse/volume.h | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/src/pulse/volume.h b/src/pulse/volume.h +index d98443b..2b6637b 100644 +--- a/src/pulse/volume.h ++++ b/src/pulse/volume.h +@@ -115,6 +115,13 @@ typedef uint32_t pa_volume_t; + /** Maximum valid volume we can store. \since 0.9.15 */ + #define PA_VOLUME_MAX ((pa_volume_t) UINT32_MAX-1) + ++/** Recommended maximum volume to show in user facing UIs. ++ * Note: UIs should deal gracefully with volumes greater than this value ++ * and not cause feedback loops etc. - i.e. if the volume is more than ++ * this, the UI should not limit it and push the limited value back to ++ * the server. \since 0.9.23 */ ++#define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) ++ + /** Special 'invalid' volume. \since 0.9.16 */ + #define PA_VOLUME_INVALID ((pa_volume_t) UINT32_MAX) + +-- +1.7.4.1 + --- pulseaudio-0.9.22+stable-queue-24-g67d18.orig/debian/patches/0096-lp453966-handle-digmic-pt2.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/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+stable-queue-24-g67d18.orig/debian/patches/0104-Load-RAOP-Zeroconf-by-default.patch +++ pulseaudio-0.9.22+stable-queue-24-g67d18/debian/patches/0104-Load-RAOP-Zeroconf-by-default.patch @@ -0,0 +1,21 @@ +Index: pulseaudio-0.9.22/src/daemon/default.pa.in +=================================================================== +--- pulseaudio-0.9.22.orig/src/daemon/default.pa.in 2010-12-23 17:12:11.000000000 -0500 ++++ pulseaudio-0.9.22/src/daemon/default.pa.in 2010-12-23 17:30:46.000000000 -0500 +@@ -78,6 +78,16 @@ + #load-module module-esound-protocol-tcp + #load-module module-native-protocol-tcp + #load-module module-zeroconf-publish ++.ifexists module-zeroconf-discover@PA_SOEXT@ ++.nofail ++load-module module-zeroconf-discover ++.fail ++.endif ++.ifexists module-raop-discover@PA_SOEXT@ ++.nofail ++load-module module-raop-discover ++.fail ++.endif + + ### Load the RTP reciever module (also configured via paprefs, see above) + #load-module module-rtp-recv