# HG changeset patch
# User Chris Cannam
# Date 1407395856 -3600
# Node ID a7005ff33d3c52abc251ed3f3955f1a2b0e47e24
# Parent  12d422dd69924375cc115a183f53b6375c478c8f
OS/X build fixes

diff -r 12d422dd6992 -r a7005ff33d3c .hgsubstate
--- a/.hgsubstate	Wed Aug 06 17:44:04 2014 +0100
+++ b/.hgsubstate	Thu Aug 07 08:17:36 2014 +0100
@@ -1,4 +1,4 @@
-73186ff0e8eb86acbafd0f5c2d5ceacd760e57d0 constant-q-cpp
+361b4f8b7b2dbce9aebec3ff577f5c68f6fbb3ae constant-q-cpp
 acc12b4d54b4ff19eac66c64749d6afb01d1e1e7 match-vamp
 ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins
 6408759460777522101d3310de8e6852a1a1af61 nnls-chroma
diff -r 12d422dd6992 -r a7005ff33d3c SCRIPTS/process.sh
--- a/SCRIPTS/process.sh	Wed Aug 06 17:44:04 2014 +0100
+++ b/SCRIPTS/process.sh	Thu Aug 07 08:17:36 2014 +0100
@@ -96,7 +96,7 @@
 	hostext=
 	valgrind=
 	archflags="-arch i386"
-	identpattern='not known yet' ##!!!
+	identpattern='Mach-O .*i386'
 	;;
     osx64)
 	platform=osx
@@ -108,7 +108,7 @@
 	valgrind=
 	# This is a difficult choice for various reasons... have to ponder
 	archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386"
-	identpattern='not known yet' ##!!!
+	identpattern='Mach-O 64-bit .*x86_64'
 	;;
 esac;
 
@@ -260,7 +260,9 @@
 run_tester() {
     ##!!! todo: timeout if the plugin takes too long and report as failure?
     dir="$1"
-    ids=$(VAMP_PATH="$dir" $hostwrapper vamp-plugin-sdk/host/vamp-simple-host$hostext --list-ids | sed 's/^vamp://' | sed 's/\r//g' )
+    # can't use sed to remove \r from DOS line endings -- BSD and GNU
+    # vary in how they interpret \r escape
+    ids=$(VAMP_PATH="$dir" $hostwrapper vamp-plugin-sdk/host/vamp-simple-host$hostext --list-ids | sed 's/^vamp://' | perl -p -e 's/\r//g' )
     cat /dev/null > "$reportdir/$dir.test.txt"
     if [ -z "$ids" ]; then
 	echo