diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-04 01:24:17 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-04 01:24:17 +0000 |
| commit | d610ad66941885f12d466dddf2bb563a45defee5 (patch) | |
| tree | 2865ae2905b470433a18b18c1e36afb5210b7fb7 /media-libs/gst-plugins-bad | |
| parent | Make sure at-spi2-atk[gtk2] does not get pulled in for accessibility support. (diff) | |
| download | gentoo-2-d610ad66941885f12d466dddf2bb563a45defee5.tar.gz gentoo-2-d610ad66941885f12d466dddf2bb563a45defee5.tar.bz2 gentoo-2-d610ad66941885f12d466dddf2bb563a45defee5.zip | |
Add blocker on gst-plugins-good-1.0 (bug #486830, thanks to Maciej Piechotka).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'media-libs/gst-plugins-bad')
| -rw-r--r-- | media-libs/gst-plugins-bad/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/media-libs/gst-plugins-bad/ChangeLog b/media-libs/gst-plugins-bad/ChangeLog index a84c215f22bf..3e2a4a009517 100644 --- a/media-libs/gst-plugins-bad/ChangeLog +++ b/media-libs/gst-plugins-bad/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/gst-plugins-bad # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.125 2013/10/02 15:01:32 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.126 2013/10/04 01:24:17 tetromino Exp $ + + 04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + gst-plugins-bad-1.2.0.ebuild: + Add blocker on gst-plugins-good-1.0 (bug #486830, thanks to Maciej + Piechotka). 02 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> gst-plugins-bad-1.2.0.ebuild: diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild index b6d860d15e0c..c19cb188bcb6 100644 --- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild,v 1.2 2013/10/02 15:01:32 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild,v 1.3 2013/10/04 01:24:17 tetromino Exp $ EAPI="5" @@ -14,6 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x8 IUSE="+introspection +orc" # FIXME: we need to depend on mesa to avoid automagic on egl +# dtmf plugin moved from bad to good in 1.2 RDEPEND=" >=dev-libs/glib-2.32:2 >=media-libs/gst-plugins-base-1.2:${SLOT} @@ -22,6 +23,8 @@ RDEPEND=" x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) orc? ( >=dev-lang/orc-0.4.17 ) + + !<media-libs/gst-plugins-good-1.1:${SLOT} " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 |