From 2203202a150a7bd4ea5c4223872564b012c6d1f9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 29 Nov 2007 01:00:24 +0000 Subject: [PATCH] update to pa 0.9.8 --- .cvsignore | 2 +- pulseaudio-0.9.8-fix-sample-upload.patch | 11 ++++ pulseaudio-0.9.8-unbreak-tunnels.patch | 25 ++++++++ pulseaudio.spec | 75 ++++++++++++++++++------ sources | 2 +- 5 files changed, 94 insertions(+), 21 deletions(-) create mode 100644 pulseaudio-0.9.8-fix-sample-upload.patch create mode 100644 pulseaudio-0.9.8-unbreak-tunnels.patch diff --git a/.cvsignore b/.cvsignore index f024f69..f2cd7cd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pulseaudio-0.9.7.svn20071017.tar.gz +pulseaudio-0.9.8.tar.gz diff --git a/pulseaudio-0.9.8-fix-sample-upload.patch b/pulseaudio-0.9.8-fix-sample-upload.patch new file mode 100644 index 0000000..78f1ba5 --- /dev/null +++ b/pulseaudio-0.9.8-fix-sample-upload.patch @@ -0,0 +1,11 @@ +Index: /trunk/src/pulse/stream.c +=================================================================== +--- /trunk/src/pulse/stream.c (revision 2067) ++++ /trunk/src/pulse/stream.c (revision 2074) +@@ -587,5 +587,5 @@ + } + +- if (s->context->version >= 12) { ++ if (s->context->version >= 12 && s->direction != PA_STREAM_UPLOAD) { + pa_sample_spec ss; + pa_channel_map cm; diff --git a/pulseaudio-0.9.8-unbreak-tunnels.patch b/pulseaudio-0.9.8-unbreak-tunnels.patch new file mode 100644 index 0000000..f0b54af --- /dev/null +++ b/pulseaudio-0.9.8-unbreak-tunnels.patch @@ -0,0 +1,25 @@ +From d91b6d26e698ad63761faf722850ad0cec52d4e4 Mon Sep 17 00:00:00 2001 +From: CJ van den Berg +Date: Wed, 28 Nov 2007 22:26:14 +0100 +Subject: [PATCH] Force module-tunnel to use protocol version 11 + +PulseAudio 0.9.8 uses protocol version 12, but module-tunnel does not +support the new opcodes in version 12 yet. This should prevent +module-tunnel reporting "protocol error" and unloading. +--- + src/modules/module-tunnel.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c +index 43a10ce..5ff0416 100644 +--- a/src/modules/module-tunnel.c ++++ b/src/modules/module-tunnel.c +@@ -1145,7 +1145,7 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata + t = pa_tagstruct_new(NULL, 0); + pa_tagstruct_putu32(t, PA_COMMAND_AUTH); + pa_tagstruct_putu32(t, tag = u->ctag++); +- pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION); ++ pa_tagstruct_putu32(t, 11); + pa_tagstruct_put_arbitrary(t, u->auth_cookie, sizeof(u->auth_cookie)); + + #ifdef HAVE_CREDS diff --git a/pulseaudio.spec b/pulseaudio.spec index 188004c..91f1c72 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -2,12 +2,12 @@ Name: pulseaudio Summary: Improved Linux sound server -Version: 0.9.7 -Release: 0.16.svn20071017%{?dist} +Version: 0.9.8 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons #Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz -Source0: pulseaudio-0.9.7.svn20071017.tar.gz +Source0: pulseaudio-0.9.8.tar.gz URL: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel @@ -15,7 +15,7 @@ BuildRequires: liboil-devel, m4, libcap-devel, libtool-ltdl-devel, pkgconfig BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel, GConf2-devel BuildRequires: lirc-devel, doxygen #jack-audio-connection-kit-devel -BuildRequires: hal-devel, libatomic_ops-devel +BuildRequires: hal-devel, libatomic_ops-devel, PolicyKit-devel bluez-libs-devel # Libtool is dragging in rpaths. Fedora's libtool should get rid of the # unneccessary ones. BuildRequires: libtool @@ -24,6 +24,8 @@ BuildRequires: openssl-devel Requires: %{name}-core-libs = %{version}-%{release} Obsoletes: pulseaudio-devel Patch1: pulseaudio-0.9.6-nochown.patch +Patch2: pulseaudio-0.9.8-fix-sample-upload.patch +Patch3: pulseaudio-0.9.8-unbreak-tunnels.patch %description PulseAudio is a sound server for Linux and other Unix like operating @@ -65,13 +67,23 @@ Requires: %{name} = %{version}-%{release} %description module-zeroconf Zeroconf publishing module for the PulseAudio sound server. -#%package module-jack -#Summary: JACK support for the PulseAudio sound server -#Group: System Environment/Daemons -#Requires: %{name} = %{version}-%{release} -# -#%description module-jack -#JACK sink and source modules for the PulseAudio sound server. +%package module-bluetooth +Summary: Bluetooth proximity support for the PulseAudio sound server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description module-bluetooth +Contains a module that can be used to automatically turn down the volume if +a bluetooth mobile phone leaves the proximity or turn it up again if it enters the +proximity again + +%package module-jack +Summary: JACK support for the PulseAudio sound server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description module-jack +JACK sink and source modules for the PulseAudio sound server. %package module-gconf Summary: GConf support for the PulseAudio sound server @@ -149,7 +161,8 @@ This package contains command line utilities for the PulseAudio sound server. %prep %setup -q -T -b0 -%patch1 -p1 +%patch2 -p2 +%patch3 -p1 %build %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -240,7 +253,7 @@ fi %{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnpid.so %{_libdir}/pulse-%{drvver}/modules/module-esound-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-esound-protocol-unix.so -#%{_libdir}/pulse-%{drvver}/modules/module-esound-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-esound-sink.so %{_libdir}/pulse-%{drvver}/modules/module-hal-detect.so %{_libdir}/pulse-%{drvver}/modules/module-http-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-http-protocol-unix.so @@ -259,18 +272,24 @@ fi %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-unix.so %{_libdir}/pulse-%{drvver}/modules/module-sine.so -#%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so -#%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so +%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so %{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so %{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so %{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so +%{_datadir}/PolicyKit/policy/PulseAudio.policy +%{_mandir}/man1/pulseaudio.1.gz +%{_mandir}/man5/default.pa.5.gz +%{_mandir}/man5/pulse-client.conf.5.gz +%{_mandir}/man5/pulse-daemon.conf.5.gz %files esound-compat %defattr(-,root,root) %{_bindir}/esdcompat %{_bindir}/esd +%{_mandir}/man1/esdcompat.1.gz %files module-lirc %defattr(-,root,root) @@ -289,11 +308,17 @@ fi %defattr(-,root,root) %{_libdir}/pulse-%{drvver}/modules/libavahi-wrap.so %{_libdir}/pulse-%{drvver}/modules/module-zeroconf-publish.so +%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-discover.so -#%files module-jack -#%defattr(-,root,root) -#%{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so -#%{_libdir}/pulse-%{drvver}/modules/module-jack-source.so +%files module-jack +%defattr(-,root,root) +%{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-jack-source.so + +%files module-bluetooth +%defattr(-,root,root) +%{_libdir}/pulse-%{drvver}/modules/module-bt-proximity.so +%{_libexecdir}/pulse/bt-proximity-helper %files module-gconf %defattr(-,root,root) @@ -320,6 +345,7 @@ fi %defattr(-,root,root) %{_bindir}/pabrowse %{_libdir}/libpulse-browse.so.* +%{_mandir}/man1/pabrowse.1.gz %files libs-devel %defattr(-,root,root) @@ -342,8 +368,19 @@ fi %{_bindir}/padsp %{_bindir}/pasuspender %{_libdir}/libpulsedsp.so +%{_mandir}/man1/pabrowse.1.gz +%{_mandir}/man1/pacat.1.gz +%{_mandir}/man1/pacmd.1.gz +%{_mandir}/man1/pactl.1.gz +%{_mandir}/man1/paplay.1.gz +%{_mandir}/man1/pasuspender.1.gz +%{_mandir}/man1/padsp.1.gz +%{_mandir}/man1/pax11publish.1.gz %changelog +* Wed Nov 28 2007 Lennart Poettering 0.9.8-1 +- Upgrade to current upstream + * Wed Oct 17 2007 Lennart Poettering 0.9.7-0.16.svn20071017 - Another SVN snapshot, fixing another round of bugs (#330541) - Split libpulscore into a seperate package to work around multilib limitation (#335011) diff --git a/sources b/sources index e8f2ea0..3d0ac27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c4414c9791bce514f33299172f4cf20 pulseaudio-0.9.7.svn20071017.tar.gz +184a41d5947e583d395f0a2541525fc2 pulseaudio-0.9.8.tar.gz