diff options
-rw-r--r-- | media-libs/xine-lib/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild | 4 | ||||
-rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.2.ebuild | 4 | ||||
-rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.3.ebuild | 4 | ||||
-rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 4 |
5 files changed, 13 insertions, 9 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 3d6fef9f2b53..614399f5f57e 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.693 2013/06/10 14:08:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.694 2013/08/11 21:46:32 aballier Exp $ + + 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> xine-lib-1.2.1-r1.ebuild, + xine-lib-1.2.2.ebuild, xine-lib-1.2.3.ebuild, xine-lib-1.2.9999.ebuild: + depend on slot 0 for ffmpeg *xine-lib-1.2.3 (10 Jun 2013) diff --git a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild index 665199e20e1a..3d0917b3d577 100644 --- a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.1-r1.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/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.14 2013/05/16 18:41:45 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.15 2013/08/11 21:46:32 aballier Exp $ EAPI=4 @@ -24,7 +24,7 @@ IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac f RDEPEND="dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib - || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) + || ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv a52? ( media-libs/a52dec ) diff --git a/media-libs/xine-lib/xine-lib-1.2.2.ebuild b/media-libs/xine-lib/xine-lib-1.2.2.ebuild index 774e056c307b..ab08e589e62c 100644 --- a/media-libs/xine-lib/xine-lib-1.2.2.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.2.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/xine-lib/xine-lib-1.2.2.ebuild,v 1.8 2013/05/16 18:41:45 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.2.ebuild,v 1.9 2013/08/11 21:46:32 aballier Exp $ EAPI=4 @@ -31,7 +31,7 @@ RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib - || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) + || ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv a52? ( media-libs/a52dec ) diff --git a/media-libs/xine-lib/xine-lib-1.2.3.ebuild b/media-libs/xine-lib/xine-lib-1.2.3.ebuild index 82d3f3e69f3b..1fd7f7c6fe18 100644 --- a/media-libs/xine-lib/xine-lib-1.2.3.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.3.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/xine-lib/xine-lib-1.2.3.ebuild,v 1.1 2013/06/10 14:08:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.3.ebuild,v 1.2 2013/08/11 21:46:32 aballier Exp $ EAPI=5 @@ -31,7 +31,7 @@ RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib - || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) + || ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv a52? ( media-libs/a52dec ) diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index a5833e5a44eb..9ae7ceab3175 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.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/xine-lib/xine-lib-1.2.9999.ebuild,v 1.22 2013/06/10 14:08:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.23 2013/08/11 21:46:32 aballier Exp $ EAPI=5 @@ -31,7 +31,7 @@ RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib - || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) + || ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv a52? ( media-libs/a52dec ) |