Added new revision with cleanup and support for mmx on amd64.

Package-Manager: portage-2.0.51.19

4 files changed, 180 insertions, 17 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index db972f519c63..fc10f89c320f 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.64 2005/04/19 20:14:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.65 2005/04/21 21:29:38 flameeyes Exp $
+
+*ffmpeg-0.4.9_p20050226-r4 (21 Apr 2005)
+
+  21 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ffmpeg-0.4.9_p20050226-r4.ebuild:
+  Added new revision which applies cleanups on bug #89172, and patch to enable
+  mmx on amd64 as for bug #88965.
 
   19 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
   ffmpeg-0.4.9_p20050226-r3.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 7574d0c7112d..be123f514939 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,27 +1,29 @@
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 6b0b0f819ad21f0f9eb38c2ef882f144 ChangeLog 9796
 MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
-MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
 MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
-MD5 f9ad96b4c9f4d1983c5d0090cb564721 ffmpeg-0.4.9_p20050226-r2.ebuild 4382
+MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
+MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
 MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
-MD5 651f1835f5f6dc7c249b937547dca00c ffmpeg-0.4.9_p20050226-r3.ebuild 4384
-MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
-MD5 05a075cdec3776cde485acd645c4fd94 ChangeLog 9548
 MD5 0e7ff4e46ede79a2e47d6285e501041a ffmpeg-0.4.9_p20050226-r1.ebuild 3926
+MD5 f9ad96b4c9f4d1983c5d0090cb564721 ffmpeg-0.4.9_p20050226-r2.ebuild 4382
 MD5 556d5a8e7d0e3475c6eb42280a6d92d0 ffmpeg-0.4.9_p20050226.ebuild 3271
-MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r2 73
+MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 651f1835f5f6dc7c249b937547dca00c ffmpeg-0.4.9_p20050226-r3.ebuild 4384
+MD5 bbccfe2b39e49ca5c6ff63a4fe19d586 ffmpeg-0.4.9_p20050226-r4.ebuild 4659
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
-MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
-MD5 56615d0a04f7435f464f01f8bed50c50 files/digest-ffmpeg-0.4.8.20040222 69
-MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
-MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
 MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
 MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
+MD5 56615d0a04f7435f464f01f8bed50c50 files/digest-ffmpeg-0.4.8.20040222 69
+MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
+MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r2 73
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
 MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
-MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
+MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
+MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
+MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r4 73
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild
new file mode 100644
index 000000000000..a1d8c92e1ff7
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2005 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_p20050226-r4.ebuild,v 1.1 2005/04/21 21:29:38 flameeyes Exp $
+
+inherit eutils flag-o-matic gcc 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://sourceforge/ffmpeg/${MY_P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# ~alpha need to test aac useflag
+# ~ia64 ~arm ~mips ~hppa 
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss threads truetype v4l xvid dts network zlib"
+
+# Theora support has switch but there's no oggtheora.c sourcefile...
+
+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.0 )
+	zlib? ( sys-libs/zlib )
+	dts? ( media-libs/libdts )
+	ieee1394? ( media-plugins/libdc1394
+		sys-libs/libraw1394 )"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S_BASE}
+
+	# 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
+
+	# make a52bin actually compile... adds the needed external lib
+	# and makes fprintf -> av_log like it's supposed to be...
+	epatch ${FILESDIR}/gentoo-${PN}001.patch
+
+	#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 \
+		libavcodec/common.h \
+		|| die "sed failed (__PIC__)"
+
+	#fixup liba52 to respect the --disable-mmx configure option
+	sed -i -e 's/#ifdef ARCH_X86/#ifdef HAVE_MMX/' \
+		libavcodec/liba52/resample.c \
+		|| die "sed failed (HAVE_MMX)"
+
+	epatch ${FILESDIR}/${PN}-libdir-pic.patch
+
+	sed -i -e "s:\$ldl\ \$extralibs:\$ldl\ -la52\ \$extralibs:" configure || die "Unable to patch in -la52"
+
+	cd ${S}
+	cp -R ${S_BASE} ${S_STATIC}
+	mv ${S_BASE} ${S_SHARED}
+}
+
+src_compile() {
+	#Note; library makefiles don't propogate flags from config.mak so
+	#use specified CFLAGS are only used in executables
+	filter-flags -fforce-addr -momit-leaf-frame-pointer
+
+	local myconf=""
+
+	#disable mmx accelerated code if not requirested, or if PIC is required
+	# as the provided asm decidedly isn't PIC.
+	if ( !has_pic && use mmx ) || use amd64 ; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	myconf="${myconf}
+		$(use_enable altivec) \
+		$(use_enable debug) \
+		$(use_enable encode mp3lame) \
+		$(use_enable a52) $(use_enable a52 a52bin) \
+		$(use_enable oss audio-oss) \
+		$(use_enable v4l) \
+		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
+		$(use_enable threads pthreads) \
+		$(use_enable xvid) \
+		$(use_enable ogg) \
+		$(use_enable vorbis) \
+		$(use_enable dts) \
+		$(use_enable network) \
+		$(use_enable zlib) \
+		$(use_enable sdl ffplay) \
+		$(use_enable aac faad) $(use_enable aac faac) $(use_enable aac faadbin) \
+		--enable-gpl \
+		--enable-pp \
+		--disable-opts"
+
+	cd ${S_STATIC}
+	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
+	emake CC="$(tc-getCC)" || die "static failed"
+
+	cd ${S_SHARED}
+	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
+	emake CC="$(tc-getCC)" || die "shared failed"
+}
+
+src_install() {
+	for d in ${S_STATIC} ${S_SHARED}; do
+		cd ${d}
+
+		use doc && make documentation
+		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 installlib || die "Install Failed"
+	done
+
+	cd ${S_SHARED}
+	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
+
+	preplib /usr
+}
+
+# FEATURES=maketest breakes the compile
+src_test() { :; }
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r4 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r4
new file mode 100644
index 000000000000..e182f6a35a7d
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r4
@@ -0,0 +1 @@
+MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308