diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-03-10 21:31:58 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-03-10 21:31:58 +0000 |
| commit | a3af37d2b08a7bc2bf4d082f9874a4dd2b483548 (patch) | |
| tree | e06e11cd51e9c28429972e84aba7ccfce7bc87bc /media-video | |
| parent | Fixed linking of shared libraries (bug #339923) (diff) | |
| download | gentoo-2-a3af37d2b08a7bc2bf4d082f9874a4dd2b483548.tar.gz gentoo-2-a3af37d2b08a7bc2bf4d082f9874a4dd2b483548.tar.bz2 gentoo-2-a3af37d2b08a7bc2bf4d082f9874a4dd2b483548.zip | |
Restore --disable-asm for ABI=x32 #427004 by devsk.
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-1.0.5.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-1.1.3.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 858d9d173fe1..56c731469512 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.617 2013/03/09 12:07:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.618 2013/03/10 21:31:58 vapier Exp $ + + 10 Mar 2013; Mike Frysinger <vapier@gentoo.org> ffmpeg-1.0.5.ebuild, + ffmpeg-1.1.3.ebuild, ffmpeg-9999.ebuild: + Restore --disable-asm for ABI=x32 #427004 by devsk. 09 Mar 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: factorize some more code into ffuse diff --git a/media-video/ffmpeg/ffmpeg-1.0.5.ebuild b/media-video/ffmpeg/ffmpeg-1.0.5.ebuild index 46e4deff2db8..b1c1e183d518 100644 --- a/media-video/ffmpeg/ffmpeg-1.0.5.ebuild +++ b/media-video/ffmpeg/ffmpeg-1.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.5.ebuild,v 1.1 2013/03/04 10:58:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.5.ebuild,v 1.2 2013/03/10 21:31:58 vapier Exp $ EAPI="4" @@ -216,6 +216,7 @@ src_configure() { # as the provided asm decidedly is not PIC for x86. use x86 && myconf="${myconf} --disable-asm" fi + [[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004 # Try to get cpu type based on CFLAGS. # Bug #172723 diff --git a/media-video/ffmpeg/ffmpeg-1.1.3.ebuild b/media-video/ffmpeg/ffmpeg-1.1.3.ebuild index 87c693e6790a..a4d2c8148373 100644 --- a/media-video/ffmpeg/ffmpeg-1.1.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-1.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.3.ebuild,v 1.1 2013/02/23 13:21:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.3.ebuild,v 1.2 2013/03/10 21:31:58 vapier Exp $ EAPI="4" @@ -213,6 +213,7 @@ src_configure() { # as the provided asm decidedly is not PIC for x86. use x86 && myconf="${myconf} --disable-asm" fi + [[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004 # Try to get cpu type based on CFLAGS. # Bug #172723 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 867cf55dc1b7..1f942c2f2461 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.123 2013/03/09 12:07:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.124 2013/03/10 21:31:58 vapier Exp $ EAPI="4" @@ -210,6 +210,7 @@ src_configure() { # as the provided asm decidedly is not PIC for x86. use x86 && myconf="${myconf} --disable-asm" fi + [[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004 # Try to get cpu type based on CFLAGS. # Bug #172723 |