New snapshot, to be tested

Package-Manager: portage-2.1_pre10-r5

4 files changed, 273 insertions, 15 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 6ab0a3d7f245..3ba6ef8f3f73 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.137 2006/05/08 04:23:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.138 2006/05/17 09:52:14 lu_zero Exp $
+
+*ffmpeg-0.4.9_p20060517 (17 May 2006)
+
+  17 May 2006; Luca Barbato <lu_zero@gentoo.org>
+  +ffmpeg-0.4.9_p20060517.ebuild:
+  new snapshot, to be tested
 
   08 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   ffmpeg-0.4.9_p20060302.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 9c620ecefcde..27d0eab3f6a0 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a SHA1 07c79c6680ebe0b1a695394ba4d24abb503c4b46 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 size 994
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
@@ -76,6 +73,7 @@ DIST ffmpeg-0.4.9-p20050906.tbz2 1671242 size 1671242
 DIST ffmpeg-0.4.9-p20051120.tar.bz2 1698488 size 1698488
 DIST ffmpeg-0.4.9-p20051216.tar.bz2 1719827 size 1719827
 DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fba1a3dc277bd SHA256 17bd539cc1244a00e0de1d0d4ae3ea731553a8405be616bfc79858496633391d size 1759647
+DIST ffmpeg-0.4.9-p20060517.tar.bz2 1811524 RMD160 d4455eb1d3d93dfedc52a513aee736d4f101ddf1 SHA256 ae150f82f2aaa0f414c1f9f2cfc5e07604bb169ce923a6961a9546a1387625cc size 1811524
 EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4388 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 SHA1 2352e7016ed2a5d78d8c4c521607efd1b985c43d SHA256 5135d135bcdd29a9e5f4dcd2e1d4b75bc851a465de513531537af6bf4684a7a5 size 4388
 MD5 da4fb7c75a6d011f4d7e0d337d449129 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
@@ -100,10 +98,14 @@ EBUILD ffmpeg-0.4.9_p20060302.ebuild 7829 RMD160 c961565d102844b0dd5c9e851629aad
 MD5 59426e6b4fc199085e58384b9e82bfcf ffmpeg-0.4.9_p20060302.ebuild 7829
 RMD160 c961565d102844b0dd5c9e851629aad8c2df92cf ffmpeg-0.4.9_p20060302.ebuild 7829
 SHA256 9ec94e4c6b8ef30dadbdddbbb72c14ffa17fb5265398cd8bb28f8f7fb1590408 ffmpeg-0.4.9_p20060302.ebuild 7829
