From 19b0cf1ce7d578941e13928df5b63f443393c7e2e836a2bac02792ce918a3748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 26 Aug 2011 03:50:33 +0000 Subject: [PATCH] Accepting request 79818 from home:dimstar:branches:multimedia:libs Update to 0.99.2 OBS-URL: https://build.opensuse.org/request/show/79818 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=72 --- disabled-start.diff | 4 ++-- pulseaudio-0.9.23.tar.gz | 3 --- pulseaudio-0.99.2.tar.gz | 3 +++ pulseaudio.changes | 19 +++++++++++++++ pulseaudio.spec | 42 ++++++++++++---------------------- suppress-socket-error-msg.diff | 10 ++++---- 6 files changed, 44 insertions(+), 37 deletions(-) delete mode 100644 pulseaudio-0.9.23.tar.gz create mode 100644 pulseaudio-0.99.2.tar.gz diff --git a/disabled-start.diff b/disabled-start.diff index e6d2b49..4d27a5d 100644 --- a/disabled-start.diff +++ b/disabled-start.diff @@ -12,9 +12,9 @@ Index: src/daemon/start-pulseaudio-x11.in + exit 1 +fi + - [ -z "$PULSE_SERVER" ] - @PA_BINARY@ --start "$@" + + if [ x"$DISPLAY" != x ] ; then Index: src/daemon/start-pulseaudio-kde.in =================================================================== --- src/daemon/start-pulseaudio-kde.in.orig diff --git a/pulseaudio-0.9.23.tar.gz b/pulseaudio-0.9.23.tar.gz deleted file mode 100644 index 1d049e4..0000000 --- a/pulseaudio-0.9.23.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e -size 2095454 diff --git a/pulseaudio-0.99.2.tar.gz b/pulseaudio-0.99.2.tar.gz new file mode 100644 index 0000000..5875b2a --- /dev/null +++ b/pulseaudio-0.99.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1215ec3615b863e57e388a57b38cd9746406a1c9b0d042e8e67a12f1acd4785 +size 2274548 diff --git a/pulseaudio.changes b/pulseaudio.changes index bf0bfdf..040c050 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Aug 25 20:29:23 UTC 2011 - dimstar@opensuse.org + +- Update to version 0.99.2 (2nd pre-release of 1.0): + + D-Bus based control protocol (beta) + + Source Output Volumes + + Passthrough Support + + Windows support restored + + Improved sample rate adaptation in module-rtp-receive + + Volume Change Sync for flat volumes + + Enhanced Port Volume controls + + New, future proof format for metadata files + + New equalizer and acoustic echo cancellation modules + + If Jack is running, Pulseaudio will connect to it automatically + by default (previously this required editing a configuration + file) +- Add pkgconfig(json) BuildRequires. +- Rebase disabled-start.diff and suppress-socket-error-msg.diff. + ------------------------------------------------------------------- Wed Jul 27 13:29:24 CEST 2011 - tiwai@suse.de diff --git a/pulseaudio.spec b/pulseaudio.spec index 6a21e81..c2b49c5 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -17,11 +17,11 @@ # norootforbuild -%define drvver 0.9.23 +%define drvver 0.99 Name: pulseaudio Summary: A Networked Sound Server -Version: 0.9.23 +Version: 0.99.2 Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons @@ -48,8 +48,8 @@ BuildRequires: libopenssl-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: libtool -BuildRequires: libtdb-devel #our libtdb-devel does not have a .pc file +BuildRequires: libtdb-devel BuildRequires: gdbm-devel BuildRequires: lirc-devel BuildRequires: libudev-devel >= 143 @@ -58,6 +58,7 @@ BuildRequires: tcpd-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(json) >= 0.9 PreReq: %fillup_prereq PreReq: pwdutils Recommends: alsa-plugins-pulse @@ -184,25 +185,12 @@ pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). -%package -n libpulse-browse0 -Summary: PulseAudio network browsing API -License: GPLv2+ ; LGPLv2.1+ -Group: System/Sound Daemons -Provides: pulseaudio-libs-zeroconf = %{version}-%{release} -Obsoletes: pulseaudio-libs-zeroconf < %{version} - -%description -n libpulse-browse0 -pulseaudio is a networked sound server for Linux and other Unix like -operating systems and Microsoft Windows. It is intended to be an -improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). - %package -n libpulse-devel Summary: Development package for the pulseaudio library License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/C and C++ Requires: libpulse0 = %{version} Requires: libpulse-mainloop-glib0 = %{version} -Requires: libpulse-browse0 = %{version} Requires: pkgconfig glib2-devel Provides: pulseaudio-devel = %{version}-%{release} Obsoletes: pulseaudio-devel < %{version} @@ -221,7 +209,6 @@ License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons Requires: %{name} = %{version} Requires: libpulse0 = %{version} -Requires: libpulse-browse0 = %{version} Requires: libpulse-mainloop-glib0 = %{version} %description utils @@ -300,10 +287,6 @@ groupadd -r pulse-access &>/dev/null || : %postun -n libpulse-mainloop-glib0 -p /sbin/ldconfig -%post -n libpulse-browse0 -p /sbin/ldconfig - -%postun -n libpulse-browse0 -p /sbin/ldconfig - %post /sbin/ldconfig %{fillup_only -an sound} @@ -347,6 +330,8 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so %{_libdir}/pulse-%{drvver}/modules/module-cli.so %{_libdir}/pulse-%{drvver}/modules/module-combine.so +%{_libdir}/pulse-%{drvver}/modules/module-combine-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-dbus-protocol.so %{_libdir}/pulse-%{drvver}/modules/module-device-manager.so %{_libdir}/pulse-%{drvver}/modules/module-loopback.so %{_libdir}/pulse-%{drvver}/modules/module-console-kit.so @@ -357,6 +342,8 @@ setup-pulseaudio --auto > /dev/null %{_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-filter-apply.so +%{_libdir}/pulse-%{drvver}/modules/module-filter-heuristics.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 @@ -366,6 +353,7 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-native-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-native-protocol-unix.so %{_libdir}/pulse-%{drvver}/modules/module-null-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-null-source.so %{_libdir}/pulse-%{drvver}/modules/module-oss.so %{_libdir}/pulse-%{drvver}/modules/module-pipe-sink.so %{_libdir}/pulse-%{drvver}/modules/module-pipe-source.so @@ -376,6 +364,7 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-unix.so %{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so +%{_libdir}/pulse-%{drvver}/modules/module-switch-on-connect.so %{_libdir}/pulse-%{drvver}/modules/module-card-restore.so %{_libdir}/pulse-%{drvver}/modules/module-sine.so %{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so @@ -392,6 +381,8 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so %{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so %{_libdir}/pulse-%{drvver}/modules/module-echo-cancel.so +%{_libdir}/pulse-%{drvver}/modules/module-virtual-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-virtual-source.so %dir %{_datadir}/pulseaudio %dir %{_datadir}/pulseaudio/alsa-mixer %dir %{_datadir}/pulseaudio/alsa-mixer/paths @@ -424,6 +415,8 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so %{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so %{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so +%{_mandir}/man1/start-pulseaudio-kde.1.gz +%{_mandir}/man1/start-pulseaudio-x11.1.gz %files module-zeroconf %defattr(-,root,root) @@ -469,11 +462,6 @@ setup-pulseaudio --auto > /dev/null %defattr(-,root,root) %{_libdir}/libpulse-mainloop-glib.so.* -%files -n libpulse-browse0 -%defattr(-,root,root) -%{_bindir}/pabrowse -%{_libdir}/libpulse-browse.so.* - %files -n libpulse-devel %defattr(-,root,root) %doc doxygen/html @@ -481,7 +469,6 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/libpulse.so %{_libdir}/libpulse-mainloop-glib.so %{_libdir}/libpulse-simple.so -%{_libdir}/libpulse-browse.so %{_libdir}/pkgconfig/libpulse*.pc %{_datadir}/vala @@ -497,7 +484,6 @@ setup-pulseaudio --auto > /dev/null %{_bindir}/pax11publish %{_bindir}/padsp %{_bindir}/pasuspender -%{_mandir}/man1/pabrowse.1.gz %{_mandir}/man1/pacat.1.gz %{_mandir}/man1/pacmd.1.gz %{_mandir}/man1/pactl.1.gz diff --git a/suppress-socket-error-msg.diff b/suppress-socket-error-msg.diff index bd4c589..3b1f6bb 100644 --- a/suppress-socket-error-msg.diff +++ b/suppress-socket-error-msg.diff @@ -2,12 +2,14 @@ src/pulsecore/socket-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/src/pulsecore/socket-client.c -+++ b/src/pulsecore/socket-client.c -@@ -258,7 +258,7 @@ +Index: pulseaudio-0.99.2/src/pulsecore/socket-client.c +=================================================================== +--- pulseaudio-0.99.2.orig/src/pulsecore/socket-client.c ++++ pulseaudio-0.99.2/src/pulsecore/socket-client.c +@@ -253,7 +253,7 @@ static int sockaddr_prepare(pa_socket_cl c->local = pa_socket_address_is_local(sa); - if ((c->fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) { + if ((c->fd = pa_socket_cloexec(sa->sa_family, SOCK_STREAM, 0)) < 0) { - pa_log("socket(): %s", pa_cstrerror(errno)); + /*pa_log("socket(): %s", pa_cstrerror(errno));*/ return -1;