summaryrefslogtreecommitdiff
path: root/audio/faad2
diff options
context:
space:
mode:
authortonio <tonio@pkgsrc.org>2009-07-13 12:55:54 +0000
committertonio <tonio@pkgsrc.org>2009-07-13 12:55:54 +0000
commit455a80bdc21e80f684bdf0953ed5657040619ec4 (patch)
treed976640a2c01d4d71fdfe3405c4d7c68a76538a9 /audio/faad2
parentb64a03ecc276b0f67cc9237f8ab26e164b37e87f (diff)
downloadpkgsrc-455a80bdc21e80f684bdf0953ed5657040619ec4.tar.gz
Let audio/faad2 install libmp4ff.
It is used by musicpd to play m4a files. Fixes PR/40584 applying a very similar patch.
Diffstat (limited to 'audio/faad2')
-rw-r--r--audio/faad2/Makefile4
-rw-r--r--audio/faad2/PLIST4
-rw-r--r--audio/faad2/distinfo4
-rw-r--r--audio/faad2/patches/patch-au13
-rw-r--r--audio/faad2/patches/patch-av23
5 files changed, 44 insertions, 4 deletions
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 385800c9701..9ef19ef6f41 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2008/09/24 22:25:14 tonnerre Exp $
+# $NetBSD: Makefile,v 1.42 2009/07/13 12:55:54 tonio Exp $
DISTNAME= faad2-2.6.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-PKGREVISION= 1
+PKGREVISION= 2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.audiocoding.com/
diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST
index 6057ecdf635..e4fa3fd345b 100644
--- a/audio/faad2/PLIST
+++ b/audio/faad2/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:32:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/07/13 12:55:54 tonio Exp $
bin/faad
include/faad2/faad2-config.h
include/faad2/faad.h
include/faad2/neaacdec.h
+include/faad2/mp4ff.h
lib/libfaad.la
+lib/libmp4ff.la
diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index a021ca477b3..17bd98390e5 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/09/24 22:25:14 tonnerre Exp $
+$NetBSD: distinfo,v 1.18 2009/07/13 12:55:54 tonio Exp $
SHA1 (faad2-2.6.1.tar.gz) = b4ad33d3c4dfa6dbf3011a3da34c631926cabfad
RMD160 (faad2-2.6.1.tar.gz) = ad559933dad6a65576a9947819190f04cb3b1c16
@@ -13,3 +13,5 @@ SHA1 (patch-ak) = d8f47b6f738d885c5e512f9f5508290a0b146bbe
SHA1 (patch-ar) = 0aa479669b1e2417f9a68adb0ac79ae9c6d5dfe8
SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845
SHA1 (patch-at) = 52839407569f452bfecccd7f531fbcac0fb519ad
+SHA1 (patch-au) = 6b88310d0ed5fa2fcd07507d4807681fa85d8525
+SHA1 (patch-av) = c8b65b8ec9780972381640452b49b41a901f8a5f
diff --git a/audio/faad2/patches/patch-au b/audio/faad2/patches/patch-au
new file mode 100644
index 00000000000..5c8a27b7de1
--- /dev/null
+++ b/audio/faad2/patches/patch-au
@@ -0,0 +1,13 @@
+$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
+
diff --git a/audio/faad2/patches/patch-av b/audio/faad2/patches/patch-av
new file mode 100644
index 00000000000..cb06afce86d
--- /dev/null
+++ b/audio/faad2/patches/patch-av
@@ -0,0 +1,23 @@
+$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