New version

Package-Manager: portage-2.1.1_pre5-r1

5 files changed, 205 insertions, 11 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f7a2a05625f7..b192ce2812f4 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # 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.151 2006/08/14 13:29:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.152 2006/08/17 06:02:13 lu_zero Exp $
+
+  16 Aug 2006; Luca Barbato <lu_zero@gentoo.org> ChangeLog:
+  New version
 
   14 Aug 2006; Luca Barbato <lu_zero@gentoo.org>
   +files/ffmpeg-0.4.9_p20060530-snow-mmx.patch,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 20162fed4830..bd2ea6f47b02 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -49,6 +49,7 @@ DIST ffmpeg-0.4.9-p20051216.tar.bz2 1719827
 DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fba1a3dc277bd SHA1 c679e2fd24737179b4009e59396d647c22adaac1 SHA256 17bd539cc1244a00e0de1d0d4ae3ea731553a8405be616bfc79858496633391d
 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
 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
@@ -65,14 +66,18 @@ EBUILD ffmpeg-0.4.9_p20060517.ebuild 7718 RMD160 94f1ed3aaa88d7595b36c1265862bb5
 MD5 587e561ad1ae6e62cc1453690819d25c ffmpeg-0.4.9_p20060517.ebuild 7718
 RMD160 94f1ed3aaa88d7595b36c1265862bb5cb469f166 ffmpeg-0.4.9_p20060517.ebuild 7718
 SHA256 c6b9c00d45c4c630e7ad9c9f909ca29afe2065b382b43a5c580111d24fa97dab ffmpeg-0.4.9_p20060517.ebuild 7718
-EBUILD ffmpeg-0.4.9_p20060530.ebuild 7481 RMD160 f9129dcb9ba581832dd79f3b5314f30e1c5a8685 SHA1 f9d690dd0a559a2e37acce59257e74928f963f67 SHA256 d7605aada626fc99806981aaeb7a952eb54fd00810c161ce04ad166aa5def55d
-MD5 309c4788cfc62490135628c10cdf7365 ffmpeg-0.4.9_p20060530.ebuild 7481
-RMD160 f9129dcb9ba581832dd79f3b5314f30e1c5a8685 ffmpeg-0.4.9_p20060530.ebuild 7481
-SHA256 d7605aada626fc99806981aaeb7a952eb54fd00810c161ce04ad166aa5def55d ffmpeg-0.4.9_p20060530.ebuild 7481
-MISC ChangeLog 23072 RMD160 d984d8a41e49e662bfd080c475823280b68788e7 SHA1 4d1303c2f7b2fc97c258c1e17baf0f59381a1448 SHA256 f3fa2f4431fbad002407873dfe17ad126546c80f29eb95bf15956458bb217a95
-MD5 c6cd5e5420d112858548e1a48f5c6295 ChangeLog 23072
-RMD160 d984d8a41e49e662bfd080c475823280b68788e7 ChangeLog 23072
-SHA256 f3fa2f4431fbad002407873dfe17ad126546c80f29eb95bf15956458bb217a95 ChangeLog 23072
+EBUILD ffmpeg-0.4.9_p20060530.ebuild 7480 RMD160 8b5c660b382c03a0a55afddde34be2ca7cf8ce5e SHA1 3a797ebd1424453be3ebe3c411e36cdf99749ece SHA256 7279ee05c78a299207fe2fdc3ce33a423ab7459d705403b786160783d6e924f3
+MD5 d68e9a78b5c36844f7688528f413a1a0 ffmpeg-0.4.9_p20060530.ebuild 7480
+RMD160 8b5c660b382c03a0a55afddde34be2ca7cf8ce5e ffmpeg-0.4.9_p20060530.ebuild 7480
+SHA256 7279ee05c78a299207fe2fdc3ce33a423ab7459d705403b786160783d6e924f3 ffmpeg-0.4.9_p20060530.ebuild 7480
+EBUILD ffmpeg-0.4.9_p20060816.ebuild 5384 RMD160 f4c4f33a4feb378254911372a7c4bbe88b7a1b36 SHA1 330d441ede3a7bab5853bae37c87f39a6cb9e4c8 SHA256 a2bb1234ef8e64f9b59ea1e44e3987b21b210455013e9696dd26ec08f3a806a9
+MD5 fd62cdc5440335947b8701112eed49df ffmpeg-0.4.9_p20060816.ebuild 5384
+RMD160 f4c4f33a4feb378254911372a7c4bbe88b7a1b36 ffmpeg-0.4.9_p20060816.ebuild 5384
+SHA256 a2bb1234ef8e64f9b59ea1e44e3987b21b210455013e9696dd26ec08f3a806a9 ffmpeg-0.4.9_p20060816.ebuild 5384
+MISC ChangeLog 23147 RMD160 5935acba8333e3508824ed0037446f94f6767078 SHA1 da0e54e3f0438876991525a047af823b3ec896b1 SHA256 a9dd19852d47654ee06f2f9c102635199a13f25c2eacb774d8b877fa7b038134
+MD5 66c59b2d5383d4679b08419b74011409 ChangeLog 23147
+RMD160 5935acba8333e3508824ed0037446f94f6767078 ChangeLog 23147
+SHA256 a9dd19852d47654ee06f2f9c102635199a13f25c2eacb774d8b877fa7b038134 ChangeLog 23147
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -92,3 +97,6 @@ SHA256 40809495f2dc849a8a2073aee157d06403a7327a51096ca78d5d8143fef813e4 files/di
 MD5 0fe6aaa1d4065bad4b6acec555ac656d files/digest-ffmpeg-0.4.9_p20060530 714
 RMD160 0f84e13ed0803a7d5e4a4ff12812b0aa3ba8cb4e files/digest-ffmpeg-0.4.9_p20060530 714
 SHA256 d12a59bb4e7e8e541a7937bc8e1539aab908413d08cbec1e512409a8a5a8b2ba files/digest-ffmpeg-0.4.9_p20060530 714
+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
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
index e785eb97617f..7916bf5a4502 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
@@ -1,6 +1,6 @@
 # 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_p20060530.ebuild,v 1.11 2006/08/14 13:29:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild,v 1.12 2006/08/17 06:02:13 lu_zero Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" #~alpha ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" #~alpha ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64
 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"
 
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
new file mode 100644
index 000000000000..6845e1673c8e
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
@@ -0,0 +1,174 @@
+# 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_p20060816.ebuild,v 1.1 2006/08/17 06:02:13 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"
+
+DEPEND="imlib? ( media-libs/imlib2 )
+	truetype? ( >=media-libs/freetype-2 )
+	sdl? ( >=media-libs/libsdl-1.2.1 )
+	doc? ( app-text/texi2html )
+	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 )
+	test? ( net-misc/wget )
+	x264? ( >=media-libs/x264-svn-20060810 )
+	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=""
+
+	#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 \
+		--mandir=/usr/share/man \
+		--enable-static --enable-shared \
+		"--cc=$(tc-getCC)" \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR=${D} install || die "Install Failed"
+
+	use doc && make 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_p20060816 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060816
new file mode 100644
index 000000000000..683cb87a3dd3
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060816
@@ -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 7c1f20b488b4ca14b88b6e0a3484db3c ffmpeg-0.4.9-p20060816.tar.bz2 1948118
+RMD160 eb8e076f75c32b7a4874009451c7cb67c32f2fc2 ffmpeg-0.4.9-p20060816.tar.bz2 1948118
+SHA256 20e397ed778e23ae6eebe17d7b91839591512a3146629a2fcc68e0729b2b03bb ffmpeg-0.4.9-p20060816.tar.bz2 1948118