[pkgsrc/trunk]: pkgsrc/audio/faad2 - remove __inline gccism

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3310d8f0ee2
branches:  trunk
changeset: 475386:b3310d8f0ee2
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat May 15 13:01:02 2004 +0000

description:
- remove __inline gccism
- add some casts to avoid sunpro c++ errors
- include the right system header file to get the integer types

fixes build with sunpro.

diffstat:

 audio/faad2/distinfo         |   5 ++++-
 audio/faad2/patches/patch-ad |  13 +++++++++++++
 audio/faad2/patches/patch-ae |  15 +++++++++++++++
 audio/faad2/patches/patch-af |  29 +++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 1 deletions(-)

diffs (84 lines):

diff -r 01cedad3ae40 -r b3310d8f0ee2 audio/faad2/distinfo
--- a/audio/faad2/distinfo      Sat May 15 12:50:06 2004 +0000
+++ b/audio/faad2/distinfo      Sat May 15 13:01:02 2004 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.2 2004/03/28 20:16:09 mycroft Exp $
+$NetBSD: distinfo,v 1.3 2004/05/15 13:01:02 grant Exp $
 
 SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
 Size (faad2-2.0.tar.gz) = 766660 bytes
 SHA1 (patch-aa) = 59215b4c221b47dbee9a713fff302fdfe700cea2
 SHA1 (patch-ab) = 33c8c741f3b3870d84c66b6eb8bf95d4b768f39e
 SHA1 (patch-ac) = 9c610dbaa89df5a82587f685116aac5e760fe32c
+SHA1 (patch-ad) = ca6ca41c5f20535f0f91edb1cd5674882369a9b2
+SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc
+SHA1 (patch-af) = 474117f9333c0b14bdd99d9c7b330e480b1e1b4a
diff -r 01cedad3ae40 -r b3310d8f0ee2 audio/faad2/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faad2/patches/patch-ad      Sat May 15 13:01:02 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/05/15 13:02:33 grant Exp $
+
+--- libfaad/common.h.orig      2004-02-06 23:55:24.000000000 +1100
++++ libfaad/common.h
+@@ -32,7 +32,7 @@
+ extern "C" {
+ #endif
+ 
+-#define INLINE __inline
++#define INLINE inline
+ #if defined(_WIN32) && !defined(_WIN32_WCE)
+ #define ALIGN __declspec(align(16))
+ #else
diff -r 01cedad3ae40 -r b3310d8f0ee2 audio/faad2/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faad2/patches/patch-ae      Sat May 15 13:01:02 2004 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2004/05/15 13:02:33 grant Exp $
+
+--- common/mp4v2/rtphint.cpp.orig      2003-06-30 07:41:00.000000000 +1000
++++ common/mp4v2/rtphint.cpp
+@@ -321,8 +321,8 @@ void MP4RtpHintTrack::GetPayload(
+         if (ppEncodingParams)
+           *ppEncodingParams = NULL;
+               if (m_pRtpMapProperty) {
+-                      const char* pRtpMap = m_pRtpMapProperty->GetValue();
+-                      char* pSlash = strchr(pRtpMap, '/');
++                      const char* pRtpMap = (const char *)m_pRtpMapProperty->GetValue();
++                      char* pSlash = (char *)strchr(pRtpMap, '/');
+ 
+                       u_int32_t length;
+                       if (pSlash) {
diff -r 01cedad3ae40 -r b3310d8f0ee2 audio/faad2/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faad2/patches/patch-af      Sat May 15 13:01:02 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1 2004/05/15 13:02:33 grant Exp $
+
+--- common/mp4ff/mp4ff_int_types.h.orig        2003-12-14 09:26:56.000000000 +1100
++++ common/mp4ff/mp4ff_int_types.h
+@@ -1,3 +1,5 @@
++#include "config.h"
++
+ #ifndef _MP4FF_INT_TYPES_H_
+ #define _MP4FF_INT_TYPES_H_
+ 
+@@ -15,9 +17,16 @@ typedef unsigned __int64 uint64_t;
+ 
+ #else
+ 
++#if HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#elif HAVE_INTTYPES_H
++#include <inttypes.h>
++#elif HAVE_STDINT_H
+ #include <stdint.h>
++#endif
++
+ 
+ #endif
+ 
+ 
+-#endif
+\ No newline at end of file
++#endif