New snapshot

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 207 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index fbedc5fa721d..7ab93f217815 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.164 2006/10/03 13:03:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.165 2006/10/17 13:16:08 lu_zero Exp $
+
+*ffmpeg-0.4.9_p20061016 (17 Oct 2006)
+
+  17 Oct 2006; Luca Barbato <lu_zero@gentoo.org>
+  +ffmpeg-0.4.9_p20061016.ebuild:
+  New version
 
   03 Oct 2006; Luca Barbato <lu_zero@gentoo.org>
   ffmpeg-0.4.9_p20060530.ebuild, ffmpeg-0.4.9_p20060816.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index df7b29685adf..a732b31f9be4 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -50,6 +50,7 @@ DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fb
 DIST ffmpeg-0.4.9-p20060517.tar.bz2 1811524 RMD160 d4455eb1d3d93dfedc52a513aee736d4f101ddf1 SHA1 506764b1c128b392161b80d146609a2abc2baf1c SHA256 ae150f82f2aaa0f414c1f9f2cfc5e07604bb169ce923a6961a9546a1387625cc
 DIST ffmpeg-0.4.9-p20060530.tar.bz2 1807070 RMD160 84d6f692cf34bb9413d9d4934bfab478c7c14658 SHA1 6df0134d9ce939b9ae1fbd4525755502c9d227db SHA256 e24b7f84801f679be8f24fcd38e1622ab06ebb97d001be67862135e78ac599f3
 DIST ffmpeg-0.4.9-p20060816.tar.bz2 1948118 RMD160 eb8e076f75c32b7a4874009451c7cb67c32f2fc2 SHA1 3ba0b79eb7bf77895b1b9d074ec825e8ab6ec018 SHA256 20e397ed778e23ae6eebe17d7b91839591512a3146629a2fcc68e0729b2b03bb
+DIST ffmpeg-0.4.9-p20061016.tar.bz2 2009859 RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c SHA1 2e15183755378b4089264be3f8865e24eeaa39dc SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531
 EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4388 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 SHA1 2352e7016ed2a5d78d8c4c521607efd1b985c43d SHA256 5135d135bcdd29a9e5f4dcd2e1d4b75bc851a465de513531537af6bf4684a7a5
 MD5 da4fb7c75a6d011f4d7e0d337d449129 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
@@ -74,10 +75,14 @@ EBUILD ffmpeg-0.4.9_p20060816.ebuild 5535 RMD160 53617589539a993da866f151c2d46fd
 MD5 3a46efe772823ca62a14382e52512a1c ffmpeg-0.4.9_p20060816.ebuild 5535
 RMD160 53617589539a993da866f151c2d46fd7c35df62e ffmpeg-0.4.9_p20060816.ebuild 5535
 SHA256 35e9f61ee732c6cc6a5c62b2e0b2df37f4d22e3b24527e0f1d4f5167604c21d4 ffmpeg-0.4.9_p20060816.ebuild 5535
-MISC ChangeLog 24693 RMD160 6b2c60f2e12747f574a1b8fcf2e68cab3a2a08c8 SHA1 3e34202f841103ebf296e516f4a5fe04c9573190 SHA256 60f7d141da6dce11ee77e958b45fc74fdee64f244b1e859a1d5759126d25cd95
-MD5 44e64d4d5008d89d5963395b8734d7e1 ChangeLog 24693
-RMD160 6b2c60f2e12747f574a1b8fcf2e68cab3a2a08c8 ChangeLog 24693
-SHA256 60f7d141da6dce11ee77e958b45fc74fdee64f244b1e859a1d5759126d25cd95 ChangeLog 24693
+EBUILD ffmpeg-0.4.9_p20061016.ebuild 5535 RMD160 800436d09f894c1c558366855a0947648b6825ec SHA1 e7d0867fc6a1c840528eb482b7ffc8d1ef582884 SHA256 d3d01292975e873a5b97d06ec44dd1a9baf4beaf50240daaeaf161df6712fa9b
+MD5 e4848293b78c36be98f00c61055ec884 ffmpeg-0.4.9_p20061016.ebuild 5535
+RMD160 800436d09f894c1c558366855a0947648b6825ec ffmpeg-0.4.9_p20061016.ebuild 5535
+SHA256 d3d01292975e873a5b97d06ec44dd1a9baf4beaf50240daaeaf161df6712fa9b ffmpeg-0.4.9_p20061016.ebuild 5535
+MISC ChangeLog 24830 RMD160 c00c75080f2a66f5dd0cda9a1cccc85230859842 SHA1 f5c39d6ed41a9106b8c627b4c7c51c5298ebca1d SHA256 10ed35db564c9bf160d607df0acdb894bae8183d565c270c44ee705404eecbc9
+MD5 00d30d8d8490d2e945374bd57a76d588 ChangeLog 24830
+RMD160 c00c75080f2a66f5dd0cda9a1cccc85230859842 ChangeLog 24830
+SHA256 10ed35db564c9bf160d607df0acdb894bae8183d565c270c44ee705404eecbc9 ChangeLog 24830
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -100,3 +105,6 @@ SHA256 d12a59bb4e7e8e541a7937bc8e1539aab908413d08cbec1e512409a8a5a8b2ba files/di
 MD5 bdca759e57e38140aa6da950d6deddf0 files/digest-ffmpeg-0.4.9_p20060816 714
 RMD160 d1797b594b73fba6e86db2efe54d392cba264c0b files/digest-ffmpeg-0.4.9_p20060816 714
 SHA256 6e4c216acd8fe5eaf285520dadd383855613b7b324d65c31d592ad0b5b70fa81 files/digest-ffmpeg-0.4.9_p20060816 714
