Adding upstream patches for fixes with pulseaudio and xine, bug 321155. Thanks to Fabian Köster.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 128 insertions, 4 deletions

diff --git a/media-sound/phonon/ChangeLog b/media-sound/phonon/ChangeLog
index eb7cede94aa8..0031f7003114 100644
--- a/media-sound/phonon/ChangeLog
+++ b/media-sound/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/phonon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.48 2010/05/17 16:01:08 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.49 2010/05/23 12:09:36 spatz Exp $
+
+  23 May 2010; Dror Levin <spatz@gentoo.org> phonon-4.4.1.ebuild,
+  +files/phonon-4.4.1-pulseaudio-connect.patch,
+  +files/phonon-4.4.1-xine-volume.patch:
+  Adding upstream patches for fixes with pulseaudio and xine, bug 321155.
+  Thanks to Fabian Köster.
 
 *phonon-4.4.1 (17 May 2010)
 
diff --git a/media-sound/phonon/Manifest b/media-sound/phonon/Manifest
index 85798d9cc8a0..bc660fd8a975 100644
--- a/media-sound/phonon/Manifest
+++ b/media-sound/phonon/Manifest
@@ -1,10 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX fix_nonascii_chars.patch 3159 RMD160 cde38d5c7000618eefa910b9638ac6b51ed663f9 SHA1 4b520fbc8e42764225d1fe7ee73213e7bbf92f3f SHA256 5969e2766160c21565dfcef3dffb6c264a9031dc6364a580b9b452358d07d6de
 AUX phonon-4.4-qt7.patch 15299 RMD160 ec017cf0dbbd79577a29c595f5bd6cbe9df7e199 SHA1 565b2c407acea17bcfeb5e24c82b14dbb398af38 SHA256 68b51882663ed0a8ef0bfa4bbb9acc8d113e033f7704cddba6add8adb061c6e3
+AUX phonon-4.4.1-pulseaudio-connect.patch 2856 RMD160 6616c02938d36841927c2c871bb94fd4f064f61e SHA1 654c74487cebc0a8c12580b9127eda4590a2a9ab SHA256 51ea85ee7126d8b6ab4b0e5e93af5564307475081e1858ecedc314a589e95c42
+AUX phonon-4.4.1-xine-volume.patch 1117 RMD160 98166edfe5aece2b134e0553a8bf918cfa372fdf SHA1 dfb9fc4ab44a41a4a4889009de1f74bd8045291c SHA256 89acdff7a719abd42f2b0efaf46e5fa7b0de33696d69e510395ac104aaed6eac
 DIST phonon-4.3.80.tar.bz2 598739 RMD160 5c271c1d53ee8878205255f8f257b7bfcd6c21c3 SHA1 914e4db5a6c23918be4b85e56a31207a2d17bf5d SHA256 89cb295f45d7db1bf261e344569c2597879657d1aa9538e5037bc2db9a508bec
 DIST phonon-4.4.1.tar.bz2 625008 RMD160 945669b48fa5278f4ca59b415799a14d45ed1c55 SHA1 e87474e144c2d03944161aeb1b18a0569642a556 SHA256 8a52b0e74c5fb5c8dd3ce65d745c7052cdcea0e7535658fbc655671cef5e5277
 DIST phonon-4.4_pre20090520.tar.bz2 583005 RMD160 5cd7abe22319124b60fe292b978b7e78fae1a29d SHA1 a0a6942cb40b28c4e30f4272b1420300546a9bdf SHA256 0073efcc672b4d2e6def34e82ff43313cf8cb14ef63d15cd9b4d9f641b998e9d
 EBUILD phonon-4.3.50_pre20090520.ebuild 1434 RMD160 de5914c8e617763edda6b9470a64b80bc2a1be14 SHA1 03d60944ca70db8d0fcfa5ba590727e633fb4431 SHA256 7d79bff1cac696034940b314b30681b7ac5777037cdcc9bcaf60376fd403d67e
 EBUILD phonon-4.3.80-r1.ebuild 3165 RMD160 4678ba4b88724247e7aeb2d2df53a0787ac79095 SHA1 9c251cf4d5be9dbc49aa95dbfc254c645dc8d0ad SHA256 c05738861d371f703c2fbed398c21c4baa9ad501fa3b33ba1abf5e250d16160b
