From: Tony Vroon <chainsaw@gentoo.org>
Date: Sun, 6 Aug 2006 20:18:48 +0000 (+0000)
Subject: Use __asm__ instead of asm in fft.c to avoid compile failure on PPC; patch provided... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a1df07c2085324bc0a2674b60a02fa7b26373edd;p=gentoo.git

Use __asm__ instead of asm in fft.c to avoid compile failure on PPC; patch provided by Matti Bickel <kabel@cat0.de> in bug #141789.
Package-Manager: portage-2.1.1_pre4-r3
---

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index c5988cc19805..665ae6758167 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.60 2006/08/06 14:22:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.61 2006/08/06 20:18:48 chainsaw Exp $
+
+  06 Aug 2006; Tony Vroon <chainsaw@gentoo.org> +files/1.1.1-ffwma-asm.diff,
+  audacious-1.1.1-r1.ebuild:
+  Use __asm__ instead of asm in fft.c to avoid compile failure on PPC; patch
+  provided by Matti Bickel <kabel@cat0.de> in bug #141789.
 
 *audacious-1.1.1-r1 (6 Aug 2006)
 
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 51e3e3991d66..9e182846a3f5 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.1.1-ffwma-asm.diff 471 RMD160 6a3bb116099b0c99081a484210f54d8f6a66f9c9 SHA1 17109fd56c3bd8107abaa78e6b6ac5e72fb3507a SHA256 c41b953be4f3a3060d436a1cbb7bc859a9f7b0173dddc8315a9134c8f2550deb
+MD5 b907827ddaf6c1ad9fa41f1f93567588 files/1.1.1-ffwma-asm.diff 471
+RMD160 6a3bb116099b0c99081a484210f54d8f6a66f9c9 files/1.1.1-ffwma-asm.diff 471
+SHA256 c41b953be4f3a3060d436a1cbb7bc859a9f7b0173dddc8315a9134c8f2550deb files/1.1.1-ffwma-asm.diff 471
 AUX 1.1.1-remove-15instrument-magic.diff 1168 RMD160 ceccb606ac171c5d42ab02a50edebd8f885605c7 SHA1 d091e21bb38ed7ea81cd26f422552a3cc1c66d45 SHA256 add25e7833dedb6e5ebb5fb3c913b6b2742d36b9544bbf76d1bd34f940ec96cc
 MD5 88cb889d4b67a0701a82ea72de630d86 files/1.1.1-remove-15instrument-magic.diff 1168
 RMD160 ceccb606ac171c5d42ab02a50edebd8f885605c7 files/1.1.1-remove-15instrument-magic.diff 1168
@@ -12,18 +16,18 @@ EBUILD audacious-1.1.0.ebuild 2638 RMD160 4cc63a2a5232d889a3e888340161912f999fd3
 MD5 81bccc3a074fca6d8c9e8f1bf484e437 audacious-1.1.0.ebuild 2638
 RMD160 4cc63a2a5232d889a3e888340161912f999fd3bb audacious-1.1.0.ebuild 2638
 SHA256 448805bd65f34b2392fc6e19c14d5053a8371d5a98d39b3967038683073152b5 audacious-1.1.0.ebuild 2638
-EBUILD audacious-1.1.1-r1.ebuild 2786 RMD160 7a2fcada5d08b88fce55532da6942ad392345d42 SHA1 ad446f3b51a25c6c507a71e019a1267ffbced904 SHA256 ae2630de5473c92fab39c40756245acf9f91f9fbbceb657df324dbaad602f734
-MD5 d491c46880df31d4a1c13afb94782b22 audacious-1.1.1-r1.ebuild 2786
-RMD160 7a2fcada5d08b88fce55532da6942ad392345d42 audacious-1.1.1-r1.ebuild 2786
-SHA256 ae2630de5473c92fab39c40756245acf9f91f9fbbceb657df324dbaad602f734 audacious-1.1.1-r1.ebuild 2786
+EBUILD audacious-1.1.1-r1.ebuild 2819 RMD160 1d44143563d58800cb0ad308e716f00ec83e46a9 SHA1 b597949a3053b002ac0291d1408d2802dd8ef81b SHA256 3e8b887b04078c08fb9e32bea1d813ab101818692ebaf133856655679051caa6
+MD5 5aefc28271b0f15071c2a40515dd09c4 audacious-1.1.1-r1.ebuild 2819
+RMD160 1d44143563d58800cb0ad308e716f00ec83e46a9 audacious-1.1.1-r1.ebuild 2819
+SHA256 3e8b887b04078c08fb9e32bea1d813ab101818692ebaf133856655679051caa6 audacious-1.1.1-r1.ebuild 2819
 EBUILD audacious-1.1.1.ebuild 2644 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 SHA1 a0328dcc4a4556fe40b56653934049bf74501782 SHA256 af57fe161b17fc538e6a6c70c8136e5b78f19c3043e0e2a71182079d8def7c49
 MD5 9e44c5f7aed278543f5f22efe8e120d0 audacious-1.1.1.ebuild 2644
 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 audacious-1.1.1.ebuild 2644
 SHA256 af57fe161b17fc538e6a6c70c8136e5b78f19c3043e0e2a71182079d8def7c49 audacious-1.1.1.ebuild 2644
