Bumped to 20050226 snapshot release.

(Portage version: 2.0.51-r15)

5 files changed, 169 insertions, 9 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 3b7c648fcd67..c2fa76883fd0 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2005/02/24 16:19:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.50 2005/02/28 16:14:43 chriswhite Exp $
+
+*ffmpeg-0.4.9_p20050226 (01 Mar 2005)
+
+  01 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/gentoo-ffmpeg001.patch, +ffmpeg-0.4.9_p20050226.ebuild:
+  Bumped to 20050226 snapshot release.
 
   24 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ffmpeg-0.4.8.ebuild:
   fixed #82873, emerge failed due to missing patch.
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d470f2d9a62f..9945c78ef945 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,17 +1,20 @@
+MD5 9c93b61e860c3e086d16e81495bf5a13 ChangeLog 7289
+MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
 MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
-MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
-MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
 MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
-MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
+MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
+MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
 MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
-MD5 9c93b61e860c3e086d16e81495bf5a13 ChangeLog 7289
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
-MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
+MD5 26233ca2229fb855225fbd2121f0a025 ffmpeg-0.4.9_p20050226.ebuild 3248
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
-MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
+MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
 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 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
+MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
+MD5 3ec4083f7fb077a5a3c40d1dd46a9a1f files/gentoo-ffmpeg001.patch 1098
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226.ebuild
new file mode 100644
index 000000000000..e75e51aed99e
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226.ebuild
@@ -0,0 +1,119 @@
+# 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.ebuild,v 1.1 2005/02/28 16:14:43 chriswhite Exp $
+
+inherit eutils flag-o-matic gcc
+
+# TODO: --enablea52bin breaks compile
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.sourceforge.net/"
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa"
+IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss truetype v4l"
+
+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)
+		oggvorbis? (media-libs/libvorbis
+					media-libs/libogg)
+		!alpha?( aac? (media-libs/faad2 media-libs/faac) )
+		dvd? (media-libs/a52dec)
+		xvid? (media-libs/xvid)
+		"
+
+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
+
+	# 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
+
+	#this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383
+	#if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	#then
+	#	einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
+	#	epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
+	#fi
+}
+
+src_compile() {
+	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
+	# fixes bug #16281
+
+	use alpha && append-flags -fPIC
+	use amd64 && append-flags -fPIC
+	use hppa && append-flags -fPIC
+	use ppc && append-flags -fPIC
+
+	local myconf=""
+
+	use encode && use aac && myconf="${myconf} --enable-faac"
+
+	if use oggvorbis ; then
+		myconf="${myconf} --enable-ogg --enable-vorbis"
+	else
+		myconf="${myconf} --disable-ogg --disable-theora"
+	fi
+
+	use !alpha && myconf="${myconf} $(use_enable aac faad) $(use_enable aac faac) $(use_enable aac faadbin)"
+
+	econf \
+	$(use_enable mmx) \
+	$(use_enable altivec) \
+	$(use_enable debug) \
+	$(use_enable encode mp3lame) \
+	$(use_enable dvd a52) $(use_enable dvd a52bin) \
+	$(use_enable oss audio-oss) \
+	$(use_enable v4l) \
+	$(use_enable dv dv1394) \
+	--enable-gpl \
+	--enable-shared-pp \
+	--enable-shared \
+	--emable-pp \
+	--disable-optimize \
+	${myconf} \
+	|| die "Configure failed"
+
+
+}
+
+src_install() {
+	use doc && make documentation
+	make DESTDIR=${D} \
+	prefix=${D}/usr \
+	mandir=${D}/usr/share/man \
+	infodir=${D}/usr/share/info \
+	bindir=${D}/usr/bin \
+	install installlib || die "Install Failed"
+
+	dodoc ChangeLog README INSTALL
+	dodoc doc/*
+
+	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
+}
+
+# FEATURES=maketest breakes the compile
+src_test() { :; }
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226
new file mode 100644
index 000000000000..e182f6a35a7d
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226
@@ -0,0 +1 @@
+MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308
diff --git a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
new file mode 100644
index 000000000000..0cf09dd5470b
--- /dev/null
+++ b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
@@ -0,0 +1,31 @@
+--- libavcodec/Makefile.old	2005-02-28 10:26:08.306815960 +0900
++++ libavcodec/Makefile	2005-02-28 10:26:42.517615128 +0900
+@@ -75,6 +75,8 @@
+ ifneq ($(CONFIG_A52BIN),yes)
+ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
+ 	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
++else
++EXTRALIBS += -la52
+ endif
+ endif
+ 
+--- libavcodec/a52dec.c.old	2005-02-28 10:23:54.002233360 +0900
++++ libavcodec/a52dec.c	2005-02-28 10:35:36.910375080 +0900
+@@ -73,7 +73,7 @@
+ {
+     void* f = dlsym(handle, symbol);
+     if (!f)
+-	fprintf(stderr, "A52 Decoder - function '%s' can't be resolved\n", symbol);
++	av_log(stderr, "A52 Decoder - function '%s' can't be resolved\n", symbol);
+     return f;
+ }
+ #endif
+@@ -86,7 +86,7 @@
+     s->handle = dlopen(liba52name, RTLD_LAZY);
+     if (!s->handle)
+     {
+-	fprintf(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
++	av_log(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
+         return -1;
+     }
+     s->a52_init = (a52_state_t* (*)(uint32_t)) dlsymm(s->handle, "a52_init");