From: Richard Kettlewell <richard@kakajou.wlan.anjou.terraraq.org.uk>
Date: Thu, 19 Nov 2009 11:01:47 +0000 (+0000)
Subject: 64-bit macos fix
X-Git-Tag: 5.0~59^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/495f9857ac708ba7386b73f1e447c2000697bb25

64-bit macos fix
---

diff --git a/README.developers b/README.developers
index 75c1c44..ed09c21 100644
--- a/README.developers
+++ b/README.developers
@@ -14,8 +14,6 @@ Dependencies:
 		     libao-dev libmad0-dev libasound2-dev libdb4.3-dev \
 		     libflac-dev vorbis-tools wget
 
-     (Use the bzr from backports, the one in etch is obsolete.)
-
      On lenny use libdb4.5-deb.  libdb4.6 does not work (and configure will
      refuse to use it).
 
@@ -33,6 +31,10 @@ Dependencies:
          wget
          vorbis-tools
 
+   * On OS X with Fink:
+
+     fink install gtk+2-dev gc libgrypt pcre flac vorbis-tools libmad wget sed
+
    * Please report unstated dependencies (here, README or debian/control).
 
 Building:
diff --git a/lib/uaudio-coreaudio.c b/lib/uaudio-coreaudio.c
index 5f28e67..6ca3f70 100644
--- a/lib/uaudio-coreaudio.c
+++ b/lib/uaudio-coreaudio.c
@@ -138,14 +138,14 @@ static void coreaudio_start(uaudio_callback *callback,
   if(status)
     coreaudio_fatal(status, "AudioHardwareGetProperty");
   D(("mSampleRate       %f", asbd.mSampleRate));
-  D(("mFormatID         %08lx", asbd.mFormatID));
-  D(("mFormatFlags      %08lx", asbd.mFormatFlags));
-  D(("mBytesPerPacket   %08lx", asbd.mBytesPerPacket));
-  D(("mFramesPerPacket  %08lx", asbd.mFramesPerPacket));
-  D(("mBytesPerFrame    %08lx", asbd.mBytesPerFrame));
-  D(("mChannelsPerFrame %08lx", asbd.mChannelsPerFrame));
-  D(("mBitsPerChannel   %08lx", asbd.mBitsPerChannel));
-  D(("mReserved         %08lx", asbd.mReserved));
+  D(("mFormatID         %08"PRIx32, asbd.mFormatID));
+  D(("mFormatFlags      %08"PRIx32, asbd.mFormatFlags));
+  D(("mBytesPerPacket   %08"PRIx32, asbd.mBytesPerPacket));
+  D(("mFramesPerPacket  %08"PRIx32, asbd.mFramesPerPacket));
+  D(("mBytesPerFrame    %08"PRIx32, asbd.mBytesPerFrame));
+  D(("mChannelsPerFrame %08"PRIx32, asbd.mChannelsPerFrame));
+  D(("mBitsPerChannel   %08"PRIx32, asbd.mBitsPerChannel));
+  D(("mReserved         %08"PRIx32, asbd.mReserved));
   /* Check that everything adds up */
   if(asbd.mFormatID != kAudioFormatLinearPCM)
     disorder_fatal(0, "audio device does not support kAudioFormatLinearPCM");