From d5a3ece6b0ebdb0dc568213946c901f29c0b143a Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Tue, 19 May 2009 13:19:49 -0400
Subject: [PATCH] Fix Mac OS X 10.6 compile problem with libsydneyaudio.
 b=492072 r=cdouble

---
 media/libsydneyaudio/README_MOZILLA           |  3 +++
 .../libsydneyaudio/include-CoreServices.patch | 21 +++++++++++++++++++
 media/libsydneyaudio/src/sydney_audio_mac.c   |  1 +
 media/libsydneyaudio/update.sh                |  1 +
 4 files changed, 26 insertions(+)
 create mode 100644 media/libsydneyaudio/include-CoreServices.patch

diff --git a/media/libsydneyaudio/README_MOZILLA b/media/libsydneyaudio/README_MOZILLA
index f4a7833505fd..98a32cd25a15 100644
--- a/media/libsydneyaudio/README_MOZILLA
+++ b/media/libsydneyaudio/README_MOZILLA
@@ -9,3 +9,6 @@ The svn revision number used was r3895.
 
 pause-resume.patch is applied to implement and fix issues
 with pausing and resuming audio streams.
+
+include-CoreServices.patch is applied to include CoreServices headers
+on Mac OS X. Fixes a build failure on Mac OS X 10.6. b=492072
diff --git a/media/libsydneyaudio/include-CoreServices.patch b/media/libsydneyaudio/include-CoreServices.patch
new file mode 100644
index 000000000000..b44f242f4210
--- /dev/null
+++ b/media/libsydneyaudio/include-CoreServices.patch
@@ -0,0 +1,21 @@
+diff --git a/media/libsydneyaudio/src/sydney_audio_mac.c b/media/libsydneyaudio/src/sydney_audio_mac.c
+--- a/media/libsydneyaudio/src/sydney_audio_mac.c
++++ b/media/libsydneyaudio/src/sydney_audio_mac.c
+@@ -29,16 +29,17 @@
+  * and other provisions required by the GPL or the LGPL. If you do not delete
+  * the provisions above, a recipient may use your version of this file under
+  * the terms of any one of the MPL, the GPL or the LGPL.
+  *
+  * ***** END LICENSE BLOCK ***** *
+  */
+ 
+ #include <pthread.h>
++#include <CoreServices/CoreServices.h>
+ #include <AudioUnit/AudioUnit.h>
+ #include "sydney_audio.h"
+ 
+ /*
+  * The Mac's audio interface is based on a "pull" I/O model, which means you
+  * can't just provide a data buffer and tell the audio device to play; you must
+  * register a callback and provide data as the device asks for it. To support
+  * sydney audio's "write-to-play" style interface, we have to buffer up the
diff --git a/media/libsydneyaudio/src/sydney_audio_mac.c b/media/libsydneyaudio/src/sydney_audio_mac.c
index d0fa1482f3b5..816c64819b09 100644
--- a/media/libsydneyaudio/src/sydney_audio_mac.c
+++ b/media/libsydneyaudio/src/sydney_audio_mac.c
@@ -34,6 +34,7 @@
  */
 
 #include <pthread.h>
+#include <CoreServices/CoreServices.h>
 #include <AudioUnit/AudioUnit.h>
 #include "sydney_audio.h"
 
diff --git a/media/libsydneyaudio/update.sh b/media/libsydneyaudio/update.sh
index 5927f6a554b2..d381585ac36c 100644
--- a/media/libsydneyaudio/update.sh
+++ b/media/libsydneyaudio/update.sh
@@ -6,3 +6,4 @@ cp $1/include/sydney_audio.h include/sydney_audio.h
 cp $1/src/*.c src/
 cp $1/AUTHORS ./AUTHORS
 patch -p4 <pause-resume.patch
+patch -p4 <include-CoreServices.patch