Fix build with -fweb compiler flag (bug #287391).

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

5 files changed, 78 insertions, 9 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index b50f15ba92dd..cda20ac5a820 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.170 2009/10/05 10:31:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.171 2009/10/07 17:43:19 flameeyes Exp $
+
+  07 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  pulseaudio-0.9.19.ebuild, pulseaudio-0.9.19-r50.ebuild,
+  +files/pulseaudio-0.9.19-fweb.patch:
+  Fix build with -fweb compiler flag (bug #287391).
 
   05 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   pulseaudio-0.9.18.ebuild, pulseaudio-0.9.18-r50.ebuild,
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 9f2ba9332c97..3df73eac00c2 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX pulseaudio-0.9.15-CVE-2009-1894.patch 1969 RMD160 69a11b7f132d24e7f99fec180ffed3caf806de77 SHA1 1b9106e52c063e83b8577434360edaf3be81351d SHA256 a14e01e386f60c083dda6049e951bcf17af693ac475afd1f455d71f400f2e526
 AUX pulseaudio-0.9.15-bsd.patch 549 RMD160 d44e309557353c115281e860bfa643b197d04921 SHA1 0cd07acc70c0e53984e7a639d9668b4817cb804c SHA256 d044e27ad71424b601f0de37e29321226579146203c6c557434d11e298798787
+AUX pulseaudio-0.9.19-fweb.patch 2263 RMD160 ab33d2b583244edde0a64c6cb285c9b0e2bf40fd SHA1 5ef59ce5e84b1b214b7e54ea64d9de851c70b25b SHA256 80fdc6c68566ed7c6bf02c263d0056c2c9f0c911d308ec166a35e309b47b2e2b
 AUX pulseaudio-0.9.8-bt-nohal.patch 1153 RMD160 5ad7a7173795c022fca73ccf694207e18d6925a7 SHA1 9f50549357b5fa498e0b7f67258de431e90f89e2 SHA256 1bdc458d55529777a3a760205a09d0381433402a3002518ba5a700b3518c727d
 AUX pulseaudio-0.9.8-create-directory.patch 685 RMD160 87c287d3ff6047c9bee892271ea3b3ac6d06fa1a SHA1 2083a575f6272135909efce292d43a2f947f285f SHA256 5fd77f5d0a897d3f70cb3e20e24b97e7f0f46d9266b8758c56a7cb84f763e571
 AUX pulseaudio-0.9.8-esoundpath.patch 1798 RMD160 c009c0d1cfdf0bb9db6ef476df29bca56b68ab58 SHA1 5901b164c5b4bd3fa485dbc1a5a950f2ba5794a9 SHA256 4ae132c68a19f07ecf1fef9c55cebc7615e38b157dc196961f666c3914a4641b
@@ -19,15 +20,15 @@ DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92
 EBUILD pulseaudio-0.9.15-r2.ebuild 4758 RMD160 df52be0452fe373793b9741e06e38ddaf6b77c65 SHA1 c8b77b5936895533adb8a3a127dc7d1d1588ac4c SHA256 4973f88a60a53270f4976b44f6005ef6b8f25a8c4542b39eaa10b6d1f537c63c
 EBUILD pulseaudio-0.9.18-r50.ebuild 6793 RMD160 849f87acaec5b8c12b62f51f9451457d432b76ad SHA1 a42cc00e58a522740f8bf35947cafa68df0fcd22 SHA256 484c292ee30ac7017306a54cc6ba08f515532a5d34c1dae5eaa6aca91d0b43dc
 EBUILD pulseaudio-0.9.18.ebuild 5401 RMD160 95910d2ed74f0d273424704559f99baa701e4bd2 SHA1 6abfc3e421e9bf44330b5f421bd406f1aa23004f SHA256 60b5491ba6d508883132fdfc4020efa3603f172695dbf894db99541d482609b6
-EBUILD pulseaudio-0.9.19-r50.ebuild 6793 RMD160 8a24d81fdc9b7344c8450a1b10d60571ae687783 SHA1 34844a619820a3eab64c4799847ab7197c9c483c SHA256 3254927ce89ae667bc067babefb25c3023d82e4ff02455b5e4652d02d32c9032
-EBUILD pulseaudio-0.9.19.ebuild 5401 RMD160 4ef7ec7fa2cbbf8552e343c2f398a3c2131f77ce SHA1 be2991c0cdec195e1b18faa145c0f03c31ebc190 SHA256 4d2b0bc21fef50784aa6cfd833d0bfb06dfe2ca84319f3df9f761a60bf30d002
+EBUILD pulseaudio-0.9.19-r50.ebuild 6832 RMD160 57baf6d265a5525deb88ce7971596d6905b3298c SHA1 77148a40a3cf45fb6d3daa233439647abf00072a SHA256 ad899c071ad8c75ee0039cf939813018063c77596aa4d36ee7598d0c81076ac8
+EBUILD pulseaudio-0.9.19.ebuild 5440 RMD160 01b5e758b6854bbb94a36945ae7d9a95a2b5bfd9 SHA1 639da2e10705b7f6a0cff04c88160ac554a048fa SHA256 e670372d434c267f3d9392327b6df63fbaf74bdc95d59618f0a875ecf2fba4fe
 EBUILD pulseaudio-0.9.9-r54.ebuild 5890 RMD160 05857cd7bdcf277b9d9bd5439f158e05087e0865 SHA1 3a7d401e5f8a8894b66fb1e63532c91ade0fa945 SHA256 09d81b78fe4089446be4dce8c438e8e99f762b140f1a74dbef08dfa084e5c34e
-MISC ChangeLog 34429 RMD160 ea748733f38e2b56bef0c17a5256668fccbd6621 SHA1 95e76d2090195cb52e63c7645ce206ca23864028 SHA256 dce31ea06b97551b32a916789daf0a24c7a922cd45f1a6b44c19ead3c854d86c
+MISC ChangeLog 34635 RMD160 3a11268401ee2fbef5fc319ce937e102ad431eed SHA1 3282dce60ae23e04ed5db917f86810b8a61a91f1 SHA256 a002931500a46edb82bc2dca7db6c9318cb349ecf43f30d1cef06b39a9218962
 MISC metadata.xml 1774 RMD160 422f7fcca52193e22c6a257eea28af8ff84247c3 SHA1 5994d8a5212a87a6ef8e6537f9cd2ef22542c8c4 SHA256 94facd3169c4b679f77ff21e329d73a073c55ff93e0d40edfd31e56419947582
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrJyw0ACgkQAiZjviIA2Xg5qQCgjAlJQsOncHfyZEQm21O0zhNy
-Nl8An0dM1ITIWvTKoHr+x3mgKMRkNMGc
-=EEbX
+iEYEARECAAYFAkrM0zwACgkQAiZjviIA2Xh/VQCeNVIjPnknP5Q4g9UE61KH9lA1
+rjwAnAljsWrGAt2iokcUBVDiNFvSORq0
+=7LHs
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.19-fweb.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.19-fweb.patch
new file mode 100644
index 000000000000..36a89bc59bab
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.19-fweb.patch
@@ -0,0 +1,59 @@
+From 8ec304d2d1e956cc3f5f35437ac4fe580b36f004 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Wed, 7 Oct 2009 19:31:11 +0200
+Subject: [PATCH] Fix build when using -fweb, accept both register and memory constraints.
+
+This was reported as Gentoo bug #287391 by Torsten Kaiser, and the fix was
+suggested by Mike Frysinger.
+---
+ src/pulsecore/svolume_mmx.c |    4 ++--
+ src/pulsecore/svolume_sse.c |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c
+index 1768eb5..745c7de 100644
+--- a/src/pulsecore/svolume_mmx.c
++++ b/src/pulsecore/svolume_mmx.c
+@@ -152,7 +152,7 @@ pa_volume_s16ne_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
+         " emms                          \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
+-        : "X" ((pa_reg_x86)channels)
++        : "rm" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
+@@ -228,7 +228,7 @@ pa_volume_s16re_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
+         " emms                          \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
+-        : "X" ((pa_reg_x86)channels)
++        : "rm" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
+diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
+index ab9394f..1cc4e0a 100644
+--- a/src/pulsecore/svolume_sse.c
++++ b/src/pulsecore/svolume_sse.c
+@@ -149,7 +149,7 @@ pa_volume_s16ne_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
+         "8:                             \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
+-        : "X" ((pa_reg_x86)channels)
++        : "rm" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
+@@ -237,7 +237,7 @@ pa_volume_s16re_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
+         "8:                             \n\t"
+ 
+         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
+-        : "X" ((pa_reg_x86)channels)
++        : "rm" ((pa_reg_x86)channels)
+         : "cc"
+     );
+ }
+-- 
+1.6.5.rc2
+
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild
index ac572a5e5957..38f625665fe1 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild,v 1.3 2009/10/05 10:31:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r50.ebuild,v 1.4 2009/10/07 17:43:19 flameeyes Exp $
 
 EAPI=2
 
@@ -88,6 +88,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fweb.patch
+
 	elibtoolize
 }
 
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
index c9be0484b29f..11bc1258a669 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild,v 1.3 2009/10/05 10:31:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild,v 1.4 2009/10/07 17:43:19 flameeyes Exp $
 
 EAPI=2
 
@@ -81,6 +81,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fweb.patch
+
 	elibtoolize
 }