[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/

[Michael Palimaka]

commit:     362f25093d479d69fab1209fbf647ea6dc9f2520
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 19:27:56 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 19:28:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362f2509

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

 media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild | 3 ++-
 media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild | 1 +
 media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

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 4c6c7fd..ad1eeee 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 6f9d2df..70f8a20 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 6d575e7..7ceaa4d 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