merge patches from reenoo@gmx.de

4 files changed, 93 insertions, 9 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0dd7bae80eb2..c15153bd35fd 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.9 2003/01/04 21:04:13 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.10 2003/01/04 23:12:08 method Exp $
+
+*ffmpeg-0.4.6-r1 (4 Jan 2003)
+  
+  4 Jan 2003; Joshua Brindle <method@gentoo.org> ffmpeg-0.4.6-r1.ebuild :
+  merge patches to ebuild and package from Rene Wagner <reenoo@gmx.de>
+  to install libavcodec as a .so. 
 
 *ffmpeg-0.4.6 (3 Jan 2003)
   
diff --git a/media-video/ffmpeg/ffmpeg-0.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..d67720a9f4ab
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2002 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.6-r1.ebuild,v 1.1 2003/01/04 23:12:08 method Exp $
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+SRC_URI="mirror://sourceforge/ffmpeg/${P}.tar.gz"
+HOMEPAGE="http://ffmpeg.sourceforge.net/"
+
+IUSE="mmx encode oggvorbis doc"
+
+inherit flag-o-matic
+filter-flags -fforce-addr
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc "
+
+DEPEND="encode? ( >=media-sound/lame-3.92 )
+		oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
+		doc? ( >=app-text/texi2html-1.64 )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	# ffmpeg doesn't use autoconf (etc.), so...
+	patch -p0 < ${FILESDIR}/${P}-Makefiles.diff || die \
+		"Patch #1 failed."
+}
+
+src_compile() {
+	local myconf
+
+	use mmx || myconf="--disable-mmx"
+	use encode && myconf="${myconf} --enable-mp3lame"
+	use oggvorbis && myconf="${myconf} --enable-vorbis"
+
+	./configure ${myconf} \
+		--prefix=/usr \
+		--enable-shared || die "./configure failed."
+	make || die "make failed."
+	use doc && make -C doc all 
+}
+
+src_install() {
+	einstall || die "Installation failed."
+	dosym /usr/bin/ffmpeg /usr/bin/ffplay
+	dosym /usr/lib/libavcodec-${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
+}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.6.ebuild b/media-video/ffmpeg/ffmpeg-0.4.6.ebuild
index c0bf273fbfc6..7397532421ca 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2002 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.6.ebuild,v 1.1 2003/01/04 21:04:13 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.6.ebuild,v 1.2 2003/01/04 23:12:08 method Exp $
 
-DESCRIPTION="Tool to manipulate and stream video files"
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
 SRC_URI="mirror://sourceforge/ffmpeg/${P}.tar.gz"
 HOMEPAGE="http://ffmpeg.sourceforge.net/"
 
-IUSE="mmx encode oggvorbis"
+IUSE="mmx encode oggvorbis doc"
 
 inherit flag-o-matic
 filter-flags -fforce-addr
@@ -16,7 +16,19 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc "
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
-        oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )"
+		oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
+		doc? ( >=app-text/texi2html-1.64 )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	# ffmpeg doesn't use autoconf (etc.), so...
+	patch -p0 < ${FILESDIR}/${P}-Makefiles.diff || die \
+		"Patch #1 failed."
+}
 
 src_compile() {
 	local myconf
@@ -25,13 +37,21 @@ src_compile() {
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
 
-	./configure ${myconf} || die
-	make || die
+	./configure ${myconf} \
+		--prefix=/usr \
+		--enable-shared || die "./configure failed."
+	make || die "make failed."
+	use doc && make -C doc all || die "make all in ./doc failed."
 }
 
 src_install() {
-	dobin ffmpeg ffserver
-	dodoc doc/*
+	einstall || die "Installation failed."
+	dosym /usr/bin/ffmpeg /usr/bin/ffplay
+	dosym /usr/lib/libavcodec-${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
 }
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.6-r1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.6-r1
new file mode 100644
index 000000000000..d63cf7c49259
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.6-r1
@@ -0,0 +1 @@
+MD5 bdd96d28327d3abe02e886c13e633878 ffmpeg-0.4.6.tar.gz 672098