diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mplayer-share/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/mplayer-share/options.mk | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common index 3a19555128d..6c19c1ae46d 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2005/09/15 13:27:34 wiz Exp $ +# $NetBSD: Makefile.common,v 1.24 2005/11/24 03:59:12 ben Exp $ MPLAYER_DIST_VERSION= 1.0pre7 @@ -39,7 +39,7 @@ HAS_CONFIGURE= YES PTHREAD_OPTS+= require CONFIGURE_ARGS+= --prefix="${PREFIX}" \ - --with-extraincdir="${LOCALBASE}/include" \ + --with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2" \ --with-extralibdir="${LOCALBASE}/lib" \ --with-x11incdir="${X11BASE}/include" \ --with-x11libdir="${X11BASE}/lib" \ diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk index de604b56274..b664a3f2685 100644 --- a/multimedia/mplayer-share/options.mk +++ b/multimedia/mplayer-share/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2005/11/11 06:47:35 rillig Exp $ +# $NetBSD: options.mk,v 1.11 2005/11/24 03:59:12 ben Exp $ .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) @@ -17,7 +17,7 @@ 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 ggi mplayer-menu nas sdl +PKG_SUPPORTED_OPTIONS+= aalib esound faad ggi mplayer-menu nas sdl . if ${OPSYS} != "SunOS" PKG_SUPPORTED_OPTIONS+= arts @@ -47,7 +47,7 @@ PKG_SUPPORTED_OPTIONS+= mplayer-real # Define PKG_SUGGESTED_OPTIONS. # ------------------------------------------------------------------------- -.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \ +.for _o_ in aalib arts cdparanoia dv dvdread esound faad gif jpeg \ lame mad mplayer-menu mplayer-real \ mplayer-runtime-cpudetection mplayer-win32 \ nas oss png sdl theora vorbis xvid @@ -102,6 +102,14 @@ CONFIGURE_ARGS+= --enable-esd CONFIGURE_ARGS+= --disable-esd .endif +.if !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 +.endif + .if !empty(PKG_OPTIONS:Mggi) CONFIGURE_ARGS+= --enable-ggi . include "../../graphics/libggi/buildlink3.mk" |