- Update to faad2-2.7

- set LICENSE to gnu-gpl-v2
- install faad(1) manpage

2009-02-02 - Version 2.7
* DAB+ support
* Use public headers internally to prevent duplicate declarations
* Explicitly typedef all types as signed
* Made sure MAIN prediction can't be started after the first frame
* Lot's of compilation issues solved
* Bugfix in SBR envelope border calculation

11 files changed, 97 insertions, 130 deletions

diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 9ef19ef6f41..2ea79341996 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2009/07/13 12:55:54 tonio Exp $
+# $NetBSD: Makefile,v 1.43 2009/08/10 00:01:55 tnn Exp $
 
-DISTNAME=	faad2-2.6.1
+DISTNAME=	faad2-2.7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
-PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.audiocoding.com/
@@ -11,12 +10,12 @@ COMMENT=	AAC decoding library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+LICENSE=	gnu-gpl-v2
 RESTRICTED=	Dolby doesn't allow binary distributions
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-WRKSRC=		${WRKDIR}/faad2
-USE_TOOLS+=	automake gmake
+USE_TOOLS+=	autoconf automake autoreconf gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 
@@ -31,15 +30,11 @@ LIBS+=		-lm
 
 CPPFLAGS.SunOS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
 
+post-extract:
+	mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
+
 pre-configure:
