From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Oc2QW-0008H8-55 for garchives@archives.gentoo.org; Thu, 22 Jul 2010 20:31:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9D2FE0894; Thu, 22 Jul 2010 20:31:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7F3FDE0894 for ; Thu, 22 Jul 2010 20:31:31 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29AD21B4009 for ; Thu, 22 Jul 2010 20:31:31 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2139) id 729112CE15; Thu, 22 Jul 2010 20:31:30 +0000 (UTC) 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/ffmpeg: ChangeLog ffmpeg-9999-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog ffmpeg-9999-r1.ebuild X-VCS-Directories: media-video/ffmpeg X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: <20100722203130.729112CE15@corvid.gentoo.org> Date: Thu, 22 Jul 2010 20:31:30 +0000 (UTC) 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: b4bce6c1-2a7a-4c0e-b18e-aa375fe02a1a X-Archives-Hash: e06db3159b405c58e14123dc6b5c2762 aballier 10/07/22 20:31:30 Modified: ChangeLog ffmpeg-9999-r1.ebuild Log: sort rdepend, use same detection of live ebuild everywhere, cosmetics, = by Nikoli in bug #324453 (Portage version: 2.2_rc67/cvs/Linux x86_64) Revision Changes Path 1.362 media-video/ffmpeg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ChangeLog?rev=3D1.362&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ChangeLog?rev=3D1.362&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ChangeLog?r1=3D1.361&r2=3D1.362 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/ffmpeg/ChangeLog,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- ChangeLog 11 Jul 2010 15:15:15 -0000 1.361 +++ ChangeLog 22 Jul 2010 20:31:30 -0000 1.362 @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.361 = 2010/07/11 15:15:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.362 = 2010/07/22 20:31:30 aballier Exp $ + + 22 Jul 2010; Alexis Ballier ffmpeg-9999-r1.ebuil= d: + sort rdepend, use same detection of live ebuild everywhere, cosmetics,= by + Nikoli in bug #324453 =20 11 Jul 2010; Jeroen Roovers ffmpeg-0.6.ebuild: Marked ~hppa (bug #324941). 1.45 media-video/ffmpeg/ffmpeg-9999-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ffmpeg-9999-r1.ebuild?rev=3D1.45&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ffmpeg-9999-r1.ebuild?rev=3D1.45&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg= /ffmpeg-9999-r1.ebuild?r1=3D1.44&r2=3D1.45 Index: ffmpeg-9999-r1.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/ffmpeg/ffmpeg-9999-r1.ebuil= d,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ffmpeg-9999-r1.ebuild 22 Jun 2010 07:28:55 -0000 1.44 +++ ffmpeg-9999-r1.ebuild 22 Jul 2010 20:31:30 -0000 1.45 @@ -1,12 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebu= ild,v 1.44 2010/06/22 07:28:55 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebu= ild,v 1.45 2010/07/22 20:31:30 aballier Exp $ =20 EAPI=3D"2" =20 SCM=3D"" if [ "${PV#9999}" !=3D "${PV}" ] ; then - SCM=3Dsubversion + SCM=3D"subversion" ESVN_REPO_URI=3D"svn://svn.ffmpeg.org/ffmpeg/trunk" fi =20 @@ -25,7 +25,7 @@ =20 LICENSE=3D"GPL-3" SLOT=3D"0" -if [[ ${PV} =3D=3D *9999* ]]; then +if [ "${PV#9999}" !=3D "${PV}" ] ; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86= -fbsd" @@ -41,32 +41,33 @@ IUSE=3D"${IUSE} video_cards_${x}" done =20 -RDEPEND=3D"sdl? ( >=3Dmedia-libs/libsdl-1.2.10 ) +RDEPEND=3D" alsa? ( media-libs/alsa-lib ) + amr? ( media-libs/opencore-amr ) + dirac? ( media-video/dirac ) encode? ( faac? ( media-libs/faac ) mp3? ( media-sound/lame ) - vorbis? ( media-libs/libvorbis media-libs/libogg ) theora? ( >=3Dmedia-libs/libtheora-1.1.1[encode] media-libs/libogg ) + vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=3Dmedia-libs/x264-0.0.20100605 ) - xvid? ( >=3Dmedia-libs/xvid-1.1.0 ) ) - zlib? ( sys-libs/zlib ) - ieee1394? ( media-libs/libdc1394 - sys-libs/libraw1394 ) - dirac? ( media-video/dirac ) + xvid? ( >=3Dmedia-libs/xvid-1.1.0 ) + ) + faad? ( >=3Dmedia-libs/faad2-2.6.1 ) gsm? ( >=3Dmedia-sound/gsm-1.0.12-r1 ) + ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) + jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=3Dmedia-libs/openjpeg-1.3-r2 ) - amr? ( media-libs/opencore-amr ) rtmp? ( media-video/rtmpdump ) + sdl? ( >=3Dmedia-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=3Dmedia-libs/speex-1.2_beta3 ) - jack? ( media-sound/jack-audio-connection-kit ) - X? ( x11-libs/libX11 x11-libs/libXext ) vaapi? ( x11-libs/libva ) + video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) vpx? ( media-libs/libvpx ) - video_cards_nvidia? ( - vdpau? ( x11-libs/libvdpau ) - )" + X? ( x11-libs/libX11 x11-libs/libXext ) + zlib? ( sys-libs/zlib ) +" =20 DEPEND=3D"${RDEPEND} >=3Dsys-devel/make-3.81 @@ -81,7 +82,7 @@ " =20 src_prepare() { - if [[ ${PV} =3D *9999* ]]; then + if [ "${PV#9999}" !=3D "${PV}" ] ; then # Set SVN version manually subversion_wc_info sed -i -e "s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/" "${S}/version.sh" || d= ie