From 8a5a35c6c54f325c49b4fd7c29c946e2d6abbb22 Mon Sep 17 00:00:00 2001 From: Mark Loeser Date: Sat, 17 Sep 2005 19:45:35 +0000 Subject: [PATCH] Thanks to basic for the patch to fix compilation on x86. Marking ~x86 for testing. bug #73248 Package-Manager: portage-2.0.52-r1 --- media-sound/audacity/ChangeLog | 7 +++++- media-sound/audacity/Manifest | 13 +++++----- media-sound/audacity/audacity-1.2.3-r1.ebuild | 10 +++++--- .../audacity/files/audacity-1.2.3-x86.patch | 24 +++++++++++++++++++ 4 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 media-sound/audacity/files/audacity-1.2.3-x86.patch diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog index 22c6909d96cf..b991233a976d 100644 --- a/media-sound/audacity/ChangeLog +++ b/media-sound/audacity/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/audacity # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.34 2005/05/15 20:03:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.35 2005/09/17 19:45:35 halcy0n Exp $ + + 17 Sep 2005; Mark Loeser + +files/audacity-1.2.3-x86.patch, audacity-1.2.3-r1.ebuild: + Thanks to basic for the patch to fix compilation on + x86. Marking ~x86 for testing. bug #73248 15 May 2005; Diego Pettenò audacity-1.2.1.ebuild, audacity-1.2.2.ebuild, audacity-1.2.3.ebuild, audacity-1.2.3-r1.ebuild: diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest index 20d52b7aca88..9fd83ae65169 100644 --- a/media-sound/audacity/Manifest +++ b/media-sound/audacity/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 69a8b71e4c91fd0dc82c1e29e05b713c ChangeLog 6688 +MD5 8af468ad169e36b46ba514d551906099 ChangeLog 6921 MD5 55dad7669fd5f768ae53eb6fff270ca9 audacity-1.2.1.ebuild 2274 MD5 fc75ba4d5a33758eecdfc678c7f32a0a audacity-1.2.2.ebuild 2183 -MD5 7ad7cc9cacede0d5d3336888b67880a3 audacity-1.2.3-r1.ebuild 1804 +MD5 b3b1d3f0eebee301f98415e406a4b1b8 audacity-1.2.3-r1.ebuild 1857 MD5 abf6e05d1c798fc33e0b91578c037837 audacity-1.2.3.ebuild 2186 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155 @@ -12,10 +12,11 @@ MD5 8f1e5073472cee2da1987db62e7db3a9 files/digest-audacity-1.2.1 72 MD5 a150eb16468631b07901c6ca01451679 files/digest-audacity-1.2.2 71 MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3 71 MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3-r1 71 +MD5 502eabf8993eb2af91e1265425024091 files/audacity-1.2.3-x86.patch 995 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFCh6s7j5H05b2HAEkRAqEAAKCHVcAQtKY4G5g1Z/bokBIdpazCNQCeMum1 -mGM0WZS6D5bSgEuo6CwTggs= -=f8SE +iD8DBQFDLHJ9CRZPokWLroQRAnT1AJ4h5yszD0RgZD9crxHqBdU9rM3CngCeMlRI +QRTMZyXJJkniXMIu6fFggm4= +=Iwu3 -----END PGP SIGNATURE----- diff --git a/media-sound/audacity/audacity-1.2.3-r1.ebuild b/media-sound/audacity/audacity-1.2.3-r1.ebuild index 1236d05f0960..d46c244a46af 100644 --- a/media-sound/audacity/audacity-1.2.3-r1.ebuild +++ b/media-sound/audacity/audacity-1.2.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.3-r1.ebuild,v 1.2 2005/05/15 20:03:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.3-r1.ebuild,v 1.3 2005/09/17 19:45:35 halcy0n Exp $ inherit wxwidgets eutils @@ -18,8 +18,7 @@ LICENSE="GPL-2" SLOT="0" # amd64: causes xfce pannel to crash... -# Bad x86 assembly: #73248 -KEYWORDS="~amd64 ~ppc ~sparc -x86 ~ppc64" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~ppc64" DEPEND="=x11-libs/wxGTK-2.4* >=app-arch/zip-2.3 @@ -35,6 +34,11 @@ DEPEND="=x11-libs/wxGTK-2.4* WX_GTK_VER="2.4" +src_unpack() { + unpack "${A}" + epatch "${FILESDIR}"/${P}-x86.patch #bug #73248 +} + src_compile() { if ! use gtk2; then need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found" diff --git a/media-sound/audacity/files/audacity-1.2.3-x86.patch b/media-sound/audacity/files/audacity-1.2.3-x86.patch new file mode 100644 index 000000000000..be98087980aa --- /dev/null +++ b/media-sound/audacity/files/audacity-1.2.3-x86.patch @@ -0,0 +1,24 @@ +--- audacity-src-1.2.3/lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp.orig 2005-07-09 19:49:20.000000000 +0800 ++++ audacity-src-1.2.3/lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp 2005-07-09 20:02:30.000000000 +0800 +@@ -86,6 +86,7 @@ + "\n\txor %%esi, %%esi" // clear %%esi = result register + // check if 'cpuid' instructions is available by toggling eflags bit 21 + ++ "\n\tpushl %%ebx" + "\n\tpushf" // save eflags to stack + "\n\tpop %%eax" // load eax from stack (with eflags) + "\n\tmovl %%eax, %%ecx" // save the original eflags values to ecx +@@ -130,11 +131,12 @@ + + "\n\tend:" + ++ "\n\tpopl %%ebx" + "\n\tmov %%esi, %0" + + : "=rm" (res) + : /* no inputs */ +- : "%edx", "%eax", "%ecx", "%ebx", "%esi" ); ++ : "%edx", "%eax", "%ecx", "%esi" ); + + return res & ~_dwDisabledISA; + #endif -- 2.26.2