[pkgsrc/trunk]: pkgsrc/multimedia Add mplayer-internal-faad option to use mpl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/206a592d82a9
branches:  trunk
changeset: 503707:206a592d82a9
user:      ben <ben%pkgsrc.org@localhost>
date:      Sat Nov 26 01:31:50 2005 +0000

description:
Add mplayer-internal-faad option to use mplayer's internal faad library.
The default is to depend on an external faad library, so bump PKGREVISION.

diffstat:

 multimedia/mplayer-share/options.mk |  19 +++++++++++++------
 multimedia/mplayer/Makefile         |   4 ++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diffs (63 lines):

diff -r d55fe4520883 -r 206a592d82a9 multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Fri Nov 25 23:44:08 2005 +0000
+++ b/multimedia/mplayer-share/options.mk       Sat Nov 26 01:31:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2005/11/24 03:59:12 ben Exp $
+# $NetBSD: options.mk,v 1.12 2005/11/26 01:31:50 ben Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -17,7 +17,11 @@
 
 # Set options based on the specific package being built.
 .if !empty(PKGNAME:M*mplayer*)
-PKG_SUPPORTED_OPTIONS+=        aalib esound faad ggi mplayer-menu nas sdl
+PKG_OPTIONS_OPTIONAL_GROUPS=   faadgroup
+PKG_OPTIONS_GROUP.faadgroup=   faad mplayer-internal-faad
+PKG_SUGGESTED_OPTIONS+=                faad
+
+PKG_SUPPORTED_OPTIONS+=        aalib esound ggi mplayer-menu nas sdl
 
 .  if ${OPSYS} != "SunOS"
 PKG_SUPPORTED_OPTIONS+=        arts
@@ -47,7 +51,7 @@
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-.for _o_ in aalib arts cdparanoia dv dvdread esound faad gif jpeg \
+.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
            lame mad mplayer-menu mplayer-real \
            mplayer-runtime-cpudetection mplayer-win32 \
            nas oss png sdl theora vorbis xvid
@@ -102,12 +106,15 @@
 CONFIGURE_ARGS+=       --disable-esd
 .endif
 
-.if !empty(PKG_OPTIONS:Mfaad)
+
+.if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
+CONFIGURE_ARGS+=       --disable-external-faad
+CONFIGURE_ARGS+=       --disable-internal-faad
+.elif !empty(PKG_OPTIONS:Mfaad)
 CONFIGURE_ARGS+=       --enable-external-faad
 .  include "../../audio/faad2/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=       --disable-external-faad
-CONFIGURE_ARGS+=       --disable-internal-faad
+CONFIGURE_ARGS+=       --enable-internal-faad
 .endif
 
 .if !empty(PKG_OPTIONS:Mggi)
diff -r d55fe4520883 -r 206a592d82a9 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Fri Nov 25 23:44:08 2005 +0000
+++ b/multimedia/mplayer/Makefile       Sat Nov 26 01:31:50 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/10/24 19:46:05 minskim Exp $
+# $NetBSD: Makefile,v 1.23 2005/11/26 01:31:50 ben Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder