diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-04 01:24:54 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-04 01:24:54 +0000 |
| commit | b83b76b6baad767c29de312f6fa170eb70d0f6d2 (patch) | |
| tree | 5f8356d58fdec19697872c0335e95079e3633b5b /media-libs/gst-plugins-good | |
| parent | Add blocker on gst-plugins-good-1.0 (bug #486830, thanks to Maciej Piechotka). (diff) | |
| download | gentoo-2-b83b76b6baad767c29de312f6fa170eb70d0f6d2.tar.gz gentoo-2-b83b76b6baad767c29de312f6fa170eb70d0f6d2.tar.bz2 gentoo-2-b83b76b6baad767c29de312f6fa170eb70d0f6d2.zip | |
Fix blocker on gst-plugins-bad-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-good')
| -rw-r--r-- | media-libs/gst-plugins-good/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/gst-plugins-good/gst-plugins-good-1.2.0.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/media-libs/gst-plugins-good/ChangeLog b/media-libs/gst-plugins-good/ChangeLog index 5e4edb6135b4..2e69fc0bfff5 100644 --- a/media-libs/gst-plugins-good/ChangeLog +++ b/media-libs/gst-plugins-good/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gst-plugins-good # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/ChangeLog,v 1.163 2013/10/02 14:59:51 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/ChangeLog,v 1.164 2013/10/04 01:24:54 tetromino Exp $ + + 04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + gst-plugins-good-1.2.0.ebuild: + Fix blocker on gst-plugins-bad-1.0 (bug #486830, thanks to Maciej Piechotka). 02 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> gst-plugins-good-1.2.0.ebuild: diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.2.0.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.2.0.ebuild index aa7551409198..adfa8d89ed7d 100644 --- a/media-libs/gst-plugins-good/gst-plugins-good-1.2.0.ebuild +++ b/media-libs/gst-plugins-good/gst-plugins-good-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-good/gst-plugins-good-1.2.0.ebuild,v 1.2 2013/10/02 14:59:51 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/gst-plugins-good-1.2.0.ebuild,v 1.3 2013/10/04 01:24:54 tetromino Exp $ EAPI="5" @@ -14,6 +14,7 @@ LICENSE="LGPL-2.1+" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="+orc" +# 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} @@ -21,10 +22,11 @@ RDEPEND=" app-arch/bzip2 sys-libs/zlib orc? ( >=dev-lang/orc-0.4.17 ) + + !<media-libs/gst-plugins-bad-1.1:${SLOT} " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 - !<media-libs/gst-plugins-bad-1.2.0:${SLOT} " # dtmf plugin move |