New snapshot, SVN revision 9330

Package-Manager: portage-2.1.2.9

4 files changed, 190 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index aea1c48ab71b..9b8ff4769a72 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.199 2007/06/01 11:20:27 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.200 2007/06/16 11:54:48 lu_zero Exp $
+
+*ffmpeg-0.4.9_p20070616 (16 Jun 2007)
+
+  16 Jun 2007; Luca Barbato <lu_zero@gentoo.org>
+  +ffmpeg-0.4.9_p20070616.ebuild:
+  New snapshot, SVN revision 9330
 
   01 Jun 2007; Samuli Suominen <drac@gentoo.org>
   ffmpeg-0.4.9_p20070525.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1ed4767d1924..95aec51604a2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -62,6 +62,7 @@ DIST ffmpeg-0.4.9-p20070129.tar.bz2 2086323 RMD160 b0895a2d3927c769b7abac1b91d66
 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
+DIST ffmpeg-0.4.9-p20070616.tar.bz2 2275972 RMD160 73d0334b85f0859bbfc40a4d9c27fb987b36ca25 SHA1 6c649cf5b4c803bf7aec2f70adbd9d0992360e71 SHA256 bb15d2aee946ac6113928386f7385b15ffa4d9640e60830bd9868079bfb2da88
 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
@@ -102,10 +103,14 @@ EBUILD ffmpeg-0.4.9_p20070525.ebuild 5513 RMD160 4fe0fb54b9434a6ddd068b139845554
 MD5 6bec43723c5eaa651e0ffea21b3f500f ffmpeg-0.4.9_p20070525.ebuild 5513
 RMD160 4fe0fb54b9434a6ddd068b13984555441e6e1f32 ffmpeg-0.4.9_p20070525.ebuild 5513
 SHA256 68c88b67ba873d491b08d1392bdb8b559ff221b89e5f448fa081e8c025059d17 ffmpeg-0.4.9_p20070525.ebuild 5513
-MISC ChangeLog 29619 RMD160 f88ca699d90ea1f798f979af1b5b72f1ad39dea3 SHA1 b22a2108c8f88b7b44612624d3595b609922b23a SHA256 2171cdc3b2a3867fbb4a41ceeb857868fecaa169c095a68a43f422bd4ac48cf2
-MD5 8f3721df58bfa0ccc9e7b1af4c526aa8 ChangeLog 29619
-RMD160 f88ca699d90ea1f798f979af1b5b72f1ad39dea3 ChangeLog 29619
-SHA256 2171cdc3b2a3867fbb4a41ceeb857868fecaa169c095a68a43f422bd4ac48cf2 ChangeLog 29619
+EBUILD ffmpeg-0.4.9_p20070616.ebuild 5519 RMD160 ce63dcb9dc47bb9a38e4ad010e75b205d0dcb000 SHA1 d6c4cb962bba9e814404dadc53a28d5191099af9 SHA256 baa01002d7b50c1f637599c6bfc2d058a70f6a0a667671df942f757e9205b88b
+MD5 67d2f25f17218789a52b4ff1637fe919 ffmpeg-0.4.9_p20070616.ebuild 5519
+RMD160 ce63dcb9dc47bb9a38e4ad010e75b205d0dcb000 ffmpeg-0.4.9_p20070616.ebuild 5519
+SHA256 baa01002d7b50c1f637599c6bfc2d058a70f6a0a667671df942f757e9205b88b ffmpeg-0.4.9_p20070616.ebuild 5519
+MISC ChangeLog 29779 RMD160 404acf1060ea69a7d4e1bf17f1fc8a56d4b1733a SHA1 2d5b7b1529c05c472eaad8f9de01888e0adaaf1c SHA256 9c07c80cfb445a7caf7b94aaf3c190b308c84a0749565e7a1377b4cb0f958f85
+MD5 e4d3ba29d02cd5aad610d1bdcc211c0e ChangeLog 29779
+RMD160 404acf1060ea69a7d4e1bf17f1fc8a56d4b1733a ChangeLog 29779
+SHA256 9c07c80cfb445a7caf7b94aaf3c190b308c84a0749565e7a1377b4cb0f958f85 ChangeLog 29779
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -140,3 +145,6 @@ SHA256 e7362005124f820743564e7eddd99840696e2d5689f1afe46c53c35089b4a0fb files/di
 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
+MD5 d2897b91ef2d2bea444c09eec4285a09 files/digest-ffmpeg-0.4.9_p20070616 274
+RMD160 2e7744442a12767ad4173f1e9d77db32a17d1b54 files/digest-ffmpeg-0.4.9_p20070616 274
+SHA256 ec7aa955e39ac4df78f4709a57c2c215bfa9eceeb5e68328b7e6b70b4adb7ebb files/digest-ffmpeg-0.4.9_p20070616 274
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild
new file mode 100644
index 000000000000..ded0d80a6600
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616.ebuild
@@ -0,0 +1,168 @@
+# 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_p20070616.ebuild,v 1.1 2007/06/16 11:54:48 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 9330"
+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 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 )
+	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 -DBROKEN_RELOCATIONS to build for bug 179872.
+	#Pretty please fix me if you can.
+	append-flags "-DBROKEN_RELOCATIONS"
+	
+	#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 x264 && myconf="${myconf} --enable-libx264"
+	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_p20070616 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070616
new file mode 100644
index 000000000000..6665174a88fb
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070616
@@ -0,0 +1,3 @@
+MD5 c6da417c0b6ce67aec96e75dcf0ee402 ffmpeg-0.4.9-p20070616.tar.bz2 2275972
+RMD160 73d0334b85f0859bbfc40a4d9c27fb987b36ca25 ffmpeg-0.4.9-p20070616.tar.bz2 2275972
+SHA256 bb15d2aee946ac6113928386f7385b15ffa4d9640e60830bd9868079bfb2da88 ffmpeg-0.4.9-p20070616.tar.bz2 2275972