New snapshot - less glitches, more features

Package-Manager: portage-2.1.2.3

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index b5243ea57156deb3d7462bbe800eb3c7765fe2eb..decd349264599374288991acdde2ee29df2dc960 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.185 2007/03/27 09:29:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.186 2007/03/30 22:28:59 lu_zero Exp $
+
+*ffmpeg-0.4.9_p20070330 (30 Mar 2007)
+
+  30 Mar 2007; Luca Barbato <lu_zero@gentoo.org>
+  +ffmpeg-0.4.9_p20070330.ebuild:
+  New snapshot
 
   27 Mar 2007; Luca Barbato <lu_zero@gentoo.org>
   ffmpeg-0.4.9_p20070325.ebuild:

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f4e6fb2479b3db5cd7654ae359ba1bcd72eccc7f..0b0e727c75958eabf480d9b67b4dd4f0403f2396 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -56,6 +56,7 @@ DIST ffmpeg-0.4.9-p20060816.tar.bz2 1948118 RMD160 eb8e076f75c32b7a4874009451c7c
 DIST ffmpeg-0.4.9-p20061016.tar.bz2 2009859 RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c SHA1 2e15183755378b4089264be3f8865e24eeaa39dc SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531
 DIST ffmpeg-0.4.9-p20070129.tar.bz2 2086323 RMD160 b0895a2d3927c769b7abac1b91d66e7f78586d4f SHA1 12d9e43fd7ee222be4f5b8c58bb63c9056ab3df3 SHA256 107a9c7bfc19c2fde01465d2cbab8082a0e4c1197ff28658aa14932e1be7914f
 DIST ffmpeg-0.4.9-p20070325.tar.bz2 2189783 RMD160 b70c170861423b3724fb7e7036535b10bc656636 SHA1 dbc456e8cedee7da76329375ac467cae74d1e0ad SHA256 147c132824b7df8d4b8dfc5c8ede92dfd3e6b5230f91570ac59326816be8b71c
+DIST ffmpeg-0.4.9-p20070330.tar.bz2 2192476 RMD160 e52bf6abbf7c630aa3e76243987fb7dd6d9b84a1 SHA1 bcc18c88c64f6f941eb1ac94357e0d6dcbf99045 SHA256 58a7e7d909e02fda07856ea044ae0f5f9c174791f63a449f2f23f37a78b34f95
 EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4373 RMD160 511095c4ea2560216773626b41faf450aec3c671 SHA1 8c370e5a0878fef1757c16e40d26c2e26f48047f SHA256 154be70b4a9c44387cd0307f2f0592455f82d65c277129905e72142870deb7ea
 MD5 4695380deafd4dda1fa644766cfc81e5 ffmpeg-0.4.9_p20050226-r3.ebuild 4373
 RMD160 511095c4ea2560216773626b41faf450aec3c671 ffmpeg-0.4.9_p20050226-r3.ebuild 4373
@@ -88,10 +89,14 @@ EBUILD ffmpeg-0.4.9_p20070325.ebuild 6111 RMD160 6a71e087b81ea18ecccdda5a2032c5d
 MD5 e642796170ecfed3c1259e509a0a84ca ffmpeg-0.4.9_p20070325.ebuild 6111
 RMD160 6a71e087b81ea18ecccdda5a2032c5d088be9aa4 ffmpeg-0.4.9_p20070325.ebuild 6111
 SHA256 2eac1188c63ec067414b56c6a971d29a406e4e739c84f4bf3495bef001a6651c ffmpeg-0.4.9_p20070325.ebuild 6111
