From 8c3d9f43848cac35359776dc9360dfb98ab7163b Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 15 Dec 2011 11:21:08 +0000 Subject: [PATCH] remove x86 special handling, this should be handled automagically by the build system nowadays Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- media-video/ffmpeg/ChangeLog | 6 +++++- media-video/ffmpeg/Manifest | 10 +++++----- media-video/ffmpeg/ffmpeg-9999.ebuild | 17 +---------------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index da53a7613e20..680d5a105563 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.505 2011/12/15 11:15:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.506 2011/12/15 11:21:08 aballier Exp $ + + 15 Dec 2011; Alexis Ballier ffmpeg-9999.ebuild: + remove x86 special handling, this should be handled automagically by the + build system nowadays 15 Dec 2011; Alexis Ballier ffmpeg-9999.ebuild: pass user cflags as extra-cflags, disable optflags as we assume user cflags diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index de198be230b6..302127cf3a2d 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -8,13 +8,13 @@ DIST ffmpeg-0.8.7.tar.bz2 4527751 RMD160 5ccc0cfcfaf77b2f7e7cc51190d00bc22db8586 EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 SHA1 a04df51a15709a9b669b8e1ff8e4e7582fce6949 SHA256 2530241330f21149e401ec15fc448acfcbcd5b16b728ae0624dba422b449947f EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318 EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4 -EBUILD ffmpeg-9999.ebuild 8905 RMD160 533b3ea4438896dd8339e793d568d83017368f0b SHA1 870e3e837972f10ed3f1c3b1c9d59d26d78589a8 SHA256 d45fef0e2b98f68ff06a6c76d5aae6861b8e64cfcfddae14c3c42a7e2e9eb504 -MISC ChangeLog 72588 RMD160 64137fa73c7e7c06e6af3073c73a40d81272f6f5 SHA1 960be9ffc1eac376ff0060a20b42c8ec5fd8096f SHA256 e403ba17e1da4dbc3bbb03822f2e1e1bcf64da3ced906a42c0465592b4ffee61 +EBUILD ffmpeg-9999.ebuild 8355 RMD160 8b3da6699131296d6b130bafb6e074b0357ec6ba SHA1 6cdc24a5b33381f3d7260fbd5e812ba019d208b0 SHA256 69240c824e5479b3590825820a9929c519912060903bf3391b48676d3ebad298 +MISC ChangeLog 72760 RMD160 3b643abf39f03cb6e2af3734d53e4d53cac554e8 SHA1 e0d50d8d66d755914ccee24a585bcf4445ea8a01 SHA256 3ed2814ef88961d2dd9c30daafaaed90290ff17afc7fd9a4d0a841a36d3be60d MISC metadata.xml 3136 RMD160 83498fadc792f93d602a65caf742e4cd1c379615 SHA1 61ecdedb07c4d97cf5f3a665e9d301c07657d863 SHA256 6a36d874d9bd519aadc8c406f9f1a07b60dd35c41a41ba8484f602b87f8ed85e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7p1u8ACgkQvFcC4BYPU0p/1wCfYiV/Ox0rnHAlPGxj6AV+5PLl -bpYAn3fOTo7Sfr5Fm5d9VwxTVV2xieSf -=K/aj +iEYEARECAAYFAk7p2CkACgkQvFcC4BYPU0pbMACdEUvZvZI6fQJN7keqZAunYl6B +Kc4An1MelGKKqZnjuL8x8fzVoVUqamRK +=jWi8 -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 872fef9363fc..b137ba07d3b7 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.69 2011/12/15 11:15:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.70 2011/12/15 11:21:08 aballier Exp $ EAPI="4" @@ -228,21 +228,6 @@ src_configure() { # Misc stuff use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables" - # 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="${EPREFIX}/usr" \ -- 2.26.2