summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2009-11-19 23:37:57 -0500
committerJonathan Callen <abcd@gentoo.org>2009-11-19 23:37:57 -0500
commit2e968d4a853b5a5e2138da148d1a6398944bf66a (patch)
treec2c705548f94ae1c430f7449f44ac0557fa54f46
parentd6be116d58dcb8c9cf7949a262ae10f633e9e20e (diff)
downloadkde-2e968d4a853b5a5e2138da148d1a6398944bf66a.tar.gz
kde-2e968d4a853b5a5e2138da148d1a6398944bf66a.tar.bz2
kde-2e968d4a853b5a5e2138da148d1a6398944bf66a.zip
[media-sound/phonon] Fix the build...
-rw-r--r--media-sound/phonon/Manifest2
-rw-r--r--media-sound/phonon/phonon-9999.ebuild7
2 files changed, 5 insertions, 4 deletions
diff --git a/media-sound/phonon/Manifest b/media-sound/phonon/Manifest
index 06a7492ad27..9029022037a 100644
--- a/media-sound/phonon/Manifest
+++ b/media-sound/phonon/Manifest
@@ -1,2 +1,2 @@
-EBUILD phonon-9999.ebuild 1395 RMD160 db786b744567b34d93b19be6e2faa87ee1d45d3b SHA1 7afbe5778a49742f72eeb62dcb115bd63e78be97 SHA256 5a73d57611a9aeffe5d10c0e1701f62fdb9959873224f19184a7dc5abe8e2015
+EBUILD phonon-9999.ebuild 1440 RMD160 62ac2432e0dd5bee62d4a914aee6ec9452f81275 SHA1 420a761b5a7f59fd451962c4017ccddce36081f8 SHA256 b2997109b21f46ad79f6a3e13bf99099fa0b58290d210d2417c48d85f59556da
MISC metadata.xml 263 RMD160 7a5466a0574ed183b274d960395a08ea1dfba410 SHA1 7ddd4a4281433a2c5944a22945a7a8f78b7eb511 SHA256 72ea86ea8d558544b77c265bded5a81dd0b6ec9325909b8ab7e41838171a6718
diff --git a/media-sound/phonon/phonon-9999.ebuild b/media-sound/phonon/phonon-9999.ebuild
index 9545ba79357..9e3a0d93800 100644
--- a/media-sound/phonon/phonon-9999.ebuild
+++ b/media-sound/phonon/phonon-9999.ebuild
@@ -18,6 +18,7 @@ IUSE="alsa debug gstreamer +xcb +xine"
RDEPEND="
!kde-base/phonon-xine
!x11-libs/qt-phonon:4
+ dev-libs/glib:2
>=x11-libs/qt-test-4.4.0:4
>=x11-libs/qt-dbus-4.4.0:4
>=x11-libs/qt-gui-4.4.0:4
@@ -34,7 +35,6 @@ RDEPEND="
"
# pulseaudio? (
# >=media-sound/pulseaudio-0.9.21[glib]
-# dev-libs/glib:2
# )
DEPEND="${RDEPEND}
>=kde-base/automoc-0.9.87
@@ -47,6 +47,8 @@ pkg_setup() {
}
src_configure() {
+ # glib *should* only be needed with USE=pulseaudio; unfortunately, that is
+ # not the case
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with alsa)
$(cmake-utils_use_with gstreamer GStreamer)
@@ -54,10 +56,9 @@ src_configure() {
$(cmake-utils_use_with xine)
$(cmake-utils_use_with xcb)
-DWITH_PulseAudio=OFF
- -DWITH_GLib2=OFF
+ -DWITH_GLib2=ON
"
# $(cmake-utils_use_with pulseaudio PulseAudio)
- # $(cmake-utils_use_with pulseaudio GLib2)
cmake-utils_src_configure
}