From 3884cf3fea0a827ff9cdcceb4b7e3fa7abaaf73e5a62e6c4942d67fe09941927 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 24 Feb 2014 16:39:02 +0000 Subject: [PATCH] Accepting request 223580 from home:Zaitor:branches:multimedia:libs - Update to version 4.99.4: + sink-input, source-output: Don't crash if format negotiation fails. + man: - pulse-cli-syntax: Document the "journal" log target. - Improve man page and help for cmdline options. + dbus: Use correct idxset when getting sources. + source: Increase max outputs per source + protocol-native: Fix a crash + thread-win32: Implement pa_thread_free_nojoin() + Updated translations. - Add pulseaudio-revert-protocol-native.patch: Don't enumerate unlinked sinks and sources". OBS-URL: https://build.opensuse.org/request/show/223580 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=137 --- pulseaudio-4.99.3.tar.xz | 3 --- pulseaudio-4.99.4.tar.xz | 3 +++ pulseaudio-revert-protocol-native.patch | 33 +++++++++++++++++++++++++ pulseaudio.changes | 17 +++++++++++++ pulseaudio.spec | 7 ++++-- 5 files changed, 58 insertions(+), 5 deletions(-) delete mode 100644 pulseaudio-4.99.3.tar.xz create mode 100644 pulseaudio-4.99.4.tar.xz create mode 100644 pulseaudio-revert-protocol-native.patch diff --git a/pulseaudio-4.99.3.tar.xz b/pulseaudio-4.99.3.tar.xz deleted file mode 100644 index 6eeadf2..0000000 --- a/pulseaudio-4.99.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2171578a7445212c41f3eec5a9a42a8a3ca33d149cff13f4e5ed3be40de19e4 -size 1454708 diff --git a/pulseaudio-4.99.4.tar.xz b/pulseaudio-4.99.4.tar.xz new file mode 100644 index 0000000..ae73e1c --- /dev/null +++ b/pulseaudio-4.99.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97786c7f2de0355a935362fa64b9c8695e93ae1152bd63844f7a79fbd43a9192 +size 1444360 diff --git a/pulseaudio-revert-protocol-native.patch b/pulseaudio-revert-protocol-native.patch new file mode 100644 index 0000000..89d5376 --- /dev/null +++ b/pulseaudio-revert-protocol-native.patch @@ -0,0 +1,33 @@ +From 3152226502014129d03a50564b1914ce267817f9 Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Mon, 17 Feb 2014 11:02:40 +0000 +Subject: Revert "protocol-native: Don't enumerate unlinked sinks and sources" + +This reverts commit bd0bd9143f8159e5475b1295e30ec026ff0b6fef. +--- +diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c +index 80e72a8..41b4b50 100644 +--- a/src/pulsecore/protocol-native.c ++++ b/src/pulsecore/protocol-native.c +@@ -3588,13 +3588,11 @@ static void command_get_info_list(pa_pdispatch *pd, uint32_t command, uint32_t t + + if (i) { + PA_IDXSET_FOREACH(p, i, idx) { +- if (command == PA_COMMAND_GET_SINK_INFO_LIST) { +- if (PA_SINK_IS_LINKED(((pa_sink *)p)->state)) +- sink_fill_tagstruct(c, reply, p); +- } else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST) { +- if (PA_SOURCE_IS_LINKED(((pa_source *)p)->state)) +- source_fill_tagstruct(c, reply, p); +- } else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST) ++ if (command == PA_COMMAND_GET_SINK_INFO_LIST) ++ sink_fill_tagstruct(c, reply, p); ++ else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST) ++ source_fill_tagstruct(c, reply, p); ++ else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST) + client_fill_tagstruct(c, reply, p); + else if (command == PA_COMMAND_GET_CARD_INFO_LIST) + card_fill_tagstruct(c, reply, p); +-- +cgit v0.9.0.2-2-gbebe + diff --git a/pulseaudio.changes b/pulseaudio.changes index 0c5f829..e4d3797 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Feb 23 19:01:59 UTC 2014 - zaitor@opensuse.org + +- Update to version 4.99.4: + + sink-input, source-output: Don't crash if format negotiation + fails. + + man: + - pulse-cli-syntax: Document the "journal" log target. + - Improve man page and help for cmdline options. + + dbus: Use correct idxset when getting sources. + + source: Increase max outputs per source + + protocol-native: Fix a crash + + thread-win32: Implement pa_thread_free_nojoin() + + Updated translations. +- Add pulseaudio-revert-protocol-native.patch: Don't enumerate + unlinked sinks and sources". + ------------------------------------------------------------------- Thu Jan 30 09:53:30 UTC 2014 - oholecek@suse.cz diff --git a/pulseaudio.spec b/pulseaudio.spec index 03485e0..35e01dd 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -17,7 +17,7 @@ Name: pulseaudio -Version: 4.99.3 +Version: 4.99.4 Release: 0 %define drvver 4.99 %define soname 0 @@ -32,7 +32,7 @@ Summary: A Networked Sound Server License: GPL-2.0+ and LGPL-2.1+ Group: System/Sound Daemons Url: http://pulseaudio.org -Source: http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz +Source: http://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz Source1: default.pa-for-gdm Source2: setup-pulseaudio Source3: sysconfig.sound-pulseaudio @@ -42,6 +42,8 @@ Source99: baselibs.conf Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff Patch2: pulseaudio-wrong-memset.patch +# PATCH-FIX-UPSTREAM pulseaudio-revert-protocol-native.patch zaitor@opensuse.org -- Revert a commit from 4.99.4 release, patch taken from upstream git. +Patch3: pulseaudio-revert-protocol-native.patch BuildRequires: alsa-devel >= 1.0.24 # require only minimal bluez, if we are on bluez 5 we will determine in %build phase BuildRequires: bluez-devel >= 4.99 @@ -291,6 +293,7 @@ This package contains GDM integration hooks for the PulseAudio sound server. %patch0 %patch1 -p1 %patch2 +%patch3 -p1 %build %configure \