From 988431b144040b0b9c2523bd14665222ce22c8f9 Mon Sep 17 00:00:00 2001 From: mycroft Date: Sun, 28 Mar 2004 20:16:09 +0000 Subject: Update to 2.0. There are many changes, but the main user-visible improvement is support for decoding AAC HE files (as generated by iTunes). --- audio/faad2/Makefile | 20 +++++--------------- audio/faad2/PLIST | 11 ++++++++++- audio/faad2/buildlink2.mk | 4 ++-- audio/faad2/buildlink3.mk | 4 ++-- audio/faad2/distinfo | 12 ++++++------ audio/faad2/patches/patch-aa | 24 ++++++++++++++---------- audio/faad2/patches/patch-ab | 21 +++++++++++---------- audio/faad2/patches/patch-ac | 25 +++++++++++++------------ 8 files changed, 63 insertions(+), 58 deletions(-) (limited to 'audio') diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index c90f104964e..b298d36c9c3 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2004/03/21 07:06:58 snj Exp $ +# $NetBSD: Makefile,v 1.15 2004/03/28 20:16:09 mycroft Exp $ # -DISTNAME= faad2-1.1 +DISTNAME= faad2-2.0 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/} @@ -23,11 +23,13 @@ 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} pre-configure: - for dir in . common/mp4v2 ; do \ + ${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend + for dir in . ; do \ cd ${WRKSRC}/$$dir; \ ${ACLOCAL} -I .; \ ${AUTOHEADER}; \ @@ -36,17 +38,5 @@ pre-configure: ${AUTOCONF}; \ done -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -post-configure: - ${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend - ${CP} ${WRKSRC}/frontend/Makefile ${WRKSRC}/frontend/Makefile.orig - ${SED} -e "s|^faad_SOURCES.*|& getopt.c|" \ - -e "s|^faad_OBJECTS.*|& getopt.$$(OBJEXT)|" \ - ${WRKSRC}/frontend/Makefile.orig > ${WRKSRC}/frontend/Makefile -.endif - -.include "../../audio/libsndfile/buildlink3.mk" .include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST index 9d5b739fb06..147047b7540 100644 --- a/audio/faad2/PLIST +++ b/audio/faad2/PLIST @@ -1,11 +1,20 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/05 17:49:42 dillo Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/03/28 20:16:09 mycroft Exp $ bin/faad include/faad.h +include/mp4.h +include/mp4ff.h +include/mpeg4ip.h +include/systems.h lib/libfaad.a lib/libfaad.la lib/libfaad.so lib/libfaad.so.0 lib/libfaad.so.0.0 +lib/libmp4ff.a +lib/libmp4ff.la +lib/libmp4ff.so +lib/libmp4ff.so.0 +lib/libmp4ff.so.0.0 lib/libmp4v2.a lib/libmp4v2.la lib/libmp4v2.so diff --git a/audio/faad2/buildlink2.mk b/audio/faad2/buildlink2.mk index 0ec154b8a05..7d1ea59c020 100644 --- a/audio/faad2/buildlink2.mk +++ b/audio/faad2/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/05 17:49:42 dillo Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2004/03/28 20:16:09 mycroft Exp $ .if !defined(FAAD2_BUILDLINK2_MK) FAAD2_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= faad2 -BUILDLINK_DEPENDS.faad2?= faad2>=1.1 +BUILDLINK_DEPENDS.faad2?= faad2>=2.0 BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2 EVAL_PREFIX+= BUILDLINK_PREFIX.faad2=faad2 diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk index 30f4df3a4d2..a9eea76b8a4 100644 --- a/audio/faad2/buildlink3.mk +++ b/audio/faad2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/03/28 20:16:09 mycroft Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FAAD2_BUILDLINK3_MK:= ${FAAD2_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaad2} BUILDLINK_PACKAGES+= faad2 .if !empty(FAAD2_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.faad2+= faad2>=1.1 +BUILDLINK_DEPENDS.faad2+= faad2>=2.0 BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2 .endif # FAAD2_BUILDLINK3_MK diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo index b68cf7032e9..e9cb0763422 100644 --- a/audio/faad2/distinfo +++ b/audio/faad2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/09/05 17:49:42 dillo Exp $ +$NetBSD: distinfo,v 1.2 2004/03/28 20:16:09 mycroft Exp $ -SHA1 (faad2-1.1.tar.gz) = 8e5b7ce2df26807fc4c22f29d97992f8d0644074 -Size (faad2-1.1.tar.gz) = 1015577 bytes -SHA1 (patch-aa) = 9f5876d1de2a757f70191bedd92047c93c31f19b -SHA1 (patch-ab) = ca4cac680f5083e82915fa42e4ee0e80736004a4 -SHA1 (patch-ac) = 63cbf6c54be2c19bbed831450d2d751e34b50dc8 +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 diff --git a/audio/faad2/patches/patch-aa b/audio/faad2/patches/patch-aa index 3eb35530665..4c40c369f2b 100644 --- a/audio/faad2/patches/patch-aa +++ b/audio/faad2/patches/patch-aa @@ -1,12 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/09/05 17:49:42 dillo Exp $ +$NetBSD: patch-aa,v 1.2 2004/03/28 20:16:09 mycroft Exp $ ---- bootstrap.orig Fri Jan 25 21:26:33 2002 -+++ bootstrap -@@ -5,4 +5,7 @@ autoheader - libtoolize --automake - automake --add-missing - autoconf +--- libfaad/Makefile.am.orig 2004-02-06 13:12:28.000000000 +0000 ++++ libfaad/Makefile.am 2004-03-27 22:27:18.000000000 +0000 +@@ -7,8 +7,9 @@ + 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 + -+(cd common/mp4v2; aclocal -I .; autoheader; libtoolize --automake; automake --add-missing; autoconf) -+ - echo "Ready to run ./configure" ++libfaad_la_INCLUDES = analysis.h bits.h cfft.h cfft_tab.h common.h \ + decoder.h drc.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 mp4.h \ + ms.h output.h pns.h pulse.h rvlc.h sine_win.h ssr.h ssr_fb.h ssr_ipqf.h \ diff --git a/audio/faad2/patches/patch-ab b/audio/faad2/patches/patch-ab index c57264a65d2..f5c82f53f25 100644 --- a/audio/faad2/patches/patch-ab +++ b/audio/faad2/patches/patch-ab @@ -1,13 +1,14 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/09/05 17:49:42 dillo Exp $ +$NetBSD: patch-ab,v 1.2 2004/03/28 20:16:09 mycroft Exp $ ---- configure.in.orig Fri Aug 23 12:42:08 2002 -+++ configure.in -@@ -29,7 +29,7 @@ AC_MSG_ERROR([ - ]) - fi +--- frontend/Makefile.am.orig 2003-11-06 11:04:13.000000000 +0000 ++++ frontend/Makefile.am 2004-03-27 22:31:13.000000000 +0000 +@@ -1,7 +1,7 @@ + bin_PROGRAMS = faad --AC_OUTPUT_COMMANDS(,[cd common/mp4v2; aclocal -I .; autoheader; libtoolize --automake; automake --add-missing; autoconf; cd -]) -+dnl AC_OUTPUT_COMMANDS(,[cd common/mp4v2; aclocal -I .; autoheader; libtoolize --automake; automake --add-missing; autoconf; cd -]) - - AC_CONFIG_SUBDIRS(common/mp4v2) +-faad_SOURCES = main.c audio.c $(top_srcdir)/common/faad/getopt.c \ +- audio.h ++faad_SOURCES = main.c audio.c getopt.c ++faad_INCLUDES = audio.h + AM_CFLAGS = -O2 + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \ diff --git a/audio/faad2/patches/patch-ac b/audio/faad2/patches/patch-ac index f333ae4b57f..a80784abbb5 100644 --- a/audio/faad2/patches/patch-ac +++ b/audio/faad2/patches/patch-ac @@ -1,13 +1,14 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/09/05 17:49:42 dillo Exp $ +$NetBSD: patch-ac,v 1.2 2004/03/28 20:16:09 mycroft Exp $ ---- frontend/audio.c.orig Thu Jul 25 14:42:54 2002 -+++ frontend/audio.c -@@ -52,7 +52,7 @@ audio_file *open_audio_file(char *infile - break; - } - aufile->sfinfo.channels = channels; -- aufile->sfinfo.samples = 0; -+ aufile->sfinfo.frames = 0; - #ifdef _WIN32 - if(infile[0] == '-') - { +--- Makefile.am.orig 2004-02-06 16:04:39.000000000 +0000 ++++ Makefile.am 2004-03-27 22:36:00.000000000 +0000 +@@ -3,6 +3,6 @@ + EXTRA_DIST = faad2.spec + + rpm: Makefile +- make dist +- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz +- rm $(PACKAGE)-$(VERSION).tar.gz ++ make dist ++ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz ++ rm $(PACKAGE)-$(VERSION).tar.gz -- cgit v1.2.3