summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2006-11-27 20:25:09 +0000
committerAlexis Ballier <aballier@gentoo.org>2006-11-27 20:25:09 +0000
commitc37a3db53331b5cc46b2e91cd859f3ed3790ee1c (patch)
tree4b69af6a6bb0832325ab5c875683c6494d94eee3
parentAdded herd=voip and fixed some minor problems. (diff)
downloadhistorical-c37a3db53331b5cc46b2e91cd859f3ed3790ee1c.tar.gz
historical-c37a3db53331b5cc46b2e91cd859f3ed3790ee1c.tar.bz2
historical-c37a3db53331b5cc46b2e91cd859f3ed3790ee1c.zip
Patch to fix exec stacks with sse asm
Package-Manager: portage-2.1.2_rc2-r2
-rw-r--r--media-sound/traverso/ChangeLog6
-rw-r--r--media-sound/traverso/Manifest26
-rw-r--r--media-sound/traverso/files/traverso-0.30.1-execstack.patch23
-rw-r--r--media-sound/traverso/traverso-0.30.1.ebuild8
4 files changed, 50 insertions, 13 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/Manifest b/media-sound/traverso/Manifest
index ee517195d344..e48319634f2c 100644
--- a/media-sound/traverso/Manifest
+++ b/media-sound/traverso/Manifest
@@ -1,19 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX traverso-0.30.1-execstack.patch 710 RMD160 de585b2d60a19998f2415f3c3aa2fb833a7a8565 SHA1 dcb6674ca30e361087f7e264359563b56c636b71 SHA256 c56bbe940fcd4ab51b1c149e97a715daf4d1c550689f0409bc2e328890e944a3
+MD5 804503164009f02d2431688cfcdaa6f4 files/traverso-0.30.1-execstack.patch 710
+RMD160 de585b2d60a19998f2415f3c3aa2fb833a7a8565 files/traverso-0.30.1-execstack.patch 710
+SHA256 c56bbe940fcd4ab51b1c149e97a715daf4d1c550689f0409bc2e328890e944a3 files/traverso-0.30.1-execstack.patch 710
AUX traverso-0.30.1-nojack.patch 1488 RMD160 20008826ef5833d689d3bf7ccfef69326fc09927 SHA1 75c325ef6f7eac14ecf8d6d5c7e66e4b53f52322 SHA256 5e67de400f6adf7afb9d5388ef45744c166998f687d66096f510a411973fdc57
MD5 14bad31cd0ccffeec2ee3a77c55c4fd1 files/traverso-0.30.1-nojack.patch 1488
RMD160 20008826ef5833d689d3bf7ccfef69326fc09927 files/traverso-0.30.1-nojack.patch 1488
SHA256 5e67de400f6adf7afb9d5388ef45744c166998f687d66096f510a411973fdc57 files/traverso-0.30.1-nojack.patch 1488
DIST traverso-0.30.1.tar.gz 269678 RMD160 e699e94b05011d3d51ce39117db1c5f7925eebfc SHA1 32e69f8ff1138e10b8cd29292a4f8cb346646049 SHA256 35740c58d9cecde6de2a1251ecc30ba211a379dc2ff8a269463c8514735d5d88
-EBUILD traverso-0.30.1.ebuild 1881 RMD160 5e3d2341cbecfddb76f803ea1e5914564bbcc9c1 SHA1 4f5225416897584d5f281db3ed89a533861a6aa0 SHA256 b5c1bc233fa3de718b2078e3393222b6ee724045a1f98bcfb83b3d189d4953c6
-MD5 49b2d3cec555607acb6ab636f5bd7a26 traverso-0.30.1.ebuild 1881
-RMD160 5e3d2341cbecfddb76f803ea1e5914564bbcc9c1 traverso-0.30.1.ebuild 1881
-SHA256 b5c1bc233fa3de718b2078e3393222b6ee724045a1f98bcfb83b3d189d4953c6 traverso-0.30.1.ebuild 1881
-MISC ChangeLog 676 RMD160 0472605247e8f9c5be64098b751c78971a34f371 SHA1 dfc475d526dd35d6dffabeca4bdb66e8b0678b42 SHA256 ff29694095a083e32582420427e6b68d70154effcfb60d429dac5eda6f24069b
-MD5 8343a30781651bbecdb16d14e45e3b0a ChangeLog 676
-RMD160 0472605247e8f9c5be64098b751c78971a34f371 ChangeLog 676
-SHA256 ff29694095a083e32582420427e6b68d70154effcfb60d429dac5eda6f24069b ChangeLog 676
+EBUILD traverso-0.30.1.ebuild 2021 RMD160 6c69cb079b71de4fe05167297c88e061751d7494 SHA1 b096cb92e02f866e4be7834ccb11c421d8363dad SHA256 2ee414e12a91436720efbede37ac03b0504dba803b49d20c46c4611f6dc788f9
+MD5 a80aaaed5ab3cc74218b9ce9189c4650 traverso-0.30.1.ebuild 2021
+RMD160 6c69cb079b71de4fe05167297c88e061751d7494 traverso-0.30.1.ebuild 2021
+SHA256 2ee414e12a91436720efbede37ac03b0504dba803b49d20c46c4611f6dc788f9 traverso-0.30.1.ebuild 2021
+MISC ChangeLog 835 RMD160 6b2cfb1ffc41c1610cc59486692c444a7c6c4866 SHA1 97a666a0a29de09cfb3ba3784b90eb4287652b72 SHA256 397b127121f14b90ee464c7edc1328dca022622ff379d5bda279eedfc517f097
+MD5 3affbc07cd5549f4d685758fe877e94b ChangeLog 835
+RMD160 6b2cfb1ffc41c1610cc59486692c444a7c6c4866 ChangeLog 835
+SHA256 397b127121f14b90ee464c7edc1328dca022622ff379d5bda279eedfc517f097 ChangeLog 835
MISC metadata.xml 542 RMD160 06fea9e680981b10df19c5c4b73708c5f3924e29 SHA1 48d17ed55cc5a499e40a222f014e89491e746727 SHA256 e4ce5974d4238e3c15c445918d8adedeaf97be27aecbab3a9b4f3ab981476225
MD5 1e89095fbb38226ad56d18054de0a4d8 metadata.xml 542
RMD160 06fea9e680981b10df19c5c4b73708c5f3924e29 metadata.xml 542
@@ -24,7 +28,7 @@ SHA256 0696cdb294fd792562cef692d9bad7c3ec904f49ab9a03e304466f06b3097c0c files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFaoe7vFcC4BYPU0oRAu6+AJ0bSDrPJqA6ve5ii+F2aGLHM3+UFwCZAe1e
-mlHBR7EUSy5SmokpO2N8Gbc=
-=AswL
+iD8DBQFFa0lzvFcC4BYPU0oRAhhjAJ4wVYR2+rnC8d8QxIjtxM1s/mn5BACeP1RL
+EPsl0yEkSMr0s2BjnfGaEvo=
+=tkcW
-----END PGP SIGNATURE-----
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