diff options
| author | ben <ben@pkgsrc.org> | 2005-11-26 01:31:50 +0000 |
|---|---|---|
| committer | ben <ben@pkgsrc.org> | 2005-11-26 01:31:50 +0000 |
| commit | cd86c568f9bbdfa29eacccd531409cd4de4cefed (patch) | |
| tree | 46e0cb3a2ca668cfef2f6c56e0574cf7e8776a82 | |
| parent | f376bcc0524d5c0c8fdf03bc9606b4afe78b9150 (diff) | |
| download | pkgsrc-cd86c568f9bbdfa29eacccd531409cd4de4cefed.tar.gz | |
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.
| -rw-r--r-- | multimedia/mplayer-share/options.mk | 19 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk index b664a3f2685..a1f0d726b90 100644 --- a/multimedia/mplayer-share/options.mk +++ b/multimedia/mplayer-share/options.mk @@ -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 @@ PKG_SUPPORTED_OPTIONS= gif jpeg mad dv dvdread oss png theora vorbis # 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 @@ PKG_SUPPORTED_OPTIONS+= mplayer-real # 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+= --enable-esd 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 --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index dfe4bdb63d8..4af1819d06d 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 |