fix compatibility with newer HALs to find the actual HW info
This commit is contained in:
parent
372099ca82
commit
1b7a8ccb24
14
kdelibs-4.0.4-phonon-hal.patch
Normal file
14
kdelibs-4.0.4-phonon-hal.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- kdelibs/phonon/libkaudiodevicelist/audiodevice.cpp 2008/05/15 10:17:11 807987
|
||||
+++ kdelibs/phonon/libkaudiodevicelist/audiodevice.cpp 2008/05/15 10:18:11 807988
|
||||
@@ -137,6 +137,11 @@
|
||||
Solid::Device parent = audioDevice.parent();
|
||||
if (parent.isValid()) {
|
||||
d->uniqueId = d->uniqueIdentifierFromDevice(parent);
|
||||
+ // newer HAL versions add one more parent in between to find the actual hardware info
|
||||
+ if (d->uniqueId.isEmpty() && parent.parent().isValid()) {
|
||||
+ parent = parent.parent();
|
||||
+ d->uniqueId = d->uniqueIdentifierFromDevice(parent);
|
||||
+ }
|
||||
if (!d->uniqueId.isEmpty()) {
|
||||
switch (audioHw->deviceType()) {
|
||||
case Solid::AudioInterface::AudioInput:
|
@ -1,7 +1,7 @@
|
||||
|
||||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.0.4
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs
|
||||
@ -78,6 +78,9 @@ Patch14: kdelibs-4.0.3-libexecdir.patch
|
||||
# fix proxy support (#443931, kde#155707)
|
||||
# patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46
|
||||
Patch15: kdelibs-4.0.4-proxy.patch
|
||||
# fix compatibility with newer HALs
|
||||
# http://websvn.kde.org/?view=rev&revision=807988
|
||||
Patch16: kdelibs-4.0.4-phonon-hal.patch
|
||||
|
||||
## upstream patches
|
||||
|
||||
@ -197,6 +200,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||
%patch13 -p1 -b .fedora-buildtype
|
||||
%patch14 -p1 -b .libexecdir
|
||||
%patch15 -p0 -b .proxy
|
||||
%patch16 -p1 -b .phonon-hal
|
||||
|
||||
|
||||
%build
|
||||
@ -354,6 +358,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 15 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-4
|
||||
- fix compatibility with newer HALs to find the actual HW info
|
||||
|
||||
* Thu May 15 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.4-3
|
||||
- fix proxy support (#443931, kde#155707)
|
||||
- move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435)
|
||||
|
Loading…
Reference in New Issue
Block a user