[pkgsrc/trunk]: pkgsrc/mk Remove 'faad' support from MPLAYER_DISABLE_DRIVERS....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f39ce7c6f4f
branches:  trunk
changeset: 459652:7f39ce7c6f4f
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Aug 04 11:43:47 2003 +0000

description:
Remove 'faad' support from MPLAYER_DISABLE_DRIVERS.  It is an input driver
needed to play files as pointed out by wiz@ (sorry for the delay) and salo@.

diffstat:

 graphics/mplayer-share/Makefile.common  |  5 ++---
 graphics/mplayer-share/Makefile.depends |  5 +++--
 mk/bsd.pkg.defaults.mk                  |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r a40c33ac4c0c -r 7f39ce7c6f4f graphics/mplayer-share/Makefile.common
--- a/graphics/mplayer-share/Makefile.common    Mon Aug 04 11:14:07 2003 +0000
+++ b/graphics/mplayer-share/Makefile.common    Mon Aug 04 11:43:47 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2003/07/27 20:01:36 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.37 2003/08/04 11:43:48 jmmv Exp $
 #
 
 MPLAYER_DIST_VERSION=  0.90
@@ -67,12 +67,11 @@
 # MPLAYER_DISABLE_DRIVERS is explained.
 MPLAYER_DRIVERS=       arts            audio/arts \
                        esd             audio/esound \
-                       faad            audio/faad2 \
                        nas             audio/nas \
                        sdl             devel/SDL
 
 .if defined(PKGNAME) && !empty(PKGNAME:M*encoder*)
-MPLAYER_DISABLE_DRIVERS=arts esd faad nas sdl
+MPLAYER_DISABLE_DRIVERS=arts esd nas sdl
 .else
 BUILD_DEFS+=           MPLAYER_DISABLE_DRIVERS
 .endif
diff -r a40c33ac4c0c -r 7f39ce7c6f4f graphics/mplayer-share/Makefile.depends
--- a/graphics/mplayer-share/Makefile.depends   Mon Aug 04 11:14:07 2003 +0000
+++ b/graphics/mplayer-share/Makefile.depends   Mon Aug 04 11:43:47 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.16 2003/07/27 20:01:36 jmmv Exp $
+# $NetBSD: Makefile.depends,v 1.17 2003/08/04 11:43:48 jmmv Exp $
 #
 
 DEPENDS+=      mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share
@@ -27,7 +27,8 @@
 .  endif
 .endfor
 
-.include "../../audio/libmad/buildlink2.mk"
+.include "../../audio/faad2/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
diff -r a40c33ac4c0c -r 7f39ce7c6f4f mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Mon Aug 04 11:14:07 2003 +0000
+++ b/mk/bsd.pkg.defaults.mk    Mon Aug 04 11:43:47 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.168 2003/08/04 11:14:07 jmmv Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.169 2003/08/04 11:43:47 jmmv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1193,7 +1193,7 @@
 MPLAYER_DISABLE_DRIVERS?=
 # Whitespace separated list of output drivers that are not wanted in
 # mplayer/gmplayer's binary.
-# Possible: arts esd faad nas sdl
+# Possible: arts esd nas sdl
 # Default: empty
 
 MPLAYER_ENABLE_RUNTIME_CPU_DETECTION?= YES