diff --git a/phonon-4.3.50-xine_pulseaudio.patch b/phonon-4.3.50-xine_pulseaudio.patch deleted file mode 100644 index ca7c300..0000000 --- a/phonon-4.3.50-xine_pulseaudio.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up phonon/xine/backend.cpp.pulseaudio phonon/xine/backend.cpp ---- phonon/xine/backend.cpp.pulseaudio 2009-10-03 14:00:19.000000000 -0500 -+++ phonon/xine/backend.cpp 2009-10-19 12:23:17.768923476 -0500 -@@ -649,7 +649,7 @@ void Backend::checkAudioOutputs() - "in KDE2 and KDE3. Its use is discouraged.

"), - /*icon name */"audio-backend-arts", outputPlugins[i]); - } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) { -- addAudioOutput(nextIndex++, 10, tr("PulseAudio"), -+ addAudioOutput(nextIndex++, 2000, tr("PulseAudio"), - xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]), - /*icon name */"audio-backend-pulseaudio", outputPlugins[i]); - } else if (0 == strcmp(outputPlugins[i], "esd")) { diff --git a/phonon-4.3.80-pulseaudio-device-priorities.patch b/phonon-4.3.80-pulseaudio-device-priorities.patch deleted file mode 100644 index bb993c4..0000000 --- a/phonon-4.3.80-pulseaudio-device-priorities.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur phonon-4.3.80/phonon/globalconfig.cpp phonon-4.3.80-pulseaudio-device-priorities/phonon/globalconfig.cpp ---- phonon-4.3.80/phonon/globalconfig.cpp 2009-12-03 20:29:35.000000000 +0100 -+++ phonon-4.3.80-pulseaudio-device-priorities/phonon/globalconfig.cpp 2010-01-22 15:57:25.000000000 +0100 -@@ -33,6 +33,7 @@ - #include "pulsesupport_p.h" - - #include -+#include - #include - - QT_BEGIN_NAMESPACE -@@ -314,6 +315,15 @@ - | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0) - ); - } -+ // make PulseAudio the global default (assume it is already default in this list) -+ if (!list.isEmpty()) { -+ int firstIndex = list.first(); -+ if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType, -+ firstIndex)["icon"].toString() == "audio-backend-pulseaudio") { -+ list.removeFirst(); -+ defaultList.prepend(firstIndex); -+ } -+ } - defaultList += list; - } - -@@ -394,6 +404,15 @@ - | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0) - ); - } -+ // make PulseAudio the global default (assume it is already default in this list) -+ if (!list.isEmpty()) { -+ int firstIndex = list.first(); -+ if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType, -+ firstIndex)["icon"].toString() == "audio-backend-pulseaudio") { -+ list.removeFirst(); -+ defaultList.prepend(firstIndex); -+ } -+ } - defaultList += list; - } - diff --git a/phonon.spec b/phonon.spec index 3237bbd..8ec9d3b 100644 --- a/phonon.spec +++ b/phonon.spec @@ -21,12 +21,6 @@ Source14: hi48-phonon-gstreamer.png Source15: hi64-phonon-gstreamer.png Source16: hi128-phonon-gstreamer.png -# Make PulseAudio the default when listed by the Xine backend and native -# PulseAudio integration is not available (e.g. F-11 with too old PulseAudio). -Patch0: phonon-4.3.80-pulseaudio-device-priorities.patch -# Give PulseAudio the highest priority in the Xine backend so the above works. -Patch1: phonon-4.3.50-xine_pulseaudio.patch - ## Mandriva/upstreamable patches Patch51: phonon-4.3.50-fix-decodebin-usage.patch Patch52: phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch @@ -46,11 +40,7 @@ BuildRequires: libxml2-devel BuildRequires: pkgconfig BuildRequires: qt4-devel BuildRequires: xine-lib-devel -%if 0%{?fedora} > 10 BuildRequires: pulseaudio-libs-devel >= 0.9.15 -%else -%define pa_keep_old_hacks 1 -%endif Requires: phonon-backend%{?_isa} >= %{version} @@ -92,12 +82,6 @@ Provides: %{name}-backend-gst = %{version}-%{release} %prep %setup -q -n phonon%{!?snap:-%{?tar_ver}%{!?tar_ver:%{version}}} -%if 0%{?pa_keep_old_hacks} -# FIXME/adapt to 4.4, or drop -#patch0 -p1 -b .pulseaudio-device-priorities -#patch1 -p1 -b .xine_pulseaudio -%endif - %patch51 -p0 -b .fix-decodebin-usage %patch52 -p1 -b .gstreamer-fix-seekable-query-failed %patch53 -p1 -b .phonon-allow-stop-empty-source