[pkgsrc/trunk]: pkgsrc/audio update to 2.6.1

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb4df5693e7f
branches:  trunk
changeset: 536256:cb4df5693e7f
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sun Dec 09 10:55:30 2007 +0000

description:
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.

diffstat:

 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 |  38 +++++++--------------
 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 ++++++++++
 audio/xmms-faad/Makefile     |  10 ++---
 22 files changed, 118 insertions(+), 361 deletions(-)

diffs (truncated from 663 to 300 lines):

diff -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/Makefile
--- a/audio/faad2/Makefile      Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/Makefile      Sun Dec 09 10:55:30 2007 +0000
@@ -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 @@
                autoconf;                                               \
        done
 
-.include "../../multimedia/libmp4v2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/PLIST
--- a/audio/faad2/PLIST Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/PLIST Sun Dec 09 10:55:30 2007 +0000
@@ -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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/distinfo
--- a/audio/faad2/distinfo      Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/distinfo      Sun Dec 09 10:55:30 2007 +0000
@@ -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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-aa
--- a/audio/faad2/patches/patch-aa      Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/patches/patch-aa      Sun Dec 09 10:55:30 2007 +0000
@@ -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 @@
 +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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-ab
--- a/audio/faad2/patches/patch-ab      Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/patches/patch-ab      Sun Dec 09 10:55:30 2007 +0000
@@ -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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-ac
--- a/audio/faad2/patches/patch-ac      Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/patches/patch-ac      Sun Dec 09 10:55:30 2007 +0000
@@ -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 @@
  
 +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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-ad
--- a/audio/faad2/patches/patch-ad      Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/patches/patch-ad      Sun Dec 09 10:55:30 2007 +0000
@@ -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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-ae
--- a/audio/faad2/patches/patch-ae      Sun Dec 09 00:23:58 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-af
--- a/audio/faad2/patches/patch-af      Sun Dec 09 00:23:58 2007 +0000
+++ b/audio/faad2/patches/patch-af      Sun Dec 09 10:55:30 2007 +0000
@@ -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 @@
  #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 @@
  
  #endif
  
- 
--#endif
-\ No newline at end of file
-+#endif
diff -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-ag
--- a/audio/faad2/patches/patch-ag      Sun Dec 09 00:23:58 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 4aef3d203d2a -r cb4df5693e7f audio/faad2/patches/patch-ah
--- a/audio/faad2/patches/patch-ah      Sun Dec 09 00:23:58 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@