push a new snapshot

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 266 insertions, 2 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1a494ffe5ac1..6f3fd47701ed 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.345 2010/03/13 14:33:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.346 2010/04/12 09:42:02 aballier Exp $
+
+*ffmpeg-0.5_p22846 (12 Apr 2010)
+
+  12 Apr 2010; Alexis Ballier <aballier@gentoo.org>
+  +ffmpeg-0.5_p22846.ebuild:
+  push a new snapshot
 
   13 Mar 2010; Luca Barbato <lu_zero@gentoo.org> ffmpeg-0.5_p20373.ebuild,
   ffmpeg-0.5_p20601-r1.ebuild, ffmpeg-0.5_p21602.ebuild,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1af588a1552e..0dd8f2d514b1 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ffmpeg-0.5_p20601-r1-libtheora.patch 1067 RMD160 58c172ffa186d616462405cec7cbc17e085e7d8e SHA1 0c4154a7ee429f8bc4b28204b9b3385d2c949e64 SHA256 bde37379b335a0505addc15697d807f3536843747556b61591333dded1a05be5
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0e19c58 SHA1 ddf5d0389586d8ceb2979e0804a7b80a9640aad4 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
 DIST ffmpeg-0.5_p20601.tar.bz2 3103450 RMD160 0fb6ebf92673510ab4118422dcbb7f96b0d47e4f SHA1 38211d48ffcab03c83d0cf2043e3c931041a6928 SHA256 3e79c8245ab66d3eda907d5857a9cecda164a9eacfa83e52322760260519ade4
 DIST ffmpeg-0.5_p21602.tar.bz2 3212091 RMD160 af9abf8e67c95abf92f6651f8c7ccf6e5c81faff SHA1 849ff09f3762cec3d864d46524f2237c05a30554 SHA256 abb889364577a5c01f3018b58e36a9cd3db64bc2a15b9ecbdeb0d0cdb8d8babe
+DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccbed3cf8 SHA1 d207570ed009b63c94485ccc64439107cf700f39 SHA256 a52d82476afa7c8ed62c1a52760e49907947c1ef1ecfc3e9022fa713e9783f2f
 EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 SHA1 1c2517f10be827668807cf051b7c595162534eb0 SHA256 84d0af467747bd359582c4e7e90e61edf6eb6857d87905228fc1411e7ce00630
 EBUILD ffmpeg-0.5_p20373.ebuild 7751 RMD160 7adda8d870c3647ce111d2f5690c904782bebdc6 SHA1 e09066505466958f7c7744d5a422770dac66a5f9 SHA256 7aaf2247514dc15481679c36f2d8cf9ac6d79f4486525fe24cf64a57db7ede43
 EBUILD ffmpeg-0.5_p20601-r1.ebuild 7958 RMD160 82a541f9c34dd51fbc37d06a0e3755a3fe0414b4 SHA1 041f89aead8a419f391689e28c054ce1ff0362db SHA256 917933245641924c22b5bf7b93136e0a8e9b3c8a7f32c413d229c931c3639355
 EBUILD ffmpeg-0.5_p21602.ebuild 7755 RMD160 58ed59f5e16d40054f4f3f1322e53a5a8efb8467 SHA1 bb906483c6b37f6c43910e94ad6eb0de8292ce3a SHA256 77b0bcc77a4348a5c262f4efac75aaed44cc1b2431a237151b4f76ae4747a3d9
+EBUILD ffmpeg-0.5_p22846.ebuild 7599 RMD160 5640fddb80dc38bcbfd84cbe6fa2a6fba3c49c0c SHA1 1fd614920e2880d6fe45d107d708449b015041b9 SHA256 a973cd6c7050d59831cac738b78a3e0a79ee56086304d4703f0dbce91ee8d44d
 EBUILD ffmpeg-9999-r1.ebuild 7532 RMD160 31f98066ff5fe36fa4e770ddf196e8928bdac027 SHA1 82b4a4b5bcb799863d06f98f320940c248078a88 SHA256 6b5fc5a778fd778df3c17034b112c754acbafd828b8ce5e60195baedcaef5f67
-MISC ChangeLog 51694 RMD160 64768aa2db9315ee05f1319778b1e2b1f18e4091 SHA1 7bc090b6ed3aeb049e739cca041cc84a2dc00185 SHA256 8878cda841f520b2bdb0b4247a632a2a24e82e2f6a709fd1278fbaa630c41ca4
+MISC ChangeLog 51833 RMD160 4b59e71e52183668479f605399b62cb23ad55b57 SHA1 2d14bdddc0171ac19de24db087824fcd37a667c5 SHA256 1af54fb193188c213bf5cf0fd0500c7b0bbef6aeb81712c8b4191330dec33a98
 MISC metadata.xml 1883 RMD160 554fd616dba222fecc06b70c87a4b500e7def88f SHA1 120b586e382db1a65a561825cc63e28c0ea891fe SHA256 630e22c41ddd64bcfd294d23413415bdcfc1c4a1e6c0da939bf533b084f35d7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvC6vAACgkQvFcC4BYPU0owIgCfYmUvDmAkxhcmNvMJX7eHkQvM
