[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Add mplayer option for faad2,...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae966e8b1dbf
branches:  trunk
changeset: 503624:ae966e8b1dbf
user:      ben <ben%pkgsrc.org@localhost>
date:      Thu Nov 24 03:59:12 2005 +0000

description:
Add mplayer option for faad2, which uses faad2 from pkgsrc.

diffstat:

 multimedia/mplayer-share/Makefile.common |   4 ++--
 multimedia/mplayer-share/options.mk      |  14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 95149465e3c6 -r ae966e8b1dbf multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common  Thu Nov 24 01:22:35 2005 +0000
+++ b/multimedia/mplayer-share/Makefile.common  Thu Nov 24 03:59:12 2005 +0000
@@ -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 @@
 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 -r 95149465e3c6 -r ae966e8b1dbf multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Thu Nov 24 01:22:35 2005 +0000
+++ b/multimedia/mplayer-share/options.mk       Thu Nov 24 03:59:12 2005 +0000
@@ -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 @@
 
 # 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 @@
 # 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+=       --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"