Add a patch to fix compilation on ARMv5. Adding to stable candidate and 2 most recent ebuilds. 0.9.21.2 and 0.9.21.2-r1 can be removed after a newer version is keyworded on arm.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

6 files changed, 140 insertions, 25 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 2dbd297dd36a..fe09b38c3785 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.198 2010/11/26 06:56:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.199 2010/11/27 06:52:54 ford_prefect Exp $
+
+  27 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
+  +files/pulseaudio-0.9.21-armv5-build-fix.patch,
+  pulseaudio-0.9.21.1.ebuild, pulseaudio-0.9.21.2-r2.ebuild,
+  pulseaudio-0.9.22.ebuild:
+  Add a patch to fix compilation on ARMv5. Adding to stable candidate and 2
+  most recent ebuilds. 0.9.21.2 and 0.9.21.2-r1 can be removed after a newer
+  version is keyworded on arm.
 
   26 Nov 2010; Tim Harder <radhermit@gentoo.org> pulseaudio-0.9.22.ebuild:
   Fix libX11 xcb USE flag dependency since >=x11-libs/libX11-1.4.0 comes with
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index a8ae942d7d2a..369f9f0276c1 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.21-armv5-build-fix.patch 3387 RMD160 a3c3d2cd97478fc7ee53eb9aa6054d7c09271ec4 SHA1 1a3747c5e24c2cc26e43348a12627725b5d6242f SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000
 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
@@ -21,22 +19,11 @@ DIST pulseaudio-0.9.21.tar.gz 2056896 RMD160 6db0725253228b673a78cbfae4824fadce2
 DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
 EBUILD pulseaudio-0.9.15-r2.ebuild 4695 RMD160 1778eb536613625bbb9b9696308cdffbfc0fc597 SHA1 fdbb8b1d7bee3b93d87c2f9740d7c62ccb269258 SHA256 dc84c1fc7aea839dcc84adc48f3444fa4bab1f5dde7bd423da3c4dd370d6c5fd
 EBUILD pulseaudio-0.9.19.ebuild 5376 RMD160 3dfd7cfc8d35acc7dcae1b4efb272fc3e9ae9ec0 SHA1 026992f09962933b2097a2d2b32cdb88c737c4a1 SHA256 1a96d1ed99f330c9de65bc5a7a54a95d5f99113fb4de7e74295458f26f8ba495
-EBUILD pulseaudio-0.9.21.1.ebuild 7141 RMD160 0a9b668a79f487a59a5345df40444097115183e9 SHA1 38bbc60715712930aae037c93b9bd331570050b2 SHA256 24ac1db7065dfab24610dbcfa695a34e23bde12a1a79da988f82ed4a22d70625
+EBUILD pulseaudio-0.9.21.1.ebuild 7291 RMD160 ec79b6438dfcdd6f90e7e060297f8ac5e6840754 SHA1 0a51360505263f7d2c78e67754296fc90655e88e SHA256 e99441b4926b1096cb0cd87a12d7a1b38fb63525b32fe74ab789a8dee00b972e
 EBUILD pulseaudio-0.9.21.2-r1.ebuild 7169 RMD160 3ef684a85d05351e0afc518eeb72be17332d064a SHA1 9c55e58bb3634a785856069ac3edac290c06bca2 SHA256 e92feef907a782bd0e27201ad9a17abbf37a2b65dbf648d364b30260ba58715f
-EBUILD pulseaudio-0.9.21.2-r2.ebuild 7283 RMD160 e1142daaa3a621886a2938e70fcd67f1f71f4b67 SHA1 344c2961944a1da853551425865655b6b41c6a84 SHA256 ff3bfa56af4639efe47bba192aeec9b341e6d7c48ce400b3b0214533cd720b3c
+EBUILD pulseaudio-0.9.21.2-r2.ebuild 7433 RMD160 70e0e8160c236a2805538a8cd6bd229286bdc39d SHA1 8343fbf41e2406c4c5ab8ef5ff91d64bcffe4716 SHA256 b8e6c0650f6cd36533c765eea4c96dc5f607f89c47e700caf5de38db31cc4f3e
 EBUILD pulseaudio-0.9.21.2.ebuild 7149 RMD160 7157c54ef26337b081dc68d002031063c6984f76 SHA1 a37d7e687013e392094ada204daa85286e8d7758 SHA256 a9d54547e66d2cec91c8e3325133b5927c63b3c1ff5d71f2def9103aadb1d902
 EBUILD pulseaudio-0.9.21.ebuild 5438 RMD160 1fb42bf4a5055b1f6ba6ce16884406678237556d SHA1 363d7f1078ba0ef19235bb826419ac0d8e2b2af1 SHA256 d55cd0be6aa10f0dc83543d5d9cec821382ce70d04752bba4f970cfe1e2e2f89
-EBUILD pulseaudio-0.9.22.ebuild 7023 RMD160 eb4c716b055538ee115f3d42e77aea478a21c301 SHA1 3f0795a9df62d8acf8168acbe2d1cf5ea684c0bd SHA256 a7250096f1dd66aed3ca7760e431a8d661f547cf1c4a0efe1d18685bf1e9d0d4
-MISC ChangeLog 39826 RMD160 cbb14244b8e6782fcdfb2c4437961c43777f4c63 SHA1 ce16c7fc0f66576ff20e54c9afb48d3e0ddcd610 SHA256 c1945dce925ebb8c9368bcb344179ca33c728f1789bdbea0b2b74f06eb32d959
+EBUILD pulseaudio-0.9.22.ebuild 7168 RMD160 fe826537ad44052cabd52f18ada019e3379f0378 SHA1 b17fb09a6abfad20b509736787a15910a97de349 SHA256 23008433e444288b1e03dc03d2db8a9c4b35cf3fe02524c6e84b80fe21deae1b
+MISC ChangeLog 40208 RMD160 c385cc928e84d73366a4388fec49f390b457d37e SHA1 bcf64a433cbf3a9882248d0c8e36ff2f8165d510 SHA256 e5c5c41d6cc2e00ced011e4b97806f079871e25eb52ec289180ddb25bb31cb4a
 MISC metadata.xml 2156 RMD160 14d0f56694ac33865c29d7db9458c9636497a66f SHA1 a3ca6364922bf6d07714d8d6670cfdac75a39e39 SHA256 2573de70d411e31d4ce22e757757893270f45281520bce564a715c1abd1f9959
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJM71oNAAoJEEqz6FtPBkyjy1wIAK1Zzkx6wQwp458Jzsv6clDQ
-WCXQ62HUH40m22Ywprly47zdJmpkeoXkykkEFa8dwnY3V3qQfVWAtOCEvFw5/r+X
-FstSEfpQVp5tMycYXtfYjQPM2Zq2YFwQMkBbNRa8KNAU7eK/Fw6rTHv9ATti19sj
-ZRfQugvWCaUNPwvjHE1cUEmCcqj9Ohr1rvFJw4xXXPDIquc2izwRBxcwges5jYks
-eOmAizaqKTdZb/+QPvsaGu7ij/MX5Mt868dc/SradWDRRLRdObCMzmcCICrictdA
-jOhQeCWLoqNb/NwWuvIMISjgyMIYByzOqVGWp407nFtN87lkN/dgRyPk334qn8Q=
-=+TnK
------END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.21-armv5-build-fix.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.21-armv5-build-fix.patch
new file mode 100644
index 000000000000..aaaaae6838cf
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.21-armv5-build-fix.patch
@@ -0,0 +1,102 @@
+From e5b136fc0fde751df3a94cd64855a74732dd4cc7 Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <arun.raghavan@collabora.co.uk>
+Date: Fri, 26 Nov 2010 11:55:57 +0530
+Subject: [PATCH] volume: Add explicit checks for ARMv6 instructions
+
+This ensures that the build does not fail if the ssat and pkhbt
+instructions are not available (armv5te and below).
+
+Fixes: http://www.pulseaudio.org/ticket/790
+---
+ configure.ac                |   33 ++++++++++++++++++++++++++++++++-
+ src/pulsecore/svolume_arm.c |    8 ++++----
+ 2 files changed, 36 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ab42dc..3df8c6b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -230,7 +230,7 @@ else
+                     [pulseaudio_cv_support_arm_atomic_ops=no])
+                  ])
+                AS_IF([test "$pulseaudio_cv_support_arm_atomic_ops" = "yes"], [
+-                   AC_DEFINE([ATOMIC_ARM_INLINE_ASM], 1, [Have ARMv6 instructions.])
++                   AC_DEFINE([ATOMIC_ARM_INLINE_ASM], 1, [Have ARM atomic instructions.])
+                    need_libatomic_ops=no
+                  ])
+            fi
+@@ -249,6 +249,37 @@ else
+     esac
+ fi
+ 
++# If we're on ARM, check for the ARMV6 instructions we need */
++case $host in
++  arm*)
++    AC_CACHE_CHECK([support for required armv6 instructions],
++      pulseaudio_cv_support_armv6,
++      [AC_COMPILE_IFELSE(
++         AC_LANG_PROGRAM([],
++           [[volatile int a = -60000, b = 0xaaaabbbb, c = 0xccccdddd;
++             asm volatile ("ldr r0, %2 \n"
++                           "ldr r2, %3 \n"
++                           "ldr r3, %4 \n"
++                           "ssat r1, #8, r0 \n"
++                           "str r1, %0 \n"
++                           "pkhbt r1, r3, r2, LSL #8 \n"
++                           "str r1, %1 \n"
++                           : "=m" (a), "=m" (b)
++                           : "m" (a), "m" (b), "m" (c)
++                           : "r0", "r1", "r2", "r3", "cc");
++             return (a == -128 && b == 0xaabbdddd) ? 0 : -1;
++           ]]),
++         [pulseaudio_cv_support_armv6=yes],
++         [pulseaudio_cv_support_armv6=no])
++      ])
++    AS_IF([test "$pulseaudio_cv_support_armv6" = "yes"], [
++        AC_DEFINE([HAVE_ARMV6], 1, [Have ARMv6 instructions.])
++      ])
++  ;;
++  *)
++  ;;
++esac
++
+ CC_CHECK_TLS
+ 
+ AC_CACHE_CHECK([whether $CC knows _Bool],
+diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c
+index fdd8f09..3973e51 100644
+--- a/src/pulsecore/svolume_arm.c
++++ b/src/pulsecore/svolume_arm.c
+@@ -35,7 +35,7 @@
+ #include "sample-util.h"
+ #include "endianmacros.h"
+ 
+-#if defined (__arm__)
++#if defined (__arm__) && defined (HAVE_ARMV6)
+ 
+ #define MOD_INC() \
+     " subs  r0, r6, %2              \n\t" \
+@@ -182,11 +182,11 @@ static void run_test (void) {
+ }
+ #endif
+ 
+-#endif /* defined (__arm__) */
++#endif /* defined (__arm__) && defined (HAVE_ARMV6) */
+ 
+ 
+ void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
+-#if defined (__arm__)
++#if defined (__arm__) && defined (HAVE_ARMV6)
+     pa_log_info("Initialising ARM optimized functions.");
+ 
+ #ifdef RUN_TEST
+@@ -194,5 +194,5 @@ void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
+ #endif
+ 
+     pa_set_volume_func (PA_SAMPLE_S16NE,     (pa_do_volume_func_t) pa_volume_s16ne_arm);
+-#endif /* defined (__arm__) */
++#endif /* defined (__arm__) && defined (HAVE_ARMV6) */
+ }
+-- 
+1.7.3.2
+
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild
index afcc79c56e8a..62255a2d85c9 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild,v 1.10 2010/09/21 22:36:43 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild,v 1.11 2010/11/27 06:52:54 ford_prefect Exp $
 
 EAPI=2
 
