diff options
| -rw-r--r-- | media-libs/x264-svn/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/x264-svn/files/x264-svn-20060409-gnustack.patch | 30 | ||||
| -rw-r--r-- | media-libs/x264-svn/x264-svn-20060409.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/media-libs/x264-svn/ChangeLog b/media-libs/x264-svn/ChangeLog index 2589dbb7448a..ae0dea972dd9 100644 --- a/media-libs/x264-svn/ChangeLog +++ b/media-libs/x264-svn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/x264-svn # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/ChangeLog,v 1.14 2006/04/09 16:34:09 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/ChangeLog,v 1.15 2006/04/10 23:41:42 flameeyes Exp $ + + 10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/x264-svn-20060409-gnustack.patch, x264-svn-20060409.ebuild: + Add patch to avoid executable stack on x86 and amd64. *x264-svn-20060409 (09 Apr 2006) diff --git a/media-libs/x264-svn/files/x264-svn-20060409-gnustack.patch b/media-libs/x264-svn/files/x264-svn-20060409-gnustack.patch new file mode 100644 index 000000000000..04d5f241488a --- /dev/null +++ b/media-libs/x264-svn/files/x264-svn-20060409-gnustack.patch @@ -0,0 +1,30 @@ +Index: x264-svn/common/amd64/amd64inc.asm +=================================================================== +--- x264-svn.orig/common/amd64/amd64inc.asm ++++ x264-svn/common/amd64/amd64inc.asm +@@ -27,6 +27,10 @@ BITS 64 + ; This is true in practice (since we never do any 64bit arithmetic on strides), + ; but is not guaranteed by the ABI. + ++%ifidn __YASM_OBJFMT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ + %macro cglobal 1 + %ifdef PREFIX + global _%1 +Index: x264-svn/common/i386/i386inc.asm +=================================================================== +--- x264-svn.orig/common/i386/i386inc.asm ++++ x264-svn/common/i386/i386inc.asm +@@ -26,6 +26,10 @@ BITS 32 + ; Macros and other preprocessor constants + ;============================================================================= + ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif ++ + ; Symbol prefix for C linkage + %macro cglobal 1 + %ifdef PREFIX diff --git a/media-libs/x264-svn/x264-svn-20060409.ebuild b/media-libs/x264-svn/x264-svn-20060409.ebuild index 4f2b4aeeaf0c..52c0a46a0b12 100644 --- a/media-libs/x264-svn/x264-svn-20060409.ebuild +++ b/media-libs/x264-svn/x264-svn-20060409.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/x264-svn-20060409.ebuild,v 1.2 2006/04/10 17:42:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264-svn/x264-svn-20060409.ebuild,v 1.3 2006/04/10 23:41:42 flameeyes Exp $ inherit multilib eutils toolchain-funcs @@ -27,6 +27,7 @@ src_unpack() { cd ${S} epatch "${FILESDIR}/${PN}-20060302-nostrip.patch" + epatch "${FILESDIR}/${P}-gnustack.patch" } src_compile() { |