-	@${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend
-	for dir in . ; do						\
-		cd ${WRKSRC}/$$dir;					\
-		aclocal -I .;						\
-		autoheader;						\
-		${LOCALBASE}/bin/libtoolize --automake;			\
-		automake --add-missing;					\
-		autoconf;						\
-	done
+	cp ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend
+	cd ${WRKSRC}/$$dir && autoreconf -if
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST
index e4fa3fd345b..26f669995be 100644
--- a/audio/faad2/PLIST
+++ b/audio/faad2/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2009/07/13 12:55:54 tonio Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/08/10 00:01:55 tnn Exp $
 bin/faad
-include/faad2/faad2-config.h
 include/faad2/faad.h
-include/faad2/neaacdec.h
+include/faad2/faad2-config.h
 include/faad2/mp4ff.h
+include/faad2/mp4ffint.h
+include/faad2/neaacdec.h
 lib/libfaad.la
 lib/libmp4ff.la
+man/man1/faad.1
diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index ed42365d0e3..0425f4bee07 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.19 2009/08/08 04:24:20 tnn Exp $
+$NetBSD: distinfo,v 1.20 2009/08/10 00:01:56 tnn Exp $
 
-SHA1 (faad2-2.6.1.tar.gz) = b4ad33d3c4dfa6dbf3011a3da34c631926cabfad
-RMD160 (faad2-2.6.1.tar.gz) = ad559933dad6a65576a9947819190f04cb3b1c16
-Size (faad2-2.6.1.tar.gz) = 839410 bytes
-SHA1 (patch-aa) = 726a80c5d1c1815d0c77b0ab587ac4e0dc81d146
-SHA1 (patch-ab) = 819c780b17f4696fb3cc18e4553c4a58de3a7f13
+SHA1 (faad2-2.7.tar.gz) = 80eaaa5cc576c35dd28863767b795c50cbcc0511
+RMD160 (faad2-2.7.tar.gz) = 3f0ca461e2953014d5b17edccb3337767d478b8d
+Size (faad2-2.7.tar.gz) = 1137407 bytes
+SHA1 (patch-aa) = e3bf0fc44569b05295bc6b682bb14a4ca36681dd
+SHA1 (patch-ab) = 460466628f164f2f11674f7977c851006492a9a0
 SHA1 (patch-ac) = d63833cfd80d7772b66b5f4912abb55a4d9dc435
-SHA1 (patch-ad) = 2c8c8cee7fb879565f18548a73e16f298b9640f7
+SHA1 (patch-ad) = 949336b6963c1d01f35a8447c988ee21c4905104
 SHA1 (patch-af) = 36b2979d871e70bf6a29e3a9c17ee4c5bb2b1aa6
 SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
-SHA1 (patch-ak) = d8f47b6f738d885c5e512f9f5508290a0b146bbe
-SHA1 (patch-ar) = 0aa479669b1e2417f9a68adb0ac79ae9c6d5dfe8
+SHA1 (patch-ak) = 2a1a3a8071f7a0dc32024dfbdd68bf98b9138145
+SHA1 (patch-ar) = 6a5e3d4316d223aaf7a983fb0caa02f8e38ebde9
 SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845
-SHA1 (patch-at) = a01fdc476dc3ee5d609b7e630b71e48dbcfd095a
-SHA1 (patch-au) = 6b88310d0ed5fa2fcd07507d4807681fa85d8525
-SHA1 (patch-av) = c8b65b8ec9780972381640452b49b41a901f8a5f
+SHA1 (patch-at) = 09abcd42e79dce382d47f9634204352d1249a4c7
+SHA1 (patch-au) = 47eaf645111c448405a0cf31c67f73333c7159c3
+SHA1 (patch-av) = 507c68137f5146b609c644186a06ea55a372d468
diff --git a/audio/faad2/patches/patch-aa b/audio/faad2/patches/patch-aa
index b7e37141154..1cbb3dac74a 100644
--- a/audio/faad2/patches/patch-aa
+++ b/audio/faad2/patches/patch-aa
@@ -1,23 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2007/12/09 10:55:31 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2009/08/10 00:01:56 tnn Exp $
 
---- libfaad/Makefile.am.orig	2004-11-08 09:06:09.000000000 +0100
+--- libfaad/Makefile.am.orig	2009-02-05 01:51:03.000000000 +0100
 +++ libfaad/Makefile.am
-@@ -12,8 +12,9 @@ ps_dec.c ps_syntax.c \
- pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \
- rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \
- sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \
--sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c \
--analysis.h bits.h cfft.h cfft_tab.h common.h \
-+sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c
-+
+@@ -14,8 +14,8 @@ libfaad_la_SOURCES = bits.c cfft.c decod
+ 		     pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \
+ 		     rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \
+ 		     sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \
+-		     sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c \
+-		     analysis.h bits.h cfft.h cfft_tab.h common.h \
++		     sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c
 +libfaad_la_INCLUDES = analysis.h bits.h cfft.h cfft_tab.h common.h \
- decoder.h drc.h drm_dec.h error.h fixed.h filtbank.h \
- huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h \
- mdct.h mdct_tab.h mp4.h ms.h output.h pns.h ps_dec.h ps_tables.h \
-@@ -25,4 +26,4 @@ ssr_win.h syntax.h structs.h tns.h \
- sbr_qmf_c.h codebook/hcb.h \
- codebook/hcb_1.h codebook/hcb_2.h codebook/hcb_3.h codebook/hcb_4.h \
- codebook/hcb_5.h codebook/hcb_6.h codebook/hcb_7.h codebook/hcb_8.h \
--codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h
-\ No newline at end of file
-+codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h
+ 		     decoder.h drc.h drm_dec.h error.h fixed.h filtbank.h \
+ 		     huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h \
+ 		     mdct.h mdct_tab.h mp4.h ms.h output.h pns.h ps_dec.h ps_tables.h \
diff --git a/audio/faad2/patches/patch-ab b/audio/faad2/patches/patch-ab
index 91b2dec7b7b..54fc8dbc0a7 100644
--- a/audio/faad2/patches/patch-ab
+++ b/audio/faad2/patches/patch-ab
@@ -1,14 +1,23 @@
-$NetBSD: patch-ab,v 1.3 2007/12/09 10:55:31 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2009/08/10 00:01:56 tnn Exp $
 
---- frontend/Makefile.am.orig	2006-05-07 20:09:00.000000000 +0200
+--- frontend/Makefile.am.orig	2009-02-06 17:03:37.000000000 +0100
 +++ frontend/Makefile.am
-@@ -7,5 +7,7 @@ faad_LDADD = $(top_builddir)/libfaad/lib
- 	$(top_builddir)/common/mp4ff/libmp4ff.la
+@@ -1,12 +1,14 @@
+ bin_PROGRAMS = faad
+-man_MANS = faad.man
++man_MANS = faad.1
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/.libs/libmp4ff.a
  
  faad_SOURCES = main.c \
--	audio.c audio.h \
--	$(top_srcdir)/common/faad/getopt.c
-+	audio.c \
-+	getopt.c
+-	       audio.c audio.h \
+-	       $(top_srcdir)/common/faad/getopt.c
++	       audio.c \
++	       getopt.c
 +
 +faad_INCLUDES = audio.h
diff --git a/audio/faad2/patches/patch-ad b/audio/faad2/patches/patch-ad
index 667eaab02e5..4281f93f00b 100644
--- a/audio/faad2/patches/patch-ad
+++ b/audio/faad2/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2007/12/09 10:55:31 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2009/08/10 00:01:56 tnn Exp $
 
---- libfaad/common.h.orig	2007-11-01 13:33:30.000000000 +0100
+--- libfaad/common.h.orig	2009-02-05 01:51:03.000000000 +0100
 +++ libfaad/common.h
-@@ -39,7 +39,7 @@ extern "C" {
- #  include "../config.h"
- #endif
+@@ -41,7 +41,7 @@ extern "C" {
+ 
+ #include "neaacdec.h"
  
 -#if 1
 +#if 0
  #define INLINE __inline
  #else
  #define INLINE inline
-@@ -328,7 +328,7 @@ char *strchr(), *strrchr();
+@@ -330,7 +330,7 @@ char *strchr(), *strrchr();
      #ifndef HAVE_LRINTF
      #define HAS_LRINTF
      // from http://www.stereopsis.com/FPU.html
diff --git a/audio/faad2/patches/patch-ak b/audio/faad2/patches/patch-ak
index 743aa3460bf..51501000831 100644
--- a/audio/faad2/patches/patch-ak
+++ b/audio/faad2/patches/patch-ak
@@ -1,17 +1,17 @@
-$NetBSD: patch-ak,v 1.4 2007/12/09 10:55:34 drochner Exp $
+$NetBSD: patch-ak,v 1.5 2009/08/10 00:01:56 tnn Exp $
 
---- configure.in.orig	2006-09-25 21:52:53.000000000 +0200
+--- configure.in.orig	2009-02-05 01:51:03.000000000 +0100
 +++ configure.in
 @@ -9,7 +9,7 @@ dnl - mpeg4ip plugin (requires mpeg4ip's
  
  AC_INIT
  AC_CONFIG_AUX_DIR(.)
--AM_INIT_AUTOMAKE(faad2, 2.6.0cvs)
-+AM_INIT_AUTOMAKE(faad2, 2.6.0cvs, do-not-define-PACKAGE-or-VERSION)
+-AM_INIT_AUTOMAKE(faad2, 2.7.0)
++AM_INIT_AUTOMAKE(faad2, 2.7.0, do-not-define-PACKAGE-or-VERSION)
  
  AC_PROG_LIBTOOL
  AC_SUBST(LIBTOOL_DEPS)
-@@ -162,6 +162,8 @@ AC_CONFIG_FILES(plugins/xmms/src/Makefil
+@@ -163,6 +163,8 @@ AC_CONFIG_FILES(plugins/xmms/src/Makefil
  AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)
  AC_CONFIG_FILES(faad2.spec)
  AC_CONFIG_FILES(frontend/Makefile)
diff --git a/audio/faad2/patches/patch-ar b/audio/faad2/patches/patch-ar
index 143abbb1284..69026f87296 100644
--- a/audio/faad2/patches/patch-ar
+++ b/audio/faad2/patches/patch-ar
@@ -1,18 +1,16 @@
-$NetBSD: patch-ar,v 1.3 2007/12/29 19:56:04 joerg Exp $
+$NetBSD: patch-ar,v 1.4 2009/08/10 00:01:56 tnn Exp $
 
---- plugins/xmms/src/Makefile.am.orig	2006-09-25 21:52:53.000000000 +0200
+--- plugins/xmms/src/Makefile.am.orig	2009-01-26 23:51:44.000000000 +0100
 +++ plugins/xmms/src/Makefile.am
-@@ -6,9 +6,10 @@ lib_LTLIBRARIES = libmp4.la
+@@ -6,9 +6,8 @@ lib_LTLIBRARIES = libmp4.la
  libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
         -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
  
 -libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
--       $(top_builddir)/common/mp4ff/libmp4ff.la
-+libmp4_la_LIBADD = $(top_builddir)/common/mp4ff/libmp4ff.la
+-       $(top_builddir)/common/mp4ff/libmp4ff.a
++libmp4_la_LIBADD = $(top_builddir)/common/mp4ff/libmp4ff.a
  
 -libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
-+LIBS = -lfaad
-+
 +libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
  libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
diff --git a/audio/faad2/patches/patch-at b/audio/faad2/patches/patch-at
index 98f59a2350e..5f7948e1058 100644
--- a/audio/faad2/patches/patch-at
+++ b/audio/faad2/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.3 2009/08/08 04:24:20 tnn Exp $
+$NetBSD: patch-at,v 1.4 2009/08/10 00:01:56 tnn Exp $
 
---- frontend/main.c.orig	2007-11-01 13:33:29.000000000 +0100
+--- frontend/main.c.orig	2008-09-22 19:55:09.000000000 +0200
 +++ frontend/main.c
-@@ -43,6 +43,7 @@
+@@ -44,6 +44,7 @@
  #include <getopt.h>
  
  #include <neaacdec.h>
@@ -10,26 +10,3 @@ $NetBSD: patch-at,v 1.3 2009/08/08 04:24:20 tnn Exp $
  #include <mp4ff.h>
  
  #include "audio.h"
-@@ -914,6 +915,8 @@ int decodeMP4file(char *mp4file, char *s
-                 sample_count = frameInfo.samples;
-             } else {
-                 sample_count = (unsigned int)(dur * frameInfo.channels);
-+		if (sample_count > frameInfo.samples)
-+			sample_count = frameInfo.samples;
- 
-                 if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples))
-                 {
-@@ -1189,11 +1192,13 @@ int main(int argc, char *argv[])
-         return 1;
-     }
- 
-+#if 0
-     /* only allow raw data on stdio */
-     if (writeToStdio == 1)
-     {
-         format = 2;
-     }
-+#endif
- 
-     /* point to the specified file name */
-     strcpy(aacFileName, argv[optind]);
diff --git a/audio/faad2/patches/patch-au b/audio/faad2/patches/patch-au
index 5c8a27b7de1..268409c049a 100644
--- a/audio/faad2/patches/patch-au
+++ b/audio/faad2/patches/patch-au
@@ -1,13 +1,17 @@
-$NetBSD: patch-au,v 1.1 2009/07/13 12:55:54 tonio Exp $
+$NetBSD: patch-au,v 1.2 2009/08/10 00:01:56 tnn Exp $
 
-install mp4ff
-
---- ./common/mp4ff/Makefile.am.orig	2006-05-07 20:09:00.000000000 +0200
-+++ ./common/mp4ff/Makefile.am
-@@ -1,4 +1,5 @@
--noinst_LTLIBRARIES = libmp4ff.la
+--- common/mp4ff/Makefile.am.orig	2009-02-06 15:24:21.000000000 +0100
++++ common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-lib_LIBRARIES = libmp4ff.a
 +lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h
+ include_HEADERS = mp4ff.h mp4ffint.h
  
- libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
  
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+-		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c mp4tagupdate.c
++
++libmp4ff_la_INCLUDES= mp4ff.h mp4ffint.h mp4ff_int_types.h
diff --git a/audio/faad2/patches/patch-av b/audio/faad2/patches/patch-av
index cb06afce86d..8b5aa3ae212 100644
--- a/audio/faad2/patches/patch-av
+++ b/audio/faad2/patches/patch-av
@@ -1,23 +1,13 @@
-$NetBSD: patch-av,v 1.1 2009/07/13 12:55:54 tonio Exp $
+$NetBSD: patch-av,v 1.2 2009/08/10 00:01:56 tnn Exp $
 
-install mp4ff
-
---- ./common/mp4ff/mp4ff.h.orig	2007-11-01 13:33:29.000000000 +0100
-+++ ./common/mp4ff/mp4ff.h
-@@ -35,7 +35,15 @@
- extern "C" {
- #endif /* __cplusplus */
+--- common/mp4ff/mp4ff.h.orig	2009-01-29 01:41:08.000000000 +0100
++++ common/mp4ff/mp4ff.h
+@@ -37,6 +37,8 @@ extern "C" {
  
--#include "mp4ff_int_types.h"
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_INTTYPES_H
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
 +#include <inttypes.h>
-+#endif
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
- 
- /* file callback structure */
- typedef struct
+ #else
+ #include "mp4ff_int_types.h"
+ #endif