Added patch to remove 'code' test on non-x86/amd64 systems as it uses i386 asm. See bug #99995. Also fix some more gcc4 problems.

Package-Manager: portage-2.0.53_rc7

4 files changed, 87 insertions, 2 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 3b4b63342972..be8c65674ea3 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.138 2005/11/19 15:57:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.139 2005/11/19 19:02:08 flameeyes Exp $
+
+  19 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-lib-1.0.10-test-ppc.patch, alsa-lib-1.0.10.ebuild:
+  Added patch to remove 'code' test on non-x86/amd64 systems as it uses i386
+  asm. See bug #99995. Also fix some more gcc4 problems.
 
   19 Nov 2005; Markus Rothe <corsair@gentoo.org> alsa-lib-1.0.10.ebuild:
   Stable on ppc64; bug #111968
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 1b7136dcda9e..90c0f72ee56a 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 05b85d2284bbe2c1a1120e871d5f5de4 ChangeLog 20668
 MD5 9c272add7e13dc69bac9eaf8c2cd0771 alsa-lib-0.9.8.ebuild 1558
 MD5 ec56c5b0dc1ad1d456164731c32d230a alsa-lib-1.0.10.ebuild 2072
@@ -21,3 +24,10 @@ MD5 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
 MD5 46a389b403bc763310e942cc9fc6d7b1 files/digest-alsa-lib-1.0.8 67
 MD5 5cbe7a7471c2f69dde2e86924eaf101e files/digest-alsa-lib-1.0.9 67
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf3ccAiZjviIA2XgRAl1AAJ9iTvoYD8Mb33fmVcCu6mNLBBzi1wCfZm+Z
+D7ioFCp8p1B2HmIJNXI1p54=
+=ixN9
+-----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.10.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.10.ebuild
index 7a8fa13a8c03..fd2ff5dc2a13 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.10.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.10.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-libs/alsa-lib/alsa-lib-1.0.10.ebuild,v 1.2 2005/11/19 15:57:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.10.ebuild,v 1.3 2005/11/19 19:02:08 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd ${S}
 	epatch "${FILESDIR}/${PN}-1.0.10_rc3-hardened.patch"
 	epatch "${FILESDIR}/${PN}-1.0.10_rc3-test.patch"
+	epatch "${FILESDIR}/${P}-test-ppc.patch"
 
 	eautoreconf
 }
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.10-test-ppc.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.10-test-ppc.patch
new file mode 100644
index 000000000000..8ccefd0b8f08
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.10-test-ppc.patch
@@ -0,0 +1,69 @@
+Index: alsa-lib-1.0.10/configure.in
+===================================================================
+--- alsa-lib-1.0.10.orig/configure.in
++++ alsa-lib-1.0.10/configure.in
+@@ -142,9 +142,11 @@ AC_MSG_CHECKING(for architecture)
+ case "$target" in
+ i?86*)
+   AC_MSG_RESULT(x86)
++  x86asm="true"
+   ;;
+ x86_64*)
+   AC_MSG_RESULT(x86)
++  x86asm="true"
+   ;;
+ alpha*)
+   AC_MSG_RESULT(alpha)
+@@ -171,6 +173,10 @@ arm*)
+   ;;
+ esac
+ 
++dnl Enable code command only for x86 or amd64 arches, as the others
++dnl does not accept i386 asm.
++AM_CONDITIONAL(X86ASM, test x$x86asm = xtrue)
++
+ dnl Check for resmgr support...
+ AC_MSG_CHECKING(for resmgr support)
+ AC_ARG_ENABLE(resmgr,
+Index: alsa-lib-1.0.10/test/latency.c
+===================================================================
+--- alsa-lib-1.0.10.orig/test/latency.c
++++ alsa-lib-1.0.10/test/latency.c
+@@ -476,7 +476,7 @@ void help(void)
+ "-e,--effect    apply an effect (bandpass filter sweep)\n"
+ );
+         printf("Recognized sample formats are:");
+-        for (k = 0; k < SND_PCM_FORMAT_LAST; ++(unsigned long) k) {
++        for (k = 0; k < SND_PCM_FORMAT_LAST; k++) {
+                 const char *s = snd_pcm_format_name(k);
+                 if (s)
+                         printf(" %s", s);
+Index: alsa-lib-1.0.10/test/pcm.c
+===================================================================
+--- alsa-lib-1.0.10.orig/test/pcm.c
++++ alsa-lib-1.0.10/test/pcm.c
+@@ -716,7 +716,7 @@ static void help(void)
+ "-v,--verbose   show the PCM setup parameters\n"
+ "\n");
+         printf("Recognized sample formats are:");
+-        for (k = 0; k < SND_PCM_FORMAT_LAST; ++(unsigned long) k) {
++        for (k = 0; k < SND_PCM_FORMAT_LAST; k++) {
+                 const char *s = snd_pcm_format_name(k);
+                 if (s)
+                         printf(" %s", s);
+Index: alsa-lib-1.0.10/test/Makefile.am
+===================================================================
+--- alsa-lib-1.0.10.orig/test/Makefile.am
++++ alsa-lib-1.0.10/test/Makefile.am
+@@ -1,6 +1,10 @@
++if X86ASM
++codeprogram = code
++endif
++
+ check_PROGRAMS=control pcm latency seq \
+ 	       playmidi1 timer rawmidi midiloop \
+-	       code oldapi queue_timer
++	       $(codeprogram) oldapi queue_timer
+ 
+ control_LDADD=../src/libasound.la
+ pcm_LDADD=../src/libasound.la