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

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

4 files changed, 65 insertions, 14 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/Manifest b/media-libs/phonon/Manifest
index 854f0f37cc51..d06f1538eacb 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,12 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX phonon-4.4-qt7.patch 15621 RMD160 dd46e1cac72aaffc714ef849c079eac1c9c03536 SHA1 f5902d8138fb550457d8acddebf24743cd5e5498 SHA256 8b236f3731434ec6fd591f7da6f1267943c819ebc523797b58d27facfafde68e
+AUX phonon-4.5.0-pow.patch 891 RMD160 65955a585928f4546f30a87b975305a88ae5b681 SHA1 78f9106b6fd1446aad3bb39ff64d5cad61afe835 SHA256 11fd07fef7a2d0b1dbab991f7e8527b8e145661174a11fdf8873ae645cf314d0
 DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606 SHA1 c329d924fb75a89a9de8a4d799ff4dcd7ee3302e SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
 DIST phonon-4.4.3.tar.bz2 648733 RMD160 d7f36bf490acc595dabfd1f7fb1f4433cf77ccf8 SHA1 50262d590beb648be9dcad6b913b920db19a84f8 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
-DIST phonon-4.4.4.tar.bz2 362249 RMD160 4697907c406165524ddab66bd416cfcf214435d0 SHA1 7f31752c20efecbe63c7b312ceb28819fa337943 SHA256 4c1d74eb06d58757bd2d81c29a3e9e86ff2e0751c8b4beec5a3365dda34d85f6
 DIST phonon-4.5.0.tar.bz2 322043 RMD160 80098d330ce4167eed5b6b6004871614178b37ef SHA1 122f7c53939a2c40c3312c2f5e59f25ca2c9ee53 SHA256 66e8913a00dc5a59e4a30c9034757a2a0eb448a8cefcf677c73dc9387a8752dc
 EBUILD phonon-4.4.2.ebuild 3203 RMD160 a0f49130f52e10cec11e1cceec4c65401cce4e7d SHA1 87543b810822b8fa7559245fc39656da33da1fdc SHA256 fb3e0e1061632acc710b8ff60829efaf24e4f3d86db32c739042f80fc1aadfd0
 EBUILD phonon-4.4.3.ebuild 3096 RMD160 c204f5d0e23ebf2c8308a5805effb756ac6d46fc SHA1 688a6d8714dfaeff908b67f1081d83cb4cf898d5 SHA256 21bc50fb7d05894498b57d7c338e19ec3dc7fb9a5cb5412c6a4e83067a8282a4
-EBUILD phonon-4.4.4.ebuild 1516 RMD160 f2a7bc3fcee4502f53259a1c88faebc0c3ccb9a8 SHA1 712281bfa4cafb4a424f918f173b62fc14187030 SHA256 34e25c124e96617fb57ccce16b6d61521d161605410b564558fda09b296b2e6b
+EBUILD phonon-4.5.0-r1.ebuild 1502 RMD160 0ac991db9ef23dec70917576d9e2255646469508 SHA1 103aca8af4eee650e7d22ff664bc1fcb469db184 SHA256 bfeda8f136405da7679a6888292dd14cbd66dda2095408b4b29229c8514111d5
 EBUILD phonon-4.5.0.ebuild 1455 RMD160 0d16ce31299e51d833807187d5d4a345da43be6f SHA1 60d0dfb986d4c2a958b5dd036733141c4cf846c8 SHA256 869bcfd73afdc83955d9e39e39d6e787d39b4c3cf020351f2b8f5a8df007b35e
 EBUILD phonon-9999.ebuild 1388 RMD160 14b0ee4fe801e7a36f74012e69373c22d0da51a1 SHA1 09b08c9e80682a52c6e17a06cdc36eb99cb65c55 SHA256 56af5ffffdcbef625f2c82cafadf76bc25606d2d7f568a02c6d9264e6224ea83
-MISC ChangeLog 11750 RMD160 4751d4795aa9c9966d955371bfee1df2946529d2 SHA1 c6c242c260fac8d252747f3d18141489200eb485 SHA256 194867ce8af24e840d8ed3ac14c602b99bfebe3bdb94c7243b4e54bd284845af
+MISC ChangeLog 11976 RMD160 9eb6b44ac1c50aeea2dd833dfac094aaecc0e0de SHA1 36f2ce390c352e33bab708ad280a7eac9c48bc2b SHA256 2044c7a09bf906934b959959ce4acdfad597e232f5f60b86ed84f2dbd761bedb
 MISC metadata.xml 221 RMD160 3b7c1f5e46245a1df8a099065a5f5e623a9ab574 SHA1 229bab5d18be9bc9f0432a2303ae58bd99eebe09 SHA256 9f8c503e1bbb2d02ea53a17549bda7713c0337d9e94619156bc29f3a219f29d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOmrUiAAoJEEb+UGWnxTyH3qUP/id63tWuJBozXNFSdNi95OCQ
+Dwq3QC8nyXrCwrhFMRiS5n+vFB/2DUc2q8emoeHwvhE65m2AFKyGEh738ErVujYr
+9q8JycYyRigaar8DQzCw5ZhzokiGrgeT6DBaY+MDFi4TWY2eu3QZ/cYieUyldVPQ
+vnN9aIk3XqdM81aBpFNo2/gNhoXvARKjSII2zpmXempJU/Bpp/bcF1QcudFLSWYJ
+DctDAyu96Kp88ph67wwXaYmqZuqd/BHwoxqgmeSLI5b+lF3wT8kl2mkQjPmSHrfO
+lqVSzf+EhLaIG8ILxnaSFSKvuiKOFnBAuhImvOVgolgESU6K9PukDpj/brnYo6u7
+zaKeqcZmmqTlQATf/HOW/TtVycVLOROHTLCiPFSy/BoyOcLx37c9icAfbbRtlA91
+N1CVjyjPhE+NbiOCrJkyfR/VIEFF24dUC95yFmxyTet97FQoccvGHqD9VninY21+
+fDjLw2TaTEh/Um+oHIdHjZnEo5D2LxxrlPWPj/DWggGWjjI6hNq0QnIYsDBQOiRV
+ChuZxlD9b3+B5iO1wdgfqG29V4fyNTZ/qfTULaq3Aybe6vF05bv92olkSn/BD4qH
+oiBEWUOUvJ66oNhaw83qw+284oogfqtlWQqjfzwMJoZ/7xlMHRvelVtgnoLSdiXj
+wWP6fx347pX64/56GVDV
+=wId/
+-----END PGP SIGNATURE-----
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=(