From 87dcf7af7e3d39967c9937a37149041e98efc5222d030cf2a9154444beda15b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 29 Jul 2011 15:28:07 +0000 Subject: [PATCH] Accepting request 77429 from home:tiwai:branches:multimedia:libs - Updated to version 0.9.23: Bugfix only update, see changelog at http://pulseaudio.org/milestone/0.9.23 - Suppress too verbose error message at socket connection failure from a client; this is annoying when alsa-plugins-pulse fallback is used OBS-URL: https://build.opensuse.org/request/show/77429 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=70 --- ...-fix-incorrect-check-of-return-value.patch | 34 ------------------- pulseaudio-0.9.22.tar.bz2 | 3 -- pulseaudio-0.9.23.tar.gz | 3 ++ pulseaudio.changes | 10 ++++++ pulseaudio.spec | 17 +++++----- suppress-socket-error-msg.diff | 15 ++++++++ 6 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 bnc666350-fix-incorrect-check-of-return-value.patch delete mode 100644 pulseaudio-0.9.22.tar.bz2 create mode 100644 pulseaudio-0.9.23.tar.gz create mode 100644 suppress-socket-error-msg.diff diff --git a/bnc666350-fix-incorrect-check-of-return-value.patch b/bnc666350-fix-incorrect-check-of-return-value.patch deleted file mode 100644 index 0ffe147..0000000 --- a/bnc666350-fix-incorrect-check-of-return-value.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7475a180ff99f08db8e79be8841ef2ef322806eb Mon Sep 17 00:00:00 2001 -From: Scott Reeves -Date: Thu, 20 Jan 2011 16:41:21 -0700 -Subject: [PATCH] fix incorrect check of return value - ---- - src/pulsecore/core-util.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c -index a642553..b662a7e 100644 ---- a/src/pulsecore/core-util.c -+++ b/src/pulsecore/core-util.c -@@ -680,7 +680,7 @@ int pa_make_realtime(int rtprio) { - } - - for (p = rtprio-1; p >= 1; p--) -- if (set_scheduler(p)) { -+ if (set_scheduler(p) >= 0) { - pa_log_info("Successfully enabled SCHED_RR scheduling for thread, with priority %i, which is lower than the requested %i.", p, rtprio); - return 0; - } -@@ -750,7 +750,7 @@ int pa_raise_priority(int nice_level) { - } - - for (n = nice_level+1; n < 0; n++) -- if (set_nice(n) > 0) { -+ if (set_nice(n) >= 0) { - pa_log_info("Successfully acquired nice level %i, which is lower than the requested %i.", n, nice_level); - return 0; - } --- -1.6.0.2 - diff --git a/pulseaudio-0.9.22.tar.bz2 b/pulseaudio-0.9.22.tar.bz2 deleted file mode 100644 index 14bd692..0000000 --- a/pulseaudio-0.9.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:869e6e9eb75ad17788e047407a2f65eae6317bb6fb5625581bd7c3596a37bb7c -size 1418116 diff --git a/pulseaudio-0.9.23.tar.gz b/pulseaudio-0.9.23.tar.gz new file mode 100644 index 0000000..1d049e4 --- /dev/null +++ b/pulseaudio-0.9.23.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e +size 2095454 diff --git a/pulseaudio.changes b/pulseaudio.changes index 66de4cc..bf0bfdf 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 27 13:29:24 CEST 2011 - tiwai@suse.de + +- Updated to version 0.9.23: + Bugfix only update, see changelog at + http://pulseaudio.org/milestone/0.9.23 +- Suppress too verbose error message at socket connection failure + from a client; this is annoying when alsa-plugins-pulse fallback + is used + ------------------------------------------------------------------- Fri Jul 22 17:23:07 CEST 2011 - vuntz@opensuse.org diff --git a/pulseaudio.spec b/pulseaudio.spec index 3050455..6a21e81 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -17,22 +17,21 @@ # norootforbuild -%define drvver 0.9.22 +%define drvver 0.9.23 Name: pulseaudio Summary: A Networked Sound Server -Version: 0.9.22 -Release: 10 +Version: 0.9.23 +Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons -Source: %{name}-%{version}.tar.bz2 +Source: http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.gz Source1: default.pa-for-gdm Source2: setup-pulseaudio Source3: sysconfig.sound-pulseaudio Source99: baselibs.conf Patch0: disabled-start.diff -# PATCH-FIX-UPSTREAM bnc666350-fix-incorrect-check-of-return-value.patch sreeves@novell.com -- fix to correctly report realtime status -Patch1: bnc666350-fix-incorrect-check-of-return-value.patch +Patch1: suppress-socket-error-msg.diff Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel @@ -392,6 +391,7 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-intended-roles.so %{_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 %dir %{_datadir}/pulseaudio %dir %{_datadir}/pulseaudio/alsa-mixer %dir %{_datadir}/pulseaudio/alsa-mixer/paths @@ -438,6 +438,7 @@ setup-pulseaudio --auto > /dev/null %defattr(-,root,root) %{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so %{_libdir}/pulse-%{drvver}/modules/module-jack-source.so +%{_libdir}/pulse-%{drvver}/modules/module-jackdbus-detect.so %files module-bluetooth %defattr(-,root,root) @@ -482,9 +483,7 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/libpulse-simple.so %{_libdir}/libpulse-browse.so %{_libdir}/pkgconfig/libpulse*.pc -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/libpulse.vapi +%{_datadir}/vala %files utils %defattr(-,root,root) diff --git a/suppress-socket-error-msg.diff b/suppress-socket-error-msg.diff new file mode 100644 index 0000000..bd4c589 --- /dev/null +++ b/suppress-socket-error-msg.diff @@ -0,0 +1,15 @@ +--- + 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 @@ + c->local = pa_socket_address_is_local(sa); + + if ((c->fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) { +- pa_log("socket(): %s", pa_cstrerror(errno)); ++ /*pa_log("socket(): %s", pa_cstrerror(errno));*/ + return -1; + } +