summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-09-06 09:33:37 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-09-06 09:33:37 +0000
commit5a1dc6f8b00479b7e39e361fbc99861d107a42c3 (patch)
tree02b7512ef2a6a2c858acfaaad2274f65fa440ba6 /media-video/ffmpeg
parentMissed one check. (diff)
downloadhistorical-5a1dc6f8b00479b7e39e361fbc99861d107a42c3.tar.gz
historical-5a1dc6f8b00479b7e39e361fbc99861d107a42c3.tar.bz2
historical-5a1dc6f8b00479b7e39e361fbc99861d107a42c3.zip
Correctly detect cpu by upstream checks when march=native is used, bug #273421
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest14
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild3
3 files changed, 19 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 61b912a282dc..125505204062 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.305 2009/08/04 09:18:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.306 2009/09/06 09:33:37 aballier Exp $
+
+ 06 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+ Correctly detect cpu by upstream checks when march=native is used, bug
+ #273421
04 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-9999-r1.ebuild,
metadata.xml:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 8017cc3cfe95..ff6846b61aae 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
EBUILD ffmpeg-0.5-r1.ebuild 6549 RMD160 7d3dc6f710b1944022c6a607737ea8be4e0b7385 SHA1 23b88211d4e61f9b49c7b8a3a1f85ed1616cf1b8 SHA256 83d0453256174cd98f8d7fbc0c8fca48f1b0ddd681e5345a796af1c0350668d9
-EBUILD ffmpeg-9999-r1.ebuild 7010 RMD160 e547c695e5dbbe0b9feb6efeb093ade8a0ec47c8 SHA1 7d50d14d3671877411915fc9819180eddbeb62e6 SHA256 a81790624e7ac785e95d8a6bbe584360459e0cff01fce187bb85d967e9ec87de
-MISC ChangeLog 46464 RMD160 089de043b35f441a89f0490a785c0af26bafd0b1 SHA1 6daa825c6145ecf2d0797b88f2b6f74eb305fc4e SHA256 bb134169bc0aecca874db4bd2acc32d2f3333da68b61d5d324d16c36172a1e76
+EBUILD ffmpeg-9999-r1.ebuild 7059 RMD160 89dea88b070ef9e382379f95f3c1882c94a3f8d1 SHA1 8a90b86f41fb8f04e51c1eaefe09c3c0af209898 SHA256 fd5c5b0d50d26843776156be94483c8fecba810b1c68c2e5cec1f0df22bb335f
+MISC ChangeLog 46622 RMD160 9b23db00cae6ff077d095bb8247db9fa6ee49c8a SHA1 20ea8ede10372ed0051b64c381902b675a33fc9e SHA256 f86bf6687227cc105b700311265eb3a7f024a281455b6b6cd564bf45ea679624
MISC metadata.xml 1789 RMD160 84a7ab72fdc26957a4040bf7d6b1f7a823b38e17 SHA1 8c8db893db07715bec78bd1b36c385c85b4fe3a0 SHA256 f250a28df71c2fb2b067cd6b274c4f36d4df33fee77ebb2a35d1e57fcf38a1ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqjgfYACgkQvFcC4BYPU0pQcwCeL7Tj5pivLTgehFJDAWvaWCMv
+hu4An2TDSy4PigC6IpQrDE44UUHkI9ML
+=2wrF
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index d4b7acdbe9b1..e7dcbfb540b7 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.16 2009/08/04 09:18:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.17 2009/09/06 09:33:37 aballier Exp $
EAPI=2
@@ -159,6 +159,7 @@ src_configure() {
# If they contain an unknown CPU it will not hurt since ffmpeg's configure
# will just ignore it.
for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+ [ "${i}" = "native" ] && i="host" # bug #273421
myconf="${myconf} --cpu=$i"
break
done