+MD5 b078bb99952b4f56d8c716ba88ac9b60 files/digest-ffmpeg-0.4.9_p20061016 714
+RMD160 d25cd611bb50bdf39ee396b47ce9a9f9760e1e32 files/digest-ffmpeg-0.4.9_p20061016 714
+SHA256 5dcd53524d59a5cefe43d9370d98f64c4345e9e32b4711576c7cbc9aba72db4b files/digest-ffmpeg-0.4.9_p20061016 714
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild
new file mode 100644
index 000000000000..e1def6dfdde3
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2006 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_p20061016.ebuild,v 1.1 2006/10/17 13:16:08 lu_zero Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.sourceforge.net/"
+MY_P=${P/_/-}
+S=${WORKDIR}/ffmpeg
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
+		   http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
+	test theora threads truetype v4l x264 xvid dts network zlib sdl"
+
+RDEPEND="imlib? ( media-libs/imlib2 )
+	truetype? ( >=media-libs/freetype-2 )
+	sdl? ( >=media-libs/libsdl-1.2.10 )
+	encode? ( media-sound/lame )
+	ogg? ( media-libs/libogg )
+	vorbis? ( media-libs/libvorbis )
+	aac? ( media-libs/faad2 media-libs/faac )
+	a52? ( >=media-libs/a52dec-0.7.4-r4 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	zlib? ( sys-libs/zlib )
+	dts? ( media-libs/libdts )
+	ieee1394? ( =media-libs/libdc1394-1*
+				sys-libs/libraw1394 )
+	x264? ( >=media-libs/x264-svn-20061014 )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html )
+	test? ( net-misc/wget )
+	amr? ( app-arch/unzip )"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	# amr (float) support
+	if use amr; then
+		einfo "Including amr wide and narrow band (float) support ... "
+
+		# narrow band codec
+		mkdir ${S}/libavcodec/amr_float
+		cd ${S}/libavcodec/amr_float
+		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
+
+		# wide band codec
+		mkdir ${S}/libavcodec/amrwb_float
+		cd ${S}/libavcodec/amrwb_float
+		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
+
+		# Patch if we're on 64-bit
+		if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
+			cd ${S}
+			epatch "${FILESDIR}/ffmpeg-0.4.9_p20060302-amr-64bit.patch"
+		fi
+	fi
+
+	cd ${S}
+
+	#Append -fomit-frame-pointer to avoid some common issues
+	use debug || append-flags "-fomit-frame-pointer"
+
+	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
+	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
+
+	# .pc files contain wrong libdir path
+	epatch ${FILESDIR}/${PN}-libdir.patch
+	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
+
+	# Make it use pic always since we don't need textrels
+	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
+
+	# To make sure the ffserver test will work
+	sed -i -e "s:-e debug=off::" tests/server-regression.sh
+
+	epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
+}
+
+src_compile() {
+	replace-flags -O0 -O2
+
+	local myconf="${EXTRA_ECONF}"
+
+	#disable mmx accelerated code if not requested, or if PIC is required
+	# as the provided asm decidedly is not PIC.
+	if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	# enabled by default
+	use altivec || myconf="${myconf} --disable-altivec"
+	use debug || myconf="${myconf} --disable-debug"
+	use oss || myconf="${myconf} --disable-audio-oss"
+	use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
+	use ieee1394 || myconf="${myconf} --disable-dv1394"
+	use network || myconf="${myconf} --disable-network"
+	use zlib || myconf="${myconf} --disable-zlib"
+	use sdl || myconf="${myconf} --disable-ffplay"
+
+	myconf="${myconf} --disable-opts"
+
+	# disabled by default
+	use encode && myconf="${myconf} --enable-mp3lame"
+	use a52 && myconf="${myconf} --enable-a52"
+	use ieee1394 && myconf="${myconf} --enable-dc1394"
+	use threads && myconf="${myconf} --enable-pthreads"
+	use xvid && myconf="${myconf} --enable-xvid"
+	if use vorbis
+	then
+		myconf="${myconf} --enable-vorbis --enable-libogg"
+	else
+		use ogg && myconf="${myconf} --enable-libogg"
+	fi
+	use dts && myconf="${myconf} --enable-dts"
+	use x264 && myconf="${myconf} --enable-x264"
+	use aac && myconf="${myconf} --enable-faad --enable-faac"
+	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
+
+	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
+
+	# 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 LDCONFIG=true DESTDIR=${D} install || die "Install Failed"
+
+	use doc && emake -j1 documentation
+	dodoc ChangeLog README INSTALL
+	dodoc doc/*
+}
+
+# Never die for now...
+src_test() {
+	cd ${S}/tests
+	for t in "codectest libavtest test-server" ; do
+		make ${t} || ewarn "Some tests in ${t} failed"
+	done
+}
+
+pkg_postinst() {
+	ewarn "ffmpeg may 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/files/digest-ffmpeg-0.4.9_p20061016 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20061016
new file mode 100644
index 000000000000..e98f1b86c535
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20061016
@@ -0,0 +1,9 @@
+MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
+RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
+SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
+MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
+RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
+SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
+MD5 22c3020ade666258044cfe5b69cbf135 ffmpeg-0.4.9-p20061016.tar.bz2 2009859
+RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c ffmpeg-0.4.9-p20061016.tar.bz2 2009859
+SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531 ffmpeg-0.4.9-p20061016.tar.bz2 2009859