-inherit eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
@@ -92,6 +92,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if use arm; then
+		# Fix build on armv5 - bug #294599
+		epatch "${FILESDIR}/${PN}-0.9.21-armv5-build-fix.patch"
+		eautoreconf
+	fi
+
 	elibtoolize
 }
 
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild
index c1fabd58d94b..c1ded9d26d6b 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild,v 1.1 2010/09/21 22:36:43 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild,v 1.2 2010/11/27 06:52:54 ford_prefect Exp $
 
 EAPI=3
 
-inherit eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
@@ -93,6 +93,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if use arm; then
+		# Fix build on armv5 - bug #294599
+		epatch "${FILESDIR}/${PN}-0.9.21-armv5-build-fix.patch"
+		eautoreconf
+	fi
+
 	elibtoolize
 }
 
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
index b8b07eac12f0..9c49c6a87841 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.2 2010/11/26 06:56:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.3 2010/11/27 06:52:54 ford_prefect Exp $
 
 EAPI=3
 
-inherit eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic versionator
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="http://www.pulseaudio.org/"
@@ -89,6 +89,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if use arm; then
+		# Fix build on armv5 - bug #294599
+		epatch "${FILESDIR}/${PN}-0.9.21-armv5-build-fix.patch"
+		eautoreconf
+	fi
+
 	elibtoolize
 }