rpms/kdelibs/F-9 kdelibs-4.0.4-phonon-hal.patch, NONE, 1.1 kdelibs.spec, 1.314, 1.315

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7597

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.4-phonon-hal.patch 
Log Message:
fix compatibility with newer HALs to find the actual HW info


kdelibs-4.0.4-phonon-hal.patch:

--- NEW FILE kdelibs-4.0.4-phonon-hal.patch ---
--- 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:


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- kdelibs.spec	15 May 2008 02:42:48 -0000	1.314
+++ kdelibs.spec	15 May 2008 13:36:15 -0000	1.315
@@ -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 @@
 # 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 @@
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch15 -p0 -b .proxy
+%patch16 -p1 -b .phonon-hal
 
 
 %build
@@ -354,6 +358,9 @@
 
 
 %changelog
+* Thu May 15 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.4-4
+- fix compatibility with newer HALs to find the actual HW info
+
 * Thu May 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.4-3
 - fix proxy support (#443931, kde#155707)
 - move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435)