From e712774d63807aa8d1a661a34cf8358dd810f4db Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Thu, 30 Dec 2004 06:35:38 +0000
Subject: Always include stdint.h and/or inttypes.h if they are present.  The
 previous sunpro patch doesn't include them when sys/types.h is present,
 breaking this package on Linux.

---
 audio/faad2/distinfo         |  4 ++--
 audio/faad2/patches/patch-af | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index 67c06fdbe77..8f16a7adc32 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/07/31 08:10:47 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2004/12/30 06:35:38 minskim Exp $
 
 SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
 Size (faad2-2.0.tar.gz) = 766660 bytes
@@ -7,4 +7,4 @@ SHA1 (patch-ab) = 33c8c741f3b3870d84c66b6eb8bf95d4b768f39e
 SHA1 (patch-ac) = 9c610dbaa89df5a82587f685116aac5e760fe32c
 SHA1 (patch-ad) = 4d57360bfd5e9c7f75d06ae274723f7aa1e11186
 SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc
-SHA1 (patch-af) = 474117f9333c0b14bdd99d9c7b330e480b1e1b4a
+SHA1 (patch-af) = c6da419d2ac6b120b2e70c72f240c6f6b83ca39a
diff --git a/audio/faad2/patches/patch-af b/audio/faad2/patches/patch-af
index 169ead8d4a6..d80c293c33e 100644
--- a/audio/faad2/patches/patch-af
+++ b/audio/faad2/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2004/05/15 13:02:33 grant Exp $
+$NetBSD: patch-af,v 1.2 2004/12/30 06:35:38 minskim Exp $
 
---- common/mp4ff/mp4ff_int_types.h.orig	2003-12-14 09:26:56.000000000 +1100
+--- common/mp4ff/mp4ff_int_types.h.orig	2003-12-13 16:26:56.000000000 -0600
 +++ common/mp4ff/mp4ff_int_types.h
 @@ -1,3 +1,5 @@
 +#include "config.h"
@@ -8,15 +8,17 @@ $NetBSD: patch-af,v 1.1 2004/05/15 13:02:33 grant Exp $
  #ifndef _MP4FF_INT_TYPES_H_
  #define _MP4FF_INT_TYPES_H_
  
-@@ -15,9 +17,16 @@ typedef unsigned __int64 uint64_t;
+@@ -15,9 +17,18 @@ typedef unsigned __int64 uint64_t;
  
  #else
  
 +#if HAVE_SYS_TYPES_H
 +#include <sys/types.h>
-+#elif HAVE_INTTYPES_H
++#endif
++#if HAVE_INTTYPES_H
 +#include <inttypes.h>
-+#elif HAVE_STDINT_H
++#endif
++#if HAVE_STDINT_H
  #include <stdint.h>
 +#endif
 +
-- 
cgit v1.2.3