From ea1301c7a95640e369be47850d3b016b7fd56934 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 7 Jul 2007 21:00:46 +0000 Subject: Fix building with USE altivec for bug 183687. Thanks to Laurent G. for reporting, Joe Jezak for solution, Kimura Masaru for testing. Package-Manager: portage-2.1.3_rc6 --- media-video/ffmpeg/ChangeLog | 7 ++++++- media-video/ffmpeg/Manifest | 16 ++++++++-------- media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild | 7 +++++-- 3 files changed, 19 insertions(+), 11 deletions(-) (limited to 'media-video') diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 78038f229e96..a1463de707ad 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,11 @@ # 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.202 2007/06/26 20:21:00 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.203 2007/07/07 21:00:46 drac Exp $ + + 07 Jul 2007; Samuli Suominen + ffmpeg-0.4.9_p20070616-r1.ebuild: + Fix building with USE altivec for bug 183687. Thanks to Laurent G. for + reporting, Joe Jezak for solution, Kimura Masaru for testing. *ffmpeg-0.4.9_p20070616-r1 (26 Jun 2007) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 2ffc97a252fc..149e2982f36e 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -103,18 +103,18 @@ EBUILD ffmpeg-0.4.9_p20070525.ebuild 5517 RMD160 a03a05dceb059920b81d2b79ff593f8 MD5 5d66b19894c2689bb35b0116cb60e1f7 ffmpeg-0.4.9_p20070525.ebuild 5517 RMD160 a03a05dceb059920b81d2b79ff593f8b2ab8d1f8 ffmpeg-0.4.9_p20070525.ebuild 5517 SHA256 0da0022f39334ae2445e4948571ba3dfa40beddec11539f4d1e887f8dbed42f6 ffmpeg-0.4.9_p20070525.ebuild 5517 -EBUILD ffmpeg-0.4.9_p20070616-r1.ebuild 5547 RMD160 4f9d05a623e593aa5c206dcb89b183f5410b8fb9 SHA1 dfbe05ea112ba10508cfb231c8a5934791c852b9 SHA256 0b8dafb1d973ea65aa55ee613a00f5525eeaeb5e32ec897473ad0d192ee08018 -MD5 464d873f4f60989e658a95f3c36c49d0 ffmpeg-0.4.9_p20070616-r1.ebuild 5547 -RMD160 4f9d05a623e593aa5c206dcb89b183f5410b8fb9 ffmpeg-0.4.9_p20070616-r1.ebuild 5547 -SHA256 0b8dafb1d973ea65aa55ee613a00f5525eeaeb5e32ec897473ad0d192ee08018 ffmpeg-0.4.9_p20070616-r1.ebuild 5547 +EBUILD ffmpeg-0.4.9_p20070616-r1.ebuild 5655 RMD160 bdb09595c836c5cdf9a3daf8d75f2b0647efb69f SHA1 092327293938b97d897b5cd07a607bf0a74d6602 SHA256 1700c047744364475de32672ed1672c6f67ddd58181c2af263faff3c065a4533 +MD5 23d74d2b758cd70b748dc10734db25aa ffmpeg-0.4.9_p20070616-r1.ebuild 5655 +RMD160 bdb09595c836c5cdf9a3daf8d75f2b0647efb69f ffmpeg-0.4.9_p20070616-r1.ebuild 5655 +SHA256 1700c047744364475de32672ed1672c6f67ddd58181c2af263faff3c065a4533 ffmpeg-0.4.9_p20070616-r1.ebuild 5655 EBUILD ffmpeg-0.4.9_p20070616.ebuild 5523 RMD160 4db34d0c189ff1dcbdecefcf3c4ede245ab5e45d SHA1 790c276fad878d4a44275c1a7775c51fa487edf7 SHA256 196ecbb292e435640658de185e7e4caccfcd4cf90c03e7d095b93f3ca2732b6b MD5 aa5876edfef8d9ff2d5bf8998a5b1d0c ffmpeg-0.4.9_p20070616.ebuild 5523 RMD160 4db34d0c189ff1dcbdecefcf3c4ede245ab5e45d ffmpeg-0.4.9_p20070616.ebuild 5523 SHA256 196ecbb292e435640658de185e7e4caccfcd4cf90c03e7d095b93f3ca2732b6b ffmpeg-0.4.9_p20070616.ebuild 5523 -MISC ChangeLog 30042 RMD160 82685dd3c26727ded44b60d5a36b67a3aad3fb29 SHA1 c8da6c69901be9543583e37704abe44cc8d89539 SHA256 f7cfb9cf1fc926a47a803313c140ac74a140bfa34196abd288cb83ffd961a7d7 -MD5 e1a622e1408ff0a0b358e57f1bee9772 ChangeLog 30042 -RMD160 82685dd3c26727ded44b60d5a36b67a3aad3fb29 ChangeLog 30042 -SHA256 f7cfb9cf1fc926a47a803313c140ac74a140bfa34196abd288cb83ffd961a7d7 ChangeLog 30042 +MISC ChangeLog 30262 RMD160 496c5c4594c4a5034fc1dc0fb30e41a9fd4b0b66 SHA1 4844ab3c8f98f60c02f77ce0db4be4181b1ed995 SHA256 34f99f9cdf1bd1cab21e626d3a14b34be964f8e19179122517232f17dd9744e7 +MD5 85a276586a6b9062ffd07dd54f090f46 ChangeLog 30262 +RMD160 496c5c4594c4a5034fc1dc0fb30e41a9fd4b0b66 ChangeLog 30262 +SHA256 34f99f9cdf1bd1cab21e626d3a14b34be964f8e19179122517232f17dd9744e7 ChangeLog 30262 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild index 331b64f13081..8eb8c631f007 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild @@ -1,6 +1,6 @@ # 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_p20070616-r1.ebuild,v 1.1 2007/06/26 20:21:00 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070616-r1.ebuild,v 1.2 2007/07/07 21:00:46 drac Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -44,7 +44,7 @@ DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )" src_unpack() { unpack ${A} || die - cd ${S} + cd "${S}" #Append -DBROKEN_RELOCATIONS to build for bug 179872. #Pretty please fix me if you can. @@ -66,6 +66,9 @@ src_unpack() { # To make sure the ffserver test will work sed -i -e "s:-e debug=off::" tests/server-regression.sh + # Fix building with altivec for bug 183687 + sed -i -e "s:TARGET_ALTIVEC:HAVE_ALTIVEC:" libswscale/Makefile + epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch" # disable non pic safe asm, bug #172877, bug #172845 and dupes # epatch "${FILESDIR}/${PN}-0.4.9_p20070330-asmpic.patch" -- cgit v1.2.3-65-gdbad