From 1f9eb8a7010a0abc1c803af9f34f6c3faff68ea3 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sun, 25 Mar 2007 13:15:50 +0000 Subject: [PATCH] New snapshot Package-Manager: portage-2.1.2.2 --- media-video/ffmpeg/ChangeLog | 8 +- media-video/ffmpeg/Manifest | 26 ++- .../ffmpeg/ffmpeg-0.4.9_p20070325.ebuild | 189 ++++++++++++++++++ .../files/digest-ffmpeg-0.4.9_p20070325 | 9 + 4 files changed, 217 insertions(+), 15 deletions(-) create mode 100644 media-video/ffmpeg/ffmpeg-0.4.9_p20070325.ebuild create mode 100644 media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070325 diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 708b88384a47..5560ef685796 100644 --- 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.182 2007/03/22 17:55:13 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.183 2007/03/25 13:15:50 lu_zero Exp $ + +*ffmpeg-0.4.9_p20070325 (25 Mar 2007) + + 25 Mar 2007; Luca Barbato + +ffmpeg-0.4.9_p20070325.ebuild: + New snapshot 22 Mar 2007; Gustavo Zacarias ffmpeg-0.4.9_p20070129.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 2961fccc2e69..15290bcc3977 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a SHA1 07c79c6680ebe0b1a695394ba4d24abb503c4b46 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994 @@ -58,6 +55,7 @@ DIST ffmpeg-0.4.9-p20060530.tar.bz2 1807070 RMD160 84d6f692cf34bb9413d9d4934bfab DIST ffmpeg-0.4.9-p20060816.tar.bz2 1948118 RMD160 eb8e076f75c32b7a4874009451c7cb67c32f2fc2 SHA1 3ba0b79eb7bf77895b1b9d074ec825e8ab6ec018 SHA256 20e397ed778e23ae6eebe17d7b91839591512a3146629a2fcc68e0729b2b03bb 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 4135273 RMD160 afec75a9bc71dbdf4fe0c5dc4a211e686cf6664a SHA1 cf126df2db77436a7df6a1297a366576a0b4dcff SHA256 efa60857190141fb7ac55081346d8ce3156eb97d0dcb57eec3ee8e953f48ef12 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 @@ -86,10 +84,14 @@ EBUILD ffmpeg-0.4.9_p20070129.ebuild 5739 RMD160 d1941181748e8241a53f4e9cae27050 MD5 61338d1a2c9cbdf1bbbe613dcf7d5646 ffmpeg-0.4.9_p20070129.ebuild 5739 RMD160 d1941181748e8241a53f4e9cae27050e0f9fdd5a ffmpeg-0.4.9_p20070129.ebuild 5739 SHA256 028afb99042da2d5bc67549286acf0e87240696d1d0285a1638e1e51caa9c53d ffmpeg-0.4.9_p20070129.ebuild 5739 -MISC ChangeLog 27441 RMD160 1a810f286186e68e08931e4e9a7fb04ae697b03a SHA1 fb955584438ad8d9c1b0a320d04176912031fad6 SHA256 fd45e0113a54ff87a0dd06b16b178dc1223e3de4bd2078cfc16bee6a60f96a42 -MD5 5c4cc86e4a43b5aa7d6a3222696e2c12 ChangeLog 27441 -RMD160 1a810f286186e68e08931e4e9a7fb04ae697b03a ChangeLog 27441 -SHA256 fd45e0113a54ff87a0dd06b16b178dc1223e3de4bd2078cfc16bee6a60f96a42 ChangeLog 27441 +EBUILD ffmpeg-0.4.9_p20070325.ebuild 6015 RMD160 b8ecd4acb7a4763e45f4b53f81e2f77e157d7446 SHA1 0e523a375f388f038ed5abc2763f347f4e8fc198 SHA256 3a35c4709b50119fa6cb3db83c8cac4cec5debbb02453f3b144c8ed9e8e35e74 +MD5 cee1c60a80551249b78b3fa3d0ff103f ffmpeg-0.4.9_p20070325.ebuild 6015 +RMD160 b8ecd4acb7a4763e45f4b53f81e2f77e157d7446 ffmpeg-0.4.9_p20070325.ebuild 6015 +SHA256 3a35c4709b50119fa6cb3db83c8cac4cec5debbb02453f3b144c8ed9e8e35e74 ffmpeg-0.4.9_p20070325.ebuild 6015 +MISC ChangeLog 27578 RMD160 0df64ab1a57345a064f1534583411700da08fdf8 SHA1 5f1392010455a41a7f0b969ac9475aa07482ff0f SHA256 97502d79dbc6dce3061083eb85fd9a620a3f6dc908072d6d015bdadbef5080da +MD5 f00ac4906e51eff9a160130477594ab1 ChangeLog 27578 +RMD160 0df64ab1a57345a064f1534583411700da08fdf8 ChangeLog 27578 +SHA256 97502d79dbc6dce3061083eb85fd9a620a3f6dc908072d6d015bdadbef5080da ChangeLog 27578 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 @@ -115,10 +117,6 @@ SHA256 5dcd53524d59a5cefe43d9370d98f64c4345e9e32b4711576c7cbc9aba72db4b files/di MD5 0fc5917b138e748590720ba627ae3fb1 files/digest-ffmpeg-0.4.9_p20070129 714 RMD160 d53b7828787e6c5924a35cbcc9807502dbb26a36 files/digest-ffmpeg-0.4.9_p20070129 714 SHA256 da375dbb878be25e06a73e390e5fbc10fa32966adf9ef3670e9c4202e6871e62 files/digest-ffmpeg-0.4.9_p20070129 714 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) - -iD8DBQFGAsMMKRy60XGEcJIRAjnfAKCXFxKIXyWkOvHfGRB637tVlnam+gCeNSH6 -wlBqprEkzNLqSjkn2zeqF9w= -=fJp/ ------END PGP SIGNATURE----- +MD5 54084a41de54984bc2d57e907931cb7e files/digest-ffmpeg-0.4.9_p20070325 714 +RMD160 64d0cad6d54ef03422b764e03502e00fa6e21052 files/digest-ffmpeg-0.4.9_p20070325 714 +SHA256 6ee3e59de7645c284aaa8595906af487f5892a52d7559369b7f14cd11c96e858 files/digest-ffmpeg-0.4.9_p20070325 714 diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070325.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070325.ebuild new file mode 100644 index 000000000000..523d9abb2fd6 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070325.ebuild @@ -0,0 +1,189 @@ +# 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_p20070325.ebuild,v 1.1 2007/03/25 13:15:50 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 8508" +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 ~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 , 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-a52" + 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 \ + --enable-swscaler" + + # 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_p20070325 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070325 new file mode 100644 index 000000000000..d3f1c4a92b2d --- /dev/null +++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070325 @@ -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 65f7dc6971bb19b7cb1801a95d01ed36 ffmpeg-0.4.9-p20070325.tar.bz2 4135273 +RMD160 afec75a9bc71dbdf4fe0c5dc4a211e686cf6664a ffmpeg-0.4.9-p20070325.tar.bz2 4135273 +SHA256 efa60857190141fb7ac55081346d8ce3156eb97d0dcb57eec3ee8e953f48ef12 ffmpeg-0.4.9-p20070325.tar.bz2 4135273 -- 2.26.2