- apply Phonon PulseAudio patch (needed for the xine-lib backend)

This commit is contained in:
Kevin Kofler 2009-06-05 23:59:02 +00:00
parent 4cafec257a
commit 000e171b14
2 changed files with 54 additions and 1 deletions

View File

@ -0,0 +1,43 @@
diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.96/phonon/globalconfig.cpp 2008-11-27 16:41:41.000000000 +0100
+++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp 2009-01-08 21:29:18.000000000 +0100
@@ -31,6 +31,7 @@
#include "phononnamespace_p.h"
#include <QtCore/QList>
+#include <QtCore/QHash>
#include <QtCore/QVariant>
QT_BEGIN_NAMESPACE
@@ -167,6 +168,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)["name"].toString() == "PulseAudio") {
+ list.removeFirst();
+ defaultList.prepend(firstIndex);
+ }
+ }
defaultList += list;
}
@@ -222,6 +232,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)["name"].toString() == "PulseAudio") {
+ list.removeFirst();
+ defaultList.prepend(firstIndex);
+ }
+ }
defaultList += list;
}

12
qt.spec
View File

@ -12,7 +12,7 @@ Epoch: 1
Name: qt4 Name: qt4
%endif %endif
Version: 4.5.1 Version: 4.5.1
Release: 14%{?dist} Release: 15%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -44,6 +44,10 @@ Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
# include kde4 plugin path, http://bugzilla.redhat.com/498809 # include kde4 plugin path, http://bugzilla.redhat.com/498809
Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch
# make PulseAudio the default device in Phonon with the xine-lib backend
# (The GStreamer backend handles this entirely differently, with a separate
# "sink" setting, and should pick up the PulseAudio "sink" without patches.)
Patch17: phonon-4.2.96-pulseaudio.patch
## upstreamable bits ## upstreamable bits
# http://bugzilla.redhat.com/485677 # http://bugzilla.redhat.com/485677
@ -358,6 +362,9 @@ test -x apply_patches && ./apply_patches
%patch14 -p1 -b .ia64_boilerplate %patch14 -p1 -b .ia64_boilerplate
%patch15 -p1 -b .enable_ft_lcdfilter %patch15 -p1 -b .enable_ft_lcdfilter
%patch16 -p1 -b .kde4_plugins %patch16 -p1 -b .kde4_plugins
pushd src/3rdparty/phonon
%patch17 -p1 -b .phonon-pulseaudio
popd
%patch51 -p1 -b .qdoc3 %patch51 -p1 -b .qdoc3
%patch52 -p1 -b .sparc64 %patch52 -p1 -b .sparc64
%patch53 -p1 -b .qatomic-inline-asm %patch53 -p1 -b .qatomic-inline-asm
@ -841,6 +848,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog %changelog
* Fri Jun 05 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.1-15
- apply Phonon PulseAudio patch (needed for the xine-lib backend)
* Fri Jun 05 2009 Than Ngo <than@redhat.com> - 4.5.1-14 * Fri Jun 05 2009 Than Ngo <than@redhat.com> - 4.5.1-14
- enable phonon and gstreamer-backend - enable phonon and gstreamer-backend