diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-07-17 07:57:48 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-07-17 07:57:48 +0000 |
| commit | 137160fb7626eb341474b802ca34f71e0fdab6ef (patch) | |
| tree | 982afe45753feee223072f4b05b85d59620e7cdc /media-video/vlc | |
| parent | Add patches for security bug #231831. -r3 is -r0 with the patch, stable candi... (diff) | |
| download | gentoo-2-137160fb7626eb341474b802ca34f71e0fdab6ef.tar.gz gentoo-2-137160fb7626eb341474b802ca34f71e0fdab6ef.tar.bz2 gentoo-2-137160fb7626eb341474b802ca34f71e0fdab6ef.zip | |
Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 and -r2 have it, part of bug #231831.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.8.6i.ebuild | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.9.0_beta2.ebuild | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index fe5c931e06d0..0c8c5303d5bc 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.359 2008/07/15 17:47:56 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.360 2008/07/17 07:57:48 aballier Exp $ + + 17 Jul 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6i.ebuild, + vlc-0.9.0_beta2.ebuild: + Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 + and -r2 have it, part of bug #231831. 15 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org> vlc-0.8.6i.ebuild: ppc stable, bug #230692 diff --git a/media-video/vlc/vlc-0.8.6i.ebuild b/media-video/vlc/vlc-0.8.6i.ebuild index 44c8c7a56151..504382ec8bac 100644 --- a/media-video/vlc/vlc-0.8.6i.ebuild +++ b/media-video/vlc/vlc-0.8.6i.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6i.ebuild,v 1.4 2008/07/15 17:47:56 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6i.ebuild,v 1.5 2008/07/17 07:57:48 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -40,7 +40,9 @@ optimisememory libnotify jack musepack x264 dc1394 gnome xulrunner" RDEPEND=" >=media-video/ffmpeg-0.4.9_p20050226-r1 - <media-video/ffmpeg-0.4.9_p20070616-r1 + <media-video/ffmpeg-0.4.9_p20070616-r20 + !=media-video/ffmpeg-0.4.9_p20070616-r1 + !=media-video/ffmpeg-0.4.9_p20070616-r2 cdda? ( >=dev-libs/libcdio-0.71 cddb? ( >=media-libs/libcddb-1.2.0 ) ) live? ( >=media-plugins/live-2005.01.29 ) diff --git a/media-video/vlc/vlc-0.9.0_beta2.ebuild b/media-video/vlc/vlc-0.9.0_beta2.ebuild index 495398b0cfd0..60a1c8b07273 100644 --- a/media-video/vlc/vlc-0.9.0_beta2.ebuild +++ b/media-video/vlc/vlc-0.9.0_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_beta2.ebuild,v 1.1 2008/07/14 12:51:09 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_beta2.ebuild,v 1.2 2008/07/17 07:57:48 aballier Exp $ EAPI="1" @@ -70,7 +70,7 @@ RDEPEND=" >=media-libs/libdvdnav-0.1.9 media-libs/libdvdplay ) esd? ( media-sound/esound ) - ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 ) + ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r3 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) @@ -176,7 +176,7 @@ vlc_use_enable_force() { # Prints the configure argument for the ffmpeg scaling api to use vlc_ffmpeg_scaling_api() { if use ffmpeg ; then - if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r1" ; then + if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" ; then echo "--enable-swscale --disable-imgresample" else echo "--disable-swscale --enable-imgresample" |