summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-10-26 22:22:45 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-10-26 22:22:45 +0000
commitf7bc8ba469792422bfdb49c29195b72f9d7cf6b3 (patch)
tree7ce79d038d6aa70db58c4d9ffe20d421f4e37cc6 /media-video
parentrevbump backport sasl fix for inspircd (diff)
downloadgentoo-2-f7bc8ba469792422bfdb49c29195b72f9d7cf6b3.tar.gz
gentoo-2-f7bc8ba469792422bfdb49c29195b72f9d7cf6b3.tar.bz2
gentoo-2-f7bc8ba469792422bfdb49c29195b72f9d7cf6b3.zip
Raise minimal version of media-video/ffmpeg to 1.2 as that is the first version that introduces VDPAU context and common hw accel support helpers; fixes bug #489512, reported by Frank Krömmelbein.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog8
-rw-r--r--media-video/vlc/vlc-2.1.0.ebuild5
-rw-r--r--media-video/vlc/vlc-2.1.9999.ebuild5
-rw-r--r--media-video/vlc/vlc-9999.ebuild5
4 files changed, 16 insertions, 7 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fce597d12bd3..b94010605bfd 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.868 2013/10/26 20:47:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.869 2013/10/26 22:22:45 tomwij Exp $
+
+ 26 Oct 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.0.ebuild,
+ vlc-2.1.9999.ebuild, vlc-9999.ebuild:
+ Raise minimal version of media-video/ffmpeg to 1.2 as that is the first
+ version that introduces VDPAU context and common hw accel support helpers;
+ fixes bug #489512, reported by Frank Krömmelbein.
26 Oct 2013; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
Actually, upon checking I now see that in the 9999 branch the configure flag
diff --git a/media-video/vlc/vlc-2.1.0.ebuild b/media-video/vlc/vlc-2.1.0.ebuild
index cabf7a3717ff..846ae440a2b1 100644
--- a/media-video/vlc/vlc-2.1.0.ebuild
+++ b/media-video/vlc/vlc-2.1.0.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-video/vlc/vlc-2.1.0.ebuild,v 1.2 2013/10/26 20:38:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.3 2013/10/26 22:22:45 tomwij Exp $
EAPI="5"
@@ -55,6 +55,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
vlm vorbis wma-fixed +X x264 +xcb xml xv zvbi"
RDEPEND="
+ !<media-video/ffmpeg-1.2:0
dev-libs/libgpg-error:0
net-dns/libidn:0
>=sys-devel/gettext-0.18.3:0
@@ -114,7 +115,7 @@ RDEPEND="
opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
opus? ( >=media-libs/opus-1.0.3:0 )
png? ( media-libs/libpng:0= sys-libs/zlib:0 )
- postproc? ( || ( media-video/ffmpeg:0= media-libs/libpostproc:0 ) )
+ postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) )
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index d7ccbea937ae..3f24c551f93f 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.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-video/vlc/vlc-2.1.9999.ebuild,v 1.6 2013/10/26 20:38:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.7 2013/10/26 22:22:45 tomwij Exp $
EAPI="5"
@@ -55,6 +55,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
vlm vorbis wma-fixed +X x264 +xcb xml xv zvbi"
RDEPEND="
+ !<media-video/ffmpeg-1.2:0
dev-libs/libgpg-error:0
net-dns/libidn:0
>=sys-devel/gettext-0.18.3:0
@@ -114,7 +115,7 @@ RDEPEND="
opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
opus? ( >=media-libs/opus-1.0.3:0 )
png? ( media-libs/libpng:0= sys-libs/zlib:0 )
- postproc? ( || ( media-video/ffmpeg:0= media-libs/libpostproc:0 ) )
+ postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) )
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index faa0c4f66a0a..2591f483cde5 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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-video/vlc/vlc-9999.ebuild,v 1.200 2013/10/26 20:47:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.201 2013/10/26 22:22:45 tomwij Exp $
EAPI="5"
@@ -55,6 +55,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
vlm vnc vorbis vpx wma-fixed +X x264 +xcb xml xv zvbi"
RDEPEND="
+ !<media-video/ffmpeg-1.2:0
dev-libs/libgpg-error:0
net-dns/libidn:0
>=sys-devel/gettext-0.18.3:0
@@ -114,7 +115,7 @@ RDEPEND="
opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
opus? ( >=media-libs/opus-1.0.3:0 )
png? ( media-libs/libpng:0= sys-libs/zlib:0 )
- postproc? ( || ( media-video/ffmpeg:0= media-libs/libpostproc:0 ) )
+ postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) )
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )