diff options
| author | tron <tron@pkgsrc.org> | 2006-05-30 20:23:32 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2006-05-30 20:23:32 +0000 |
| commit | 5d42af6261498d040340a6960c4ba882f64417a8 (patch) | |
| tree | 3c905a24133ec9da8809bb4a99e95f791aa32aa2 /audio | |
| parent | 1a1671fd9fbd7bc171ca5962c449958e77f8112d (diff) | |
| download | pkgsrc-5d42af6261498d040340a6960c4ba882f64417a8.tar.gz | |
Disable bundled and outdated "mp4v2" library. Depend on newer version
from "mpeg4ip" package instead which resolves the conflict between
the two packages. Patch taken from PLD linux.
Bump package revision because of thix fix.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/faad2/Makefile | 10 | ||||
| -rw-r--r-- | audio/faad2/PLIST | 7 | ||||
| -rw-r--r-- | audio/faad2/distinfo | 5 |
3 files changed, 9 insertions, 13 deletions
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index 0205155ea04..5d656e3c707 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2006/05/19 12:21:52 adrianp Exp $ -# +# $NetBSD: Makefile,v 1.34 2006/05/30 20:23:32 tron Exp $ DISTNAME= faad2-2.0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/} @@ -10,8 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.audiocoding.com/ COMMENT= AAC decoding library -CONFLICTS= mpeg4ip-[0-9]* - RESTRICTED= Dolby doesn't allow binary distributions NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} @@ -24,7 +21,6 @@ USE_LIBTOOL= YES AUTOCONF_REQD= 2.50 GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-mp4v2 CONFIGURE_ARGS+= --includedir=${PREFIX}/include/faad2 # Avoid an ICE in gcc2 on sparc64 CONFIGURE_ENV+= F77=${FALSE:Q} @@ -44,4 +40,6 @@ pre-configure: autoconf; \ done +.include "../../devel/SDL/buildlink3.mk" +.include "../../multimedia/mpeg4ip/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST index 6260f135970..81d75c0b469 100644 --- a/audio/faad2/PLIST +++ b/audio/faad2/PLIST @@ -1,12 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2005/12/08 10:06:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/05/30 20:23:32 tron Exp $ bin/faad include/faad2/faad2-config.h include/faad2/faad.h -include/faad2/mp4.h include/faad2/mp4ff.h -include/faad2/mpeg4ip.h -include/faad2/systems.h lib/libfaad.la -lib/libmp4ff.la -lib/libmp4v2.la @dirrm include/faad2 diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo index 5b77a6c8d97..755ed80493c 100644 --- a/audio/faad2/distinfo +++ b/audio/faad2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/12/08 10:06:32 wiz Exp $ +$NetBSD: distinfo,v 1.11 2006/05/30 20:23:32 tron Exp $ SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8 RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 @@ -16,3 +16,6 @@ SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77 SHA1 (patch-ak) = baed39b230c085cb67710f95e2b11a801547d366 SHA1 (patch-al) = e3dcbf3a0f19a4aca58bcad4ba079b2fee7415e2 SHA1 (patch-am) = 7473594abc5349658a100db4a7dada5a8835468c +SHA1 (patch-an) = 2267c3e65f820e72e0db4f2ce7b4c14f430e4cf4 +SHA1 (patch-ao) = 53739236153804fe4d9a663654f5822d44aee826 +SHA1 (patch-aq) = 145ec56e89f0533480888fd6a0bb87896d865fc1 |