Mon Jul 13 12:55:54 2009 UTC ()
Let audio/faad2 install libmp4ff.
It is used by musicpd to play m4a files.

Fixes PR/40584 applying a very similar patch.


(tonio)
diff -r1.41 -r1.42 pkgsrc/audio/faad2/Makefile
diff -r1.11 -r1.12 pkgsrc/audio/faad2/PLIST
diff -r1.17 -r1.18 pkgsrc/audio/faad2/distinfo
diff -r0 -r1.1 pkgsrc/audio/faad2/patches/patch-au
diff -r0 -r1.1 pkgsrc/audio/faad2/patches/patch-av
cvs diff -r1.41 -r1.42 pkgsrc/audio/faad2/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/faad2/Makefile 2008/09/24 22:25:14 1.41
+++ pkgsrc/audio/faad2/Makefile 2009/07/13 12:55:54 1.42
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.41 2008/09/24 22:25:14 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.42 2009/07/13 12:55:54 tonio Exp $
2 2
3DISTNAME= faad2-2.6.1 3DISTNAME= faad2-2.6.1
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.audiocoding.com/ 9HOMEPAGE= http://www.audiocoding.com/
10COMMENT= AAC decoding library 10COMMENT= AAC decoding library
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14RESTRICTED= Dolby doesn't allow binary distributions 14RESTRICTED= Dolby doesn't allow binary distributions
15NO_BIN_ON_FTP= ${RESTRICTED} 15NO_BIN_ON_FTP= ${RESTRICTED}
16NO_BIN_ON_CDROM=${RESTRICTED} 16NO_BIN_ON_CDROM=${RESTRICTED}
17 17
18WRKSRC= ${WRKDIR}/faad2 18WRKSRC= ${WRKDIR}/faad2
19USE_TOOLS+= automake gmake 19USE_TOOLS+= automake gmake
cvs diff -r1.11 -r1.12 pkgsrc/audio/faad2/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/faad2/PLIST 2009/06/14 17:32:05 1.11
+++ pkgsrc/audio/faad2/PLIST 2009/07/13 12:55:54 1.12
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:32:05 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.12 2009/07/13 12:55:54 tonio Exp $
2bin/faad 2bin/faad
3include/faad2/faad2-config.h 3include/faad2/faad2-config.h
4include/faad2/faad.h 4include/faad2/faad.h
5include/faad2/neaacdec.h 5include/faad2/neaacdec.h
 6include/faad2/mp4ff.h
6lib/libfaad.la 7lib/libfaad.la
 8lib/libmp4ff.la
cvs diff -r1.17 -r1.18 pkgsrc/audio/faad2/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/faad2/distinfo 2008/09/24 22:25:14 1.17
+++ pkgsrc/audio/faad2/distinfo 2009/07/13 12:55:54 1.18
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: distinfo,v 1.17 2008/09/24 22:25:14 tonnerre Exp $ 1$NetBSD: distinfo,v 1.18 2009/07/13 12:55:54 tonio Exp $
2 2
3SHA1 (faad2-2.6.1.tar.gz) = b4ad33d3c4dfa6dbf3011a3da34c631926cabfad 3SHA1 (faad2-2.6.1.tar.gz) = b4ad33d3c4dfa6dbf3011a3da34c631926cabfad
4RMD160 (faad2-2.6.1.tar.gz) = ad559933dad6a65576a9947819190f04cb3b1c16 4RMD160 (faad2-2.6.1.tar.gz) = ad559933dad6a65576a9947819190f04cb3b1c16
5Size (faad2-2.6.1.tar.gz) = 839410 bytes 5Size (faad2-2.6.1.tar.gz) = 839410 bytes
6SHA1 (patch-aa) = 726a80c5d1c1815d0c77b0ab587ac4e0dc81d146 6SHA1 (patch-aa) = 726a80c5d1c1815d0c77b0ab587ac4e0dc81d146
7SHA1 (patch-ab) = 819c780b17f4696fb3cc18e4553c4a58de3a7f13 7SHA1 (patch-ab) = 819c780b17f4696fb3cc18e4553c4a58de3a7f13
8SHA1 (patch-ac) = d63833cfd80d7772b66b5f4912abb55a4d9dc435 8SHA1 (patch-ac) = d63833cfd80d7772b66b5f4912abb55a4d9dc435
9SHA1 (patch-ad) = 2c8c8cee7fb879565f18548a73e16f298b9640f7 9SHA1 (patch-ad) = 2c8c8cee7fb879565f18548a73e16f298b9640f7
10SHA1 (patch-af) = 36b2979d871e70bf6a29e3a9c17ee4c5bb2b1aa6 10SHA1 (patch-af) = 36b2979d871e70bf6a29e3a9c17ee4c5bb2b1aa6
11SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77 11SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
12SHA1 (patch-ak) = d8f47b6f738d885c5e512f9f5508290a0b146bbe 12SHA1 (patch-ak) = d8f47b6f738d885c5e512f9f5508290a0b146bbe
13SHA1 (patch-ar) = 0aa479669b1e2417f9a68adb0ac79ae9c6d5dfe8 13SHA1 (patch-ar) = 0aa479669b1e2417f9a68adb0ac79ae9c6d5dfe8
14SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845 14SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845
15SHA1 (patch-at) = 52839407569f452bfecccd7f531fbcac0fb519ad 15SHA1 (patch-at) = 52839407569f452bfecccd7f531fbcac0fb519ad
 16SHA1 (patch-au) = 6b88310d0ed5fa2fcd07507d4807681fa85d8525
 17SHA1 (patch-av) = c8b65b8ec9780972381640452b49b41a901f8a5f
File Added: pkgsrc/audio/faad2/patches/Attic/patch-au
$NetBSD: patch-au,v 1.1 2009/07/13 12:55:54 tonio 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
+lib_LTLIBRARIES = libmp4ff.la
+include_HEADERS = mp4ff.h
 
 libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
File Added: pkgsrc/audio/faad2/patches/Attic/patch-av
$NetBSD: patch-av,v 1.1 2009/07/13 12:55:54 tonio 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 */
 
-#include "mp4ff_int_types.h"
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 /* file callback structure */
 typedef struct