-MISC ChangeLog 10545 RMD160 57d4e212eb70ebc3852d3e658df3c5aea26a168a SHA1 730babb086dddf0e29a9d05fe7a66b3e89bfa2f7 SHA256 5531d90666a4ff2337ca6b4460efd3da504dd54a56e6e126c8b32acc63457001
-MD5 3060951ca6ed395ea9c3d1dddd281f8c ChangeLog 10545
-RMD160 57d4e212eb70ebc3852d3e658df3c5aea26a168a ChangeLog 10545
-SHA256 5531d90666a4ff2337ca6b4460efd3da504dd54a56e6e126c8b32acc63457001 ChangeLog 10545
+MISC ChangeLog 10788 RMD160 70fac8f800f6b1a28911b507cdb4cee39ce5aee8 SHA1 7a56a13cc29135675312a6d7438583e3826b91e3 SHA256 89a446a0036bf90d13e32babab3d44986a578c2ea2c10886ba68028dd9a65ab6
+MD5 3296240a4d6c580e56c94c62670b8521 ChangeLog 10788
+RMD160 70fac8f800f6b1a28911b507cdb4cee39ce5aee8 ChangeLog 10788
+SHA256 89a446a0036bf90d13e32babab3d44986a578c2ea2c10886ba68028dd9a65ab6 ChangeLog 10788
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -40,7 +44,7 @@ SHA256 740da60ce500fcc16e36ea972aed38116e2c3328db451789e91973df79b23c3a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE1frsp5vW4rUFj5oRAt/DAKCXu81KdDQbMJez4u/ZzJ+FiTjBpwCdFLxu
-HoDSC894zS8dhsRekupvuQs=
-=AyDF
+iD8DBQFE1k6Fp5vW4rUFj5oRArVEAJ93o7zqpAwggAVqR51RJItODEuvNgCeMBIp
+TrAsOHmx3G+96P9LwYAahlk=
+=R4pw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-1.1.1-r1.ebuild b/media-sound/audacious/audacious-1.1.1-r1.ebuild
index 10cf8a75e553..24661c502a5a 100644
--- a/media-sound/audacious/audacious-1.1.1-r1.ebuild
+++ b/media-sound/audacious/audacious-1.1.1-r1.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/audacious/audacious-1.1.1-r1.ebuild,v 1.1 2006/08/06 14:08:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.1.1-r1.ebuild,v 1.2 2006/08/06 20:18:48 chainsaw Exp $
 
 inherit flag-o-matic
 
@@ -55,6 +55,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-remove-15instrument-magic.diff
+	epatch ${FILESDIR}/${PV}-ffwma-asm.diff
 }
 
 src_compile() {
@@ -87,7 +88,7 @@ src_compile() {
 		$(use_enable musepack) \
 		$(use_enable jack) \
 		$(use_enable timidity) \
-		$(use_enable charset chardet) \
+		$(use_enable chardet) \
 		|| die
 
 	emake || die "make failed"
diff --git a/media-sound/audacious/files/1.1.1-ffwma-asm.diff b/media-sound/audacious/files/1.1.1-ffwma-asm.diff
new file mode 100644
index 000000000000..d3abc2cbc0ee
--- /dev/null
+++ b/media-sound/audacious/files/1.1.1-ffwma-asm.diff
@@ -0,0 +1,13 @@
+Index: Plugins/Input/wma/libffwma/fft.c
+===================================================================
+--- Plugins/Input/wma/libffwma/fft.c	(revision 1937)
++++ Plugins/Input/wma/libffwma/fft.c	(working copy)
+@@ -105,7 +105,7 @@
+       } else {
+         canjump = 1;
+ 
+-        asm volatile ("mtspr 256, %0\n\t"
++        __asm__ volatile ("mtspr 256, %0\n\t"
+                       "vand %%v0, %%v0, %%v0"
+                       :
+                       : "r" (-1));