diff --git a/.cvsignore b/.cvsignore index cdcc50b..b7eb0a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ hi32-phonon-gstreamer.png hi48-phonon-gstreamer.png hi64-phonon-gstreamer.png phonon-4.4.1.tar.bz2 +phonon-4.4.2.tar.bz2 diff --git a/phonon-4.4.1-kde235193.patch b/phonon-4.4.1-kde235193.patch deleted file mode 100644 index 76bd615..0000000 --- a/phonon-4.4.1-kde235193.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up phonon-4.4.1/phonon/pulsesupport.cpp.kde235193 phonon-4.4.1/phonon/pulsesupport.cpp ---- phonon-4.4.1/phonon/pulsesupport.cpp.kde235193 2010-04-21 09:06:29.000000000 -0500 -+++ phonon-4.4.1/phonon/pulsesupport.cpp 2010-04-24 13:19:46.019780887 -0500 -@@ -569,6 +569,31 @@ static void context_state_callback(pa_co - 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::iterator it = s_outputStreams.begin(); it != s_outputStreams.end(); ++it) { -+ PulseStream *stream = *it; -+ logMessage(QString("Phonon Output Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid())); -+ stream->setIndex(PA_INVALID_INDEX); -+ } -+ if (!(o = pa_context_get_sink_input_info_list(c, sink_input_cb, NULL))) { -+ logMessage(QString("pa_context_get_sink_input_info_list() failed")); -+ return; -+ } -+ pa_operation_unref(o); -+ -+ for (QMap::iterator it = s_captureStreams.begin(); it != s_captureStreams.end(); ++it) { -+ PulseStream *stream = *it; -+ logMessage(QString("Phonon Capture Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid())); -+ stream->setIndex(PA_INVALID_INDEX); -+ } -+ if (!(o = pa_context_get_source_output_info_list(c, source_output_cb, NULL))) { -+ logMessage(QString("pa_context_get_source_output_info_list() failed")); -+ return; -+ } -+ pa_operation_unref(o); - } - - #ifdef HAVE_PULSEAUDIO_DEVICE_MANAGER -diff -up phonon-4.4.1/xine/audiooutput.cpp.kde235193 phonon-4.4.1/xine/audiooutput.cpp ---- phonon-4.4.1/xine/audiooutput.cpp.kde235193 2010-04-21 09:06:29.000000000 -0500 -+++ phonon-4.4.1/xine/audiooutput.cpp 2010-04-24 13:16:09.495761750 -0500 -@@ -48,6 +48,7 @@ namespace Xine - - AudioOutput::AudioOutput(QObject *parent) - : AbstractAudioOutput(new AudioOutputXT, parent) -+ , m_volume(1.0) - { - } - diff --git a/phonon.spec b/phonon.spec index 36777e2..74e369e 100644 --- a/phonon.spec +++ b/phonon.spec @@ -1,8 +1,8 @@ Summary: Multimedia framework api Name: phonon -Version: 4.4.1 -Release: 2%{?dist} +Version: 4.4.2 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ @@ -24,8 +24,6 @@ Patch52: phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch Patch53: phonon-4.3.50-phonon-allow-stop-empty-source.patch ## Upstream patches -# phonon-backend-xine-4.4.1 (with pulseaudio) = no audio, http://bugs.kde.org/235193 -Patch100: phonon-4.4.1-kde235193.patch BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.0 @@ -85,8 +83,6 @@ Provides: %{name}-backend-gst = %{version}-%{release} %patch52 -p1 -b .gstreamer-fix-seekable-query-failed %patch53 -p1 -b .phonon-allow-stop-empty-source -%patch100 -p1 -b .kde235193 - %build mkdir -p %{_target_platform} @@ -124,6 +120,11 @@ install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/app %endif +%check +export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig +test "$(pkg-config --modversion phonon)" = "%{version}" + + %clean rm -rf %{buildroot} @@ -191,6 +192,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: %changelog +* Tue Jun 08 2010 Rex Dieter - 4.4.2-1 +- phonon-4.4.2 + * Sat Apr 24 2010 Rex Dieter - 4.4.1-2 - phonon-backend-xine-4.4.1 (with pulseaudio) = no audio (kde#235193) diff --git a/sources b/sources index 4fc628d..0766a94 100644 --- a/sources +++ b/sources @@ -5,4 +5,4 @@ 12db12c009b722a6dc141f78feb7e330 hi32-phonon-gstreamer.png 86c34a1b81d44980b1381f94ed6b7a23 hi48-phonon-gstreamer.png 153505c71ec021b0a3bd4b74f2492e93 hi64-phonon-gstreamer.png -5a1444f009a77054f16fea38c08e6cb5 phonon-4.4.1.tar.bz2 +d9eab28383783261254f1cef3b92a3fa phonon-4.4.2.tar.bz2