-MISC ChangeLog 20785 RMD160 c1753db302587d192e3401272321c9f804e06234 SHA1 e31e0799b7963298a444f95a98b7a6a7e0267d51 SHA256 b997c1e4d9a8b8afbec80e6b1f386ddb57264f5d818d5ad4ef321cc547406478 size 20785
-MD5 9ce8239dbdef401857963692b1dcbd97 ChangeLog 20785
-RMD160 c1753db302587d192e3401272321c9f804e06234 ChangeLog 20785
-SHA256 b997c1e4d9a8b8afbec80e6b1f386ddb57264f5d818d5ad4ef321cc547406478 ChangeLog 20785
+EBUILD ffmpeg-0.4.9_p20060517.ebuild 7718 RMD160 94f1ed3aaa88d7595b36c1265862bb5cb469f166 SHA1 b9e84e10b9cb5041dcf1beabd1c748a25a7814e7 SHA256 c6b9c00d45c4c630e7ad9c9f909ca29afe2065b382b43a5c580111d24fa97dab size 7718
+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
+MISC ChangeLog 20935 RMD160 84fb1d14b1fc6d2b245fdd6ec797b277fe1b2ffc SHA1 aac35b13f2c815489a2e1fcac7a811d8b2483eeb SHA256 ba758691b018ca4f47ee74516f930a559a5cd790c0182bd5d276ed36466c34c2 size 20935
+MD5 ca2211a31b6e91ff625b7b3236c7f8e7 ChangeLog 20935
+RMD160 84fb1d14b1fc6d2b245fdd6ec797b277fe1b2ffc ChangeLog 20935
+SHA256 ba758691b018ca4f47ee74516f930a559a5cd790c0182bd5d276ed36466c34c2 ChangeLog 20935
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 size 223
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -126,10 +128,6 @@ SHA256 61b82cac8ca3bda3af573eef3b528771d181495e46e8fab0f859d6e05394c05e files/di
 MD5 7fb55dd969da83d7f7224f769d373d6c files/digest-ffmpeg-0.4.9_p20060302 714
 RMD160 1119c53182aa3203cf623204ff94e994dab64c82 files/digest-ffmpeg-0.4.9_p20060302 714
 SHA256 06f9e13780a1730bdd77cce2e1821b99f6b1baa0c1017ee9b026eb512e3f18f3 files/digest-ffmpeg-0.4.9_p20060302 714
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEXse3AiZjviIA2XgRAoXgAJ0X16zVsadv+/udtxU9G43gaZSO9wCdHjWo
-E1BOIOk2agG5f8r0oye80Vw=
-=+K2j
------END PGP SIGNATURE-----
+MD5 b1bbc380755d26b9e1a8952a410b8474 files/digest-ffmpeg-0.4.9_p20060517 714
+RMD160 c245565fec19b10a0e96178e3754011047765c7a files/digest-ffmpeg-0.4.9_p20060517 714
+SHA256 40809495f2dc849a8a2073aee157d06403a7327a51096ca78d5d8143fef813e4 files/digest-ffmpeg-0.4.9_p20060517 714
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060517.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060517.ebuild
new file mode 100644
index 000000000000..8bfeeaafb992
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060517.ebuild
@@ -0,0 +1,245 @@
+# 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_p20060517.ebuild,v 1.1 2006/05/17 09:52:14 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}
+S_BASE=${WORKDIR}/${MY_P}
+S_STATIC=${S_BASE}-static
+S_SHARED=${S_BASE}-shared
+
+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"
+# ~alpha need to test aac useflag
+# ~ia64 ~arm ~mips ~hppa
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="-*" #~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+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 )
+	theora? ( media-libs/libtheora )
+	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 )
+	amr? ( app-arch/unzip )"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S_BASE}
+
+	# amr (float) support
+	if use amr; then
+		einfo "Including amr wide and narrow band (float) support ... "
+
+		# narrow band codec
+		mkdir ${S_BASE}/libavcodec/amr_float
+		cd ${S_BASE}/libavcodec/amr_float
+		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
+
+		# wide band codec
+		mkdir ${S_BASE}/libavcodec/amrwb_float
+		cd ${S_BASE}/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_BASE}
+			epatch ${FILESDIR}/${P}-amr-64bit.patch
+		fi
+	fi
+
+	cd ${S_BASE}
+
+	#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
+
+	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
+
+	# .pc files contain wrong libdir path
+	epatch ${FILESDIR}/${PN}-libdir.patch
+	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
+
+	# ffmpeg doesn'g use libtool, so the condition for PIC code
+	# is __PIC__, not PIC.
+	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
+		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
+		libavcodec/msmpeg4.c \
+		libavutil/common.h \
+		|| die "sed failed (__PIC__)"
+
+	# 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
+	cd ${S}
+	cp -R ${S_BASE} ${S_STATIC}
+	mv ${S_BASE} ${S_SHARED}
+	cd ${S_SHARED}
+	epatch "${FILESDIR}/ffmpeg-shared-gcc4.1.patch"
+}
+
+src_compile() {
+	#Note; library makefiles don't propogate flags from config.mak so
+	#use specified CFLAGS are only used in executables
+	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
+
+	if use elibc_FreeBSD; then
+		myconf="${myconf} --enable-memalign-hack"
+	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"
+	use ogg && myconf="${myconf} --enable-libogg"
+	use vorbis && myconf="${myconf} --enable-vorbis"
+	use theora && myconf="${myconf} --enable-theora"
+	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"
+
+	cd ${S_STATIC}
+	#econf generates configure options unknown to ffmpeg's configure, so configure manually
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-static --disable-shared \
+		"--cc=$(tc-getCC)" \
+		"--extra-ldflags=${LDFLAGS}" \
+		${myconf} || die "static failed"
+
+
+	emake || die "static failed"
+
+	# 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
+
+	# This is needed to make sure that when linking with --as-needed all the
+	# libraries are found in the right places, not suitable for upstream yet as
+	# it's GNU-ld only (most likely).
+	append-ldflags "-Wl,-rpath-link,${S_SHARED}/libav"{codec,format,util}
+
+	cd ${S_SHARED}
+	#econf generates configure options unknown to ffmpeg's configure, so configure manually
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--disable-static --enable-shared \
+		"--cc=$(tc-getCC)" \
+		"--extra-ldflags=${LDFLAGS}" \
+		${myconf} || die "shared failed"
+
+	emake || die "shared failed"
+}
+
+src_install() {
+	for d in ${S_STATIC} ${S_SHARED}; do
+		cd ${d}
+
+		make DESTDIR=${D} \
+			prefix=${D}/usr \
+			libdir=${D}/usr/$(get_libdir) \
+			mandir=${D}/usr/share/man \
+			infodir=${D}/usr/share/info \
+			bindir=${D}/usr/bin \
+			install install-libs || die "Install Failed"
+	done
+
+	cd ${S_SHARED}
+	use doc && make documentation
+	dodoc ChangeLog README INSTALL
+	dodoc doc/*
+
+	cd ${S_STATIC}/libavcodec/libpostproc
+	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
+		install || die "Failed to install libpostproc.a!"
+
+	cd ${S_SHARED}/libavcodec/libpostproc
+	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
+		SHARED_PP="yes" \
+		install || die "Failed to install libpostproc.so!"
+
+	# Some stuff like transcode can use this one.
+	dolib ${S_STATIC}/libavcodec/libpostproc/libpostproc.a
+}
+
+# Never die for now...
+src_test() {
+
+	for d in ${S_STATIC} ${S_SHARED}; do
+		cd ${d}/tests
+		for t in "codectest libavtest test-server" ; do
+			make ${t} || ewarn "Some tests in ${t} failed for ${d}"
+		done
+	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_p20060517 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060517
new file mode 100644
index 000000000000..c720116092fa
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060517
@@ -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 9aeb71c3a9768f4664299bd6778cc565 ffmpeg-0.4.9-p20060517.tar.bz2 1811524
+RMD160 d4455eb1d3d93dfedc52a513aee736d4f101ddf1 ffmpeg-0.4.9-p20060517.tar.bz2 1811524
+SHA256 ae150f82f2aaa0f414c1f9f2cfc5e07604bb169ce923a6961a9546a1387625cc ffmpeg-0.4.9-p20060517.tar.bz2 1811524