rev 17383 - in trunk/packages/phonon/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-03-06 21:27:35 +0000 (Sat, 06 Mar 2010)
New Revision: 17383

Added:
   trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff
Modified:
   trunk/packages/phonon/debian/changelog
   trunk/packages/phonon/debian/patches/series
Log:
Add 04_skip_pa_detection_if_no_glib_loop.diff patch which fixes phonon
hang if GLib loop is disabled in Qt.

Modified: trunk/packages/phonon/debian/changelog
===================================================================
--- trunk/packages/phonon/debian/changelog	2010-03-06 20:24:52 UTC (rev 17382)
+++ trunk/packages/phonon/debian/changelog	2010-03-06 21:27:35 UTC (rev 17383)
@@ -1,3 +1,10 @@
+phonon (4:4.6.0really4.3.80-2) UNRELEASED; urgency=low
+
+  * Add 04_skip_pa_detection_if_no_glib_loop.diff patch which fixes phonon
+    hang if GLib loop is disabled in Qt.
+
+ -- Modestas Vainius <modax at debian.org>  Sat, 06 Mar 2010 23:25:56 +0200
+
 phonon (4:4.6.0really4.3.80-1) experimental; urgency=low
 
   * New upstream release (using really-style version number).

Added: trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff
===================================================================
--- trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff	                        (rev 0)
+++ trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff	2010-03-06 21:27:35 UTC (rev 17383)
@@ -0,0 +1,24 @@
+Author: Martin T. H. Sandsmark <sandsmark at samfundet.no>
+Description: do not hang if GLib loop is not used
+ Previously phonon used to hang at Pulseaudio detection. Now PulseAudio
+ detection is simply not done.
+Origin: upstream, http://gitorious.org/phonon/phonon/commit/466914c63cf09a51e9ea4702355cb1f5da99c4f3.diff
+ http://gitorious.org/phonon/phonon/commit/e476ebec8197db26838f7159487219fc5c7c9040.diff
+Forwarded: not-needed
+
+--- a/phonon/pulsesupport.cpp
++++ b/phonon/pulsesupport.cpp
+@@ -650,6 +650,13 @@
+     if (pulseenv.toInt())
+         return;
+ 
++    // We require a glib event loop
++    if (QLatin1String(QAbstractEventDispatcher::instance()->metaObject()->className())
++            == "QGuiEventDispatcherGlib") {
++        logMessage("Disabling PulseAudio integration for lack of GLib event loop.");
++        return;
++    }
++
+     s_mainloop = pa_glib_mainloop_new(NULL);
+     Q_ASSERT(s_mainloop);
+     pa_mainloop_api *api = pa_glib_mainloop_get_api(s_mainloop);

Modified: trunk/packages/phonon/debian/patches/series
===================================================================
--- trunk/packages/phonon/debian/patches/series	2010-03-06 20:24:52 UTC (rev 17382)
+++ trunk/packages/phonon/debian/patches/series	2010-03-06 21:27:35 UTC (rev 17383)
@@ -1,3 +1,4 @@
 01_phonon-inc.patch
 02_no_rpath.patch
 03_phonon_is_not_forced_in_KDE.diff
+04_skip_pa_detection_if_no_glib_loop.diff