summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-06-14 16:36:35 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-06-14 16:36:35 +0000
commitc1684048305064ff8e19de18cfe3e89a49ce2d74 (patch)
tree0178a87a9c4892ee7398948a568c7c1d6c9cff00 /media-tv
parentStable for HPPA (bug #473242). (diff)
downloadgentoo-2-c1684048305064ff8e19de18cfe3e89a49ce2d74.tar.gz
gentoo-2-c1684048305064ff8e19de18cfe3e89a49ce2d74.tar.bz2
gentoo-2-c1684048305064ff8e19de18cfe3e89a49ce2d74.zip
vdpau requires a recent ffmpeg version so depend on virtual/ffmpeg-9 in that case
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 4192cb9ad4bd..b65e26d813bc 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-tv/xbmc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.185 2013/06/13 22:47:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.186 2013/06/14 16:36:35 aballier Exp $
+
+ 14 Jun 2013; Alexis Ballier <aballier@gentoo.org> xbmc-9999.ebuild:
+ vdpau requires a recent ffmpeg version so depend on virtual/ffmpeg-9 in that
+ case
*xbmc-12.2-r1 (13 Jun 2013)
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 001ffff599a0..c82983df80b8 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-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-tv/xbmc/xbmc-9999.ebuild,v 1.145 2013/05/24 14:05:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.146 2013/06/14 16:36:35 aballier Exp $
EAPI=5
@@ -114,7 +114,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
vaapi? ( x11-libs/libva[opengl] )
vdpau? (
|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
- virtual/ffmpeg[vdpau]
+ >=virtual/ffmpeg-9[vdpau]
)
X? (
x11-apps/xdpyinfo