| 1 |
aballier 08/06/29 19:40:48 |
| 2 |
|
| 3 |
Modified: ChangeLog vlc-0.9.0_alpha20080625.ebuild |
| 4 |
Log: |
| 5 |
Support also ffmpeg without swscaler |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.351 media-video/vlc/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.351&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.351&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.350&r2=1.351 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 18 |
retrieving revision 1.350 |
| 19 |
retrieving revision 1.351 |
| 20 |
diff -u -r1.350 -r1.351 |
| 21 |
--- ChangeLog 29 Jun 2008 14:15:43 -0000 1.350 |
| 22 |
+++ ChangeLog 29 Jun 2008 19:40:47 -0000 1.351 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for media-video/vlc |
| 25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.350 2008/06/29 14:15:43 aballier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.351 2008/06/29 19:40:47 aballier Exp $ |
| 28 |
+ |
| 29 |
+ 29 Jun 2008; Alexis Ballier <aballier@g.o> |
| 30 |
+ vlc-0.9.0_alpha20080625.ebuild: |
| 31 |
+ Support also ffmpeg without swscaler |
| 32 |
|
| 33 |
29 Jun 2008; Alexis Ballier <aballier@g.o> |
| 34 |
vlc-0.9.0_alpha20080625.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.10 media-video/vlc/vlc-0.9.0_alpha20080625.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild?rev=1.10&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild?rev=1.10&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild?r1=1.9&r2=1.10 |
| 43 |
|
| 44 |
Index: vlc-0.9.0_alpha20080625.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild,v |
| 47 |
retrieving revision 1.9 |
| 48 |
retrieving revision 1.10 |
| 49 |
diff -u -r1.9 -r1.10 |
| 50 |
--- vlc-0.9.0_alpha20080625.ebuild 29 Jun 2008 14:15:43 -0000 1.9 |
| 51 |
+++ vlc-0.9.0_alpha20080625.ebuild 29 Jun 2008 19:40:47 -0000 1.10 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
EAPI="1" |
| 59 |
|
| 60 |
@@ -72,7 +72,7 @@ |
| 61 |
>=media-libs/libdvdnav-0.1.9 |
| 62 |
media-libs/libdvdplay ) |
| 63 |
esd? ( media-sound/esound ) |
| 64 |
- ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r2 ) |
| 65 |
+ ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 ) |
| 66 |
flac? ( media-libs/libogg |
| 67 |
>=media-libs/flac-1.1.2 ) |
| 68 |
fluidsynth? ( media-sound/fluidsynth ) |
| 69 |
@@ -175,6 +175,19 @@ |
| 70 |
fi |
| 71 |
} |
| 72 |
|
| 73 |
+# Prints the configure argument for the ffmpeg scaling api to use |
| 74 |
+vlc_ffmpeg_scaling_api() { |
| 75 |
+ if use ffmpeg ; then |
| 76 |
+ if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r1" ; then |
| 77 |
+ echo "--enable-swscale --disable-imgresample" |
| 78 |
+ else |
| 79 |
+ echo "--disable-swscale --enable-imgresample" |
| 80 |
+ fi |
| 81 |
+ else |
| 82 |
+ echo "--disable-swscale --disable-imgresample" |
| 83 |
+ fi |
| 84 |
+} |
| 85 |
+ |
| 86 |
pkg_setup() { |
| 87 |
vlc_use_needs skins truetype |
| 88 |
vlc_use_force skins qt4 |
| 89 |
@@ -238,7 +251,7 @@ |
| 90 |
$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ |
| 91 |
$(use_enable esd) \ |
| 92 |
$(use_enable fbcon fb) \ |
| 93 |
- $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) \ |
| 94 |
+ $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(use_enable ffmpeg postproc) \ |
| 95 |
$(use_enable flac) \ |
| 96 |
$(use_enable fluidsynth) \ |
| 97 |
--disable-galaktos \ |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
-- |
| 102 |
gentoo-commits@l.g.o mailing list |
Archives