diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2006-11-27 20:25:09 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2006-11-27 20:25:09 +0000 |
| commit | 3f435984b999e28ac0a55af001194f1645263421 (patch) | |
| tree | 01163f7384e6ee9e98f8640b3c14a2cb9c685502 /media-sound/traverso | |
| parent | Added herd=voip and fixed some minor problems. (diff) | |
| download | gentoo-2-3f435984b999e28ac0a55af001194f1645263421.tar.gz gentoo-2-3f435984b999e28ac0a55af001194f1645263421.tar.bz2 gentoo-2-3f435984b999e28ac0a55af001194f1645263421.zip | |
Patch to fix exec stacks with sse asm
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'media-sound/traverso')
| -rw-r--r-- | media-sound/traverso/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/traverso/files/traverso-0.30.1-execstack.patch | 23 | ||||
| -rw-r--r-- | media-sound/traverso/traverso-0.30.1.ebuild | 8 |
3 files changed, 35 insertions, 2 deletions
diff --git a/media-sound/traverso/ChangeLog b/media-sound/traverso/ChangeLog index c66223cf063a..689546158281 100644 --- a/media-sound/traverso/ChangeLog +++ b/media-sound/traverso/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/traverso # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.3 2006/11/27 06:38:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.4 2006/11/27 20:25:09 aballier Exp $ + + 27 Nov 2006; Alexis Ballier <aballier@gentoo.org> + +files/traverso-0.30.1-execstack.patch, traverso-0.30.1.ebuild: + Patch to fix exec stacks with sse asm 27 Nov 2006; Alexis Ballier <aballier@gentoo.org> +files/traverso-0.30.1-nojack.patch, traverso-0.30.1.ebuild: diff --git a/media-sound/traverso/files/traverso-0.30.1-execstack.patch b/media-sound/traverso/files/traverso-0.30.1-execstack.patch new file mode 100644 index 000000000000..b77ef6399f59 --- /dev/null +++ b/media-sound/traverso/files/traverso-0.30.1-execstack.patch @@ -0,0 +1,23 @@ +--- traverso-0.30.1/src/engine/engine.pro.old 2006-11-27 21:07:33.000000000 +0100 ++++ traverso-0.30.1/src/engine/engine.pro 2006-11-27 21:07:41.000000000 +0100 +@@ -42,7 +42,7 @@ + contains(DEFINES, JACK_SUPPORT):HEADERS += JackDriver.h + + unix { +- contains(DEFINES, SSE_OPTIMIZATIONS):SOURCES += sse_functions.s ++ contains(DEFINES, SSE_OPTIMIZATIONS):SOURCES += sse_functions.S + } + + +--- traverso-0.30.1/src/engine/sse_functions.S.old 2006-11-27 21:13:16.000000000 +0100 ++++ traverso-0.30.1/src/engine/sse_functions.S 2006-11-27 21:13:38.000000000 +0100 +@@ -524,6 +524,8 @@ + .size x86_sse_compute_peak, .-x86_sse_compute_peak + #; end proc + +- ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif + + diff --git a/media-sound/traverso/traverso-0.30.1.ebuild b/media-sound/traverso/traverso-0.30.1.ebuild index 6cafefca5d5e..400cdd2e1d4d 100644 --- a/media-sound/traverso/traverso-0.30.1.ebuild +++ b/media-sound/traverso/traverso-0.30.1.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-sound/traverso/traverso-0.30.1.ebuild,v 1.3 2006/11/27 06:38:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.30.1.ebuild,v 1.4 2006/11/27 20:25:09 aballier Exp $ inherit eutils qt4 toolchain-funcs @@ -26,6 +26,12 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-nojack.patch" + + # remove exec stacks + mv "${S}/src/engine/sse_functions.s" "${S}/src/engine/sse_functions.S" + epatch "${FILESDIR}/${P}-execstack.patch" + + use jack || sed -ie "s:^\(DEFINES\ +=\ JACK_SUPPORT.*\):#\1:" src/base.pri use alsa || sed -ie "s:^\(DEFINES\ +=\ ALSA_SUPPORT.*\):#\1:" src/base.pri use sse || sed -ie "s:^\(.*DEFINES\ +=\ SSE_OPTIMIZATIONS.*\):#\1:" src/base.pri |