Add a new snapshot, masked because it breaks a lot of consumers.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.6 x86_64

4 files changed, 215 insertions, 3 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 4b164e852cdc..8ba539fcd772 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.226 2008/10/11 17:17:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.227 2008/10/14 08:53:10 aballier Exp $
+
+*ffmpeg-0.4.9_p20081014 (14 Oct 2008)
+
+  14 Oct 2008; Alexis Ballier <aballier@gentoo.org> metadata.xml,
+  +ffmpeg-0.4.9_p20081014.ebuild:
+  Add a new snapshot, masked because it breaks a lot of consumers.
 
   11 Oct 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   ffmpeg-0.4.9_p20070616-r3.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 18b434773e16..458931379517 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a SHA1 07c79c6680ebe0b1a695394ba4d24abb503c4b46 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226
 AUX CVE-2008-3162.patch 2936 RMD160 5a4c226d5d43d106cced92b9e80c5cbc9b9fc8e2 SHA1 dcc242a09deba9a2e960621244e42b72dfd9c661 SHA256 1a07075fcfb6c763912cd295a34532a629f3cf1d3fef60fed1c6418c80abda7d
 AUX ffmpeg-0.4.9_p20060302-amr-64bit.patch 1161 RMD160 c3e17a8e8a3e501ae9ce8b8e455063444d1bc15f SHA1 e4f280a2934e238529ca8b0d8d2abec2638d9fb1 SHA256 f993ac1ad11e254d846fbd0b3f73f81043551fce90438fdd196374ca9ece6c9c
@@ -15,6 +18,7 @@ AUX ffmpeg-unknown-options.patch 414 RMD160 46f7d8e81ab42368dabb6e29dec29a02d780
 DIST ffmpeg-0.4.9-p20070616.tar.bz2 2275972 RMD160 73d0334b85f0859bbfc40a4d9c27fb987b36ca25 SHA1 6c649cf5b4c803bf7aec2f70adbd9d0992360e71 SHA256 bb15d2aee946ac6113928386f7385b15ffa4d9640e60830bd9868079bfb2da88
 DIST ffmpeg-0.4.9-p20080206.tar.bz2 2474139 RMD160 0472ed0fa1d69a791328b3c221bdd08b0a826648 SHA1 8f3a6ea93c200ca949d47a432b9c5174a954ec75 SHA256 3effb76b8ecfcf2de7cf261b26fc9eb70fd193d487e98cb9563e53e7d369f785
 DIST ffmpeg-0.4.9-p20080326.tar.bz2 2505113 RMD160 72e6c77e1d3abad32582e1e226fdfd6139d744b7 SHA1 4b348d8b8d8a1c4073b5f9eab2092eea6188b9a3 SHA256 72684719183fee4ef110b82af3960700470622a756cfb116cfd5c3e3b6ae89d3
+DIST ffmpeg-0.4.9-p20081014.tar.bz2 2676641 RMD160 6b7e556292425dabcf1f6e94c01d493a3d353835 SHA1 016fdd2798ce442dddfe4551e04a2324b0587428 SHA256 a039ac78b31e24b1a1a06daa927bdf24fc3cc7b73adbb7a5d936a0c828b84018
 EBUILD ffmpeg-0.4.9_p20070616-r1.ebuild 5689 RMD160 d3098df2faf6ed8bb446c7d23c030a60b3b945c2 SHA1 eb3931cd4a8eca2b0cc77f5dedc6ec02ab2de12d SHA256 29d6116c4af64866f286ee0baade7e05b2b51055aa2f4dfee04dc74a94099209
 EBUILD ffmpeg-0.4.9_p20070616-r2.ebuild 5761 RMD160 8deab60e9301c695dea9c631b69dcb79646ef932 SHA1 825b44d0b32a9e372f3505079455111513ef3a19 SHA256 0eceeb8a2215ccb577e97c4138bbb3285023fc45e49c4b73cac5200a5cab7454
 EBUILD ffmpeg-0.4.9_p20070616-r20.ebuild 5836 RMD160 ec982fa1f8b0823d817a723a4179f21dc73e9a4f SHA1 b1a3ef9ae14e8ca6a6fb70d4077c35592ce35355 SHA256 7ec16882ac8a3bb3e3c7098c3330f6bbc1bcb4c4477b1505aace2321d0bfdc6e
