From 362f25093d479d69fab1209fbf647ea6dc9f2520 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sun, 10 Jul 2016 05:27:56 +1000 Subject: [PATCH] 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 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 -- 2.26.2