diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 18:10:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 18:10:32 +0000 |
| commit | 374b2bed65820a39af9bd6de1f0464cb6188c6ff (patch) | |
| tree | cd32fbc1ed845d3c9c6ffd3c19ac5c3fb7ddaddf /media-libs/xine-lib | |
| parent | Allow using older libav as well, for postproc. (diff) | |
| download | gentoo-2-374b2bed65820a39af9bd6de1f0464cb6188c6ff.tar.gz gentoo-2-374b2bed65820a39af9bd6de1f0464cb6188c6ff.tar.bz2 gentoo-2-374b2bed65820a39af9bd6de1f0464cb6188c6ff.zip | |
Fix the order again...
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/xine-lib')
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 10 | ||||
| -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.9999.ebuild | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 2f5469bfe5db..d15aadc90444 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,14 +1,14 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.682 2012/05/22 18:05:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.683 2012/05/22 18:10:32 ssuominen Exp $ - 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> xine-lib-1.2.1-r1.ebuild, + 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.1-r1.ebuild, xine-lib-1.2.9999.ebuild: - Allow using older libav as well, for postproc. + Change order to || ( media-video/ffmpeg $others ) for postproc. - 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.1-r1.ebuild, + 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> xine-lib-1.2.1-r1.ebuild, xine-lib-1.2.9999.ebuild: - Change order to || ( media-video/ffmpeg media-libs/libpostproc ) + Allow using older libav as well, for postproc. 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> xine-lib-1.2.1-r1.ebuild, xine-lib-1.2.9999.ebuild: 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 73c7c517a6f0..4a3ce70737bb 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-2012 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.10 2012/05/22 18:05:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.11 2012/05/22 18:10:32 ssuominen Exp $ EAPI=4 @@ -26,7 +26,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-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) + || ( media-video/ffmpeg 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 4f2487ed55a0..0c4f6941121f 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-2012 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.15 2012/05/22 18:05:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.16 2012/05/22 18:10:32 ssuominen Exp $ EAPI=4 @@ -26,7 +26,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-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) + || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) virtual/ffmpeg virtual/libiconv virtual/libintl |