Merge lp:~ubuntu-branches/ubuntu/oneiric/phonon/oneiric-201108111512 into lp:ubuntu/oneiric/phonon

Proposed by Ubuntu Package Importer on 2011-09-02
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/phonon/oneiric-201108111512
Merge into: lp:ubuntu/oneiric/phonon
Diff against target: 265 lines (+235/-0) (has conflicts)
5 files modified
debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch (+49/-0)
debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch (+51/-0)
debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch (+83/-0)
debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch (+33/-0)
debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch (+19/-0)
Conflict adding file debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch.  Moved existing file to debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch.moved.
Conflict adding file debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch.  Moved existing file to debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch.moved.
Conflict adding file debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch.  Moved existing file to debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch.moved.
Conflict adding file debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch.  Moved existing file to debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch.moved.
Conflict adding file debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch.  Moved existing file to debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/phonon/oneiric-201108111512
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-09-02 Pending
Review via email: mp+73919@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/phonon reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/phonon/oneiric-201108111512. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

39. By Jonathan Riddell on 2011-08-10

* Add patches recommended by upstream to fix Pulseaudio integration:
 - kubuntu_phonon-4.5.0-fix-capture-categories.patch
 - kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch
 - kubuntu_phonon-4.5.0-fix-capture-devices.patch
 - kubuntu_phonon-4.5.0-fix-device-categories.patch
 - kubuntu_phonon-4.5.0-pulse-qpow.patch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch'