+G6wAn3wlcxJiL/trmGj1kZEJy+AumavP
+=kbqH
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild
new file mode 100644
index 000000000000..23635abf8c81
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.5_p22846.ebuild
@@ -0,0 +1,246 @@
+# 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-0.5_p22846.ebuild,v 1.1 2010/04/12 09:42:02 aballier Exp $
+
+EAPI=2
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM=subversion
+	ESVN_REPO_URI="svn://svn.ffmpeg.org/ffmpeg/trunk"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
+	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
+	  theora threads x264 xvid network zlib sdl X mp3 opencore-amr
+	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
+	  speex +ssse3 jpeg2k vdpau"
+
+VIDEO_CARDS="nvidia"
+
+for x in ${VIDEO_CARDS}; do
+	IUSE="${IUSE} video_cards_${x}"
+done
+
+RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
+	alsa? ( media-libs/alsa-lib )
+	encode? (
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20100118 )
+		xvid? ( >=media-libs/xvid-1.1.0 ) )
+	faad? ( >=media-libs/faad2-2.6.1 )
+	zlib? ( sys-libs/zlib )
+	ieee1394? ( media-libs/libdc1394
+				sys-libs/libraw1394 )
+	dirac? ( media-video/dirac )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	opencore-amr? ( media-libs/opencore-amr )
+	schroedinger? ( media-libs/schroedinger )
+	speex? ( >=media-libs/speex-1.2_beta3 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	video_cards_nvidia? (
+		vdpau? ( x11-libs/libvdpau )
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( dev-util/pkgconfig )
+	schroedinger? ( dev-util/pkgconfig )
+	mmx? ( dev-lang/yasm )
+	doc? ( app-text/texi2html )
+	test? ( net-misc/wget )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )"
+
+src_prepare() {
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		sed -i s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/ "${S}/version.sh"
+	elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		sed -i s/UNKNOWN/SVN-r${FFMPEG_REVISION}/ "${S}/version.sh"
+	fi
+}
+
+src_configure() {
+	local myconf="${EXTRA_FFMPEG_CONF}"
+
+	# enabled by default
+	use debug || myconf="${myconf} --disable-debug"
+	use zlib || myconf="${myconf} --disable-zlib"
+	use sdl || myconf="${myconf} --disable-ffplay"
+	use network || myconf="${myconf} --disable-network"
+
+	use custom-cflags && myconf="${myconf} --disable-optimizations"
+	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
+
+	# enabled by default
+	if use encode
+	then
+		use mp3 && myconf="${myconf} --enable-libmp3lame"
+		use vorbis && myconf="${myconf} --enable-libvorbis"
+		use theora && myconf="${myconf} --enable-libtheora"
+		use x264 && myconf="${myconf} --enable-libx264"
+		use xvid && myconf="${myconf} --enable-libxvid"
+		if use bindist
+		then
+			use faac && ewarn "faac is nonfree and cannot be distributed;
+			disabling faac support."
+		else
+			use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+		fi
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	# Indevs
+	for i in v4l v4l2 alsa oss jack ; do
+		use $i || myconf="${myconf} --disable-indev=$i"
+	done
+	# Outdevs
+	for i in alsa oss ; do
+		use $i || myconf="${myconf} --disable-outdev=$i"
+	done
+	use X && myconf="${myconf} --enable-x11grab"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf="${myconf} --enable-pthreads"
+
+	# Decoders
+	use opencore-amr && myconf="${myconf} --enable-libopencore-amrwb
+		--enable-libopencore-amrnb"
+	for i in gsm faad dirac schroedinger speex; do
+		use $i && myconf="${myconf} --enable-lib$i"
+	done
+	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
+
+	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
+	#	use vdpau || myconf="${myconf} --disable-decoder=$i"
+	#done
+	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
+	use vdpau || myconf="${myconf} --disable-vdpau"
+
+	# CPU features
+	for i in mmx ssse3 altivec ; do
+		use $i ||  myconf="${myconf} --disable-$i"
+	done
+	use mmxext || myconf="${myconf} --disable-mmx2"
+	use 3dnow || myconf="${myconf} --disable-amd3dnow"
+	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC.
+	if gcc-specs-pie ; then
+		myconf="${myconf} --disable-mmx --disable-mmx2"
+	fi
+
+	# Option to force building pic
+	use pic && myconf="${myconf} --enable-pic"
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
+		myconf="${myconf} --cpu=$i"
+		break
+	done
+
+	# Mandatory configuration
+	myconf="${myconf} --enable-gpl --enable-version3 --enable-postproc \
+			--enable-avfilter --enable-avfilter-lavf \
+			--disable-stripping"
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf="${myconf} --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf="${myconf} --target-os=mingw32"
+				;;
+			*linux*)
+				myconf="${myconf} --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+	use doc || myconf="${myconf} --disable-doc"
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if (use debug); then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	cd "${S}"
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--shlibdir=/usr/$(get_libdir) \
+		--mandir=/usr/share/man \
+		--enable-static --enable-shared \
+		--cc="$(tc-getCC)" \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake version.h || die #252269
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man || die "Install Failed"
+
+	dodoc Changelog README INSTALL
+	dodoc doc/*
+}
+
+src_test() {
+	if use encode ; then
+		for t in codectest lavftest seektest ; do
+			LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+				emake ${t} || die "Some tests in ${t} failed"
+		done
+	else
+		ewarn "Tests fail without USE=encode, skipping"
+	fi
+}