From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1KD2lZ-00028J-O0 for garchives@archives.gentoo.org; Sun, 29 Jun 2008 19:40:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20BC3E045A; Sun, 29 Jun 2008 19:40:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CF9CFE045A for ; Sun, 29 Jun 2008 19:40:52 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 6DA3D670F3 for ; Sun, 29 Jun 2008 19:40:52 +0000 (UTC) Received: from aballier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1KD2lU-0005XD-CF for gentoo-commits@lists.gentoo.org; Sun, 29 Jun 2008 19:40:48 +0000 From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/vlc: ChangeLog vlc-0.9.0_alpha20080625.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog vlc-0.9.0_alpha20080625.ebuild X-VCS-Directories: media-video/vlc X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: Sender: Alexis Ballier Date: Sun, 29 Jun 2008 19:40:48 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ccfecf30-6f70-47fd-a545-954a9dd94c6f X-Archives-Hash: 02e9970857f008637f84664f27512e9e aballier 08/06/29 19:40:48 Modified: ChangeLog vlc-0.9.0_alpha20080625.ebuild Log: Support also ffmpeg without swscaler (Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64) Revision Changes Path 1.351 media-video/vlc/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/Ch= angeLog?rev=3D1.351&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/Ch= angeLog?rev=3D1.351&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/Ch= angeLog?r1=3D1.350&r2=3D1.351 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- ChangeLog 29 Jun 2008 14:15:43 -0000 1.350 +++ ChangeLog 29 Jun 2008 19:40:47 -0000 1.351 @@ -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 200= 8/06/29 14:15:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.351 200= 8/06/29 19:40:47 aballier Exp $ + + 29 Jun 2008; Alexis Ballier + vlc-0.9.0_alpha20080625.ebuild: + Support also ffmpeg without swscaler =20 29 Jun 2008; Alexis Ballier vlc-0.9.0_alpha20080625.ebuild: 1.10 media-video/vlc/vlc-0.9.0_alpha20080625.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vl= c-0.9.0_alpha20080625.ebuild?rev=3D1.10&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vl= c-0.9.0_alpha20080625.ebuild?rev=3D1.10&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vl= c-0.9.0_alpha20080625.ebuild?r1=3D1.9&r2=3D1.10 Index: vlc-0.9.0_alpha20080625.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625= .ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vlc-0.9.0_alpha20080625.ebuild 29 Jun 2008 14:15:43 -0000 1.9 +++ vlc-0.9.0_alpha20080625.ebuild 29 Jun 2008 19:40:47 -0000 1.10 @@ -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_alpha200806= 25.ebuild,v 1.9 2008/06/29 14:15:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha200806= 25.ebuild,v 1.10 2008/06/29 19:40:47 aballier Exp $ =20 EAPI=3D"1" =20 @@ -72,7 +72,7 @@ >=3Dmedia-libs/libdvdnav-0.1.9 media-libs/libdvdplay ) esd? ( media-sound/esound ) - ffmpeg? ( >=3Dmedia-video/ffmpeg-0.4.9_p20070616-r2 ) + ffmpeg? ( >=3Dmedia-video/ffmpeg-0.4.9_p20070616 ) flac? ( media-libs/libogg >=3Dmedia-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) @@ -175,6 +175,19 @@ fi } =20 +# Prints the configure argument for the ffmpeg scaling api to use +vlc_ffmpeg_scaling_api() { + if use ffmpeg ; then + if has_version ">=3Dmedia-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 @@ $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ $(use_enable esd) \ $(use_enable fbcon fb) \ - $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enabl= e ffmpeg swscale) \ + $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpe= g_scaling_api) $(use_enable ffmpeg postproc) \ $(use_enable flac) \ $(use_enable fluidsynth) \ --disable-galaktos \ --=20 gentoo-commits@lists.gentoo.org mailing list