-EBUILD phonon-4.4.1.ebuild 3193 RMD160 3ed8492c346c3514eb6474ee0496729962f1918e SHA1 87124ac06f7be828c61f66de52b7efb3fee117e0 SHA256 2a8846ed8babb1aa6e7f044a4d0f70e26ccfc85ca018cf5824c9a152afa8d0ff
-MISC ChangeLog 6646 RMD160 34aa47df9f4f5f81ece2c0097bd100ce257fd20f SHA1 a445d577198e7f32e657a0a8d965927124f8b740 SHA256 1a644d006c9aed7b323dfafaf48547e873475abd35f39e26f4795be0a65c4258
+EBUILD phonon-4.4.1.ebuild 3305 RMD160 530598d41da82f1b09110f1dea3fff342a2f20c3 SHA1 c69d8f72955a2d5b3d8b60a631df7ebf4188cbe4 SHA256 b9b132045bc2fb83e3a5f6b95225614e2e0ca57fadc74c446676cdf25056cbec
+MISC ChangeLog 6901 RMD160 04fc051dcf4725cbef8ffd78096100d6cfea49fd SHA1 afd455a3ff1f174e5141f97996b814fecf171908 SHA256 844c8a20ceadc38f29a7687007b340a8d7b3c8f86fef17028126f483615a1f3f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQEcBAEBCgAGBQJL+RsJAAoJEAWF714uGAc6BEMH/AgNkSWWKbHzXdJdI3t0b61E
+FPTyiJowsSRv4ZYU69qRHmOdVAS+36qL8jyv88gf0BEXJqFL+iVUjfXWJdfu9Z7x
+ekwGnPjtC3EnTnuADAlzWmtkHRp3Iuchlh0p0dw33P8JPhQKvzakKyXwp4xbYO2T
+rtQPne5kaeR+mkoIBGojPjT/lz8e3CDtVHWKbu9Ssy02JcbQOnj0TvLqXH6kunyN
+8Y4Mr00SrOynMIwEDcEDAHMaXQGxqExQEKpqyy2I+logtfxKQgc52J2oRmht/P1o
+2z4e+wiebEmQ4tZm/HHsLBlEErnOV8nrEr6XocVhskkaR6KjtFlTfO15OLD74PE=
+=u1AP
+-----END PGP SIGNATURE-----
diff --git a/media-sound/phonon/files/phonon-4.4.1-pulseaudio-connect.patch b/media-sound/phonon/files/phonon-4.4.1-pulseaudio-connect.patch
new file mode 100644
index 000000000000..2aa84369c80c
--- /dev/null
+++ b/media-sound/phonon/files/phonon-4.4.1-pulseaudio-connect.patch
@@ -0,0 +1,60 @@
+From 1eb324f60f8df6bc7a866679919d79f1a2a3ff81 Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <cguthrie@mandriva.org>
+Date: Sat, 24 Apr 2010 14:54:36 +0100
+Subject: [PATCH] pulse: Fix the reading of stream information on startup.
+
+Due to the new probe+reconnect logic, it is possible to initialise
+a 'PulseStream' object and start the backend outputting it
+prior to our control connection being established. This means that
+we miss the subscription event and never actually associate the
+PA stream index with our stream object. Whenever something changes
+on the stream at the PA end things would kick in and would work fine,
+so this was sometimes hard to see and identify.
+
+This change simply invalidates all streams when we're finished connecting
+to PA and then loads up all info from PA to set the indexes correctly.
+
+CCBUG: 235193
+---
+ phonon/pulsesupport.cpp |   25 +++++++++++++++++++++++++
+ 1 files changed, 25 insertions(+), 0 deletions(-)
+
+diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
+index f4f2a13..92a732d 100644
+--- a/phonon/pulsesupport.cpp
++++ b/phonon/pulsesupport.cpp
+@@ -569,6 +569,31 @@ static void context_state_callback(pa_context *c, void *)
+                 return;
+             }
+             pa_operation_unref(o);
++
++            // In the case of reconnection or simply lagging behind the stream object creation
++            // on startup (due to the probe+reconnect system), we invalidate all loaded streams
++            // and then load up info about all streams.
++            for (QMap<QString, PulseStream*>::iterator it = s_outputStreams.begin(); it != s_outputStreams.end(); ++it) {
++              PulseStream *stream = *it;
++              logMessage(QString("Phonon Output Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid()));
++              stream->setIndex(PA_INVALID_INDEX);
++            }
++            if (!(o = pa_context_get_sink_input_info_list(c, sink_input_cb, NULL))) {
++              logMessage(QString("pa_context_get_sink_input_info_list() failed"));
++              return;
++            }
++            pa_operation_unref(o);
++
++            for (QMap<QString, PulseStream*>::iterator it = s_captureStreams.begin(); it != s_captureStreams.end(); ++it) {
++              PulseStream *stream = *it;
++              logMessage(QString("Phonon Capture Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid()));
++              stream->setIndex(PA_INVALID_INDEX);
++            }
++            if (!(o = pa_context_get_source_output_info_list(c, source_output_cb, NULL))) {
++              logMessage(QString("pa_context_get_source_output_info_list() failed"));
++              return;
++            }
++            pa_operation_unref(o);
+         }
+ 
+ #ifdef HAVE_PULSEAUDIO_DEVICE_MANAGER
+-- 
+1.6.1
+
diff --git a/media-sound/phonon/files/phonon-4.4.1-xine-volume.patch b/media-sound/phonon/files/phonon-4.4.1-xine-volume.patch
new file mode 100644
index 000000000000..5d25d9df86e0
--- /dev/null
+++ b/media-sound/phonon/files/phonon-4.4.1-xine-volume.patch
@@ -0,0 +1,35 @@
+From b44f19d7038f7e6182db4d29aee39dab569193fd Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <cguthrie@mandriva.org>
+Date: Sat, 24 Apr 2010 14:25:31 +0100
+Subject: [PATCH] xine: Initialise volume to 1.
+
+When PulseAudio is used, it's essential that the internal representation
+of the volume remains at the maxium. Xine will use this to set the initial volume.
+
+Thankfully, xine's PulseAudio output does not seem to use per-application volume control
+as otherwise this 100% would be passed on an prevent PA from saving
+volumes properly.
+
+Currently, however one more problem remains with Xine+PA+volume
+in that the standard volume widget does not seem to be hooked up
+correctly. I'll look at this problem next.
+BUG: 235193
+---
+ xine/audiooutput.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/xine/audiooutput.cpp b/xine/audiooutput.cpp
+index 05b9240..f9f922e 100644
+--- a/xine/audiooutput.cpp
++++ b/xine/audiooutput.cpp
+@@ -48,6 +48,7 @@ namespace Xine
+ 
+ AudioOutput::AudioOutput(QObject *parent)
+     : AbstractAudioOutput(new AudioOutputXT, parent)
++    , m_volume(1.0)
+ {
+ }
+ 
+-- 
+1.6.1
+
diff --git a/media-sound/phonon/phonon-4.4.1.ebuild b/media-sound/phonon/phonon-4.4.1.ebuild
index 7d0cea83bf56..e3210a1ac192 100644
--- a/media-sound/phonon/phonon-4.4.1.ebuild
+++ b/media-sound/phonon/phonon-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.4.1.ebuild,v 1.1 2010/05/17 16:01:08 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.4.1.ebuild,v 1.2 2010/05/23 12:09:36 spatz Exp $
 
 EAPI="2"
 
@@ -39,6 +39,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/automoc-0.9.87
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-xine-volume.patch"
+	"${FILESDIR}/${P}-pulseaudio-connect.patch"
+)
+
 S=${WORKDIR}/${P/.0}
 
 pkg_setup() {
@@ -61,6 +66,8 @@ src_prepare() {
 			-i CMakeLists.txt \
 			|| die "failed to enable GStreamer backend"
 	fi
+
+	base_src_prepare
 }
 
 src_configure() {