rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Tue May 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-3 

- drop no longer needed ALSA default device Phonon hack
This commit is contained in:
Kevin Kofler 2008-05-13 17:20:19 +00:00
parent 0ca51b5037
commit 3dc991f2f8
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kdelibs-3.97.0-alsa-default-device.patch
View File

@ -1,27 +0,0 @@
diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp
--- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp 2007-11-20 23:02:30.000000000 +0100
+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp 2008-01-04 16:23:04.000000000 +0100
@@ -349,6 +349,8 @@
if (lines.size() > 1) {
d->cardName = i18n("%1 (%2)", d->cardName, lines[1]);
}
+ if (alsaDeviceName == "default")
+ d->initialPreference = 1000;
if (alsaDeviceName.startsWith("front:") ||
alsaDeviceName.startsWith("rear:") ||
alsaDeviceName.startsWith("center_lfe:") ||
diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp
--- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp 2007-11-27 18:17:14.000000000 +0100
+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp 2008-01-04 16:23:04.000000000 +0100
@@ -188,6 +188,11 @@
}
snd_device_name_free_hint(hints);
+ DeviceHint defaultHint;
+ defaultHint.name = QString::fromLatin1("default");
+ defaultHint.description= QString::fromLatin1("ALSA Default Device");
+ deviceHints << defaultHint;
+
snd_config_update_free_global();
snd_config_update();
Q_ASSERT(snd_config);

9
kdelibs.spec
View File

@ -1,7 +1,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.0.72
Release: 2%{?dist}
Release: 3%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -52,9 +52,6 @@ Source2: kde4.csh
Patch0: kdelibs-4.0.72-parallel_devel.patch
# fix kde#149705
Patch2: kdelibs-3.95.0-kde149705.patch
# Force Phonon to use the ALSA default device by default
# This should make it work better with PulseAudio.
Patch4: kdelibs-3.97.0-alsa-default-device.patch
# Hunspell support for K3Spell
# http://fedoraproject.org/wiki/Releases/FeatureDictionary
# http://bugs.kde.org/show_bug.cgi?id=154561
@ -182,7 +179,6 @@ format for easy browsing.
%patch0 -p1 -b .parallel_devel
%patch2 -p1 -b .kde149705
%patch4 -p1 -b .alsa-default
%if 0%{?fedora} >= 9
%patch5 -p1 -b .k3spell-hunspell
%else
@ -360,6 +356,9 @@ rm -rf %{buildroot}
%changelog
* Tue May 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-3
- drop no longer needed ALSA default device Phonon hack
* Sun May 4 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-2
- BR new minimum versions of qt4-devel and soprano-devel