Experimental snapshot

(Portage version: 2.0.53_rc7)

5 files changed, 197 insertions, 12 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index cc33613f174b..2de5732f1f6c 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.95 2005/09/18 00:35:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.96 2005/11/20 18:18:39 lu_zero Exp $
+
+*ffmpeg-0.4.9_p20051120 (20 Nov 2005)
+
+  20 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ffmpeg-configure.patch, +ffmpeg-0.4.9_p20051120.ebuild:
+  New experimental snapshot
 
   18 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
   ffmpeg-0.4.9_p20050906.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f0838ca9967d..52bd621a205b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,30 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ac414ac82eb29e6ac563012b771a4729 ChangeLog 14909
+MD5 4a461ee81cefc05d833d5c906ad5c7ae ChangeLog 15091
 MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
 MD5 bb5094085c4fff51dc773d7735117475 ffmpeg-0.4.9_p20050226-r3.ebuild 4393
 MD5 ff615b7d4ca2c8355c1d0a358271e2d8 ffmpeg-0.4.9_p20050226-r5.ebuild 4543
 MD5 e4e188b8783b45bbc9c454b9f4de3aad ffmpeg-0.4.9_p20050906.ebuild 4781
+MD5 5bd0a04af47cd0f73f827265062728a0 ffmpeg-0.4.9_p20051120.ebuild 4660
 MD5 437df7598487b85a8678e49317d897b1 ffmpeg-0.4.9_pre1-r1.ebuild 4065
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
 MD5 39cf7a98d0f59cfde5b82ab7fedf19d0 files/digest-ffmpeg-0.4.9_p20050906 73
+MD5 e7fdab307678c48f460afd6a50358fd2 files/digest-ffmpeg-0.4.9_p20051120 76
 MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1-r1 70
 MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
 MD5 7ff9e08e701f8a8a860c09bd9259843f files/ffmpeg-0.4.9_p20050906-osx.patch 11103
 MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
+MD5 96c7f1f67e0299ad71b9c0fad55c3960 files/ffmpeg-configure.patch 585
 MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
 MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
 MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
 MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRJ0vgIKl8Uu19MoRAtuUAJ9y2EEzhjGiyQlyPNY3fKv7UAysSQCdE2s7
-TovOOveoAwBGP64/SDee0NM=
-=mztN
------END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild
new file mode 100644
index 000000000000..bdd32f215368
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild
@@ -0,0 +1,160 @@
+# 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_p20051120.ebuild,v 1.1 2005/11/20 18:18:39 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"
+
+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="-*"
+IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l 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.0.3 )
+	zlib? ( sys-libs/zlib )
+	dts? ( media-libs/libdts )
+	ieee1394? ( =media-libs/libdc1394-1*
+	            sys-libs/libraw1394 )
+	test? ( net-misc/wget )"
+
+src_unpack() {
+	unpack ${A} || die
+	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-configure.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 \
+		libavutil/common.h \
+		|| die "sed failed (__PIC__)"
+
+	# 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}
+}
+
+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
+	replace-flags -O0 -O2
+
+	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
+
+	if use elibc_FreeBSD; then
+		myconf="${myconf} --enable-memalign-hack"
+	fi
+
+	myconf="${myconf}
+		$(use_enable altivec) \
+		$(use_enable debug) \
+		$(use_enable encode mp3lame) \
+		$(use_enable a52) --disable-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 libogg) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable dts) \
+		$(use_enable network) \
+		$(use_enable zlib) \
+		$(use_enable sdl ffplay) \
+		$(use_enable aac faad) $(use_enable aac faac) --disable-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}
+
+		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}
+	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
+
+	preplib /usr
+}
+
+# Never die for now...
+src_test() {
+
+	for d in ${S_STATIC} ${S_SHARED}; do
+		cd ${d}
+		make test || ewarn "Some test failed"
+	done
+}
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20051120 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20051120
new file mode 100644
index 000000000000..f87248452a3a
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20051120
@@ -0,0 +1 @@
+MD5 bf08f447f51f12d6d31d46d5ebcac367 ffmpeg-0.4.9-p20051120.tar.bz2 1698488
diff --git a/media-video/ffmpeg/files/ffmpeg-configure.patch b/media-video/ffmpeg/files/ffmpeg-configure.patch
new file mode 100644
index 000000000000..8bfab44cc523
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-configure.patch
@@ -0,0 +1,25 @@
+Index: configure
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
+retrieving revision 1.215
+diff -u -r1.215 configure
+--- configure	22 Oct 2005 19:17:39 -0000	1.215
++++ configure	20 Nov 2005 17:07:53 -0000
+@@ -215,7 +215,7 @@
+ dlfcn="no"
+ dlopen="no"
+ mpegaudio_hp="yes"
+-SHFLAGS=-shared
++SHFLAGS='-shared -Wl,-soname,$@.0'
+ netserver="no"
+ need_inet_aton="no"
+ ffserver="yes"
+@@ -580,8 +580,6 @@
+   ;;
+   *)
+   echo "Unknown option \"$opt\"."
+-  echo "See $0 --help for available options."
+-  exit 1
+   ;;
+   esac
+ done