diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-31 08:10:47 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-31 08:10:47 +0000 |
| commit | 8315b5011248aa9df877f024f40f63f8c0e5b857 (patch) | |
| tree | 675c39ecc89c0d676c238cb73809bc517c0627f9 /audio/faad2 | |
| parent | 16b2c0382db4ca5567f84a480b0d6ed2f4e80c03 (diff) | |
| download | pkgsrc-8315b5011248aa9df877f024f40f63f8c0e5b857.tar.gz | |
Fix lrintf() function in libfaad/common.h to make this build on
NetBSD -current, this closes PR pkg/26412.
Diffstat (limited to 'audio/faad2')
| -rw-r--r-- | audio/faad2/Makefile | 23 | ||||
| -rw-r--r-- | audio/faad2/distinfo | 4 | ||||
| -rw-r--r-- | audio/faad2/patches/patch-ad | 15 |
3 files changed, 26 insertions, 16 deletions
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index 24aead1c616..37e4d226c20 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/05/15 13:03:20 grant Exp $ +# $NetBSD: Makefile,v 1.19 2004/07/31 08:10:47 xtraeme Exp $ # DISTNAME= faad2-2.0 @@ -14,20 +14,21 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} WRKSRC= ${WRKDIR}/faad2 -USE_BUILDLINK3= YES -USE_GCC_SHLIB= YES -USE_GNU_TOOLS+= make -USE_LANGUAGES= c c++ -USE_LIBTOOL= YES +USE_BUILDLINK3= YES +USE_GNU_TOOLS+= make +USE_LANGUAGES= c c++ +USE_LIBTOOL= YES -AUTOMAKE_REQD= 1.4 -AUTOCONF_REQD= 2.50 -GNU_CONFIGURE= YES +AUTOMAKE_REQD= 1.4 +AUTOCONF_REQD= 2.50 +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-mp4v2 # Avoid an ICE in gcc2 on sparc64 CONFIGURE_ENV+= F77=${FALSE} +LIBS+= -lm + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" @@ -36,8 +37,8 @@ CPPFLAGS+= _D_LARGEFILE_SOURCE=1 .endif pre-configure: - ${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend - for dir in . ; do \ + @${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend + for dir in . ; do \ cd ${WRKSRC}/$$dir; \ ${ACLOCAL} -I .; \ ${AUTOHEADER}; \ diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo index 7c5d533849c..67c06fdbe77 100644 --- a/audio/faad2/distinfo +++ b/audio/faad2/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2004/05/15 13:01:02 grant Exp $ +$NetBSD: distinfo,v 1.4 2004/07/31 08:10:47 xtraeme 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-ad) = 4d57360bfd5e9c7f75d06ae274723f7aa1e11186 SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc SHA1 (patch-af) = 474117f9333c0b14bdd99d9c7b330e480b1e1b4a diff --git a/audio/faad2/patches/patch-ad b/audio/faad2/patches/patch-ad index f76cee7e304..212a9e6427a 100644 --- a/audio/faad2/patches/patch-ad +++ b/audio/faad2/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1 2004/05/15 13:02:33 grant Exp $ +$NetBSD: patch-ad,v 1.2 2004/07/31 08:10:47 xtraeme Exp $ ---- libfaad/common.h.orig 2004-02-06 23:55:24.000000000 +1100 -+++ libfaad/common.h +--- libfaad/common.h.orig 2004-07-31 09:50:50.000000000 +0200 ++++ libfaad/common.h 2004-07-31 09:54:34.000000000 +0200 @@ -32,7 +32,7 @@ extern "C" { #endif @@ -11,3 +11,12 @@ $NetBSD: patch-ad,v 1.1 2004/05/15 13:02:33 grant Exp $ #if defined(_WIN32) && !defined(_WIN32_WCE) #define ALIGN __declspec(align(16)) #else +@@ -310,7 +310,7 @@ + #elif (defined(__i386__) && defined(__GNUC__)) + #define HAS_LRINTF + // from http://www.stereopsis.com/FPU.html +- static INLINE int lrintf(float f) ++ static long INLINE int lrintf(float f) + { + int i; + __asm__ __volatile__ ( |