From fe3f25053e2dc8b8cf420b92afb535e98d750c34 Mon Sep 17 00:00:00 2001 From: drochner Date: Sun, 9 Dec 2007 10:55:30 +0000 Subject: update to 2.6.1 This adds SBR/PS support and bugfixes. The licensing problems which appeared in 2.5 were resolved in 2.6.1. pkgsrc notes: -no dependency on libmp4v2 anymore -added a patch to the "faad" standalone player to restore previous behaviour: The -w option writes .wav format (with riff header) to stdout. Thanks to Raymond Meyer for help and testing. --- audio/faad2/Makefile | 6 ++-- audio/faad2/PLIST | 5 ++- audio/faad2/distinfo | 34 ++++++++------------ audio/faad2/patches/patch-aa | 27 ++++++++-------- audio/faad2/patches/patch-ab | 22 ++++++------- audio/faad2/patches/patch-ac | 16 ++++------ audio/faad2/patches/patch-ad | 24 +++++++------- audio/faad2/patches/patch-ae | 15 --------- audio/faad2/patches/patch-af | 10 ++---- audio/faad2/patches/patch-ag | 36 --------------------- audio/faad2/patches/patch-ah | 15 --------- audio/faad2/patches/patch-ai | 13 -------- audio/faad2/patches/patch-ak | 36 +++++++-------------- audio/faad2/patches/patch-al | 25 --------------- audio/faad2/patches/patch-am | 13 -------- audio/faad2/patches/patch-an | 22 ------------- audio/faad2/patches/patch-ao | 13 -------- audio/faad2/patches/patch-aq | 74 -------------------------------------------- audio/faad2/patches/patch-ar | 23 +++++++------- audio/faad2/patches/patch-as | 20 ++++++------ audio/faad2/patches/patch-at | 18 +++++++++++ 21 files changed, 113 insertions(+), 354 deletions(-) delete mode 100644 audio/faad2/patches/patch-ae delete mode 100644 audio/faad2/patches/patch-ag delete mode 100644 audio/faad2/patches/patch-ah delete mode 100644 audio/faad2/patches/patch-ai delete mode 100644 audio/faad2/patches/patch-al delete mode 100644 audio/faad2/patches/patch-am delete mode 100644 audio/faad2/patches/patch-an delete mode 100644 audio/faad2/patches/patch-ao delete mode 100644 audio/faad2/patches/patch-aq create mode 100644 audio/faad2/patches/patch-at (limited to 'audio/faad2') diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index 791dc5e992b..39654517b6f 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2007/07/01 15:50:01 heinz Exp $ +# $NetBSD: Makefile,v 1.40 2007/12/09 10:55:30 drochner Exp $ -DISTNAME= faad2-2.0 -PKGREVISION= 9 +DISTNAME= faad2-2.6.1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/} @@ -42,5 +41,4 @@ pre-configure: autoconf; \ done -.include "../../multimedia/libmp4v2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST index 50d364e2c25..64cf5281129 100644 --- a/audio/faad2/PLIST +++ b/audio/faad2/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.9 2007/02/09 20:10:50 drochner Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/12/09 10:55:30 drochner Exp $ bin/faad include/faad2/faad2-config.h include/faad2/faad.h -include/faad2/mp4ff.h +include/faad2/neaacdec.h lib/libfaad.la -lib/libmp4ff.la @dirrm include/faad2 diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo index 6b3d33ee5e6..517315f87fd 100644 --- a/audio/faad2/distinfo +++ b/audio/faad2/distinfo @@ -1,23 +1,15 @@ -$NetBSD: distinfo,v 1.14 2007/02/09 20:10:50 drochner Exp $ +$NetBSD: distinfo,v 1.15 2007/12/09 10:55:30 drochner Exp $ -SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8 -RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 -Size (faad2-2.0.tar.gz) = 766660 bytes -SHA1 (patch-aa) = 60f8ee14a3da38405eeab29047670b6878114244 -SHA1 (patch-ab) = 33c8c741f3b3870d84c66b6eb8bf95d4b768f39e -SHA1 (patch-ac) = 0e7b30fa05d995f2061bcb0669a396701dc1e9d6 -SHA1 (patch-ad) = 4d57360bfd5e9c7f75d06ae274723f7aa1e11186 -SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc -SHA1 (patch-af) = c6da419d2ac6b120b2e70c72f240c6f6b83ca39a -SHA1 (patch-ag) = a2527f6ddfcf65ba6077bc6145c87bb354c740db -SHA1 (patch-ah) = d062e23144932994c4193189efc6dfc47520f139 -SHA1 (patch-ai) = 0f09c422d764467fdb5d4bce846bc80e653d4aac +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 (patch-ac) = d63833cfd80d7772b66b5f4912abb55a4d9dc435 +SHA1 (patch-ad) = 2c8c8cee7fb879565f18548a73e16f298b9640f7 +SHA1 (patch-af) = 36b2979d871e70bf6a29e3a9c17ee4c5bb2b1aa6 SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77 -SHA1 (patch-ak) = d0a89de2fe7be1d784ea65433521d29f13c130a5 -SHA1 (patch-al) = e3dcbf3a0f19a4aca58bcad4ba079b2fee7415e2 -SHA1 (patch-am) = 7473594abc5349658a100db4a7dada5a8835468c -SHA1 (patch-an) = 2267c3e65f820e72e0db4f2ce7b4c14f430e4cf4 -SHA1 (patch-ao) = 53739236153804fe4d9a663654f5822d44aee826 -SHA1 (patch-aq) = 145ec56e89f0533480888fd6a0bb87896d865fc1 -SHA1 (patch-ar) = 0eea09b484217e5b763b2e9ce012414dc77c95df -SHA1 (patch-as) = f90050ba166e5a7eac7b0db5e9360eecab59dba7 +SHA1 (patch-ak) = d8f47b6f738d885c5e512f9f5508290a0b146bbe +SHA1 (patch-ar) = 4a5be13a4499518043d16f3c4dba94d30160f372 +SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845 +SHA1 (patch-at) = 4e28b2150f7383674450e25db472ccb566e61cc0 diff --git a/audio/faad2/patches/patch-aa b/audio/faad2/patches/patch-aa index 550b3e8e51d..b7e37141154 100644 --- a/audio/faad2/patches/patch-aa +++ b/audio/faad2/patches/patch-aa @@ -1,14 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2005/10/06 13:13:28 ben Exp $ +$NetBSD: patch-aa,v 1.4 2007/12/09 10:55:31 drochner Exp $ ---- libfaad/Makefile.am.orig 2004-02-06 13:12:28.000000000 +0000 -+++ libfaad/Makefile.am 2004-03-27 22:27:18.000000000 +0000 -@@ -1,5 +1,4 @@ - lib_LTLIBRARIES = libfaad.la --include_HEADERS = ../include/faad.h - - libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ - error.c filtbank.c \ -@@ -7,8 +6,9 @@ ic_predict.c is.c lt_predict.c mdct.c mp +--- libfaad/Makefile.am.orig 2004-11-08 09:06:09.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 \ @@ -17,6 +11,13 @@ $NetBSD: patch-aa,v 1.3 2005/10/06 13:13:28 ben Exp $ +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 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 \ + 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 diff --git a/audio/faad2/patches/patch-ab b/audio/faad2/patches/patch-ab index f5c82f53f25..91b2dec7b7b 100644 --- a/audio/faad2/patches/patch-ab +++ b/audio/faad2/patches/patch-ab @@ -1,14 +1,14 @@ -$NetBSD: patch-ab,v 1.2 2004/03/28 20:16:09 mycroft Exp $ +$NetBSD: patch-ab,v 1.3 2007/12/09 10:55:31 drochner Exp $ ---- 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 +--- frontend/Makefile.am.orig 2006-05-07 20:09:00.000000000 +0200 ++++ frontend/Makefile.am +@@ -7,5 +7,7 @@ faad_LDADD = $(top_builddir)/libfaad/lib + $(top_builddir)/common/mp4ff/libmp4ff.la --faad_SOURCES = main.c audio.c $(top_srcdir)/common/faad/getopt.c \ -- audio.h -+faad_SOURCES = main.c audio.c getopt.c + faad_SOURCES = main.c \ +- audio.c audio.h \ +- $(top_srcdir)/common/faad/getopt.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 b6cffa5c4bd..5257f24730d 100644 --- a/audio/faad2/patches/patch-ac +++ b/audio/faad2/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2007/02/09 20:10:50 drochner Exp $ +$NetBSD: patch-ac,v 1.6 2007/12/09 10:55:31 drochner Exp $ ---- Makefile.am.orig 2004-02-06 17:04:39.000000000 +0100 +--- Makefile.am.orig 2004-07-27 10:52:20.000000000 +0200 +++ Makefile.am -@@ -1,8 +1,10 @@ +@@ -1,7 +1,9 @@ -SUBDIRS = libfaad common frontend plugins +SUBDIRS = libfaad common frontend include @@ -10,10 +10,6 @@ $NetBSD: patch-ac,v 1.5 2007/02/09 20:10:50 drochner Exp $ +include_HEADERS = faad2-config.h + - 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 + rpm: Makefile + make dist + $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz diff --git a/audio/faad2/patches/patch-ad b/audio/faad2/patches/patch-ad index 212a9e6427a..667eaab02e5 100644 --- a/audio/faad2/patches/patch-ad +++ b/audio/faad2/patches/patch-ad @@ -1,22 +1,22 @@ -$NetBSD: patch-ad,v 1.2 2004/07/31 08:10:47 xtraeme Exp $ +$NetBSD: patch-ad,v 1.3 2007/12/09 10:55:31 drochner Exp $ ---- 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" { +--- libfaad/common.h.orig 2007-11-01 13:33:30.000000000 +0100 ++++ libfaad/common.h +@@ -39,7 +39,7 @@ extern "C" { + # include "../config.h" #endif --#define INLINE __inline -+#define INLINE inline - #if defined(_WIN32) && !defined(_WIN32_WCE) - #define ALIGN __declspec(align(16)) +-#if 1 ++#if 0 + #define INLINE __inline #else -@@ -310,7 +310,7 @@ - #elif (defined(__i386__) && defined(__GNUC__)) + #define INLINE inline +@@ -328,7 +328,7 @@ char *strchr(), *strrchr(); + #ifndef HAVE_LRINTF #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html - static INLINE int lrintf(float f) -+ static long INLINE int lrintf(float f) ++ static INLINE long int lrintf(float f) { int i; __asm__ __volatile__ ( diff --git a/audio/faad2/patches/patch-ae b/audio/faad2/patches/patch-ae deleted file mode 100644 index 1cfb40dcc19..00000000000 --- a/audio/faad2/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$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 --git a/audio/faad2/patches/patch-af b/audio/faad2/patches/patch-af index d80c293c33e..18368469850 100644 --- a/audio/faad2/patches/patch-af +++ b/audio/faad2/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.2 2004/12/30 06:35:38 minskim Exp $ +$NetBSD: patch-af,v 1.3 2007/12/09 10:55:32 drochner Exp $ ---- common/mp4ff/mp4ff_int_types.h.orig 2003-12-13 16:26:56.000000000 -0600 +--- common/mp4ff/mp4ff_int_types.h.orig 2005-02-01 14:15:55.000000000 +0100 +++ common/mp4ff/mp4ff_int_types.h @@ -1,3 +1,5 @@ +#include "config.h" @@ -8,7 +8,7 @@ $NetBSD: patch-af,v 1.2 2004/12/30 06:35:38 minskim Exp $ #ifndef _MP4FF_INT_TYPES_H_ #define _MP4FF_INT_TYPES_H_ -@@ -15,9 +17,18 @@ typedef unsigned __int64 uint64_t; +@@ -15,7 +17,16 @@ typedef unsigned __int64 uint64_t; #else @@ -25,7 +25,3 @@ $NetBSD: patch-af,v 1.2 2004/12/30 06:35:38 minskim Exp $ #endif - --#endif -\ No newline at end of file -+#endif diff --git a/audio/faad2/patches/patch-ag b/audio/faad2/patches/patch-ag deleted file mode 100644 index 73b47474b3b..00000000000 --- a/audio/faad2/patches/patch-ag +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2005/08/05 13:01:57 tonio Exp $ - ---- common/mp4v2/mp4property.h.orig 2005-08-05 12:14:37.000000000 +0200 -+++ common/mp4v2/mp4property.h 2005-08-05 12:16:34.000000000 +0200 -@@ -58,7 +58,7 @@ - return m_name; - } - -- virtual MP4PropertyType GetType() = NULL; -+ virtual MP4PropertyType GetType() = 0; - - bool IsReadOnly() { - return m_readOnly; -@@ -74,17 +74,17 @@ - m_implicit = value; - } - -- virtual u_int32_t GetCount() = NULL; -- virtual void SetCount(u_int32_t count) = NULL; -+ virtual u_int32_t GetCount() = 0; -+ virtual void SetCount(u_int32_t count) = 0; - - virtual void Generate() { /* default is a no-op */ }; - -- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0; - -- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0; - - virtual void Dump(FILE* pFile, u_int8_t indent, -- bool dumpImplicits, u_int32_t index = 0) = NULL; -+ bool dumpImplicits, u_int32_t index = 0) = 0; - - virtual bool FindProperty(const char* name, - MP4Property** ppProperty, u_int32_t* pIndex = NULL); diff --git a/audio/faad2/patches/patch-ah b/audio/faad2/patches/patch-ah deleted file mode 100644 index 9631874b7d5..00000000000 --- a/audio/faad2/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/08/05 13:01:57 tonio Exp $ - ---- common/mp4v2/rtphint.h.orig 2005-08-05 12:17:32.000000000 +0200 -+++ common/mp4v2/rtphint.h 2005-08-05 12:17:55.000000000 +0200 -@@ -35,8 +35,8 @@ - return m_pPacket; - } - -- virtual u_int16_t GetDataSize() = NULL; -- virtual void GetData(u_int8_t* pDest) = NULL; -+ virtual u_int16_t GetDataSize() = 0; -+ virtual void GetData(u_int8_t* pDest) = 0; - - MP4Track* FindTrackFromRefIndex(u_int8_t refIndex); - diff --git a/audio/faad2/patches/patch-ai b/audio/faad2/patches/patch-ai deleted file mode 100644 index dff0dd16f57..00000000000 --- a/audio/faad2/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2005/08/05 13:01:57 tonio Exp $ - ---- common/mp4ff/mp4ffint.h.orig 2005-08-05 13:09:25.000000000 +0200 -+++ common/mp4ff/mp4ffint.h 2005-08-05 13:09:52.000000000 +0200 -@@ -301,7 +301,7 @@ - mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f); - #endif - void mp4ff_close(mp4ff_t *ff); --void mp4ff_track_add(mp4ff_t *f); -+static void mp4ff_track_add(mp4ff_t *f); - int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size); - int32_t parse_atoms(mp4ff_t *f); - diff --git a/audio/faad2/patches/patch-ak b/audio/faad2/patches/patch-ak index 7d315e660b5..743aa3460bf 100644 --- a/audio/faad2/patches/patch-ak +++ b/audio/faad2/patches/patch-ak @@ -1,34 +1,22 @@ -$NetBSD: patch-ak,v 1.3 2006/07/27 17:27:29 wiz Exp $ +$NetBSD: patch-ak,v 1.4 2007/12/09 10:55:34 drochner Exp $ ---- configure.in.orig 2004-02-06 17:04:39.000000000 +0100 +--- configure.in.orig 2006-09-25 21:52:53.000000000 +0200 +++ configure.in -@@ -1,5 +1,5 @@ +@@ -9,7 +9,7 @@ dnl - mpeg4ip plugin (requires mpeg4ip's + AC_INIT --AM_INIT_AUTOMAKE(faad2, 2.0) -+AM_INIT_AUTOMAKE(faad2, 2.0, do-not-define-PACKAGE-or-VERSION) + AC_CONFIG_AUX_DIR(.) +-AM_INIT_AUTOMAKE(faad2, 2.6.0cvs) ++AM_INIT_AUTOMAKE(faad2, 2.6.0cvs, do-not-define-PACKAGE-or-VERSION) AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) -@@ -13,7 +13,7 @@ AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_ARG_WITH( xmms, [ --with-xmms compile XMMS plugins],WITHXMMS=$withval, WITHXMMS=no) - -@@ -114,7 +114,7 @@ if test x$WITHDRM = xyes; then - AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)]) - fi - --AC_CONFIG_FILES(libfaad/Makefile frontend/Makefile common/Makefile plugins/Makefile Makefile ) -+AC_CONFIG_FILES(libfaad/Makefile frontend/Makefile common/Makefile plugins/Makefile include/Makefile Makefile ) - +@@ -162,6 +162,8 @@ AC_CONFIG_FILES(plugins/xmms/src/Makefil AC_CONFIG_FILES(plugins/mpeg4ip/Makefile) - -@@ -122,3 +122,4 @@ AC_CONFIG_FILES(common/mp4ff/Makefile co - AC_CONFIG_FILES(faad2.spec) + AC_CONFIG_FILES(frontend/Makefile) ++AC_CONFIG_FILES(include/Makefile) + AC_CONFIG_FILES(Makefile) + AC_OUTPUT +cp config.h faad2-config.h diff --git a/audio/faad2/patches/patch-al b/audio/faad2/patches/patch-al deleted file mode 100644 index 8defc7dcbf4..00000000000 --- a/audio/faad2/patches/patch-al +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-al,v 1.1 2005/10/09 03:23:11 ben Exp $ - ---- common/mp4v2/systems.h.orig 2003-06-29 14:41:00.000000000 -0700 -+++ common/mp4v2/systems.h -@@ -29,9 +29,7 @@ - #include - #define NEED_SDL_VIDEO_IN_MAIN_THREAD - #else --#undef PACKAGE --#undef VERSION --#include -+#include - #endif - - -@@ -269,7 +267,8 @@ char *strsep(char **strp, const char *de - - #define NUM_ELEMENTS_IN_ARRAY(name) ((sizeof((name))) / (sizeof(*(name)))) - --#ifndef HAVE_GLIB_H -+#ifndef __G_LIB_H__ -+/* #ifndef HAVE_GLIB_H */ - typedef char gchar; - typedef unsigned char guchar; - diff --git a/audio/faad2/patches/patch-am b/audio/faad2/patches/patch-am deleted file mode 100644 index 6cd0a997a58..00000000000 --- a/audio/faad2/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2005/12/08 10:06:32 wiz Exp $ - ---- frontend/main.c.orig 2004-01-06 12:59:47.000000000 +0100 -+++ frontend/main.c -@@ -832,7 +832,7 @@ int decodeMP4file(char *mp4file, char *s - } - } - } -- if (j > 0) printf("\n"); -+ if (j > 0) fprintf(stderr, "\n"); - #endif - } - diff --git a/audio/faad2/patches/patch-an b/audio/faad2/patches/patch-an deleted file mode 100644 index 0d3419ac75c..00000000000 --- a/audio/faad2/patches/patch-an +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-an,v 1.1 2006/05/30 20:28:34 tron Exp $ - ---- plugins/mpeg4ip/aa_file.cpp.orig 2004-01-05 14:05:12.000000000 +0000 -+++ plugins/mpeg4ip/aa_file.cpp 2006-05-30 16:04:22.000000000 +0100 -@@ -77,7 +77,7 @@ - - int aac_file_next_frame (codec_data_t *your, - uint8_t **buffer, -- uint64_t *ts) -+ frame_timestamp_t *ts) - { - aac_codec_t *aac = (aac_codec_t *)your; - -@@ -98,7 +98,7 @@ - uint64_t calc; - calc = aac->m_framecount * 1024 * M_LLU; - calc /= aac->m_freq; -- *ts = calc; -+ ts->msec_timestamp = calc; - *buffer = aac->m_buffer; - aac->m_framecount++; - return (aac->m_buffer_size); diff --git a/audio/faad2/patches/patch-ao b/audio/faad2/patches/patch-ao deleted file mode 100644 index 319cf005a4f..00000000000 --- a/audio/faad2/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2006/05/30 20:28:34 tron Exp $ - ---- plugins/mpeg4ip/faad2.h.orig 2004-01-05 14:05:12.000000000 +0000 -+++ plugins/mpeg4ip/faad2.h 2006-05-30 16:04:22.000000000 +0100 -@@ -81,7 +81,7 @@ - - int aac_file_next_frame(codec_data_t *ifptr, - uint8_t **buffer, -- uint64_t *ts); -+ frame_timestamp_t *ts); - int aac_file_eof(codec_data_t *ifptr); - - void aac_file_used_for_frame(codec_data_t *ifptr, diff --git a/audio/faad2/patches/patch-aq b/audio/faad2/patches/patch-aq deleted file mode 100644 index 5e49edbd68c..00000000000 --- a/audio/faad2/patches/patch-aq +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2006/05/30 20:28:34 tron Exp $ - ---- plugins/mpeg4ip/faad2.cpp.orig 2004-01-05 14:05:12.000000000 +0000 -+++ plugins/mpeg4ip/faad2.cpp 2006-05-30 16:04:22.000000000 +0100 -@@ -35,7 +35,9 @@ - /* - * Create CAACodec class - */ --static codec_data_t *aac_codec_create (const char *compressor, -+static codec_data_t *aac_codec_create ( -+ const char* /*stream_type*/, -+ const char* /*compressor*/, - int type, - int profile, - format_list_t *media_fmt, -@@ -148,7 +150,7 @@ - * Decode task call for FAAC - */ - static int aac_decode (codec_data_t *ptr, -- uint64_t ts, -+ frame_timestamp_t* ts, - int from_rtp, - int *sync_frame, - uint8_t *buffer, -@@ -163,15 +165,15 @@ - if (aac->m_record_sync_time) { - aac->m_current_frame = 0; - aac->m_record_sync_time = 0; -- aac->m_current_time = ts; -- aac->m_last_rtp_ts = ts; -+ aac->m_current_time = ts->msec_timestamp; -+ aac->m_last_rtp_ts = ts->msec_timestamp; - } else { -- if (aac->m_last_rtp_ts == ts) { -+ if (aac->m_last_rtp_ts == ts->msec_timestamp) { - aac->m_current_time += aac->m_msec_per_frame; - aac->m_current_frame++; - } else { -- aac->m_last_rtp_ts = ts; -- aac->m_current_time = ts; -+ aac->m_last_rtp_ts = ts->msec_timestamp; -+ aac->m_current_time = ts->msec_timestamp; - aac->m_current_frame = 0; - } - -@@ -237,9 +239,9 @@ - aac->m_vft->audio_configure(aac->m_ifptr, - aac->m_freq, - aac->m_chans, -- AUDIO_S16SYS, -+ AUDIO_FMT_S16, - aac->m_output_frame_size); -- uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr); -+ uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr, aac->m_freq, aac->m_current_time); - aac->m_audio_inited = 1; - } - /* -@@ -281,6 +283,7 @@ - }; - - static int aac_codec_check (lib_message_func_t message, -+ const char *stream_type, - const char *compressor, - int type, - int profile, -@@ -322,7 +325,7 @@ - } - if (userdata != NULL) { - mpeg4_audio_config_t audio_config; -- decode_mpeg4_audio_config(userdata, userdata_size, &audio_config); -+ decode_mpeg4_audio_config(userdata, userdata_size, &audio_config, false); - message(LOG_DEBUG, "aac", "audio type is %d", audio_config.audio_object_type); - if (fmtp != NULL) free_fmtp_parse(fmtp); - diff --git a/audio/faad2/patches/patch-ar b/audio/faad2/patches/patch-ar index 20bea66754d..75597d4512a 100644 --- a/audio/faad2/patches/patch-ar +++ b/audio/faad2/patches/patch-ar @@ -1,17 +1,16 @@ -$NetBSD: patch-ar,v 1.1 2006/08/06 10:38:42 wiz Exp $ +$NetBSD: patch-ar,v 1.2 2007/12/09 10:55:37 drochner Exp $ ---- plugins/xmms/src/Makefile.am.orig 2004-02-07 03:05:07.000000000 +1100 +--- plugins/xmms/src/Makefile.am.orig 2006-09-25 21:52:53.000000000 +0200 +++ plugins/xmms/src/Makefile.am -@@ -5,9 +5,9 @@ libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cfl - `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \ - -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 +@@ -6,8 +6,9 @@ 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/mp4v2/libmp4v2.la -+LIBS = -lfaad -lmp4v2 -+CFLAGS = `$(XMMS_CONFIG) --cflags` `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 +- $(top_builddir)/common/mp4ff/libmp4ff.la ++libmp4_la_LIBADD = $(top_builddir)/common/mp4ff/libmp4ff.la ++ ++LIBS = -lfaad + + libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread - libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \ -- `$(GTK_CONFIG) --libs` -lpthread -lstdc++ -+ `$(GTK_CONFIG) --libs` -lstdc++ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} - libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c diff --git a/audio/faad2/patches/patch-as b/audio/faad2/patches/patch-as index 20cf88af6a6..8e02929c05f 100644 --- a/audio/faad2/patches/patch-as +++ b/audio/faad2/patches/patch-as @@ -1,15 +1,13 @@ -$NetBSD: patch-as,v 1.1 2006/08/06 10:38:42 wiz Exp $ +$NetBSD: patch-as,v 1.2 2007/12/09 10:55:37 drochner Exp $ ---- plugins/xmms/src/libmp4.c.orig 2003-12-04 05:37:56.000000000 +1100 +--- plugins/xmms/src/libmp4.c.orig 2007-06-05 21:00:18.000000000 +0200 +++ plugins/xmms/src/libmp4.c -@@ -8,8 +8,8 @@ +@@ -23,7 +23,7 @@ + #include + #endif /*HAVE_BMP*/ - #include - #include --#include "faad.h" --#include "mp4.h" -+#include -+#include +-#include "neaacdec.h" ++#include + #include "mp4ff.h" - #include - #include + #define MP4_DESCRIPTION "MP4 & MPEG2/4-AAC audio player - 1.2.x" diff --git a/audio/faad2/patches/patch-at b/audio/faad2/patches/patch-at new file mode 100644 index 00000000000..ee0daa51012 --- /dev/null +++ b/audio/faad2/patches/patch-at @@ -0,0 +1,18 @@ +$NetBSD: patch-at,v 1.1 2007/12/09 10:55:37 drochner Exp $ + +--- frontend/main.c.orig 2007-12-08 17:49:45.000000000 +0100 ++++ frontend/main.c +@@ -1189,11 +1189,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]); -- cgit v1.2.3