fixes bug #48090

4 files changed, 121 insertions, 3 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e8a3b558513c..9e7993fcb9cb 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.35 2004/06/07 17:14:06 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.36 2004/06/09 15:02:44 lordvan Exp $
+
+*ffmpeg-0.4.8.20040322-r1 (09 Jun 2004)
+
+  09 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  +ffmpeg-0.4.8.20040322-r1.ebuild:
+  -r1 adds faac support, added local USE flag
+  fixes bug #48090, thanks to Stefan Briesenick <sbriesen@gmx.de>
 
   07 Jun 2004; Travis Tilley <lv@gentoo.org> ffmpeg-0.4.8.20040322.ebuild:
   stable on amd64
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 881cd9334b8a..508ffffb4345 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,11 +1,13 @@
 MD5 84a27708e863d4c3fe8f2c99f1a05a40 ffmpeg-0.4.8.20040222.ebuild 3300
 MD5 c47ffd4762bbd81606974cc39a507a87 ffmpeg-0.4.8.ebuild 2387
-MD5 6bb70a5fb3b12d30e251793bdf13c809 ffmpeg-0.4.8.20040322.ebuild 3294
+MD5 30631e1531d6673bfa478354d4e31bb9 ffmpeg-0.4.8.20040322.ebuild 3293
+MD5 f688a2acffa0fe87921aca24cfc9d4a7 ffmpeg-0.4.8.20040322-r1.ebuild 3380
 MD5 f08417b78b86be6de292fd739077ef67 ffmpeg-0.4.7.ebuild 2182
-MD5 df16bff758921ddc253ca6b062640d57 ChangeLog 5297
+MD5 aabaa2206341907cb47a8cb1ed4201a8 ChangeLog 5296
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
 MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
+MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 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
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
new file mode 100644
index 000000000000..a04564940dfa
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.1 2004/06/09 15:02:44 lordvan Exp $
+
+inherit eutils flag-o-matic
+
+# TODO: --enablea52bin breaks compile
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.sourceforge.net/"
+PDATE=${PV##*.}
+MY_PV=${PV%.*}
+S=${WORKDIR}/${PN}-${PDATE}
+SRC_URI="http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PDATE}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+IUSE="mmx altivec encode oggvorbis doc faad faac dvd static sdl imlib truetype"
+
+DEPEND="encode? ( >=media-sound/lame-3.92 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
+	doc? ( >=app-text/texi2html-1.64 )
+	faad? ( >=media-libs/faad2-1.1 )
+	!ia64? ( !alpha? ( faac? ( >=media-libs/faac-1.23 ) ) )
+	dvd? ( >=media-libs/a52dec-0.7.4 )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	imlib? ( >=media-libs/imlib2-1.0.6 )
+	truetype? ( >=media-libs/freetype-2.1.2 )
+	!<media-video/mplayer-1.0_pre3-r1"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
+	cd ${S}
+	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
+}
+
+src_compile() {
+	filter-flags -fforce-addr -fPIC
+	# fixes bug #16281
+	use alpha && append-flags -fPIC
+	use amd64 && append-flags -fPIC
+
+	local myconf
+	#myconf="${myconf} --disable-opts --enable-pp --enable-shared-pp"
+	myconf="${myconf} --disable-opts --enable-pp"
+	use mmx || myconf="${myconf} --disable-mmx"
+	use encode && myconf="${myconf} --enable-mp3lame"
+	use oggvorbis && myconf="${myconf} --enable-vorbis"
+	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
+	use faac && myconf="${myconf} --enable-faac"
+	use dvd && myconf="${myconf} --enable-a52"
+	use static || myconf="${myconf} --enable-shared"
+	use sdl || myconf="${myconf} --disable-ffplay"
+	use debug || myconf="${myconf} --disable-debug"
+	use altivec || myconf="${myconf} --disable-altivec"
+
+# Using --enable-a52bin breaks the compile
+	#use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
+
+	./configure ${myconf} \
+		--prefix=/usr || die "./configure failed."
+	make || die "make failed."
+	use doc && make -C doc all
+
+	filter-flags -momit-leaf-frame-pointer
+	# fixes bug #45576
+	./configure ${myconf} \
+		--prefix=/usr || die "./configure failed."
+	# Build libpostproc
+	cd ${S}/libavcodec/libpostproc
+	make || die "Failed to build libpostproc.a!"
+	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		prefix=${D}/usr \
+		bindir=${D}/usr/bin \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+	dosym /usr/bin/ffmpeg /usr/bin/ffplay
+	dosym /usr/lib/libavcodec-${MY_PV}.so /usr/lib/libavcodec.so
+
+	dodoc COPYING CREDITS Changelog INSTALL README
+	docinto doc
+	dodoc doc/TODO doc/*.html doc/*.texi
+	insinto /etc
+	doins doc/ffserver.conf
+
+	# Install libpostproc ...
+	cd ${S}/libavcodec/libpostproc
+	make prefix=${D}/usr \
+		install || die "Failed to install libpostproc.a!"
+	make prefix=${D}/usr \
+		SHARED_PP="yes" \
+		install || die "Failed to install libpostproc.so!"
+	cd ${S}
+	# Some stuff like transcode can use this one.
+	dolib ${S}/libavcodec/libpostproc/libpostproc.a
+
+	preplib /usr
+}
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322-r1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322-r1
new file mode 100644
index 000000000000..d342e6bcd757
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322-r1
@@ -0,0 +1 @@
+MD5 24c6e9073699ccdb8119b2fcfd476bd2 ffmpeg-20040322.tar.bz2 1301977