Hello community,
here is the log from the commit of package phonon for openSUSE:Factory
checked in at Sat May 15 00:29:48 CEST 2010.
--------
--- KDE/phonon/phonon.changes 2010-05-05 21:37:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/phonon/phonon.changes 2010-05-11 21:56:57.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 11 21:53:43 CEST 2010 - dmueller@suse.de
+
+- add diff to current master to fix pulseaudio regression (bnc#604046)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
phonon-master.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon-backend-xine.spec ++++++
--- /var/tmp/diff_new_pack.zGGlyi/_old 2010-05-15 00:29:42.000000000 +0200
+++ /var/tmp/diff_new_pack.zGGlyi/_new 2010-05-15 00:29:42.000000000 +0200
@@ -27,13 +27,14 @@
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: fdupes
Version: 4.4.1
-Release: 1
+Release: 2
License: LGPLv2.0+
Url: http://phonon.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/KDE
Summary: Phonon Multimedia Platform Abstraction
Source0: phonon-%{version}.tar.bz2
+Patch0: phonon-master.diff
%if %suse_version > 1030
%requires_ge libqt4
%endif
@@ -78,6 +79,7 @@
%prep
%setup -q -n phonon-%version
+%patch0 -p1
%build
# compile everything for now, actually we should compile
++++++ phonon.spec ++++++
--- /var/tmp/diff_new_pack.zGGlyi/_old 2010-05-15 00:29:42.000000000 +0200
+++ /var/tmp/diff_new_pack.zGGlyi/_new 2010-05-15 00:29:42.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: automoc4 cmake kde4-filesystem libpulse-devel libqt4-devel
BuildRequires: fdupes
Version: 4.4.1
-Release: 1
+Release: 2
License: LGPLv2.0+
Url: http://phonon.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,6 +29,7 @@
Summary: Phonon Multimedia Platform Abstraction
Source0: %name-%{version}.tar.bz2
Source1: baselibs.conf
+Patch0: phonon-master.diff
%if %suse_version > 1030
%requires_ge libqt4
%endif
@@ -83,6 +84,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kde4 -d build
++++++ phonon-master.diff ++++++
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0a22e7..cbc7e55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ set(CMAKE_COLOR_MAKEFILE ON)
set(PHONON_LIB_MAJOR_VERSION "4")
set(PHONON_LIB_MINOR_VERSION "4")
-set(PHONON_LIB_PATCH_VERSION "1")
+set(PHONON_LIB_PATCH_VERSION "2")
set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.4.0")
set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION})
diff --git a/ds9/ds9.desktop b/ds9/ds9.desktop
index 1bc3451..d96049d 100644
--- a/ds9/ds9.desktop
+++ b/ds9/ds9.desktop
@@ -47,8 +47,8 @@ Name[ru]=DirectShow9
Name[se]=DirectShow9
Name[sk]=DirectShow 9
Name[sl]=DirectShow 9
-Name[sr]=Директшоу‑9
-Name[sr@ijekavian]=Директшоу‑9
+Name[sr]=Дајректшоу‑9
+Name[sr@ijekavian]=Дајректшоу‑9
Name[sr@ijekavianlatin]=DirectShow‑9
Name[sr@latin]=DirectShow‑9
Name[sv]=Directshow 9
@@ -96,8 +96,8 @@ Comment[ru]=Механизм DirectShow9 для Phonon
Comment[se]=Phonon DirectShow9 duogášmohtor
Comment[sk]=Phonon DirectShow 9 podsystém
Comment[sl]=Phononova Hrbtenica DirectShow 9
-Comment[sr]=Директшоу‑9 као позадина Фонона
-Comment[sr@ijekavian]=Директшоу‑9 као позадина Фонона
+Comment[sr]=Дајректшоу‑9 као позадина Фонона
+Comment[sr@ijekavian]=Дајректшоу‑9 као позадина Фонона
Comment[sr@ijekavianlatin]=DirectShow‑9 kao pozadina Phonona
Comment[sr@latin]=DirectShow‑9 kao pozadina Phonona
Comment[sv]=Phonon Directshow 9-gränssnitt
diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
index f4f2a13..92a732d 100644
--- a/phonon/pulsesupport.cpp
+++ b/phonon/pulsesupport.cpp
@@ -569,6 +569,31 @@ static void context_state_callback(pa_context *c, void *)
return;
}
pa_operation_unref(o);
+
+ // In the case of reconnection or simply lagging behind the stream object creation
+ // on startup (due to the probe+reconnect system), we invalidate all loaded streams
+ // and then load up info about all streams.
+ for (QMap