@@ -22,5 +26,13 @@ EBUILD ffmpeg-0.4.9_p20070616-r3.ebuild 5635 RMD160 b7d24e0ae190f6aae3125b0fb1b4
 EBUILD ffmpeg-0.4.9_p20070616.ebuild 5544 RMD160 988fc4648a3d3f1f97299ecf487ade95e851d230 SHA1 5851bdf4449ee383236d668205b06baf746dcd70 SHA256 002663f87e8281bbd7395ce56e97fe24db99ab8273faae65fa601b9bb737d083
 EBUILD ffmpeg-0.4.9_p20080206.ebuild 5209 RMD160 be8038158c780b31842f0054c7bed3148922350e SHA1 0ac4ef0f819d8e9e75794a3ed01c24f6b86d967e SHA256 e5be2b691b44145a32206a4724c6db47cb79bd7de1ae0f1d7fafff0442bfe61b
 EBUILD ffmpeg-0.4.9_p20080326.ebuild 5246 RMD160 a52a5cf821b2026f7dcd09c452c97b90bf58496c SHA1 735aefd0a3c019246a532ed14210ca33834200e4 SHA256 91cf06581bcfd9137dfce8c9d68ab7cf62f35959d257754b2aeaf6359fa1e580
-MISC ChangeLog 34668 RMD160 bf547a401c4a6c007dc32ad2c71210b56be03dc5 SHA1 085202cad69cab95be7ca0378d5585bc63110528 SHA256 636135a1940b8fc8aed6c1098bac420573bc892b9c4c882baf803a5ddb661d9d
-MISC metadata.xml 494 RMD160 e4193a4c05dc6518b00e25cd3b2f9d655b708a22 SHA1 33eacc7be75485c9d3f5e3292afb93f21a6e526a SHA256 ccdf622a50225d21ee6408cb8a72c0acd7c8c5f1061ee8959a15107d8751bf18
+EBUILD ffmpeg-0.4.9_p20081014.ebuild 5688 RMD160 6edc64fd295e8811f4bda90560e15795e31321f2 SHA1 264dd2bfd3e6a7908f6dac45230681d20197f022 SHA256 a5caa50eac197ac21a0874929c558ccd4160cf6b5c400e828912beae566fc6b5
+MISC ChangeLog 34873 RMD160 8ea77156e2a5b44897bfd3ac396dd69b850a67cb SHA1 f2b8f8d6a379fd7711b86faab60819ad998b35ce SHA256 25f96d7d8bb7795cc89904b821fe3b4518340a991ce4a8396f25e832d8612d2c
+MISC metadata.xml 1158 RMD160 f666c9d210c950f862cbf0fcc323a7085f5febe7 SHA1 e5c84b8a4916b9bb20960ae16345c6d0844baa81 SHA256 ab916e46e6a91bf195e25dfe23c777436744017dfdb96d3330fd633bec599e2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj0Xf0ACgkQvFcC4BYPU0r8NQCguSdAUMfrZi7sP9AY+9OrQmZl
+s1UAnicXd+meN202JXzwO7RPr8TliSwd
+=eW8Y
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20081014.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20081014.ebuild
new file mode 100644
index 000000000000..d8d8ba0ee022
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20081014.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20081014.ebuild,v 1.1 2008/10/14 08:53:10 aballier Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video.
+Includes libavcodec. svn revision 15615"
+HOMEPAGE="http://ffmpeg.org/"
+MY_P=${P/_/-}
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+S=${WORKDIR}/ffmpeg
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="aac altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis
+	  test theora threads x264 xvid network zlib sdl X mp3 schroedinger
+	  hardcoded-tables bindist v4l v4l2 ssse3 vhook"
+
+RDEPEND="vhook? ( media-libs/imlib2 >=media-libs/freetype-2 )
+	sdl? ( >=media-libs/libsdl-1.2.10 )
+	encode? (
+		aac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		theora? ( media-libs/libtheora media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20081006 )
+		xvid? ( >=media-libs/xvid-1.1.0 ) )
+	aac? ( media-libs/faad2 )
+	zlib? ( sys-libs/zlib )
+	ieee1394? ( =media-libs/libdc1394-1*
+				sys-libs/libraw1394 )
+	dirac? ( media-video/dirac )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	schroedinger? ( media-libs/schroedinger )
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	amr? ( media-libs/amrnb media-libs/amrwb )"
+
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/yasm )
+	doc? ( app-text/texi2html )
+	test? ( net-misc/wget )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
+}
+
+src_compile() {
+	replace-flags -O0 -O2
+	#x86, what a wonderful arch....
+	replace-flags -O1 -O2
+	local myconf="${EXTRA_ECONF}"
+
+	# enabled by default
+	use debug || myconf="${myconf} --disable-debug"
+	use zlib || myconf="${myconf} --disable-zlib"
+	use sdl || myconf="${myconf} --disable-ffplay"
+
+	if use network; then
+		use ipv6 || myconf="${myconf} --disable-ipv6"
+	else
+		myconf="${myconf} --disable-network"
+	fi
+
+	myconf="${myconf} --disable-optimizations"
+
+	# disabled by default
+	if use encode
+	then
+		use aac && myconf="${myconf} --enable-libfaac"
+		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"
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	for i in v4l v4l2 ; do
+		use $i || myconf="${myconf} --disable-demuxer=$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 aac && myconf="${myconf} --enable-libfaad"
+	use dirac && myconf="${myconf} --enable-libdirac"
+	use schroedinger && myconf="${myconf} --enable-libschroedinger"
+	if use gsm; then
+		myconf="${myconf} --enable-libgsm"
+		# Crappy detection or our installation is weird, pick one (FIXME)
+		append-flags -I/usr/include/gsm
+	fi
+	if use bindist
+	then
+		use amr && ewarn "libamr is nonfree and cannot be distributed; disabling amr support."
+	else
+		use amr && myconf="${myconf} --enable-libamr-nb \
+									 --enable-libamr-wb \
+									 --enable-nonfree"
+	fi
+
+	# CPU features
+	for i in mmx ssse3 altivec ; do
+		use $i ||  myconf="${myconf} --disable-$i"
+	done
+	use mmxext || myconf="${myconf} --disable-mmx2"
+	# 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
+
+	# video hooking support. replaced by libavfilter, probably needs to be
+	# dropped at some point.
+	use vhook || myconf="${myconf} --disable-vhook"
+
+	# Mandatory configuration
+	myconf="${myconf} --enable-gpl --enable-postproc \
+			--enable-avfilter --enable-avfilter-lavf \
+			--enable-swscale --disable-stripping"
+
+	# cross compile support (FIXME?)
+	tc-is-cross-compiler && myconf="${myconf} --cross-compile --arch=$(tc-arch-kernel)"
+
+	# Misc stuff
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+
+	# 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"
+
+	emake -j1 depend || die "depend failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "Install Failed"
+
+	use doc && emake -j1 documentation
+	dodoc Changelog README INSTALL
+	dodoc doc/*
+}
+
+# Never die for now...
+src_test() {
+	for t in codectest libavtest servertest seektest ; do
+		emake ${t} || ewarn "Some tests in ${t} failed"
+	done
+}
+
+pkg_postinst() {
+	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
+	ewarn "like xine-lib or vlc stop working as expected please"
+	ewarn "rebuild them."
+}
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 2f5f2e25ea6f..8de5b9e18914 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -7,7 +7,13 @@
   </maintainer>
   <use>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
+    <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
+    <flag name="gsm">Enables support for the gsm lossy speech compression codec via libgsm.</flag>
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
+    <flag name="mmxext">Enables mmx2 support</flag>
     <flag name="network">Enables network streaming support</flag>
+    <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+    <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+    <flag name="vhook">Enables video hooking support.</flag>
   </use>
 </pkgmetadata>