summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-05-22 18:05:34 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-05-22 18:05:34 +0000
commitbe550cbd25abfb77fe4c597bd72fb5d0fabb3a76 (patch)
tree6e4b8e8be75f9d43825c5d8d0c0ba380030b7eee /media-libs/xine-lib
parentold (diff)
downloadgentoo-2-be550cbd25abfb77fe4c597bd72fb5d0fabb3a76.tar.gz
gentoo-2-be550cbd25abfb77fe4c597bd72fb5d0fabb3a76.tar.bz2
gentoo-2-be550cbd25abfb77fe4c597bd72fb5d0fabb3a76.zip
Allow using older libav as well, for postproc.
(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 5516d6b848e8..2f5469bfe5db 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.681 2012/05/22 16:36:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.682 2012/05/22 18:05:34 flameeyes Exp $
+
+ 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> xine-lib-1.2.1-r1.ebuild,
+ xine-lib-1.2.9999.ebuild:
+ Allow using older libav as well, for postproc.
22 May 2012; Samuli Suominen <ssuominen@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 e4e1512b602d..73c7c517a6f0 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.9 2012/05/22 16:36:18 ssuominen Exp $
+# $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 $
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-video/ffmpeg media-libs/libpostproc )
+ || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
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 0cd58b32b351..4f2487ed55a0 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.14 2012/05/22 16:36:18 ssuominen Exp $
+# $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 $
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-video/ffmpeg media-libs/libpostproc )
+ || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
virtual/ffmpeg
virtual/libiconv
virtual/libintl