summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-07-10 05:27:56 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-07-10 05:28:37 +1000
commit362f25093d479d69fab1209fbf647ea6dc9f2520 (patch)
treed22bc7112cbe2b7969f881c32d3d2db38e1a1a67 /media-libs/phonon-gstreamer
parentdev-libs/jsoncpp: Bump to 1.7.4 w/ pkg-config fix (diff)
downloadgentoo-362f25093d479d69fab1209fbf647ea6dc9f2520.tar.gz
gentoo-362f25093d479d69fab1209fbf647ea6dc9f2520.tar.bz2
gentoo-362f25093d479d69fab1209fbf647ea6dc9f2520.zip
media-libs/phonon-gstreamer: introduce dev-qt/qtwebkit:4[gstreamer] blocker
dev-qt/qtwebkit:4[gstreamer] uses media-libs/gstreamer:0.10, while later versions of media-libs/phonon-gstreamer use media-libs/gstreamer:1.0. This can cause both gstreamer libraries to get loaded at once, resulting in a crash due to symbol collision. Gentoo-bug: 522880 Package-Manager: portage-2.3.0
Diffstat (limited to 'media-libs/phonon-gstreamer')
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild3
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild1
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild1
3 files changed, 4 insertions, 1 deletions
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
index 4c6c7fdab159..ad1eeeea4777 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -46,6 +46,7 @@ RDEPEND="
)
virtual/opengl
network? ( media-plugins/gst-plugins-soup:1.0 )
+ !dev-qt/qtwebkit:4[gstreamer]
"
DEPEND="${RDEPEND}
qt4? ( >=dev-util/automoc-0.9.87 )
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
index 6f9d2dffbbb7..70f8a2032b06 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
)
virtual/opengl
network? ( media-plugins/gst-plugins-soup:1.0 )
+ !dev-qt/qtwebkit:4[gstreamer]
"
DEPEND="${RDEPEND}
virtual/pkgconfig
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 6d575e7e6661..7ceaa4d61397 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
)
virtual/opengl
network? ( media-plugins/gst-plugins-soup:1.0 )
+ !dev-qt/qtwebkit:4[gstreamer]
"
DEPEND="${RDEPEND}
virtual/pkgconfig