diff options
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.9.0_alpha20080625.ebuild | 19 |
2 files changed, 21 insertions, 4 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 1cad65e9014e..3cf3670c04e0 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # 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.350 2008/06/29 14:15:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.351 2008/06/29 19:40:47 aballier Exp $ + + 29 Jun 2008; Alexis Ballier <aballier@gentoo.org> + vlc-0.9.0_alpha20080625.ebuild: + Support also ffmpeg without swscaler 29 Jun 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.9.0_alpha20080625.ebuild: diff --git a/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild index 3a8f2e2083c5..76551f0f8eab 100644 --- a/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild +++ b/media-video/vlc/vlc-0.9.0_alpha20080625.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_alpha20080625.ebuild,v 1.9 2008/06/29 14:15:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild,v 1.10 2008/06/29 19:40:47 aballier Exp $ EAPI="1" @@ -72,7 +72,7 @@ RDEPEND=" >=media-libs/libdvdnav-0.1.9 media-libs/libdvdplay ) esd? ( media-sound/esound ) - ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r2 ) + ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) @@ -175,6 +175,19 @@ vlc_use_enable_force() { fi } +# 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 + echo "--enable-swscale --disable-imgresample" + else + echo "--disable-swscale --enable-imgresample" + fi + else + echo "--disable-swscale --disable-imgresample" + fi +} + pkg_setup() { vlc_use_needs skins truetype vlc_use_force skins qt4 @@ -238,7 +251,7 @@ src_compile () { $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ $(use_enable esd) \ $(use_enable fbcon fb) \ - $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) \ + $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(use_enable ffmpeg postproc) \ $(use_enable flac) \ $(use_enable fluidsynth) \ --disable-galaktos \ |