Add pulseaudio-1 build fix, bug 386489; remove old

(Portage version: 2.1.10.27/cvs/Linux x86_64)

3 files changed, 42 insertions, 11 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 9594561ca2b7..31632eac4fe4 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.16 2011/06/01 16:04:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.17 2011/10/16 10:41:36 dilfridge Exp $
+
+*phonon-4.5.0-r1 (16 Oct 2011)
+
+  16 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -phonon-4.4.4.ebuild,
+  +phonon-4.5.0-r1.ebuild, +files/phonon-4.5.0-pow.patch:
+  Add pulseaudio-1 build fix, bug 386489; remove old
 
   01 Jun 2011; Brent Baude <ranger@gentoo.org> phonon-4.4.3.ebuild:
   Marking phonon-4.4.3 ppc for bug 354033
diff --git a/media-libs/phonon/files/phonon-4.5.0-pow.patch b/media-libs/phonon/files/phonon-4.5.0-pow.patch
new file mode 100644
index 000000000000..0111a20412ae
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.5.0-pow.patch
@@ -0,0 +1,27 @@
+commit 436d5379abe83c53c652d8a251f7ab504a1523df
+Author: Colin Guthrie <colin@mageia.org>
+Date:   Thu Aug 4 16:55:47 2011 +0100
+
+    pulse: Use qPow() as pow() is sometimes not found.
+
+diff --git a/phonon/pulsestream.cpp b/phonon/pulsestream.cpp
+index d1e6711..e129f1b 100644
+--- a/phonon/pulsestream.cpp
++++ b/phonon/pulsestream.cpp
+@@ -21,6 +21,7 @@
+ */
+ 
+ #include "pulsestream_p.h"
++#include <QtCore/qmath.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -81,7 +82,7 @@ void PulseStream::setVolume(const pa_cvolume *volume)
+         // AudioOutput expects the "backend" to supply values that have been
+         // adjusted for Stephens' law, so we need to fudge them accordingly
+         // so that the %ages match up in KMix/the application's own slider.
+-        emit volumeChanged(pow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
++        emit volumeChanged(qPow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
+     }
+ }
+ 
diff --git a/media-libs/phonon/phonon-4.4.4.ebuild b/media-libs/phonon/phonon-4.5.0-r1.ebuild
index 20d254b8b448..9dfb3969250c 100644
--- a/media-libs/phonon/phonon-4.4.4.ebuild
+++ b/media-libs/phonon/phonon-4.5.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.4.4.ebuild,v 1.4 2011/03/28 23:13:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0-r1.ebuild,v 1.1 2011/10/16 10:41:36 dilfridge Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit cmake-utils
 
@@ -11,9 +11,9 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
 SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
-IUSE="debug gstreamer pulseaudio +vlc xine"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine"
 
 COMMON_DEPEND="
 	>=x11-libs/qt-core-4.6.0:4
@@ -28,9 +28,9 @@ COMMON_DEPEND="
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )
 # mplayer? ( media-sound/phonon-mplayer )
-# quicktime? ( media-sound/phonon-quicktime )
 # waveout? ( media-sound/phonon-waveout )
 PDEPEND="
+	aqua? ( media-libs/phonon-qt7 )
 	gstreamer? ( media-libs/phonon-gstreamer )
 	vlc? ( >=media-libs/phonon-vlc-0.3.2 )
 	xine? ( >=media-libs/phonon-xine-0.4.4 )
@@ -44,11 +44,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 "
 
-pkg_setup() {
-	if use !gstreamer && use !vlc && use !xine; then
-		ewarn "You must at least select one backend for phonon to be usuable"
-	fi
-}
+REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
+
+PATCHES=( "${FILESDIR}/${P}-pow.patch" )
 
 src_configure() {
 	local mycmakeargs=(