diff options
| author | chuck <chuck@pkgsrc.org> | 2008-11-21 21:09:57 +0000 |
|---|---|---|
| committer | chuck <chuck@pkgsrc.org> | 2008-11-21 21:09:57 +0000 |
| commit | a4a49d8f2d4b31263349772d73e5568f27bf6340 (patch) | |
| tree | 981720789df9a843849673f807d19e161b4d3149 /multimedia | |
| parent | e7974d1e527b054d3ade9b53f980f7275a551a7e (diff) | |
| download | pkgsrc-a4a49d8f2d4b31263349772d73e5568f27bf6340.tar.gz | |
fix compile time error on Darwin in player/lib/audio/portaudio:
In file included from pa_mac_core.c:124:
pa_host.h:55: error: conflicting types for 'uint32'
/System/Library/Frameworks/Security.framework/Headers/cssmconfig.h:64: error: previous declaration of 'uint32' was here
use <inttypes.h> and uint32_t instead.
note that according to player/lib/audio/Makefile.am, this old portaudio
lib is used only if HAVE_MAC_OSX.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpeg4ip/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/patches/patch-ak | 63 |
2 files changed, 65 insertions, 1 deletions
diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo index 0789b2560e3..431ac7facd6 100644 --- a/multimedia/mpeg4ip/distinfo +++ b/multimedia/mpeg4ip/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2007/08/09 20:02:36 drochner Exp $ +$NetBSD: distinfo,v 1.11 2008/11/21 21:09:57 chuck Exp $ SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3 RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a @@ -13,3 +13,4 @@ SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7 +SHA1 (patch-ak) = 8a89f6eb4860b12479a062303c15a4f09416c964 diff --git a/multimedia/mpeg4ip/patches/patch-ak b/multimedia/mpeg4ip/patches/patch-ak new file mode 100644 index 00000000000..f5f9bdfed99 --- /dev/null +++ b/multimedia/mpeg4ip/patches/patch-ak @@ -0,0 +1,63 @@ +$NetBSD: patch-ak,v 1.1 2008/11/21 21:09:57 chuck Exp $ + +--- player/lib/audio/portaudio/pa_host.h.orig 2004-04-01 18:54:23.000000000 -0500 ++++ player/lib/audio/portaudio/pa_host.h 2008-11-21 15:46:31.000000000 -0500 +@@ -48,18 +48,7 @@ + #define SUPPORT_AUDIO_CAPTURE (1)
+ #endif
+
+-#ifndef int32
+- typedef long int32;
+-#endif
+-#ifndef uint32
+- typedef unsigned long uint32;
+-#endif
+-#ifndef int16
+- typedef short int16;
+-#endif
+-#ifndef uint16
+- typedef unsigned short uint16;
+-#endif
++#include <inttypes.h>
+
+ /* Used to convert between various sample formats. */
+ typedef void (PortAudioConverter)(
+@@ -75,11 +64,11 @@ +
+ typedef struct internalPortAudioStream
+ {
+- uint32 past_Magic; /* ID for struct to catch bugs. */
++ uint32_t past_Magic; /* ID for struct to catch bugs. */
+
+ /* Begin user specified information. */
+- uint32 past_FramesPerUserBuffer;
+- uint32 past_NumUserBuffers;
++ uint32_t past_FramesPerUserBuffer;
++ uint32_t past_NumUserBuffers;
+ double past_SampleRate; /* Closest supported sample rate. */
+ int past_NumInputChannels;
+ int past_NumOutputChannels;
+@@ -89,7 +78,7 @@ + PaSampleFormat past_OutputSampleFormat;
+ PortAudioCallback *past_Callback;
+ void *past_UserData;
+- uint32 past_Flags;
++ uint32_t past_Flags;
+ /* End user specified information. */
+
+ void *past_DeviceData;
+@@ -102,11 +91,11 @@ + volatile int past_StopNow; /* Background should stop playing now. */
+ /* These buffers are used when the native format does not match the user format. */
+ void *past_InputBuffer;
+- uint32 past_InputBufferSize; /* Size in bytes of the input buffer. */
++ uint32_t past_InputBufferSize; /* Size in bytes of the input buffer. */
+ void *past_OutputBuffer;
+- uint32 past_OutputBufferSize;
++ uint32_t past_OutputBufferSize;
+ /* Measurements */
+- uint32 past_NumCallbacks;
++ uint32_t past_NumCallbacks;
+ PaTimestamp past_FrameCount; /* Frames output to buffer. */
+ /* For measuring CPU utilization. */
+ double past_AverageInsideCount;
|