-MISC ChangeLog 27784 RMD160 2cc8da8ca71d140e5499a097c50efd1fa4870358 SHA1 cbd8deb44263f49f1f8018c23353096dac2e65db SHA256 fab3cddaa8fc30ff46d57b89005dd0e954cbf677adeafa6ab7fb98717453d899
-MD5 5d4b032d1f6d791ce18a0932073ba2f2 ChangeLog 27784
-RMD160 2cc8da8ca71d140e5499a097c50efd1fa4870358 ChangeLog 27784
-SHA256 fab3cddaa8fc30ff46d57b89005dd0e954cbf677adeafa6ab7fb98717453d899 ChangeLog 27784
+EBUILD ffmpeg-0.4.9_p20070330.ebuild 6084 RMD160 89d53a1e1e1332e5d31904a1e65984a0fa928d56 SHA1 7970612597452f9e40672d5e7a1d4ab2e787dff1 SHA256 aa0f22c856d1e84ab81451ba54806c54f3a535afd601df064287d9147366ece2
+MD5 b253ca3e496d0ce1579a12da7e905db4 ffmpeg-0.4.9_p20070330.ebuild 6084
+RMD160 89d53a1e1e1332e5d31904a1e65984a0fa928d56 ffmpeg-0.4.9_p20070330.ebuild 6084
+SHA256 aa0f22c856d1e84ab81451ba54806c54f3a535afd601df064287d9147366ece2 ffmpeg-0.4.9_p20070330.ebuild 6084
+MISC ChangeLog 27922 RMD160 4144f1ab3149f36ae7fb8fbe7e9d7f00d760b1eb SHA1 6136a55f2217373d3874829462cd312a65da1517 SHA256 1ca5abf1465da1d0796f587df40978b43a0e8a255b72c7f0cb9410c9456fdf83
+MD5 4436448fd74f83ae6a638e98674bce1d ChangeLog 27922
+RMD160 4144f1ab3149f36ae7fb8fbe7e9d7f00d760b1eb ChangeLog 27922
+SHA256 1ca5abf1465da1d0796f587df40978b43a0e8a255b72c7f0cb9410c9456fdf83 ChangeLog 27922
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -120,3 +125,6 @@ SHA256 da375dbb878be25e06a73e390e5fbc10fa32966adf9ef3670e9c4202e6871e62 files/di
 MD5 4c77d13308e01ce73825173197162cd1 files/digest-ffmpeg-0.4.9_p20070325 714
 RMD160 6ba9686ab9ec4afe8c14cfe84acd9ad8ac253db5 files/digest-ffmpeg-0.4.9_p20070325 714
 SHA256 1e5dc7d4a04cc22acdd5de9055bc5313893eaab38703cff06fc004e95a9ec1c4 files/digest-ffmpeg-0.4.9_p20070325 714
+MD5 d98d9051657b11d7b00a8ac162ebbf40 files/digest-ffmpeg-0.4.9_p20070330 714
+RMD160 1d590a65f72ee227dbed00f4529f3d326b7fe007 files/digest-ffmpeg-0.4.9_p20070330 714
+SHA256 e7362005124f820743564e7eddd99840696e2d5689f1afe46c53c35089b4a0fb files/digest-ffmpeg-0.4.9_p20070330 714

diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
new file mode 100644 (file)
index 0000000..6290e3b
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2007 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_p20070330.ebuild,v 1.1 2007/03/30 22:28:59 lu_zero Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video.
+Includes libavcodec. SVN revision 8560"
+HOMEPAGE="http://ffmpeg.org/"
+MY_P=${P/_/-}
+S=${WORKDIR}/ffmpeg
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+       amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
+                  http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
+       test theora threads truetype v4l x264 xvid dts network zlib sdl X"
+
+RDEPEND="imlib? ( media-libs/imlib2 )
+       truetype? ( >=media-libs/freetype-2 )
+       sdl? ( >=media-libs/libsdl-1.2.10 )
+       encode? ( media-sound/lame
+               vorbis? ( media-libs/libvorbis )
+               theora? ( media-libs/libtheora ) )
+       ogg? ( media-libs/libogg )
+       aac? ( media-libs/faad2 media-libs/faac )
+       a52? ( >=media-libs/a52dec-0.7.4-r4 )
+       xvid? ( >=media-libs/xvid-1.1.0 )
+       zlib? ( sys-libs/zlib )
+       dts? ( media-libs/libdts )
+       ieee1394? ( =media-libs/libdc1394-1*
+                               sys-libs/libraw1394 )
+       x264? ( >=media-libs/x264-svn-20061014 )
+       X? ( x11-libs/libX11 x11-libs/libXext )"
+
+DEPEND="${RDEPEND}
+       doc? ( app-text/texi2html )
+       test? ( net-misc/wget )
+       amr? ( app-arch/unzip )"
+# Make sure the mmx USE flag is unmasked
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
+
+src_unpack() {
+       unpack ${A} || die
+       cd ${S}
+
+       # amr (float) support
+       if use amr; then
+               einfo "Including amr wide and narrow band (float) support ... "
+
+               # narrow band codec
+               mkdir ${S}/libavcodec/amr_float
+               cd ${S}/libavcodec/amr_float
+               unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
+
+               # wide band codec
+               mkdir ${S}/libavcodec/amrwb_float
+               cd ${S}/libavcodec/amrwb_float
+               unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
+
+               # Patch if we're on 64-bit
+               if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
+                       cd ${S}
+                       epatch "${FILESDIR}/ffmpeg-0.4.9_p20060302-amr-64bit.patch"
+               fi
+       fi
+
+       cd ${S}
+
+       #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
+
+       # .pc files contain wrong libdir path
+       epatch ${FILESDIR}/${PN}-libdir-2007.patch
+       sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
+
+       # Make it use pic always since we don't need textrels
+       sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
+
+       # To make sure the ffserver test will work
+       sed -i -e "s:-e debug=off::" tests/server-regression.sh
+
+       epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
+}
+
+src_compile() {
+       replace-flags -O0 -O2
+       #x86, what a wonderful arch....
+       replace-flags -O1 -O2
+       local myconf="${EXTRA_ECONF}"
+
+       #disable mmx accelerated code if not requested, or if PIC is required
+       # as the provided asm decidedly is not PIC.
+       if ( gcc-specs-pie || ! use mmx ) ; then
+               myconf="${myconf} --disable-mmx"
+       fi
+
+       # enabled by default
+       use altivec || myconf="${myconf} --disable-altivec"
+       use debug || myconf="${myconf} --disable-debug"
+       use oss || myconf="${myconf} --disable-audio-oss"
+       use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
+       use ieee1394 || myconf="${myconf} --disable-dv1394"
+       use network || myconf="${myconf} --disable-network"
+       use zlib || myconf="${myconf} --disable-zlib"
+       use sdl || myconf="${myconf} --disable-ffplay"
+
+       myconf="${myconf} --disable-opts"
+
+       # disabled by default
+       if use encode
+       then
+               myconf="${myconf} --enable-libmp3lame"
+               use vorbis && myconf="${myconf} --enable-libvorbis --enable-libogg"
+               use theora && myconf="${myconf} --enable-libtheora --enable-libogg"
+       fi
+       use a52 && myconf="${myconf} --enable-liba52"
+       use ieee1394 && myconf="${myconf} --enable-dc1394"
+       use threads && myconf="${myconf} --enable-pthreads"
+       use xvid && myconf="${myconf} --enable-xvid"
+       use X && myconf="${myconf} --enable-x11grab"
+       use ogg && myconf="${myconf} --enable-libogg"
+       use dts && myconf="${myconf} --enable-libdts"
+       use x264 && myconf="${myconf} --enable-x264"
+       use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
+       use amr && myconf="${myconf} --enable-amr-nb --enable-amr-wb \
+                                                                --enable-amr-if2"
+
+       myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
+
+       tc-is-cross-compiler && myconf="${myconf} --cross-compile --arch=$(tc-arch-kernel)"
+
+       # Specific workarounds for too-few-registers arch...
+       if [[ $(tc-arch) == "x86" ]]; then
+               filter-flags -fforce-addr -momit-leaf-frame-pointer
+               append-flags -fomit-frame-pointer
+               is-flag -O? || append-flags -O2
+               if (use debug); then
+                       # no need to warn about debug if not using debug flag
+                       ewarn ""
+                       ewarn "Debug information will be almost useless as the frame pointer is omitted."
+                       ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+                       ewarn "difficult to fix. Please have that in mind."
+                       ewarn ""
+               fi
+       fi
+
+       cd ${S}
+       ./configure \
+               --prefix=/usr \
+               --libdir=/usr/$(get_libdir) \
+               --shlibdir=/usr/$(get_libdir) \
+               --mandir=/usr/share/man \
+               --enable-static --enable-shared \
+               "--cc=$(tc-getCC)" \
+               ${myconf} || die "configure failed"
+
+       emake -j1 depend || die "depend failed"
+       emake || die "make failed"
+}
+
+src_install() {
+       emake -j1 LDCONFIG=true DESTDIR=${D} install || die "Install Failed"
+
+       use doc && emake -j1 documentation
+       dodoc Changelog README INSTALL
+       dodoc doc/*
+}
+
+# Never die for now...
+src_test() {
+       cd ${S}/tests
+       for t in "codectest libavtest test-server" ; do
+               make ${t} || ewarn "Some tests in ${t} failed"
+       done
+}
+
+pkg_postinst() {
+       ewarn "ffmpeg may had ABI changes, if ffmpeg based programs"
+       ewarn "like xine-lib or vlc stop working as expected please"
+       ewarn "rebuild them."
+}

diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070330 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070330
new file mode 100644 (file)
index 0000000..15df244
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070330
@@ -0,0 +1,9 @@
+MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
+RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
+SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
+MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
+RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
+SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
+MD5 eb4210984880af7f2c0043c4e3f1658e ffmpeg-0.4.9-p20070330.tar.bz2 2192476
+RMD160 e52bf6abbf7c630aa3e76243987fb7dd6d9b84a1 ffmpeg-0.4.9-p20070330.tar.bz2 2192476
+SHA256 58a7e7d909e02fda07856ea044ae0f5f9c174791f63a449f2f23f37a78b34f95 ffmpeg-0.4.9-p20070330.tar.bz2 2192476