1 |
commit: 362f25093d479d69fab1209fbf647ea6dc9f2520 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 9 19:27:56 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 9 19:28:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362f2509 |
7 |
|
8 |
media-libs/phonon-gstreamer: introduce dev-qt/qtwebkit:4[gstreamer] blocker |
9 |
|
10 |
dev-qt/qtwebkit:4[gstreamer] uses media-libs/gstreamer:0.10, while later |
11 |
versions of media-libs/phonon-gstreamer use media-libs/gstreamer:1.0. |
12 |
|
13 |
This can cause both gstreamer libraries to get loaded at once, resulting in a |
14 |
crash due to symbol collision. |
15 |
|
16 |
Gentoo-bug: 522880 |
17 |
|
18 |
Package-Manager: portage-2.3.0 |
19 |
|
20 |
media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild | 3 ++- |
21 |
media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild | 1 + |
22 |
media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild | 1 + |
23 |
3 files changed, 4 insertions(+), 1 deletion(-) |
24 |
|
25 |
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild |
26 |
index 4c6c7fd..ad1eeee 100644 |
27 |
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild |
28 |
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild |
29 |
@@ -1,4 +1,4 @@ |
30 |
-# Copyright 1999-2015 Gentoo Foundation |
31 |
+# Copyright 1999-2016 Gentoo Foundation |
32 |
# Distributed under the terms of the GNU General Public License v2 |
33 |
# $Id$ |
34 |
|
35 |
@@ -46,6 +46,7 @@ RDEPEND=" |
36 |
) |
37 |
virtual/opengl |
38 |
network? ( media-plugins/gst-plugins-soup:1.0 ) |
39 |
+ !dev-qt/qtwebkit:4[gstreamer] |
40 |
" |
41 |
DEPEND="${RDEPEND} |
42 |
qt4? ( >=dev-util/automoc-0.9.87 ) |
43 |
|
44 |
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild |
45 |
index 6f9d2df..70f8a20 100644 |
46 |
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild |
47 |
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild |
48 |
@@ -47,6 +47,7 @@ RDEPEND=" |
49 |
) |
50 |
virtual/opengl |
51 |
network? ( media-plugins/gst-plugins-soup:1.0 ) |
52 |
+ !dev-qt/qtwebkit:4[gstreamer] |
53 |
" |
54 |
DEPEND="${RDEPEND} |
55 |
virtual/pkgconfig |
56 |
|
57 |
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
58 |
index 6d575e7..7ceaa4d 100644 |
59 |
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
60 |
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild |
61 |
@@ -47,6 +47,7 @@ RDEPEND=" |
62 |
) |
63 |
virtual/opengl |
64 |
network? ( media-plugins/gst-plugins-soup:1.0 ) |
65 |
+ !dev-qt/qtwebkit:4[gstreamer] |
66 |
" |
67 |
DEPEND="${RDEPEND} |
68 |
virtual/pkgconfig |