rpms/pulseaudio/devel pulseaudio-0.9.8-fix-sample-upload.patch, NONE, 1.1 pulseaudio-0.9.8-unbreak-tunnels.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 pulseaudio.spec, 1.23, 1.24 sources, 1.16, 1.17

Thu Nov 29 01:00:57 UTC 2007

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10424

Modified Files:
	.cvsignore pulseaudio.spec sources 
Added Files:
	pulseaudio-0.9.8-fix-sample-upload.patch 
	pulseaudio-0.9.8-unbreak-tunnels.patch 
Log Message:
update to pa 0.9.8


pulseaudio-0.9.8-fix-sample-upload.patch:

--- NEW FILE pulseaudio-0.9.8-fix-sample-upload.patch ---
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;

pulseaudio-0.9.8-unbreak-tunnels.patch:

--- NEW FILE pulseaudio-0.9.8-unbreak-tunnels.patch ---
>From d91b6d26e698ad63761faf722850ad0cec52d4e4 Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj at vdbonline.com>
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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Oct 2007 21:20:15 -0000	1.14
+++ .cvsignore	29 Nov 2007 01:00:24 -0000	1.15
@@ -1 +1 @@
-pulseaudio-0.9.7.svn20071017.tar.gz
+pulseaudio-0.9.8.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pulseaudio.spec	17 Oct 2007 21:20:15 -0000	1.23
+++ pulseaudio.spec	29 Nov 2007 01:00:24 -0000	1.24
@@ -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: 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 @@
 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 @@
 %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 @@
 
 %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 @@
 %{_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 @@
 %{_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 @@
 %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 @@
 %defattr(-,root,root)
 %{_bindir}/pabrowse
 %{_libdir}/libpulse-browse.so.*
+%{_mandir}/man1/pabrowse.1.gz
 
 %files libs-devel
 %defattr(-,root,root)
@@ -342,8 +368,19 @@
 %{_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 <lpoetter at redhat.com> 0.9.8-1
+- Upgrade to current upstream
+
 * Wed Oct 17 2007 Lennart Poettering <lpoetter at redhat.com> 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Oct 2007 21:20:15 -0000	1.16
+++ sources	29 Nov 2007 01:00:24 -0000	1.17
@@ -1 +1 @@
-4c4414c9791bce514f33299172f4cf20  pulseaudio-0.9.7.svn20071017.tar.gz
+184a41d5947e583d395f0a2541525fc2  pulseaudio-0.9.8.tar.gz


