diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-06-29 19:40:47 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-06-29 19:40:47 +0000 |
| commit | 4e2fb6dce50006f32ad5a6c1da2b4cf09f592938 (patch) | |
| tree | 3d249e64c0bafd3f2c557b62a4a33db7c5d88518 /media-video/vlc | |
| parent | bump 1.8.7 to 1.8.7_p22 for security fix (diff) | |
| download | historical-4e2fb6dce50006f32ad5a6c1da2b4cf09f592938.tar.gz historical-4e2fb6dce50006f32ad5a6c1da2b4cf09f592938.tar.bz2 historical-4e2fb6dce50006f32ad5a6c1da2b4cf09f592938.zip | |
Support also ffmpeg without swscaler
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 10 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.9.0_alpha20080625.ebuild | 19 |
3 files changed, 26 insertions, 9 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/Manifest b/media-video/vlc/Manifest index ab5a83ae3eae..27bb537640f5 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -10,13 +10,13 @@ DIST vlc-patches-56.tar.bz2 5736 RMD160 fbda37e0662e89c0452c28ea6a369e27f7b2f04f DIST vlc-snapshot-20080625.tar.bz2 15158559 RMD160 19caabbfce71ff5efcf5302488827a4021d3ca4f SHA1 7c61096fd2ad9a6711841ede4126e37591e70b43 SHA256 fdad2b8561de5a23e7120c94b30ad8833973accd7a0dd4000c0b3e3aac308895 EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47 EBUILD vlc-0.8.6h.ebuild 8989 RMD160 3f08b80bdc96d6ab57f5d5869949bf18f3a4c915 SHA1 2b9b6a353c7b467bb5468ec6770dfdb62638269b SHA256 eabf234909dfb3f9bbc36993839c00039282847cfdc580bd88ac4f6ae31cfce8 -EBUILD vlc-0.9.0_alpha20080625.ebuild 10443 RMD160 d7a3b5db7c56072e1dd9400801b8d3030b72c384 SHA1 4ea278dd4b4ef2f706b312069dd2b8d4db727619 SHA256 faaee9c79e84cf3652940c707c8e110e18a793a733997e8f0b93fddff7970126 -MISC ChangeLog 58603 RMD160 0e9a112926f61f8581e37f58e17481b28bbd4bb1 SHA1 905c13518bd8af08e88dbe41f2bb9a2b5322943c SHA256 ce67b12e2ddf8791c5a4cef97e728418aaf925bc21759f8d94c344aa4ce52221 +EBUILD vlc-0.9.0_alpha20080625.ebuild 10821 RMD160 95ecf6c386355a4b5890453be37190bd2627615a SHA1 14b42e00939fa0dfeb6e413ee1eecd95ea0bd4dd SHA256 232bda01b4cb40d31cbfa267f9bc289f2c5f4bd459f807eded0f5b55899ee731 +MISC ChangeLog 58729 RMD160 62e2a46ba89882a4cae90d513125935c1d3b21e2 SHA1 1bdbd78813fb5dd312b799059e1b8388c332cbec SHA256 74d025629a15d0a3c70176f6762199c475c7cc8381bd1cfef782dfd31763e090 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkhnmRgACgkQvFcC4BYPU0o5sACeKPhu+EmxlszjRNrUdDCJM1gY -CjgAoJJH8W6by207RJ8KNR/2HbHvDibU -=SSpD +iEYEARECAAYFAkhn5UkACgkQvFcC4BYPU0rCcQCglBGj2o9yly9Ju4x1U4xaB/HV +SwcAoLA5mqYoms/UyA0NHNgscOAtNbEH +=nQ/N -----END PGP SIGNATURE----- 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 \ |