Fix build failure on NetBSD/arm.

patch-ah (new):
 Fix wrong placed #else clause against #if defined(__linux__) in cpu-arm.c.

patch-ba:
 Check NetBSD's native atomic_ops in configure even in arm case.
 configure checks $host_cpu first, not $host_os on checks for
 native atomic operations.
 (In upstream it seems fixed to see $host_os first but
  it might still have problem around NetBSD version checks)

3 files changed, 38 insertions, 5 deletions

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index c1f72533d43..801acf6d0a9 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2010/07/24 12:51:09 tron Exp $
+$NetBSD: distinfo,v 1.22 2010/08/10 05:42:33 tsutsui Exp $
 
 SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
@@ -10,7 +10,8 @@ SHA1 (patch-ad) = ae06ccadef3f7a0e685a2b8d0235ea3629f3680f
 SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30
 SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e
 SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a
-SHA1 (patch-ba) = d05d290d90120986654aa86f090b6c20c68e8594
+SHA1 (patch-ah) = 8327883adcbc679fdb97de9a0f10a89438ea9fd7
+SHA1 (patch-ba) = 3e5f28049363676d4bf3061605529253bea24f25
 SHA1 (patch-bb) = e6f4095eb460c605b8dcc02980c5cff0cd0715a8
 SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171
 SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20
diff --git a/audio/pulseaudio/patches/patch-ah b/audio/pulseaudio/patches/patch-ah
new file mode 100644
index 00000000000..ce1221a551c
--- /dev/null
+++ b/audio/pulseaudio/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.3 2010/08/10 05:42:34 tsutsui Exp $
+
+--- src/pulsecore/cpu-arm.c.orig	2009-11-23 03:57:07.000000000 +0000
++++ src/pulsecore/cpu-arm.c	2010-08-07 08:14:36.000000000 +0000
+@@ -129,11 +129,11 @@
+           (flags & PA_CPU_ARM_EDSP) ? "EDSP " : "",
+           (flags & PA_CPU_ARM_NEON) ? "NEON " : "",
+           (flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : "");
+-#else /* defined (__linux__) */
+-    pa_log ("ARM cpu features not yet supported on this OS");
+-#endif /* defined (__linux__) */
+ 
+     if (flags & PA_CPU_ARM_V6)
+         pa_volume_func_init_arm (flags);
++#else /* defined (__linux__) */
++    pa_log ("ARM cpu features not yet supported on this OS");
++#endif /* defined (__linux__) */
+ #endif /* defined (__arm__) */
+ }
diff --git a/audio/pulseaudio/patches/patch-ba b/audio/pulseaudio/patches/patch-ba
index d5f82f315e2..5002749e53e 100644
--- a/audio/pulseaudio/patches/patch-ba
+++ b/audio/pulseaudio/patches/patch-ba
@@ -1,12 +1,25 @@
-$NetBSD: patch-ba,v 1.6 2010/07/24 12:51:09 tron Exp $
+$NetBSD: patch-ba,v 1.7 2010/08/10 05:42:34 tsutsui Exp $
 
 Fix for security vulnerability reported in CVE-2009-1299, taken from here:
 
 http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee
 
+Also handle atomic_ops for NetBSD/arm.
+
 --- configure.ac.orig	2009-11-23 04:06:47.000000000 +0000
-+++ configure.ac	2010-07-24 13:33:30.000000000 +0100
-@@ -424,7 +424,7 @@
++++ configure.ac	2010-08-07 08:06:57.000000000 +0000
+@@ -220,6 +220,10 @@
+                 AC_MSG_RESULT([yes])
+                 AC_DEFINE_UNQUOTED(ATOMIC_ARM_LINUX_HELPERS, 1, [special arm linux implementation])
+                 need_libatomic_ops=no
++            elif test "x$pulse_target_os" = "xnetbsd" && test "x$atomic_netbsd_helpers" = "xyes"; then
++                AC_MSG_RESULT([yes])
++                AC_DEFINE_UNQUOTED(NETBSD_ATOMIC_OPS, 1, [netbsd implementation])
++                need_libatomic_ops=no
+             else
+                AC_MSG_RESULT([no])
+                AC_CACHE_CHECK([compiler support for arm inline asm atomic operations],
+@@ -424,7 +428,7 @@
  AC_FUNC_FORK
  AC_FUNC_GETGROUPS
  AC_FUNC_SELECT_ARGTYPES