summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-22 16:36:18 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-22 16:36:18 +0000
commit745e5be60ad3d147b85247a79d4032024ba0997d (patch)
treec30de4b0b1cfde9a9acabd302233c4f8706b7391 /media-libs/xine-lib
parentAdd an explicit dependency over libpostproc. (diff)
downloadgentoo-2-745e5be60ad3d147b85247a79d4032024ba0997d.tar.gz
gentoo-2-745e5be60ad3d147b85247a79d4032024ba0997d.tar.bz2
gentoo-2-745e5be60ad3d147b85247a79d4032024ba0997d.zip
Change order to || ( media-video/ffmpeg media-libs/libpostproc )
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r--media-libs/xine-lib/ChangeLog6
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild4
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 498341b8fe4d..5516d6b848e8 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.680 2012/05/22 16:33:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.681 2012/05/22 16:36:18 ssuominen Exp $
+
+ 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.1-r1.ebuild,
+ xine-lib-1.2.9999.ebuild:
+ Change order to || ( media-video/ffmpeg media-libs/libpostproc )
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 77b8a0c8aacb..e4e1512b602d 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.8 2012/05/22 16:33:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.9 2012/05/22 16:36:18 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/ffmpeg )
+ || ( media-video/ffmpeg media-libs/libpostproc )
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 ef1c835722b4..0cd58b32b351 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.13 2012/05/22 16:33:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.14 2012/05/22 16:36:18 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/ffmpeg )
+ || ( media-video/ffmpeg media-libs/libpostproc )
virtual/ffmpeg
virtual/libiconv
virtual/libintl