From: Luca Barbato Date: Mon, 29 Jan 2007 16:07:31 +0000 (+0000) Subject: New snapshot, beware\! X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2983d9ba2299057246db77b3069aae4867c5667f;p=gentoo.git New snapshot, beware\! Package-Manager: portage-2.1.2-r5 --- diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 79734f59c841..6145c9b7110a 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.175 2007/01/29 04:19:21 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.176 2007/01/29 16:07:30 lu_zero Exp $ + +*ffmpeg-0.4.9_p20070129 (29 Jan 2007) + + 29 Jan 2007; Luca Barbato + +files/ffmpeg-libdir-2007.patch, +ffmpeg-0.4.9_p20070129.ebuild: + New snapshot 29 Jan 2007; Bryan Østergaard ffmpeg-0.4.9_p20061016.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 7b043bc5a36a..babd7da3516f 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 @@ -21,6 +18,10 @@ AUX ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622 RMD160 7c2d6900b9079468d6ab2bc9b MD5 049939198b5acd5b3fb3f0e319724c81 files/ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622 RMD160 7c2d6900b9079468d6ab2bc9b619ebe853d7b8fb files/ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622 SHA256 7df5d4a945d36b582392f671eead16a94bdc75e859ab69c1f2e6c05c34bf8c7b files/ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622 +AUX ffmpeg-libdir-2007.patch 427 RMD160 0dcdc4e3e0ece50cf26e2836ad15cb3ac8a97c1d SHA1 af4b8de5cb8b047e000eb2ae1edb0ce49494ef01 SHA256 122e1eb5d933bb451db240b55f38899348ee91add3ec8eb75cbfb6931663c64c +MD5 f9dcc9bb249be2ecbaf5f1e65d4e0152 files/ffmpeg-libdir-2007.patch 427 +RMD160 0dcdc4e3e0ece50cf26e2836ad15cb3ac8a97c1d files/ffmpeg-libdir-2007.patch 427 +SHA256 122e1eb5d933bb451db240b55f38899348ee91add3ec8eb75cbfb6931663c64c files/ffmpeg-libdir-2007.patch 427 AUX ffmpeg-libdir-pic.patch 6027 RMD160 f66a87d1ea3662c7ab0b9010e0f19af49638161a SHA1 43be5652bf5dc70d46697e3ff6b1b3f30a02d501 SHA256 30b404aaf936f3ed6fe0a1f94d7f03982fef3524c94e4ca2b98d97133347ecc8 MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027 RMD160 f66a87d1ea3662c7ab0b9010e0f19af49638161a files/ffmpeg-libdir-pic.patch 6027 @@ -53,6 +54,7 @@ DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fb DIST ffmpeg-0.4.9-p20060530.tar.bz2 1807070 RMD160 84d6f692cf34bb9413d9d4934bfab478c7c14658 SHA1 6df0134d9ce939b9ae1fbd4525755502c9d227db SHA256 e24b7f84801f679be8f24fcd38e1622ab06ebb97d001be67862135e78ac599f3 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 EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4383 RMD160 d27a79f1f99afd17f9ff01da0c1693afd12892ee SHA1 edf3ad8060e5bd007ed6bef834fc3f9223617f97 SHA256 f96358add36c2f9dcc38cc90327f5ce1b4f1cf18b1c7810c3d149ec47162322b MD5 3332432b29fe1c0a8d25c9c7d1eba931 ffmpeg-0.4.9_p20050226-r3.ebuild 4383 RMD160 d27a79f1f99afd17f9ff01da0c1693afd12892ee ffmpeg-0.4.9_p20050226-r3.ebuild 4383 @@ -77,10 +79,14 @@ EBUILD ffmpeg-0.4.9_p20061016.ebuild 5601 RMD160 b4b6585ef678cd8d5bdfb220aa7ca51 MD5 44150ee916f8e188a2e7aee91233759d ffmpeg-0.4.9_p20061016.ebuild 5601 RMD160 b4b6585ef678cd8d5bdfb220aa7ca5162d3f1ec4 ffmpeg-0.4.9_p20061016.ebuild 5601 SHA256 69d0dd25ccaf8db41733ec12d1c069def8b19adc67c430e10a5fbff26bd2100d ffmpeg-0.4.9_p20061016.ebuild 5601 -MISC ChangeLog 26346 RMD160 c8cfebebb94b315472ef9655db2707d93abf579b SHA1 7c999e0e0b2bbf75c3f8637e6050257b9ff229b5 SHA256 b08be476e8101fffd7be40466d8dbaf607fb20b5db9b9fccaf9c7108fe953f99 -MD5 ddbdf77967089b897c06b76abae92240 ChangeLog 26346 -RMD160 c8cfebebb94b315472ef9655db2707d93abf579b ChangeLog 26346 -SHA256 b08be476e8101fffd7be40466d8dbaf607fb20b5db9b9fccaf9c7108fe953f99 ChangeLog 26346 +EBUILD ffmpeg-0.4.9_p20070129.ebuild 5606 RMD160 2f346253ee7e8948cfb13605eae07f9ce5596a0f SHA1 7954101c7c7f5e496652c51d251f5ecf874bc8e0 SHA256 d6050880ad53b9adbf8c135805a55f04ac6e06291f61bd4a4658a94deee5eb5b +MD5 ee5a3911c254ec36586da9d054ad25c1 ffmpeg-0.4.9_p20070129.ebuild 5606 +RMD160 2f346253ee7e8948cfb13605eae07f9ce5596a0f ffmpeg-0.4.9_p20070129.ebuild 5606 +SHA256 d6050880ad53b9adbf8c135805a55f04ac6e06291f61bd4a4658a94deee5eb5b ffmpeg-0.4.9_p20070129.ebuild 5606 +MISC ChangeLog 26518 RMD160 d600f1484421025a6d406e03f87d0924bf71a0cf SHA1 42e283ad524a3c9820ce01e678142ee771d0cf43 SHA256 528c1bc3d8127b8ba7d04f3ffd02f862b77022ef1b2fb40d511dc008e0bb3812 +MD5 147f39f292239fefa240c3c52f53c4ce ChangeLog 26518 +RMD160 d600f1484421025a6d406e03f87d0924bf71a0cf ChangeLog 26518 +SHA256 528c1bc3d8127b8ba7d04f3ffd02f862b77022ef1b2fb40d511dc008e0bb3812 ChangeLog 26518 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 @@ -103,10 +109,6 @@ SHA256 6e4c216acd8fe5eaf285520dadd383855613b7b324d65c31d592ad0b5b70fa81 files/di MD5 b078bb99952b4f56d8c716ba88ac9b60 files/digest-ffmpeg-0.4.9_p20061016 714 RMD160 d25cd611bb50bdf39ee396b47ce9a9f9760e1e32 files/digest-ffmpeg-0.4.9_p20061016 714 SHA256 5dcd53524d59a5cefe43d9370d98f64c4345e9e32b4711576c7cbc9aba72db4b files/digest-ffmpeg-0.4.9_p20061016 714 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFvXWKugEuf3OQ0akRAqzyAJwOk/HcgwSNKHa+hEoFVaj7ziOD9gCePqob -xat7a+yKi1EvmZBWvOKqXf4= -=tgnX ------END PGP SIGNATURE----- +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 diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild new file mode 100644 index 000000000000..641be8bb2ed1 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild @@ -0,0 +1,180 @@ +# 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_p20070129.ebuild,v 1.1 2007/01/29 16:07:31 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}/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" + +RDEPEND="imlib? ( media-libs/imlib2 ) + truetype? ( >=media-libs/freetype-2 ) + sdl? ( >=media-libs/libsdl-1.2.10 ) + encode? ( media-sound/lame ) + ogg? ( media-libs/libogg ) + vorbis? ( media-libs/libvorbis ) + 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 )" + +DEPEND="${RDEPEND} + doc? ( app-text/texi2html ) + test? ( net-misc/wget ) + amr? ( app-arch/unzip )" + +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 ) && ( ! use amd64 ); 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 + use encode && myconf="${myconf} --enable-mp3lame" + use a52 && myconf="${myconf} --enable-a52" + use ieee1394 && myconf="${myconf} --enable-dc1394" + use threads && myconf="${myconf} --enable-pthreads" + use xvid && myconf="${myconf} --enable-xvid" + if use vorbis + then + myconf="${myconf} --enable-vorbis --enable-libogg" + else + use ogg && myconf="${myconf} --enable-libogg" + fi + use dts && myconf="${myconf} --enable-dts" + use x264 && myconf="${myconf} --enable-x264" + use aac && myconf="${myconf} --enable-faad --enable-faac" + use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb" + + myconf="${myconf} --enable-gpl --enable-pp --disable-strip" + + # 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_p20070129 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070129 new file mode 100644 index 000000000000..676a100ad8ec --- /dev/null +++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20070129 @@ -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 c66ad26fc5fb77adac6c823bbbaa1c3c ffmpeg-0.4.9-p20070129.tar.bz2 2086323 +RMD160 b0895a2d3927c769b7abac1b91d66e7f78586d4f ffmpeg-0.4.9-p20070129.tar.bz2 2086323 +SHA256 107a9c7bfc19c2fde01465d2cbab8082a0e4c1197ff28658aa14932e1be7914f ffmpeg-0.4.9-p20070129.tar.bz2 2086323 diff --git a/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch b/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch new file mode 100644 index 000000000000..e3a2f6bd0816 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch @@ -0,0 +1,11 @@ +--- /var/tmp/portage/media-video/ffmpeg-0.4.9_p20070129/work/ffmpeg/configure.orig 2007-01-29 15:24:05.000000000 +0100 ++++ /var/tmp/portage/media-video/ffmpeg-0.4.9_p20070129/work/ffmpeg/configure 2007-01-29 15:37:23.000000000 +0100 +@@ -2166,7 +2166,7 @@ + cat <$name.pc + prefix=$PREFIX + exec_prefix=\${prefix} +-libdir=\${exec_prefix}/lib ++libdir=\${exec_prefix}/GENTOOLIBDIR + includedir=\${prefix}/include + + Name: $name