summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2015-01-06 19:39:11 +0000
committerManuel Rüger <mrueg@gentoo.org>2015-01-06 19:39:11 +0000
commita730b173868c0b74cd0dfc5827ab9eb534056078 (patch)
tree2968186122dd81af2621a36c1ead1e0665a67aaa /media-libs/avidemux-core/avidemux-core-9999.ebuild
parentUpdate xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See b... (diff)
downloadgentoo-2-a730b173868c0b74cd0dfc5827ab9eb534056078.tar.gz
gentoo-2-a730b173868c0b74cd0dfc5827ab9eb534056078.tar.bz2
gentoo-2-a730b173868c0b74cd0dfc5827ab9eb534056078.zip
Update xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See bug #534710
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'media-libs/avidemux-core/avidemux-core-9999.ebuild')
-rw-r--r--media-libs/avidemux-core/avidemux-core-9999.ebuild9
1 files changed, 6 insertions, 3 deletions
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index ca844efbe2e0..30d22d29232b 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.8 2014/08/10 21:07:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.9 2015/01/06 19:39:11 mrueg Exp $
EAPI="5"
@@ -36,7 +36,10 @@ DEPEND="
xv? ( x11-libs/libXv:0 )
vaapi? ( x11-libs/libva:0 )
vdpau? ( x11-libs/libvdpau:0 )
- video_cards_fglrx? ( x11-libs/xvba-video:0 )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3
+ x11-libs/xvba-video:0 )
+ )
"
RDEPEND="
$DEPEND