rpms/phonon/F-8 phonon-4.2.0-pulseaudio.patch, NONE, 1.1 phonon.spec, 1.7, 1.8
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Sun Aug 10 18:34:16 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/phonon/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28015/F-8
Modified Files:
phonon.spec
Added Files:
phonon-4.2.0-pulseaudio.patch
Log Message:
* Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-4
- rename -backend-gst back to -backend-gstreamer (longer name as -backend-xine)
The GStreamer backend isn't ready to be the default, and KDE 4.1 also defaults
to the Xine backend when both are installed.
- fix PulseAudio not being the default in the Xine backend (4.2 regression)
phonon-4.2.0-pulseaudio.patch:
--- NEW FILE phonon-4.2.0-pulseaudio.patch ---
diff -ur phonon-4.2.0/phonon/globalconfig.cpp phonon-4.2.0-pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.0/phonon/globalconfig.cpp 2008-07-22 18:31:58.000000000 +0200
+++ phonon-4.2.0-pulseaudio/phonon/globalconfig.cpp 2008-08-10 20:04:22.000000000 +0200
@@ -28,6 +28,7 @@
#include "phononnamespace_p.h"
#include <QtCore/QList>
+#include <QtCore/QHash>
#include <QtCore/QVariant>
QT_BEGIN_NAMESPACE
@@ -158,6 +159,15 @@
| (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
);
}
+ // 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;
}
@@ -212,6 +222,15 @@
| (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
);
}
+ // 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;
}
Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-8/phonon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phonon.spec 24 Jul 2008 14:10:26 -0000 1.7
+++ phonon.spec 10 Aug 2008 18:33:46 -0000 1.8
@@ -2,12 +2,19 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2
+# Make PulseAudio the default again when listed by the backend.
+# Note that this currently only works for the Xine backend. Device selection in
+# the GStreamer backend is weird: there is a setting for "sink" which cannot be
+# set through systemsettings, and listed devices are only those supported by the
+# "sink". So it never lists "PulseAudio" as a supported device, you have to pick
+# it as a "sink", and then the device setting is ignored entirely.
+Patch0: phonon-4.2.0-pulseaudio.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automoc4
@@ -24,14 +31,14 @@
%description
%{summary}.
-%package backend-gst
+%package backend-gstreamer
Summary: Gstreamer phonon backend
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Provides: phonon-backend = %{version}-%{release}
-Obsoletes: %{name}-backend-gstreamer < 4.2-2
-Provides: %{name}-backend-gstreamer = %{version}-%{release}
-%description backend-gst
+Obsoletes: %{name}-backend-gst < 4.2.0-4
+Provides: %{name}-backend-gst = %{version}-%{release}
+%description backend-gstreamer
%{summary}.
%package devel
@@ -46,6 +53,7 @@
%prep
%setup -q
+%patch0 -p1 -b .pulseaudio
%build
@@ -82,7 +90,7 @@
%dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
%dir %{_kde4_datadir}/kde4/services/phononbackends/
-%files backend-gst
+%files backend-gstreamer
%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
%{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
@@ -97,6 +105,15 @@
%changelog
+* Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-4
+- rename -backend-gst back to -backend-gstreamer (longer name as -backend-xine)
+ The GStreamer backend isn't ready to be the default, and KDE 4.1 also defaults
+ to the Xine backend when both are installed.
+- fix PulseAudio not being the default in the Xine backend (4.2 regression)
+
+* Sat Aug 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-3
+- -backend-gst: Obsoletes: -backend-gstreamer < 4.2.0-2
+
* Thu Jul 24 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
- rename -backend-gstreamer -> backend-gst
More information about the fedora-extras-commits
mailing list