2--- debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch 2011-09-02 23:10:31 +0000
4@@ -0,0 +1,49 @@
5+From 6b596e197111aa47d9d4054b0a5b4e3c66e48b56 Mon Sep 17 00:00:00 2001
6+From: Colin Guthrie <colin@mageia.org>
7+Date: Mon, 8 Aug 2011 16:54:35 +0200
8+Subject: [PATCH] pulse: Spell a11y propery (those are ones dammit)
9+
10+---
11+ phonon/pulsesupport.cpp | 8 ++++----
12+ 1 files changed, 4 insertions(+), 4 deletions(-)
13+
14+Index: phonon/phonon/pulsesupport.cpp
15+===================================================================
16+--- phonon.orig/phonon/pulsesupport.cpp 2011-08-10 16:05:31.562294000 +0100
17++++ phonon/phonon/pulsesupport.cpp 2011-08-10 16:13:31.307937641 +0100
18+@@ -193,7 +193,7 @@
19+ return Phonon::NotificationCategory;
20+ if (r == "phone")
21+ return Phonon::CommunicationCategory;
22+- if (r == "ally")
23++ if (r == "a11y")
24+ return Phonon::AccessibilityCategory;
25+
26+ // ^^ "animation" and "production" have no mapping
27+@@ -214,7 +214,7 @@
28+ return Phonon::CommunicationCaptureCategory;
29+ if (r == "production")
30+ return Phonon::RecordingCaptureCategory;
31+- if (r == "ally")
32++ if (r == "a11y")
33+ return Phonon::ControlCaptureCategory;
34+
35+ *success = false;
36+@@ -237,7 +237,7 @@
37+ case Phonon::CommunicationCategory:
38+ return QByteArray("phone");
39+ case Phonon::AccessibilityCategory:
40+- return QByteArray("ally");
41++ return QByteArray("a11y");
42+ default:
43+ return QByteArray();
44+ }
45+@@ -253,7 +253,7 @@
46+ case Phonon::RecordingCaptureCategory:
47+ return QByteArray("production");
48+ case Phonon::ControlCaptureCategory:
49+- return QByteArray("ally");
50++ return QByteArray("a11y");
51+ default:
52+ return QByteArray();
53+ }
54
55=== renamed file 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch' => 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-categories.patch.moved'
56=== added file 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch'
57--- debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch 1970-01-01 00:00:00 +0000
58+++ debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch 2011-09-02 23:10:31 +0000
59@@ -0,0 +1,51 @@
60+From 4ab9f6763bf3647d3238e75527dabb9a3433a4e9 Mon Sep 17 00:00:00 2001
61+From: Colin Guthrie <colin@mageia.org>
62+Date: Mon, 8 Aug 2011 18:22:05 +0200
63+Subject: [PATCH] globalconfig: Properly show pulseaudio device orders for
64+ capture.
65+
66+---
67+ phonon/globalconfig.cpp | 24 ++++++++++++++----------
68+ 1 files changed, 14 insertions(+), 10 deletions(-)
69+
70+diff --git a/phonon/globalconfig.cpp b/phonon/globalconfig.cpp
71+index d0d256d..f47c8f8 100644
72+--- a/phonon/globalconfig.cpp
73++++ b/phonon/globalconfig.cpp
74+@@ -173,19 +173,23 @@ static QList<int> sortDevicesByCategoryPriority(const GlobalConfig *config, cons
75+ }
76+
77+ QList<int> deviceList;
78+-
79+- QString categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(category));
80+- if (!backendConfig->hasKey(categoryKey)) {
81+- // no list in config for the given category
82+- categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(NoCategory));
83++ PulseSupport *pulse = PulseSupport::getInstance();
84++ if (pulse->isActive()) {
85++ deviceList = pulse->objectIndexesByCategory(type, category);
86++ } else {
87++ QString categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(category));
88+ if (!backendConfig->hasKey(categoryKey)) {
89+- // no list in config for NoCategory
90+- return defaultList;
91++ // no list in config for the given category
92++ categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(NoCategory));
93++ if (!backendConfig->hasKey(categoryKey)) {
94++ // no list in config for NoCategory
95++ return defaultList;
96++ }
97+ }
98+- }
99+
100+- //Now the list from d->config
101+- deviceList = backendConfig->value(categoryKey, QList<int>());
102++ //Now the list from d->config
103++ deviceList = backendConfig->value(categoryKey, QList<int>());
104++ }
105+
106+ //if there are devices in d->config that the backend doesn't report, remove them from the list
107+ QMutableListIterator<int> i(deviceList);
108+--
109+1.7.6
110+
111
112=== renamed file 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch' => 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-device-pulseaudio-order.patch.moved'
113=== added file 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch'
114--- debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch 1970-01-01 00:00:00 +0000
115+++ debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch 2011-09-02 23:10:31 +0000
116@@ -0,0 +1,83 @@
117+From 48883971821dd0f26f9684bf6c6a0b23b07d60fb Mon Sep 17 00:00:00 2001
118+From: Colin Guthrie <colin@mageia.org>
119+Date: Sat, 4 Jun 2011 17:52:54 +0200
120+Subject: [PATCH] Do not show platform or backend capture devices when
121+ PulseAudio is used.
122+
123+---
124+ phonon/globalconfig.cpp | 54 +++++++++++++++++++++++-----------------------
125+ 1 files changed, 27 insertions(+), 27 deletions(-)
126+
127+Index: phonon/phonon/globalconfig.cpp
128+===================================================================
129+--- phonon.orig/phonon/globalconfig.cpp 2011-08-10 16:13:36.257937639 +0100
130++++ phonon/phonon/globalconfig.cpp 2011-08-10 16:13:54.167937634 +0100
131+@@ -545,41 +545,41 @@
132+ | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
133+ );
134+ }
135+- }
136++ } else {
137++ BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
138+
139+ #ifndef QT_NO_PHONON_PLATFORMPLUGIN
140+- if (PlatformPlugin *platformPlugin = Factory::platformPlugin()) {
141+- // the platform plugin lists the audio devices for the platform
142+- // this list already is in default order (as defined by the platform plugin)
143+- defaultList += platformPlugin->objectDescriptionIndexes(AudioCaptureDeviceType);
144+- if (hide) {
145+- QMutableListIterator<int> it(defaultList);
146+- while (it.hasNext()) {
147+- AudioCaptureDevice objDesc = AudioCaptureDevice::fromIndex(it.next());
148+- const QVariant var = objDesc.property("isAdvanced");
149+- if (var.isValid() && var.toBool()) {
150+- it.remove();
151++ if (PlatformPlugin *platformPlugin = Factory::platformPlugin()) {
152++ // the platform plugin lists the audio devices for the platform
153++ // this list already is in default order (as defined by the platform plugin)
154++ defaultList += platformPlugin->objectDescriptionIndexes(AudioCaptureDeviceType);
155++ if (hide) {
156++ QMutableListIterator<int> it(defaultList);
157++ while (it.hasNext()) {
158++ AudioCaptureDevice objDesc = AudioCaptureDevice::fromIndex(it.next());
159++ const QVariant var = objDesc.property("isAdvanced");
160++ if (var.isValid() && var.toBool()) {
161++ it.remove();
162++ }
163+ }
164+ }
165+ }
166+- }
167+ #endif //QT_NO_PHONON_PLATFORMPLUGIN
168+
169+- // lookup the available devices directly from the backend
170+- BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
171+-
172+- if (backendIface) {
173+- // this list already is in default order (as defined by the backend)
174+- QList<int> list = backendIface->objectDescriptionIndexes(AudioCaptureDeviceType);
175+- if (hide || !defaultList.isEmpty() || (override & HideUnavailableDevices)) {
176+- filter(AudioCaptureDeviceType, backendIface, &list,
177+- (hide ? FilterAdvancedDevices : 0)
178+- // the platform plugin maybe already provided the hardware devices?
179+- | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
180+- | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
181+- );
182++ // lookup the available devices directly from the backend
183++ if (backendIface) {
184++ // this list already is in default order (as defined by the backend)
185++ QList<int> list = backendIface->objectDescriptionIndexes(AudioCaptureDeviceType);
186++ if (hide || !defaultList.isEmpty() || (override & HideUnavailableDevices)) {
187++ filter(AudioCaptureDeviceType, backendIface, &list,
188++ (hide ? FilterAdvancedDevices : 0)
189++ // the platform plugin maybe already provided the hardware devices?
190++ | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
191++ | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
192++ );
193++ }
194++ defaultList += list;
195+ }
196+- defaultList += list;
197+ }
198+
199+ #ifndef QT_NO_PHONON_SETTINGSGROUP
200
201=== renamed file 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch' => 'debian/patches/kubuntu_phonon-4.5.0-fix-capture-devices.patch.moved'
202=== added file 'debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch'
203--- debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch 1970-01-01 00:00:00 +0000
204+++ debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch 2011-09-02 23:10:31 +0000
205@@ -0,0 +1,33 @@
206+From 9f22dbd23c9cb9efa16331e9d1e064ba83cefdad Mon Sep 17 00:00:00 2001
207+From: Colin Guthrie <colin@mageia.org>
208+Date: Sun, 5 Jun 2011 12:31:46 +0200
209+Subject: [PATCH] Fix the nice names for the capture enume broken by Harald in
210+ 84e0937
211+
212+Likely a sed or global find/replace thinko
213+---
214+ phonon/phononnamespace.cpp | 6 +++---
215+ 1 files changed, 3 insertions(+), 3 deletions(-)
216+
217+diff --git a/phonon/phononnamespace.cpp b/phonon/phononnamespace.cpp
218+index 1e42dda..997434c 100644
219+--- a/phonon/phononnamespace.cpp
220++++ b/phonon/phononnamespace.cpp
221+@@ -76,11 +76,11 @@ namespace Phonon
222+ case Phonon::NoCategory:
223+ break;
224+ case Phonon::CommunicationCategory:
225+- return QCoreApplication::translate("Phonon::", "CaptureCommunication");
226++ return QCoreApplication::translate("Phonon::", "Communication");
227+ case Phonon::RecordingCaptureCategory:
228+- return QCoreApplication::translate("Phonon::", "CaptureRecording");
229++ return QCoreApplication::translate("Phonon::", "Recording");
230+ case Phonon::ControlCaptureCategory:
231+- return QCoreApplication::translate("Phonon::", "CaptureControl");
232++ return QCoreApplication::translate("Phonon::", "Control");
233+ }
234+ return QString();
235+ }
236+--
237+1.7.6
238+
239
240=== renamed file 'debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch' => 'debian/patches/kubuntu_phonon-4.5.0-fix-device-categories.patch.moved'
241=== added file 'debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch'
242--- debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch 1970-01-01 00:00:00 +0000
243+++ debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch 2011-09-02 23:10:31 +0000
244@@ -0,0 +1,19 @@
245+--- phonon-4.5.0/phonon/pulsestream.cpp~ 2011-08-04 16:36:29.406729335 +0100
246++++ phonon-4.5.0/phonon/pulsestream.cpp 2011-08-04 16:36:29.442728719 +0100
247+@@ -21,6 +21,7 @@
248+ */
249+
250+ #include "pulsestream_p.h"
251++#include <QtCore/qmath.h>
252+
253+ QT_BEGIN_NAMESPACE
254+
255+@@ -81,7 +82,7 @@
256+ // AudioOutput expects the "backend" to supply values that have been
257+ // adjusted for Stephens' law, so we need to fudge them accordingly
258+ // so that the %ages match up in KMix/the application's own slider.
259+- emit volumeChanged(pow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
260++ emit volumeChanged(qPow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
261+ }
262+ }
263+
264
265=== renamed file 'debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch' => 'debian/patches/kubuntu_phonon-4.5.0-pulse-qpow.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: