New snapshot

Package-Manager: portage-2.1.2.7

4 files changed, 188 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index b4c15f1e3431..3668f3abdf01 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.196 2007/05/16 05:29:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.197 2007/05/26 06:53:13 lu_zero Exp $
+
+*ffmpeg-0.4.9_p20070525 (26 May 2007)
+
+  26 May 2007; Luca Barbato <lu_zero@gentoo.org>
+  +ffmpeg-0.4.9_p20070525.ebuild:
+  New snapshot, using libamr
 
   16 May 2007; Jeroen Roovers <jer@gentoo.org>
   ffmpeg-0.4.9_p20070330.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4fbc15d9158f..f9bc73ad9192 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -61,6 +61,7 @@ DIST ffmpeg-0.4.9-p20061016.tar.bz2 2009859 RMD160 b41eeb50ef91e5f7a44f725d29d3b
 DIST ffmpeg-0.4.9-p20070129.tar.bz2 2086323 RMD160 b0895a2d3927c769b7abac1b91d66e7f78586d4f SHA1 12d9e43fd7ee222be4f5b8c58bb63c9056ab3df3 SHA256 107a9c7bfc19c2fde01465d2cbab8082a0e4c1197ff28658aa14932e1be7914f
 DIST ffmpeg-0.4.9-p20070325.tar.bz2 2189783 RMD160 b70c170861423b3724fb7e7036535b10bc656636 SHA1 dbc456e8cedee7da76329375ac467cae74d1e0ad SHA256 147c132824b7df8d4b8dfc5c8ede92dfd3e6b5230f91570ac59326816be8b71c
 DIST ffmpeg-0.4.9-p20070330.tar.bz2 2192476 RMD160 e52bf6abbf7c630aa3e76243987fb7dd6d9b84a1 SHA1 bcc18c88c64f6f941eb1ac94357e0d6dcbf99045 SHA256 58a7e7d909e02fda07856ea044ae0f5f9c174791f63a449f2f23f37a78b34f95
+DIST ffmpeg-0.4.9-p20070525.tar.bz2 2264657 RMD160 dca62fedb6b5b61fe57c73a1cbac278b760fe98d SHA1 12bc5cb37bed8b9e66ea4d9711eed9a3d35edd9f SHA256 1b391c14e5c0015af6e6449dc9fd27a4f63aa0d342716427ba014c98950e2224
 EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4373 RMD160 511095c4ea2560216773626b41faf450aec3c671 SHA1 8c370e5a0878fef1757c16e40d26c2e26f48047f SHA256 154be70b4a9c44387cd0307f2f0592455f82d65c277129905e72142870deb7ea
 MD5 4695380deafd4dda1fa644766cfc81e5 ffmpeg-0.4.9_p20050226-r3.ebuild 4373
 RMD160 511095c4ea2560216773626b41faf450aec3c671 ffmpeg-0.4.9_p20050226-r3.ebuild 4373
@@ -97,10 +98,14 @@ EBUILD ffmpeg-0.4.9_p20070330.ebuild 6177 RMD160 e73a5924ce8064d86333cbb8f5e10d0
 MD5 5a0d371a792cbb7477c947d15d1e0557 ffmpeg-0.4.9_p20070330.ebuild 6177
 RMD160 e73a5924ce8064d86333cbb8f5e10d04d20143c3 ffmpeg-0.4.9_p20070330.ebuild 6177
 SHA256 a5639e863ccc778ee3364f8e78f0df206ff5cca86cb2e8ec26d77f6644925f20 ffmpeg-0.4.9_p20070330.ebuild 6177
-MISC ChangeLog 29195 RMD160 ef2589b51b7c511fe20ead7cec5379a73d8a1b96 SHA1 00c70aa95582b69c3452a142ea9460473efea681 SHA256 c55e379b9dd111db8c3a0736897d38d18bf0f8fad3b0341ac55ddecdbd4509b9
-MD5 3a0f8c39134aa2bf219b29415bd9be68 ChangeLog 29195
-RMD160 ef2589b51b7c511fe20ead7cec5379a73d8a1b96 ChangeLog 29195
-SHA256 c55e379b9dd111db8c3a0736897d38d18bf0f8fad3b0341ac55ddecdbd4509b9 ChangeLog 29195
+EBUILD ffmpeg-0.4.9_p20070525.ebuild 5466 RMD160 93bd6b3487eddd27c03ac8dfbc2c56f908b022d2 SHA1 88ad32a6a1d96285b0cbb0b0c2eaf5891e1279ef SHA256 a183e366e8c2dbdfc771f3b9499221d1dfb82aca2739551f089485455b122a29
+MD5 3fcf067e3ec62bf817a25761eeaa7d58 ffmpeg-0.4.9_p20070525.ebuild 5466
+RMD160 93bd6b3487eddd27c03ac8dfbc2c56f908b022d2 ffmpeg-0.4.9_p20070525.ebuild 5466
+SHA256 a183e366e8c2dbdfc771f3b9499221d1dfb82aca2739551f089485455b122a29 ffmpeg-0.4.9_p20070525.ebuild 5466
+MISC ChangeLog 29351 RMD160 0add36b88f9131f0e3a6f8132a343b03b23338ba SHA1 5eb56cf4d81011823a8f590caeeecc305e932156 SHA256 b088cc6549751116b221686a6d48431bf70f6afd8c9037eec852185112211e8b
+MD5 000aa81c098fb6f94824b57277f6ba28 ChangeLog 29351
+RMD160 0add36b88f9131f0e3a6f8132a343b03b23338ba ChangeLog 29351
+SHA256 b088cc6549751116b221686a6d48431bf70f6afd8c9037eec852185112211e8b ChangeLog 29351
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -132,3 +137,6 @@ SHA256 1e5dc7d4a04cc22acdd5de9055bc5313893eaab38703cff06fc004e95a9ec1c4 files/di
 MD5 d98d9051657b11d7b00a8ac162ebbf40 files/digest-ffmpeg-0.4.9_p20070330 714
 RMD160 1d590a65f72ee227dbed00f4529f3d326b7fe007 files/digest-ffmpeg-0.4.9_p20070330 714
 SHA256 e7362005124f820743564e7eddd99840696e2d5689f1afe46c53c35089b4a0fb files/digest-ffmpeg-0.4.9_p20070330 714
+MD5 be5ee013b20c5f7a1b7cd80c8724db1f files/digest-ffmpeg-0.4.9_p20070525 274
+RMD160 f709d0840278a433d673895ec7d5fc4699e381cf files/digest-ffmpeg-0.4.9_p20070525 274
+SHA256 64692a35b1abc348612b0dd2372475d45ec8759e428c726d1a3cac5b84e7e60e files/digest-ffmpeg-0.4.9_p20070525 274
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070525.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070525.ebuild
new file mode 100644
index 000000000000..9b1bdd96d004
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070525.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2007 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_p20070525.ebuild,v 1.1 2007/05/26 06:53: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. SVN revision 8560"
+HOMEPAGE="http://ffmpeg.org/"
+MY_P=${P/_/-}
+S=${WORKDIR}/ffmpeg
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 X"
+
+RDEPEND="imlib? ( media-libs/imlib2 )
+	truetype? ( >=media-libs/freetype-2 )
+	sdl? ( >=media-libs/libsdl-1.2.10 )
+	encode? ( media-sound/lame
+		vorbis? ( media-libs/libvorbis )
+		theora? ( media-libs/libtheora ) )
+	ogg? ( media-libs/libogg )
+	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 )
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	amr? ( media-libs/amrnb media-libs/amrwb )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html )
+	test? ( net-misc/wget )"
+# Make sure the mmx USE flag is unmasked
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
+
+src_unpack() {
+	unpack ${A} || die
+	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-2007.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"
+	# disable non pic safe asm, bug #172877, bug #172845 and dupes
+	# epatch "${FILESDIR}/${PN}-0.4.9_p20070330-asmpic.patch"
+}
+
+src_compile() {
+	replace-flags -O0 -O2
+	#x86, what a wonderful arch....
+	replace-flags -O1 -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 ) ; 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
+	if use encode
+	then
+		myconf="${myconf} --enable-libmp3lame"
+		use vorbis && myconf="${myconf} --enable-libvorbis --enable-libogg"
+		use theora && myconf="${myconf} --enable-libtheora --enable-libogg"
+	fi
+	use a52 && myconf="${myconf} --enable-liba52"
+	use ieee1394 && myconf="${myconf} --enable-dc1394"
+	use threads && myconf="${myconf} --enable-pthreads"
+	use xvid && myconf="${myconf} --enable-xvid"
+	use X && myconf="${myconf} --enable-x11grab"
+	use ogg && myconf="${myconf} --enable-libogg"
+	use dts && myconf="${myconf} --enable-libdts"
+	use x264 && myconf="${myconf} --enable-x264"
+	use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
+	use amr && myconf="${myconf} --enable-libamr-nb --enable-libamr-wb"
+
+	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
+
+	tc-is-cross-compiler && myconf="${myconf} --cross-compile --arch=$(tc-arch-kernel)"
+
+	# 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_p20070525 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070525
new file mode 100644
index 000000000000..8dfa02b74822
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070525
@@ -0,0 +1,3 @@
+MD5 14629997a4819e8f84643c39fa7f45de ffmpeg-0.4.9-p20070525.tar.bz2 2264657
+RMD160 dca62fedb6b5b61fe57c73a1cbac278b760fe98d ffmpeg-0.4.9-p20070525.tar.bz2 2264657
+SHA256 1b391c14e5c0015af6e6449dc9fd27a4f63aa0d342716427ba014c98950e2224 ffmpeg-0.4.9-p20070525.tar.bz2 2264657